r766 - in branches/stable/source: . src src/build-aux src/doc src/libs src/libs/libpng src/libs/libpng/TLpatches src/libs/libpng/libpng-src src/libs/libpng/libpng-src/arm src/libs/libpng/libpng-src/contrib src/libs/libpng/libpng-src/contrib/conftest src/libs/libpng/libpng-src/contrib/examples src/libs/libpng/libpng-src/contrib/gregbook src/libs/libpng/libpng-src/contrib/intel src/libs/libpng/libpng-src/contrib/libtests src/libs/libpng/libpng-src/contrib/mips-msa src/libs/libpng/libpng-src/contrib/pngminus src/libs/libpng/libpng-src/contrib/pngsuite src/libs/libpng/libpng-src/contrib/tools src/libs/libpng/libpng-src/mips src/libs/libpng/libpng-src/projects/vstudio src/libs/libpng/libpng-src/projects/vstudio/libpng src/libs/libpng/libpng-src/projects/vstudio/pnglibconf src/libs/libpng/libpng-src/projects/vstudio/pngstest src/libs/libpng/libpng-src/projects/vstudio/pngtest src/libs/libpng/libpng-src/projects/vstudio/pngunknown src/libs/libpng/libpng-src/projects/vstudio/pngvali d src/libs/libpng/libpng-src/projects/vstudio/zlib src/libs/libpng/libpng-src/scripts src/libs/libpng/libpng-src/tests src/libs/poppler src/libs/poppler/TLpatches src/libs/poppler/poppler-src src/libs/poppler/poppler-src/fofi src/libs/poppler/poppler-src/goo src/libs/poppler/poppler-src/poppler src/libs/poppler/poppler-src/splash src/libs/xpdf src/libs/xpdf/TLpatches src/libs/zlib src/libs/zlib/TLpatches src/libs/zlib/zlib-src src/libs/zlib/zlib-src/contrib src/libs/zlib/zlib-src/contrib/ada src/libs/zlib/zlib-src/contrib/blast src/libs/zlib/zlib-src/contrib/delphi src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib src/libs/zlib/zlib-src/contrib/infback9 src/libs/zlib/zlib-src/contrib/minizip src/libs/zlib/zlib-src/contrib/pascal src/libs/zlib/zlib-src/contrib/puff src/libs/zlib/zlib-src/contrib/vstudio src/libs/zlib/zlib-src/contrib/vstudio/vc10 src/libs/zlib/zlib-src/contrib/vstudio/vc11 src/libs/zlib/zlib-src/contrib/vstudio/vc12 src/libs/zlib/zlib-src/contrib/vstudio/vc14 src/libs/z lib/zlib-src/contrib/vstudio/vc9 src/libs/zlib/zlib-src/examples src/libs/zlib/zlib-src/msdos src/libs/zlib/zlib-src/old src/libs/zlib/zlib-src/old/os2 src/libs/zlib/zlib-src/os400 src/libs/zlib/zlib-src/qnx src/libs/zlib/zlib-src/test src/libs/zlib/zlib-src/win32 src/texk src/texk/kpathsea src/texk/kpathsea/doc src/texk/tests/TeXLive src/texk/web2c src/texk/web2c/cwebdir src/texk/web2c/lib src/texk/web2c/pdftexdir src/texk/web2c/web2c src/utils
karl at freefriends.org
karl at freefriends.org
Thu Feb 16 17:38:17 CET 2017
Author: karl
Date: 2017-02-16 16:38:15 +0000 (Thu, 16 Feb 2017)
New Revision: 766
Added:
branches/stable/source/src/build-aux/ar-lib
branches/stable/source/src/libs/libpng/TLpatches/
branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa
branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/
branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/INSTALL
branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/filter_sse2_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_init.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_sse.patch
branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/
branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/README
branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent
branches/stable/source/src/libs/libpng/libpng-src/mips/
branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/mips/mips_init.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/gensrc.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/test.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png
branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png
branches/stable/source/src/libs/poppler/TLpatches/
branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX
branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions
branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.h
branches/stable/source/src/libs/xpdf/TLpatches/
branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog
branches/stable/source/src/libs/xpdf/TLpatches/TL-Changes
branches/stable/source/src/libs/xpdf/TLpatches/patch-10-exclude-body-of-Page_getDefaultCTM
branches/stable/source/src/libs/xpdf/TLpatches/patch-20-skip-reading-config-file
branches/stable/source/src/libs/xpdf/TLpatches/patch-22-exclude-openTempFile
branches/stable/source/src/libs/xpdf/TLpatches/patch-30-include-strings_h
branches/stable/source/src/libs/xpdf/TLpatches/patch-40-W32TeX
branches/stable/source/src/libs/xpdf/TLpatches/patch-41-W32TeX
branches/stable/source/src/libs/zlib/TLpatches/
branches/stable/source/src/libs/zlib/TLpatches/ChangeLog
branches/stable/source/src/libs/zlib/TLpatches/TL-Changes
branches/stable/source/src/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.sln
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.def
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.sln
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/os400/
branches/stable/source/src/libs/zlib/zlib-src/os400/README400
branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc
branches/stable/source/src/libs/zlib/zlib-src/os400/make.sh
branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc
Removed:
branches/stable/source/src/libs/libpng/libpng-PATCHES/
branches/stable/source/src/libs/libpng/libpng-src-PATCHES/
branches/stable/source/src/libs/poppler/poppler-PATCHES/
branches/stable/source/src/libs/poppler/poppler-src-PATCHES/
branches/stable/source/src/libs/xpdf/xpdf-PATCHES/
branches/stable/source/src/libs/zlib/zlib-PATCHES/
branches/stable/source/src/libs/zlib/zlib-src/Makefile
branches/stable/source/src/libs/zlib/zlib-src/as400/
Modified:
branches/stable/source/Makefile
branches/stable/source/src/Makefile.am
branches/stable/source/src/Makefile.in
branches/stable/source/src/build-aux/compile
branches/stable/source/src/build-aux/config.guess
branches/stable/source/src/build-aux/config.sub
branches/stable/source/src/build-aux/depcomp
branches/stable/source/src/build-aux/texinfo.tex
branches/stable/source/src/configure
branches/stable/source/src/doc/build-tools.txt
branches/stable/source/src/doc/tlbuild.info
branches/stable/source/src/doc/tlbuild.texi
branches/stable/source/src/libs/README
branches/stable/source/src/libs/configure
branches/stable/source/src/libs/libpng/ChangeLog
branches/stable/source/src/libs/libpng/README
branches/stable/source/src/libs/libpng/configure
branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
branches/stable/source/src/libs/libpng/libpng-src/CHANGES
branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
branches/stable/source/src/libs/libpng/libpng-src/INSTALL
branches/stable/source/src/libs/libpng/libpng-src/LICENSE
branches/stable/source/src/libs/libpng/libpng-src/Makefile.am
branches/stable/source/src/libs/libpng/libpng-src/README
branches/stable/source/src/libs/libpng/libpng-src/TODO
branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/config.h.in
branches/stable/source/src/libs/libpng/libpng-src/configure.ac
branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/README.txt
branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/README
branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/readpng2.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng-win.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng2-win.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README
branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/README.txt
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
branches/stable/source/src/libs/libpng/libpng-src/example.c
branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
branches/stable/source/src/libs/libpng/libpng-src/libpng.3
branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
branches/stable/source/src/libs/libpng/libpng-src/png.5
branches/stable/source/src/libs/libpng/libpng-src/png.c
branches/stable/source/src/libs/libpng/libpng-src/png.h
branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
branches/stable/source/src/libs/libpng/libpng-src/pngerror.c
branches/stable/source/src/libs/libpng/libpng-src/pngget.c
branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
branches/stable/source/src/libs/libpng/libpng-src/pngmem.c
branches/stable/source/src/libs/libpng/libpng-src/pngpread.c
branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
branches/stable/source/src/libs/libpng/libpng-src/pngread.c
branches/stable/source/src/libs/libpng/libpng-src/pngrio.c
branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
branches/stable/source/src/libs/libpng/libpng-src/pngset.c
branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c
branches/stable/source/src/libs/libpng/libpng-src/pngwio.c
branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c
branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def
branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest
branches/stable/source/src/libs/libpng/version.ac
branches/stable/source/src/libs/poppler/ChangeLog
branches/stable/source/src/libs/poppler/Makefile.am
branches/stable/source/src/libs/poppler/Makefile.in
branches/stable/source/src/libs/poppler/config.h.in
branches/stable/source/src/libs/poppler/configure
branches/stable/source/src/libs/poppler/configure.ac
branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
branches/stable/source/src/libs/poppler/poppler-src/ConfigureChecks.cmake
branches/stable/source/src/libs/poppler/poppler-src/NEWS
branches/stable/source/src/libs/poppler/poppler-src/config.h.cmake
branches/stable/source/src/libs/poppler/poppler-src/config.h.in
branches/stable/source/src/libs/poppler/poppler-src/configure.ac
branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiBase.cc
branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.cc
branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.h
branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.cc
branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.h
branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h
branches/stable/source/src/libs/poppler/poppler-src/goo/Makefile.am
branches/stable/source/src/libs/poppler/poppler-src/gtk-doc.make
branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoFontEngine.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Decrypt.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Makefile.am
branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.cmake
branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.in
branches/stable/source/src/libs/poppler/poppler-src/splash/Splash.cc
branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.cc
branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.h
branches/stable/source/src/libs/poppler/poppler-src/splash/SplashScreen.cc
branches/stable/source/src/libs/poppler/version.ac
branches/stable/source/src/libs/zlib/ChangeLog
branches/stable/source/src/libs/zlib/README
branches/stable/source/src/libs/zlib/configure
branches/stable/source/src/libs/zlib/version.ac
branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt
branches/stable/source/src/libs/zlib/zlib-src/ChangeLog
branches/stable/source/src/libs/zlib/zlib-src/Makefile.in
branches/stable/source/src/libs/zlib/zlib-src/README
branches/stable/source/src/libs/zlib/zlib-src/adler32.c
branches/stable/source/src/libs/zlib/zlib-src/compress.c
branches/stable/source/src/libs/zlib/zlib-src/configure
branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib
branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-streams.ads
branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-thin.ads
branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.h
branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.def
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.def
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.def
branches/stable/source/src/libs/zlib/zlib-src/crc32.c
branches/stable/source/src/libs/zlib/zlib-src/deflate.c
branches/stable/source/src/libs/zlib/zlib-src/deflate.h
branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c
branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.c
branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c
branches/stable/source/src/libs/zlib/zlib-src/gzguts.h
branches/stable/source/src/libs/zlib/zlib-src/gzlib.c
branches/stable/source/src/libs/zlib/zlib-src/gzread.c
branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c
branches/stable/source/src/libs/zlib/zlib-src/infback.c
branches/stable/source/src/libs/zlib/zlib-src/inffast.c
branches/stable/source/src/libs/zlib/zlib-src/inflate.c
branches/stable/source/src/libs/zlib/zlib-src/inflate.h
branches/stable/source/src/libs/zlib/zlib-src/inftrees.c
branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.dj2
branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.emx
branches/stable/source/src/libs/zlib/zlib-src/old/Makefile.emx
branches/stable/source/src/libs/zlib/zlib-src/old/os2/Makefile.os2
branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg
branches/stable/source/src/libs/zlib/zlib-src/test/example.c
branches/stable/source/src/libs/zlib/zlib-src/test/infcover.c
branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c
branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml
branches/stable/source/src/libs/zlib/zlib-src/trees.c
branches/stable/source/src/libs/zlib/zlib-src/uncompr.c
branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.gcc
branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.msc
branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt
branches/stable/source/src/libs/zlib/zlib-src/win32/VisualC.txt
branches/stable/source/src/libs/zlib/zlib-src/win32/zlib.def
branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc
branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein
branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in
branches/stable/source/src/libs/zlib/zlib-src/zlib.3
branches/stable/source/src/libs/zlib/zlib-src/zlib.3.pdf
branches/stable/source/src/libs/zlib/zlib-src/zlib.h
branches/stable/source/src/libs/zlib/zlib-src/zlib.map
branches/stable/source/src/libs/zlib/zlib-src/zutil.c
branches/stable/source/src/libs/zlib/zlib-src/zutil.h
branches/stable/source/src/tardate.ac
branches/stable/source/src/texk/README
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/c-auto.in
branches/stable/source/src/texk/kpathsea/config.h
branches/stable/source/src/texk/kpathsea/configure
branches/stable/source/src/texk/kpathsea/db.c
branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
branches/stable/source/src/texk/kpathsea/elt-dirs.c
branches/stable/source/src/texk/kpathsea/expand.c
branches/stable/source/src/texk/kpathsea/find-suffix.c
branches/stable/source/src/texk/kpathsea/hash.c
branches/stable/source/src/texk/kpathsea/knj.c
branches/stable/source/src/texk/kpathsea/knj.h
branches/stable/source/src/texk/kpathsea/kpsestat.c
branches/stable/source/src/texk/kpathsea/kpsewhich.c
branches/stable/source/src/texk/kpathsea/make-suffix.c
branches/stable/source/src/texk/kpathsea/mktexdir
branches/stable/source/src/texk/kpathsea/path-elt.c
branches/stable/source/src/texk/kpathsea/progname.c
branches/stable/source/src/texk/kpathsea/readable.c
branches/stable/source/src/texk/kpathsea/tex-file.c
branches/stable/source/src/texk/kpathsea/texmf.cnf
branches/stable/source/src/texk/kpathsea/tilde.c
branches/stable/source/src/texk/kpathsea/types.h
branches/stable/source/src/texk/kpathsea/variable.c
branches/stable/source/src/texk/kpathsea/version.ac
branches/stable/source/src/texk/kpathsea/win32lib.c
branches/stable/source/src/texk/kpathsea/win32lib.h
branches/stable/source/src/texk/kpathsea/xbasename.c
branches/stable/source/src/texk/kpathsea/xdirname.c
branches/stable/source/src/texk/kpathsea/xdirtest.c
branches/stable/source/src/texk/kpathsea/xgetcwd.c
branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.am
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/ctangleboot.cin
branches/stable/source/src/texk/web2c/cwebboot.cin
branches/stable/source/src/texk/web2c/cwebboot.hin
branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
branches/stable/source/src/texk/web2c/cwebdir/Makefile
branches/stable/source/src/texk/web2c/cwebdir/README
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/common.c
branches/stable/source/src/texk/web2c/cwebdir/common.h
branches/stable/source/src/texk/web2c/cwebdir/common.w
branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweave.w
branches/stable/source/src/texk/web2c/cwebdir/cweb.el
branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
branches/stable/source/src/texk/web2c/help.h
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/printversion.c
branches/stable/source/src/texk/web2c/lib/texmfmp.c
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/NEWS
branches/stable/source/src/texk/web2c/tex.ch
branches/stable/source/src/texk/web2c/texmfmp.h
branches/stable/source/src/texk/web2c/web2c/configure
branches/stable/source/src/utils/README
branches/stable/source/src/utils/configure
branches/stable/source/src/version.ac
branches/stable/source/sync-pdftex.sh
Log:
sync from tl 43243
Modified: branches/stable/source/Makefile
===================================================================
--- branches/stable/source/Makefile 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/Makefile 2017-02-16 16:38:15 UTC (rev 766)
@@ -16,6 +16,7 @@
cd build-pdftex/texk/web2c && ./pdftex --version && ./pdftex --help
synctest:
+ svn status # if not clean, commit first or changes will be lost
./sync-pdftex.sh # does not actually change anything.
syncreal:
Modified: branches/stable/source/src/Makefile.am
===================================================================
--- branches/stable/source/src/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,8 @@
+## $Id$
## Makefile.am for the TeX Live top-level
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2016 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
## Ensure aclocal.m4 is up to date
@@ -59,6 +61,12 @@
##
@echo "top-level make $@ done."
+install-exec-hook:
+ @echo "WARNING: make install does not result in a usable TeX!"
+ @echo " ! The binaries require the myriad support files."
+ @echo " ! See http://tug.org/texlive/distro.html"
+ @echo " ! and http://tug.org/texlive/build.html#deploy, for example."
+
# Allow for skipping make check if needed.
if cross
check_target = skip
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/Makefile.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -919,7 +919,8 @@
install-dvi-am:
install-exec-am:
-
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
install-html-am:
@@ -960,7 +961,8 @@
uninstall-am:
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) install-am install-exec-am \
+ install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
am--refresh check check-am clean clean-cscope clean-generic \
@@ -971,13 +973,13 @@
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-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-am uninstall \
- uninstall-am
+ install-exec-am install-exec-hook install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am 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-am uninstall uninstall-am
.PRECIOUS: Makefile
@@ -1029,6 +1031,12 @@
@echo "top-level make $@: running $(check_target)..."
$(MAKE) $(AM_MAKEFLAGS) $(check_target)
@echo "top-level make $@ done."
+
+install-exec-hook:
+ @echo "WARNING: make install does not result in a usable TeX!"
+ @echo " ! The binaries require the myriad support files."
+ @echo " ! See http://tug.org/texlive/distro.html"
+ @echo " ! and http://tug.org/texlive/build.html#deploy, for example."
skip:
.PHONY: skip
Added: branches/stable/source/src/build-aux/ar-lib
===================================================================
--- branches/stable/source/src/build-aux/ar-lib (rev 0)
+++ branches/stable/source/src/build-aux/ar-lib 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda at lysator.liu.se>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, 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, see <http://www.gnu.org/licenses/>.
+
+# 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.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+ echo "$me: $1" 1>&2
+ exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv in
+ mingw)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+ operation=$2
+ archive=$3
+ at_file_contents=`cat "$1"`
+ eval set x "$at_file_contents"
+ shift
+
+ for member
+ do
+ $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+ done
+}
+
+case $1 in
+ '')
+ func_error "no command. Try '$0 --help' for more information."
+ ;;
+ -h | --h*)
+ cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "$me, version $scriptversion"
+ exit $?
+ ;;
+esac
+
+if test $# -lt 3; then
+ func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+ if test $# -lt 2; then
+ func_error "you must specify a program, an action and an archive"
+ fi
+ case $1 in
+ -lib | -LIB \
+ | -ltcg | -LTCG \
+ | -machine* | -MACHINE* \
+ | -subsystem* | -SUBSYSTEM* \
+ | -verbose | -VERBOSE \
+ | -wx* | -WX* )
+ AR="$AR $1"
+ shift
+ ;;
+ *)
+ action=$1
+ shift
+ break
+ ;;
+ esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+ case $action in
+ d*) delete=yes ;;
+ x*) extract=yes ;;
+ t*) list=yes ;;
+ q*) quick=yes ;;
+ r*) replace=yes ;;
+ s*) index=yes ;;
+ S*) ;; # the index is always updated implicitly
+ c*) create=yes ;;
+ u*) ;; # TODO: don't ignore the update modifier
+ v*) ;; # TODO: don't ignore the verbose modifier
+ *)
+ func_error "unknown action specified"
+ ;;
+ esac
+ action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+ yes,* | ,yes)
+ ;;
+ yesyes*)
+ func_error "more than one action specified"
+ ;;
+ *)
+ func_error "no action specified"
+ ;;
+esac
+
+if test -n "$delete"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ for member
+ do
+ case $1 in
+ @*)
+ func_at_file "${1#@}" -REMOVE "$archive"
+ ;;
+ *)
+ func_file_conv "$1"
+ $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+ ;;
+ esac
+ done
+
+elif test -n "$extract"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ if test $# -gt 0; then
+ for member
+ do
+ case $1 in
+ @*)
+ func_at_file "${1#@}" -EXTRACT "$archive"
+ ;;
+ *)
+ func_file_conv "$1"
+ $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+ ;;
+ esac
+ done
+ else
+ $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+ do
+ $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+ done
+ fi
+
+elif test -n "$quick$replace"; then
+ if test ! -f "$orig_archive"; then
+ if test -z "$create"; then
+ echo "$me: creating $orig_archive"
+ fi
+ orig_archive=
+ else
+ orig_archive=$archive
+ fi
+
+ for member
+ do
+ case $1 in
+ @*)
+ func_file_conv "${1#@}"
+ set x "$@" "@$file"
+ ;;
+ *)
+ func_file_conv "$1"
+ set x "$@" "$file"
+ ;;
+ esac
+ shift
+ shift
+ done
+
+ if test -n "$orig_archive"; then
+ $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+ else
+ $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+ fi
+
+elif test -n "$list"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ $AR -NOLOGO -LIST "$archive" || exit $?
+fi
Property changes on: branches/stable/source/src/build-aux/ar-lib
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/build-aux/compile 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/build-aux/config.guess 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2016-05-15'
+timestamp='2017-02-07'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1000,6 +1000,9 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
@@ -1032,6 +1035,9 @@
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
@@ -1337,6 +1343,9 @@
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
+ NSX-?:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk${UNAME_RELEASE}
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/build-aux/config.sub 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2016-05-10'
+timestamp='2017-02-07'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,6 +301,7 @@
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -428,6 +429,7 @@
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -643,6 +645,14 @@
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -938,6 +948,9 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -1022,7 +1035,7 @@
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
@@ -1032,7 +1045,7 @@
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
@@ -1387,9 +1400,9 @@
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1412,7 @@
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1628,6 +1641,9 @@
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/build-aux/depcomp 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# 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
Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/build-aux/texinfo.tex 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-05-07.20}
+\def\texinfoversion{2017-01-14.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -165,6 +165,9 @@
% Give the space character the catcode for a space.
\def\spaceisspace{\catcode`\ =10\relax}
+% Likewise for ^^M, the end of line character.
+\def\endlineisspace{\catcode13=10\relax}
+
\chardef\dashChar = `\-
\chardef\slashChar = `\/
\chardef\underChar = `\_
@@ -862,36 +865,6 @@
\temp
}
-% @| inserts a changebar to the left of the current line. It should
-% surround any changed text. This approach does *not* work if the
-% change spans more than two lines of output. To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change). This command
-% is not documented, not supported, and doesn't work.
-%
-\def\|{%
- % \vadjust can only be used in horizontal mode.
- \leavevmode
- %
- % Append this vertical mode material after the current line in the output.
- \vadjust{%
- % We want to insert a rule with the height and depth of the current
- % leading; that is exactly what \strutbox is supposed to record.
- \vskip-\baselineskip
- %
- % \vadjust-items are inserted at the left edge of the type. So
- % the \llap here moves out into the left-hand margin.
- \llap{%
- %
- % For a thicker or thinner bar, change the `1pt'.
- \vrule height\baselineskip width1pt
- %
- % This is the space between the bar and the text.
- \hskip 12pt
- }%
- }%
-}
-
% @include FILE -- \input text of FILE.
%
\def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -980,21 +953,14 @@
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-%
-\def\comment{\begingroup \catcode`\^^M=\active%
-\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}%
-{\catcode`\^^M=\active%
-\gdef\commentxxx#1^^M{\endgroup%
-\futurelet\nexttoken\commentxxxx}%
-\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}%
-}
\def\c{\begingroup \catcode`\^^M=\active%
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\cxxx}
{\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}}
-% See comment in \scanmacro about why the definitions of @c and @comment differ
+%
+\let\comment\c
% @paragraphindent NCHARS
% We'll use ems for NCHARS, close enough.
@@ -1108,9 +1074,14 @@
% For LuaTeX
%
+\newif\iftxiuseunicodedestname
+\txiuseunicodedestnamefalse % For pdfTeX etc.
+
\ifx\luatexversion\thisisundefined
\else
- % Escape PDF strings UTF-8 to UTF-16
+ % Use Unicode destination names
+ \txiuseunicodedestnametrue
+ % Escape PDF strings with converting UTF-16 from UTF-8
\begingroup
\catcode`\%=12
\directlua{
@@ -1138,7 +1109,24 @@
end
}
\endgroup
- \def\pdfescapestring#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+ \def\pdfescapestrutfsixteen#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
+ % Escape PDF strings without converting
+ \begingroup
+ \directlua{
+ function PDFescstr(str)
+ for c in string.bytes(str) do
+ if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
+ tex.sprint(
+ string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
+ c))
+ else
+ tex.sprint(string.char(c))
+ end
+ end
+ end
+ }
+ \endgroup
+ \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
% For LuaTeX >= 0.85
\def\pdfdest{\pdfextension dest}
@@ -1192,6 +1180,7 @@
\ifx\pdfescapestring\thisisundefined
% No primitive available; should we give a warning or log?
% Many times it won't matter.
+ \xdef#1{#1}%
\else
% The expandable \pdfescapestring primitive escapes parentheses,
% backslashes, and other special chars.
@@ -1198,6 +1187,14 @@
\xdef#1{\pdfescapestring{#1}}%
\fi
}
+\def\txiescapepdfutfsixteen#1{%
+ \ifx\pdfescapestrutfsixteen\thisisundefined
+ % No UTF-16 converting macro available.
+ \txiescapepdf{#1}%
+ \else
+ \xdef#1{\pdfescapestrutfsixteen{#1}}%
+ \fi
+}
\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
with PDF output, and none of those formats could be found. (.eps cannot
@@ -1307,17 +1304,77 @@
\pdfrefximage \pdflastximage
\fi}
%
- \def\pdfmkdest#1{{%
+ \def\setpdfdestname#1{{%
% We have to set dummies so commands such as @code, and characters
% such as \, aren't expanded when present in a section title.
\indexnofonts
+ \makevalueexpandable
\turnoffactive
- \makevalueexpandable
+ \iftxiuseunicodedestname
+ \ifx \declaredencoding \latone
+ % Pass through Latin-1 characters.
+ % LuaTeX with byte wise I/O converts Latin-1 characters to Unicode.
+ \else
+ \ifx \declaredencoding \utfeight
+ % Pass through Unicode characters.
+ \else
+ % Use ASCII approximations in destination names.
+ \passthroughcharsfalse
+ \fi
+ \fi
+ \else
+ % Use ASCII approximations in destination names.
+ \passthroughcharsfalse
+ \fi
\def\pdfdestname{#1}%
\txiescapepdf\pdfdestname
- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
}}
%
+ \def\setpdfoutlinetext#1{{%
+ \indexnofonts
+ \makevalueexpandable
+ \turnoffactive
+ \ifx \declaredencoding \latone
+ % The PDF format can use an extended form of Latin-1 in bookmark
+ % strings. See Appendix D of the PDF Reference, Sixth Edition, for
+ % the "PDFDocEncoding".
+ \passthroughcharstrue
+ % Pass through Latin-1 characters.
+ % LuaTeX: Convert to Unicode
+ % pdfTeX: Use Latin-1 as PDFDocEncoding
+ \def\pdfoutlinetext{#1}%
+ \else
+ \ifx \declaredencoding \utfeight
+ \ifx\luatexversion\thisisundefined
+ % For pdfTeX with UTF-8.
+ % TODO: the PDF format can use UTF-16 in bookmark strings,
+ % but the code for this isn't done yet.
+ % Use ASCII approximations.
+ \passthroughcharsfalse
+ \def\pdfoutlinetext{#1}%
+ \else
+ % For LuaTeX with UTF-8.
+ % Pass through Unicode characters for title texts.
+ \passthroughcharstrue
+ \def\pdfoutlinetext{#1}%
+ \fi
+ \else
+ % For non-Latin-1 or non-UTF-8 encodings.
+ % Use ASCII approximations.
+ \passthroughcharsfalse
+ \def\pdfoutlinetext{#1}%
+ \fi
+ \fi
+ % LuaTeX: Convert to UTF-16
+ % pdfTeX: Use Latin-1 as PDFDocEncoding
+ \txiescapepdfutfsixteen\pdfoutlinetext
+ }}
+ %
+ \def\pdfmkdest#1{%
+ \setpdfdestname{#1}%
+ \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+ }
+ %
% used to mark target names; must be expandable.
\def\pdfmkpgn#1{#1}
%
@@ -1345,23 +1402,13 @@
% page number. We could generate a destination for the section
% text in the case where a section has no node, but it doesn't
% seem worth the trouble, since most documents are normally structured.
- {
- \ifx\luatexversion\thisisundefined \else
- \turnoffactive % LuaTeX can use Unicode strings for PDF
- \fi
- \edef\pdfoutlinedest{#3}%
- \ifx\pdfoutlinedest\empty
- \def\pdfoutlinedest{#4}%
- \else
- \txiescapepdf\pdfoutlinedest
- \fi
- %
- % Also escape PDF chars in the display string.
- \edef\pdfoutlinetext{#1}%
- \txiescapepdf\pdfoutlinetext
- %
- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
- }
+ \setpdfoutlinetext{#1}
+ \setpdfdestname{#3}
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{#4}%
+ \fi
+ %
+ \pdfoutline goto name{\pdfmkpgn{\pdfdestname}}#2{\pdfoutlinetext}%
}
%
\def\pdfmakeoutlines{%
@@ -1519,71 +1566,132 @@
%
% For XeTeX
%
-\newif\iftxiuseunicodedestname
\ifx\XeTeXrevision\thisisundefined
\else
%
% XeTeX version check
%
- \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99995}>-1
- % XeTeX 0.99995+ contains xdvipdfmx 20160307+.
- % It can handle Unicode destination name for PDF.
+ \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99996}>-1
+ % TeX Live 2016 contains XeTeX 0.99996 and xdvipdfmx 20160307.
+ % It can use the `dvipdfmx:config' special (from TeX Live SVN r40941).
+ % For avoiding PDF destination name replacement, we use this special
+ % instead of xdvipdfmx's command line option `-C 0x0010'.
+ \special{dvipdfmx:config C 0x0010}
+ % XeTeX 0.99995+ comes with xdvipdfmx 20160307+.
+ % It can handle Unicode destination names for PDF.
\txiuseunicodedestnametrue
\else
- % XeTeX < 0.99995 can not handle Unicode destination name for PDF
- % because xdvipdfmx 20150315 has UTF-16 convert issue.
- % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+ % XeTeX < 0.99996 (TeX Live < 2016) cannot use the
+ % `dvipdfmx:config' special.
+ % So for avoiding PDF destination name replacement,
+ % xdvipdfmx's command line option `-C 0x0010' is necessary.
+ %
+ % XeTeX < 0.99995 can not handle Unicode destination names for PDF
+ % because xdvipdfmx 20150315 has a UTF-16 conversion issue.
+ % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
\txiuseunicodedestnamefalse
\fi
%
+ % Color support
+ %
+ \def\rgbDarkRed{0.50 0.09 0.12}
+ \def\rgbBlack{0 0 0}
+ %
+ \def\pdfsetcolor#1{\special{pdf:scolor [#1]}}
+ %
+ % Set color, and create a mark which defines \thiscolor accordingly,
+ % so that \makeheadline knows which color to restore.
+ \def\setcolor#1{%
+ \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \domark
+ \pdfsetcolor{#1}%
+ }
+ %
+ \def\maincolor{\rgbBlack}
+ \pdfsetcolor{\maincolor}
+ \edef\thiscolor{\maincolor}
+ \def\lastcolordefs{}
+ %
+ \def\makefootline{%
+ \baselineskip24pt
+ \line{\pdfsetcolor{\maincolor}\the\footline}%
+ }
+ %
+ \def\makeheadline{%
+ \vbox to 0pt{%
+ \vskip-22.5pt
+ \line{%
+ \vbox to8.5pt{}%
+ % Extract \thiscolor definition from the marks.
+ \getcolormarks
+ % Typeset the headline with \maincolor, then restore the color.
+ \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+ }%
+ \vss
+ }%
+ \nointerlineskip
+ }
+ %
% PDF outline support
%
- % Emulate the primitive of pdfTeX
+ % Emulate pdfTeX primitive
\def\pdfdest name#1 xyz{%
- \special{pdf:dest (name#1) [@thispage /XYZ @xpos @ypos]}%
+ \special{pdf:dest (#1) [@thispage /XYZ @xpos @ypos null]}%
}
- \def\pdfmkdest#1{{%
+ %
+ \def\setpdfdestname#1{{%
% We have to set dummies so commands such as @code, and characters
% such as \, aren't expanded when present in a section title.
\indexnofonts
+ \makevalueexpandable
+ \turnoffactive
\iftxiuseunicodedestname
- \def\pdfdestname{#1}% Pass through Unicode characters.
+ % Pass through Unicode characters.
\else
- \edef\pdfdestname{#1}% Replace Unicode characters to ASCII.
+ % Use ASCII approximations in destination names.
+ \passthroughcharsfalse
\fi
- \turnoffactive
- \makevalueexpandable
+ \def\pdfdestname{#1}%
\txiescapepdf\pdfdestname
- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
}}
%
+ \def\setpdfoutlinetext#1{{%
+ \turnoffactive
+ % Always use Unicode characters in title texts.
+ \def\pdfoutlinetext{#1}%
+ % For XeTeX, xdvipdfmx converts to UTF-16.
+ % So we do not convert.
+ \txiescapepdf\pdfoutlinetext
+ }}
+ %
+ \def\pdfmkdest#1{%
+ \setpdfdestname{#1}%
+ \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+ }
+ %
+ % by default, use black for everything.
+ \def\urlcolor{\rgbBlack}
+ \def\linkcolor{\rgbBlack}
+ \def\endlink{\setcolor{\maincolor}\pdfendlink}
+ %
\def\dopdfoutline#1#2#3#4{%
- \iftxiuseunicodedestname
- \def\pdfoutlinedest{#3}% Pass through Unicode characters.
- \else
- \edef\pdfoutlinedest{#3}% Replace Unicode characters to ASCII.
+ \setpdfoutlinetext{#1}
+ \setpdfdestname{#3}
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{#4}%
\fi
- \ifx\pdfoutlinedest\empty
- \def\pdfoutlinedest{#4}%
- \fi
- {
- \turnoffactive
- \txiescapepdf\pdfoutlinedest
- \edef\pdfoutlinetext{#1}%
- \txiescapepdf\pdfoutlinetext
- %
- \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
- << /S /GoTo /D (name\pdfoutlinedest) >> >> }%
- }
+ %
+ \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A
+ << /S /GoTo /D (\pdfdestname) >> >> }%
}
%
\def\pdfmakeoutlines{%
\begingroup
%
- % In the case of XeTeX, counts of subentries is not necesary.
- % Therefore, read toc only once.
+ % For XeTeX, counts of subentries are not necessary.
+ % Therefore, we read toc only once.
%
- % We use the node names as the destinations.
+ % We use node names as destinations.
\def\partentry##1##2##3##4{}% ignore parts in the outlines
\def\numchapentry##1##2##3##4{%
\dopdfoutline{##1}{1}{##3}{##4}}%
@@ -1603,7 +1711,7 @@
\let\unnsubsecentry\numsubsecentry%
\let\unnsubsubsecentry\numsubsubsecentry%
%
- % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
+ % For XeTeX, xdvipdfmx converts strings to UTF-16.
% Therefore, the encoding and the language may not be considered.
%
\indexnofonts
@@ -1625,9 +1733,9 @@
\special{pdf:docview << /PageMode /UseOutlines >> }
% ``\special{pdf:tounicode ...}'' is not necessary
% because xdvipdfmx converts strings from UTF-8 to UTF-16 without it.
- % However, due to UTF-16 convert issue of xdvipdfmx 20150315,
- % ``\special{pdf:dest ...}'' can not handle non-ASCII strings.
- % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+ % However, due to a UTF-16 conversion issue of xdvipdfmx 20150315,
+ % ``\special{pdf:dest ...}'' cannot handle non-ASCII strings.
+ % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
%
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
@@ -1687,7 +1795,7 @@
{\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
\def\pdflink#1{%
\special{pdf:bann << /Border [0 0 0]
- /Type /Annot /Subtype /Link /A << /S /GoTo /D (name#1) >> >>}%
+ /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}%
\setcolor{\linkcolor}#1\endlink}
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
%
@@ -1699,7 +1807,7 @@
\def\xeteximagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
\def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
%
- % XeTeX (and the PDF format) support .pdf, .png, .jpg (among
+ % XeTeX (and the PDF format) supports .pdf, .png, .jpg (among
% others). Let's try in that order, PDF first since if
% someone has a scalable image, presumably better to use that than a
% bitmap.
@@ -1743,41 +1851,10 @@
}
\fi
-\message{fonts,}
-% Change the current font style to #1, remembering it in \curfontstyle.
-% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
-% italics, not bold italics.
%
-\def\setfontstyle#1{%
- \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
- \csname ten#1\endcsname % change the current font
-}
+\message{fonts,}
-% Select #1 fonts with the current style.
-%
-\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
-
-\def\rm{\fam=0 \setfontstyle{rm}}
-\def\it{\fam=\itfam \setfontstyle{it}}
-\def\sl{\fam=\slfam \setfontstyle{sl}}
-\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
-\def\tt{\fam=\ttfam \setfontstyle{tt}}
-
-% Unfortunately, we have to override this for titles and the like, since
-% in those cases "rm" is bold. Sigh.
-\def\rmisbold{\rm\def\curfontstyle{bf}}
-
-% Texinfo sort of supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf.
-\newfam\sffam
-\def\sf{\fam=\sffam \setfontstyle{sf}}
-\let\li = \sf % Sometimes we call it \li, not \sf.
-
-% We don't need math for this font style.
-\def\ttsl{\setfontstyle{ttsl}}
-
-
% Set the baselineskip to #1, and the lineskip and strut size
% correspondingly. There is no deep meaning behind these magic numbers
% used as factors; they just match (closely enough) what Knuth defined.
@@ -2127,8 +2204,8 @@
\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf
-\let\tenttsl=\defttsl \let\tensl=\defsl \bf}
+\def\df{\let\ttfont=\deftt \let\bffont = \defbf
+\let\ttslfont=\defttsl \let\slfont=\defsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
@@ -2215,7 +2292,7 @@
\font\ssecsy=cmsy10 scaled 1315
\def\ssececsize{1200}
-% Reduced fonts for @acro in text (10pt).
+% Reduced fonts for @acronym in text (10pt).
\def\reducednominalsize{10pt}
\setfont\reducedrm\rmshape{10}{1000}{OT1}
\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
@@ -2261,8 +2338,8 @@
\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf
-\let\tensl=\defsl \let\tenttsl=\defttsl \bf}
+\def\df{\let\ttfont=\deftt \let\bffont = \defbf
+\let\slfont=\defsl \let\ttslfont=\defttsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
@@ -2348,7 +2425,7 @@
\font\ssecsy=cmsy10
\def\ssececsize{1000}
-% Reduced fonts for @acro in text (9pt).
+% Reduced fonts for @acronym in text (9pt).
\def\reducednominalsize{9pt}
\setfont\reducedrm\rmshape{9}{1000}{OT1}
\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
@@ -2368,7 +2445,13 @@
\rm
} % end of 10pt text font size definitions, \definetextfontsizex
+% Fonts for short table of contents.
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
+
% We provide the user-level command
% @fonttextsize 10
% (or 11) to redefine the text font size. pt is assumed.
@@ -2394,21 +2477,48 @@
\endgroup
}
+%
+% Change the current font style to #1, remembering it in \curfontstyle.
+% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
+% italics, not bold italics.
+%
+\def\setfontstyle#1{%
+ \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
+ \csname #1font\endcsname % change the current font
+}
+
+\def\rm{\fam=0 \setfontstyle{rm}}
+\def\it{\fam=\itfam \setfontstyle{it}}
+\def\sl{\fam=\slfam \setfontstyle{sl}}
+\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
+\def\tt{\fam=\ttfam \setfontstyle{tt}}
+
+% Texinfo sort of supports the sans serif font style, which plain TeX does not.
+% So we set up a \sf.
+\newfam\sffam
+\def\sf{\fam=\sffam \setfontstyle{sf}}
+
+% We don't need math for this font style.
+\def\ttsl{\setfontstyle{ttsl}}
+
+
% In order for the font changes to affect most math symbols and letters,
% we have to define the \textfont of the standard families. We don't
% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
%
\def\resetmathfonts{%
- \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
- \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
- \textfont\ttfam=\tentt \textfont\sffam=\tensf
+ \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
+ \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
+ \textfont\ttfam=\ttfont \textfont\sffam=\sffont
}
-% The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE. We do this because \STYLE needs to also set the
-% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
-% \tenSTYLE to set the current font.
%
+
+% The font-changing commands (all called \...fonts) redefine the meanings
+% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs
+% to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
+% commands hardwire \STYLEfont to set the current font.
+%
% Each font-changing command also sets the names \lsize (one size lower)
% and \lllsize (three sizes lower). These relative commands are used
% in, e.g., the LaTeX logo and acronyms.
@@ -2415,79 +2525,64 @@
%
% This all needs generalizing, badly.
%
-\def\textfonts{%
- \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
- \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
- \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
- \let\tenttsl=\textttsl
- \def\curfontsize{text}%
- \def\lsize{reduced}\def\lllsize{smaller}%
- \resetmathfonts \setleading{\textleading}}
-\def\titlefonts{%
- \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
- \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
- \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
- \let\tenttsl=\titlettsl
- \def\curfontsize{title}%
- \def\lsize{chap}\def\lllsize{subsec}%
- \resetmathfonts \setleading{27pt}}
-\def\titlefont#1{{\titlefonts\rmisbold #1}}
-\def\chapfonts{%
- \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
- \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
- \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
- \let\tenttsl=\chapttsl
- \def\curfontsize{chap}%
- \def\lsize{sec}\def\lllsize{text}%
- \resetmathfonts \setleading{19pt}}
-\def\secfonts{%
- \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
- \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
- \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
- \let\tenttsl=\secttsl
- \def\curfontsize{sec}%
- \def\lsize{subsec}\def\lllsize{reduced}%
- \resetmathfonts \setleading{17pt}}
-\def\subsecfonts{%
- \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
- \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
- \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
- \let\tenttsl=\ssecttsl
- \def\curfontsize{ssec}%
- \def\lsize{text}\def\lllsize{small}%
- \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts
-\def\reducedfonts{%
- \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
- \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
- \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
- \let\tenttsl=\reducedttsl
- \def\curfontsize{reduced}%
- \def\lsize{small}\def\lllsize{smaller}%
- \resetmathfonts \setleading{10.5pt}}
-\def\smallfonts{%
- \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
- \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
- \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
- \let\tenttsl=\smallttsl
- \def\curfontsize{small}%
- \def\lsize{smaller}\def\lllsize{smaller}%
- \resetmathfonts \setleading{10.5pt}}
-\def\smallerfonts{%
- \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
- \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
- \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
- \let\tenttsl=\smallerttsl
- \def\curfontsize{smaller}%
- \def\lsize{smaller}\def\lllsize{smaller}%
- \resetmathfonts \setleading{9.5pt}}
-% Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}{OT1}
-\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}{OT1}
-\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
+\def\assignfonts#1{%
+ \expandafter\let\expandafter\rmfont\csname #1rm\endcsname
+ \expandafter\let\expandafter\itfont\csname #1it\endcsname
+ \expandafter\let\expandafter\slfont\csname #1sl\endcsname
+ \expandafter\let\expandafter\bffont\csname #1bf\endcsname
+ \expandafter\let\expandafter\ttfont\csname #1tt\endcsname
+ \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname
+ \expandafter\let\expandafter\sffont \csname #1sf\endcsname
+ \expandafter\let\expandafter\ifont \csname #1i\endcsname
+ \expandafter\let\expandafter\syfont \csname #1sy\endcsname
+ \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname
+}
+\newif\ifrmisbold
+
+% Select smaller font size with the current style. Used to change font size
+% in, e.g., the LaTeX logo and acronyms. If we are using bold fonts for
+% normal roman text, also use bold fonts for roman text in the smaller size.
+\def\switchtolllsize{%
+ \expandafter\assignfonts\expandafter{\lllsize}%
+ \ifrmisbold
+ \let\rmfont\bffont
+ \fi
+ \csname\curfontstyle\endcsname
+}%
+
+\def\switchtolsize{%
+ \expandafter\assignfonts\expandafter{\lsize}%
+ \ifrmisbold
+ \let\rmfont\bffont
+ \fi
+ \csname\curfontstyle\endcsname
+}%
+
+\def\definefontsetatsize#1#2#3#4#5{%
+\expandafter\def\csname #1fonts\endcsname{%
+ \def\curfontsize{#1}%
+ \def\lsize{#2}\def\lllsize{#3}%
+ \csname rmisbold#5\endcsname
+ \assignfonts{#1}%
+ \resetmathfonts
+ \setleading{#4}%
+}}
+
+\definefontsetatsize{text} {reduced}{smaller}{\textleading}{false}
+\definefontsetatsize{title} {chap} {subsec} {27pt} {true}
+\definefontsetatsize{chap} {sec} {text} {19pt} {true}
+\definefontsetatsize{sec} {subsec} {reduced}{17pt} {true}
+\definefontsetatsize{ssec} {text} {small} {15pt} {true}
+\definefontsetatsize{reduced}{small} {smaller}{10.5pt}{false}
+\definefontsetatsize{small} {smaller}{smaller}{10.5pt}{false}
+\definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false}
+
+\def\titlefont#1{{\titlefonts\rm #1}}
+\let\subsecfonts = \ssecfonts
+\let\subsubsecfonts = \ssecfonts
+
% Define these just so they can be easily changed for other fonts.
\def\angleleft{$\langle$}
\def\angleright{$\rangle$}
@@ -3111,7 +3206,7 @@
%
\def\acronym#1{\doacronym #1,,\finish}
\def\doacronym#1,#2,#3\finish{%
- {\selectfonts\lsize #1}%
+ {\switchtolsize #1}%
\def\temp{#2}%
\ifx\temp\empty \else
\space ({\unsepspaces \ignorespaces \temp \unskip})%
@@ -3204,10 +3299,10 @@
% fix it (significant additions to font machinery) until someone notices.
%
\def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi}
-\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}%
+\def\finishsub#1{$\sb{\hbox{\switchtolllsize #1}}$}%
%
\def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi}
-\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}%
+\def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}%
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
@@ -3271,23 +3366,10 @@
\let\atchar=\@
% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
-% Unless we're in typewriter, use \ecfont because the CM text fonts do
-% not have braces, and we don't want to switch into math.
-\def\mylbrace{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
-\def\myrbrace{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
-\let\{=\mylbrace \let\lbracechar=\{
-\let\}=\myrbrace \let\rbracechar=\}
-\begingroup
- % Definitions to produce \{ and \} commands for indices,
- % and @{ and @} for the aux/toc files.
- \catcode`\{ = \other \catcode`\} = \other
- \catcode`\[ = 1 \catcode`\] = 2
- \catcode`\! = 0 \catcode`\\ = \other
- !gdef!lbracecmd[\{]%
- !gdef!rbracecmd[\}]%
- !gdef!lbraceatcmd[@{]%
- !gdef!rbraceatcmd[@}]%
-!endgroup
+\def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
+\def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
+\let\{=\lbracechar
+\let\}=\rbracechar
% @comma{} to avoid , parsing problems.
\let\comma = ,
@@ -3305,8 +3387,8 @@
% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
\def\questiondown{?`}
\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+\def\ordf{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{o}}}
% Dotless i and dotless j, used for accents.
\def\imacro{i}
@@ -3335,12 +3417,12 @@
{\setbox0=\hbox{T}%
\vbox to \ht0{\hbox{%
\ifx\textnominalsize\xwordpt
- % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+ % for 10pt running text, lllsize (8pt) is too small for the A in LaTeX.
% Revert to plain's \scriptsize, which is 7pt.
\count255=\the\fam $\fam\count255 \scriptstyle A$%
\else
% For 11pt, we can use our lllsize.
- \selectfonts\lllsize A%
+ \switchtolllsize A%
\fi
}%
\vss
@@ -3406,7 +3488,7 @@
%
\newbox\errorbox
%
-{\tentt \global\dimen0 = 3em}% Width of the box.
+{\ttfont \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
@@ -3557,7 +3639,7 @@
% Adapted from the plain.tex definition of \copyright.
%
\def\registeredsymbol{%
- $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
+ $^{{\ooalign{\hfil\raise.07ex\hbox{\switchtolllsize R}%
\hfil\crcr\Orb}}%
}$%
}
@@ -3651,12 +3733,11 @@
% Settings used for typesetting titles: no hyphenation, no indentation,
% don't worry much about spacing, ragged right. This should be used
-% inside a \vbox, and fonts need to be set appropriately first. Because
-% it is always used for titles, nothing else, we call \rmisbold. \par
-% should be specified before the end of the \vbox, since a vbox is a group.
+% inside a \vbox, and fonts need to be set appropriately first. \par should
+% be specified before the end of the \vbox, since a vbox is a group.
%
\def\raggedtitlesettings{%
- \rmisbold
+ \rm
\hyphenpenalty=10000
\parindent=0pt
\tolerance=5000
@@ -3665,7 +3746,7 @@
% Macros to be used within @titlepage:
-\let\subtitlerm=\tenrm
+\let\subtitlerm=\rmfont
\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
\parseargdef\title{%
@@ -3691,7 +3772,7 @@
\else
\checkenv\titlepage
\ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
- {\secfonts\rmisbold \leftline{#1}}%
+ {\secfonts\rm \leftline{#1}}%
\fi
}
@@ -4606,6 +4687,31 @@
\fi
}
+% Like \expandablevalue, but completely expandable (the \message in the
+% definition above operates at the execution level of TeX). Used when
+% writing to auxiliary files, due to the expansion that \write does.
+% If flag is undefined, pass through an unexpanded @value command: maybe it
+% will be set by the time it is read back in.
+%
+% NB flag names containing - or _ may not work here.
+\def\dummyvalue#1{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ \noexpand\value{#1}%
+ \else
+ \csname SET#1\endcsname
+ \fi
+}
+
+% Used for @value's in index entries to form the sort key: expand the @value
+% if possible, otherwise sort late.
+\def\indexnofontsvalue#1{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ ZZZZZZZ
+ \else
+ \csname SET#1\endcsname
+ \fi
+}
+
% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
% with @set.
%
@@ -4730,14 +4836,7 @@
% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
% #3 the target index (bar).
\def\dosynindex#1#2#3{%
- % Only do \closeout if we haven't already done it, else we'll end up
- % closing the target index.
- \expandafter \ifx\csname donesynindex#2\endcsname \relax
- % The \closeout helps reduce unnecessary open files; the limit on the
- % Acorn RISC OS is a mere 16 files.
- \expandafter\closeout\csname#2indfile\endcsname
- \expandafter\let\csname donesynindex#2\endcsname = 1
- \fi
+ \requireopenindexfile{#3}%
% redefine \fooindfile:
\expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
\expandafter\let\csname#2indfile\endcsname=\temp
@@ -4747,7 +4846,7 @@
% Define \doindex, the driver for all index macros.
% Argument #1 is generated by the calling \fooindex macro,
-% and it the two-letter name of the index.
+% and it is the two-letter name of the index.
\def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx}
\def\doindexxxx #1{\doind{\indexname}{#1}}
@@ -4756,63 +4855,61 @@
\def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
+
% Used when writing an index entry out to an index file to prevent
% expansion of Texinfo commands that can appear in an index entry.
%
\def\indexdummies{%
\escapechar = `\\ % use backslash in output files.
- \def\@{@}% change to @@ when we switch to @ as escape char in index files.
- \def\ {\realbackslash\space }%
+ \definedummyletter\@%
+ \definedummyletter\ %
%
- % Need these unexpandable (because we define \tt as a dummy)
- % definitions when @{ or @} appear in index entry text. Also, more
- % complicated, when \tex is in effect and \{ is a \delimiter again.
- % We can't use \lbracecmd and \rbracecmd because texindex assumes
- % braces and backslashes are used only as delimiters. Perhaps we
- % should use @lbracechar and @rbracechar?
- \def\{{{\tt\char123}}%
- \def\}{{\tt\char125}}%
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
%
% Do the redefinitions.
- \commondummies
+ \definedummies
}
-% For the aux and toc files, @ is the escape character. So we want to
-% redefine everything using @ as the escape character (instead of
-% \realbackslash, still used for index files). When everything uses @,
-% this will be simpler.
+% Used for the aux and toc files, where @ is the escape character.
%
\def\atdummies{%
- \def\@{@@}%
- \def\ {@ }%
- \let\{ = \lbraceatcmd
- \let\} = \rbraceatcmd
+ \definedummyletter\@%
+ \definedummyletter\ %
+ \definedummyletter\{%
+ \definedummyletter\}%
%
% Do the redefinitions.
- \commondummies
+ \definedummies
\otherbackslash
}
-% Called from \indexdummies and \atdummies.
+% \definedummyword defines \#1 as \string\#1\space, thus effectively
+% preventing its expansion. This is used only for control words,
+% not control letters, because the \space would be incorrect for
+% control characters, but is needed to separate the control word
+% from whatever follows.
%
-\def\commondummies{%
- % \definedummyword defines \#1 as \string\#1\space, thus effectively
- % preventing its expansion. This is used only for control words,
- % not control letters, because the \space would be incorrect for
- % control characters, but is needed to separate the control word
- % from whatever follows.
+% These can be used both for control words that take an argument and
+% those that do not. If it is followed by {arg} in the input, then
+% that will dutifully get written to the index (or wherever).
+%
+% For control letters, we have \definedummyletter, which omits the
+% space.
+%
+\def\definedummyword #1{\def#1{\string#1\space}}%
+\def\definedummyletter#1{\def#1{\string#1}}%
+\let\definedummyaccent\definedummyletter
+
+% Called from \indexdummies and \atdummies, to effectively prevent
+% the expansion of commands.
+%
+\def\definedummies{%
%
- % For control letters, we have \definedummyletter, which omits the
- % space.
- %
- % These can be used both for control words that take an argument and
- % those that do not. If it is followed by {arg} in the input, then
- % that will dutifully get written to the index (or wherever).
- %
- \def\definedummyword ##1{\def##1{\string##1\space}}%
- \def\definedummyletter##1{\def##1{\string##1}}%
- \let\definedummyaccent\definedummyletter
- %
+ \let\commondummyword\definedummyword
+ \let\commondummyletter\definedummyletter
+ \let\commondummyaccent\definedummyaccent
\commondummiesnofonts
%
\definedummyletter\_%
@@ -4853,6 +4950,7 @@
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\atchar
\definedummyword\arrow
\definedummyword\bullet
\definedummyword\comma
@@ -4892,82 +4990,82 @@
%
% We want to disable all macros so that they are not expanded by \write.
\macrolist
- \definedummyword\value
+ \let\value\dummyvalue
%
\normalturnoffactive
}
-% \commondummiesnofonts: common to \commondummies and \indexnofonts.
-% Define \definedumyletter, \definedummyaccent and \definedummyword before
-% using.
+% \commondummiesnofonts: common to \definedummies and \indexnofonts.
+% Define \commondummyletter, \commondummyaccent and \commondummyword before
+% using. Used for accents, font commands, and various control letters.
%
\def\commondummiesnofonts{%
% Control letters and accents.
- \definedummyletter\!%
- \definedummyaccent\"%
- \definedummyaccent\'%
- \definedummyletter\*%
- \definedummyaccent\,%
- \definedummyletter\.%
- \definedummyletter\/%
- \definedummyletter\:%
- \definedummyaccent\=%
- \definedummyletter\?%
- \definedummyaccent\^%
- \definedummyaccent\`%
- \definedummyaccent\~%
- \definedummyword\u
- \definedummyword\v
- \definedummyword\H
- \definedummyword\dotaccent
- \definedummyword\ogonek
- \definedummyword\ringaccent
- \definedummyword\tieaccent
- \definedummyword\ubaraccent
- \definedummyword\udotaccent
- \definedummyword\dotless
+ \commondummyletter\!%
+ \commondummyaccent\"%
+ \commondummyaccent\'%
+ \commondummyletter\*%
+ \commondummyaccent\,%
+ \commondummyletter\.%
+ \commondummyletter\/%
+ \commondummyletter\:%
+ \commondummyaccent\=%
+ \commondummyletter\?%
+ \commondummyaccent\^%
+ \commondummyaccent\`%
+ \commondummyaccent\~%
+ \commondummyword\u
+ \commondummyword\v
+ \commondummyword\H
+ \commondummyword\dotaccent
+ \commondummyword\ogonek
+ \commondummyword\ringaccent
+ \commondummyword\tieaccent
+ \commondummyword\ubaraccent
+ \commondummyword\udotaccent
+ \commondummyword\dotless
%
% Texinfo font commands.
- \definedummyword\b
- \definedummyword\i
- \definedummyword\r
- \definedummyword\sansserif
- \definedummyword\sc
- \definedummyword\slanted
- \definedummyword\t
+ \commondummyword\b
+ \commondummyword\i
+ \commondummyword\r
+ \commondummyword\sansserif
+ \commondummyword\sc
+ \commondummyword\slanted
+ \commondummyword\t
%
% Commands that take arguments.
- \definedummyword\abbr
- \definedummyword\acronym
- \definedummyword\anchor
- \definedummyword\cite
- \definedummyword\code
- \definedummyword\command
- \definedummyword\dfn
- \definedummyword\dmn
- \definedummyword\email
- \definedummyword\emph
- \definedummyword\env
- \definedummyword\file
- \definedummyword\image
- \definedummyword\indicateurl
- \definedummyword\inforef
- \definedummyword\kbd
- \definedummyword\key
- \definedummyword\math
- \definedummyword\option
- \definedummyword\pxref
- \definedummyword\ref
- \definedummyword\samp
- \definedummyword\strong
- \definedummyword\tie
- \definedummyword\U
- \definedummyword\uref
- \definedummyword\url
- \definedummyword\var
- \definedummyword\verb
- \definedummyword\w
- \definedummyword\xref
+ \commondummyword\abbr
+ \commondummyword\acronym
+ \commondummyword\anchor
+ \commondummyword\cite
+ \commondummyword\code
+ \commondummyword\command
+ \commondummyword\dfn
+ \commondummyword\dmn
+ \commondummyword\email
+ \commondummyword\emph
+ \commondummyword\env
+ \commondummyword\file
+ \commondummyword\image
+ \commondummyword\indicateurl
+ \commondummyword\inforef
+ \commondummyword\kbd
+ \commondummyword\key
+ \commondummyword\math
+ \commondummyword\option
+ \commondummyword\pxref
+ \commondummyword\ref
+ \commondummyword\samp
+ \commondummyword\strong
+ \commondummyword\tie
+ \commondummyword\U
+ \commondummyword\uref
+ \commondummyword\url
+ \commondummyword\var
+ \commondummyword\verb
+ \commondummyword\w
+ \commondummyword\xref
}
% For testing: output @{ and @} in index sort strings as \{ and \}.
@@ -5023,11 +5121,11 @@
%
\def\indexnofonts{%
% Accent commands should become @asis.
- \def\definedummyaccent##1{\let##1\asis}%
+ \def\commondummyaccent##1{\let##1\asis}%
% We can just ignore other control letters.
- \def\definedummyletter##1{\let##1\empty}%
+ \def\commondummyletter##1{\let##1\empty}%
% All control words become @asis by default; overrides below.
- \let\definedummyword\definedummyaccent
+ \let\commondummyword\commondummyaccent
\commondummiesnofonts
%
% Don't no-op \tt, since it isn't a user-level command
@@ -5069,37 +5167,40 @@
\def\LaTeX{LaTeX}%
\def\TeX{TeX}%
%
- % Assorted special characters.
- % (The following {} will end up in the sort string, but that's ok.)
- \def\arrow{->}%
- \def\bullet{bullet}%
- \def\comma{,}%
- \def\copyright{copyright}%
- \def\dots{...}%
- \def\enddots{...}%
- \def\equiv{==}%
- \def\error{error}%
- \def\euro{euro}%
- \def\expansion{==>}%
- \def\geq{>=}%
- \def\guillemetleft{<<}%
- \def\guillemetright{>>}%
- \def\guilsinglleft{<}%
- \def\guilsinglright{>}%
- \def\leq{<=}%
- \def\minus{-}%
- \def\point{.}%
- \def\pounds{pounds}%
- \def\print{-|}%
- \def\quotedblbase{"}%
- \def\quotedblleft{"}%
- \def\quotedblright{"}%
- \def\quoteleft{`}%
- \def\quoteright{'}%
- \def\quotesinglbase{,}%
- \def\registeredsymbol{R}%
- \def\result{=>}%
- \def\textdegree{o}%
+ % Assorted special characters. \defglyph gives the control sequence a
+ % definition that removes the {} that follows its use.
+ \defglyph\atchar{@}%
+ \defglyph\arrow{->}%
+ \defglyph\bullet{bullet}%
+ \defglyph\comma{,}%
+ \defglyph\copyright{copyright}%
+ \defglyph\dots{...}%
+ \defglyph\enddots{...}%
+ \defglyph\equiv{==}%
+ \defglyph\error{error}%
+ \defglyph\euro{euro}%
+ \defglyph\expansion{==>}%
+ \defglyph\geq{>=}%
+ \defglyph\guillemetleft{<<}%
+ \defglyph\guillemetright{>>}%
+ \defglyph\guilsinglleft{<}%
+ \defglyph\guilsinglright{>}%
+ \defglyph\leq{<=}%
+ \defglyph\lbracechar{\{}%
+ \defglyph\minus{-}%
+ \defglyph\point{.}%
+ \defglyph\pounds{pounds}%
+ \defglyph\print{-|}%
+ \defglyph\quotedblbase{"}%
+ \defglyph\quotedblleft{"}%
+ \defglyph\quotedblright{"}%
+ \defglyph\quoteleft{`}%
+ \defglyph\quoteright{'}%
+ \defglyph\quotesinglbase{,}%
+ \defglyph\rbracechar{\}}%
+ \defglyph\registeredsymbol{R}%
+ \defglyph\result{=>}%
+ \defglyph\textdegree{o}%
%
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
@@ -5112,9 +5213,13 @@
% goes to end-of-line is not handled.
%
\macrolist
+ \let\value\indexnofontsvalue
}
+\def\defglyph#1#2{\def#1##1{#2}} % see above
+
+
\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
% Most index entries go through here, but \dosubind is the general case.
@@ -5360,7 +5465,7 @@
% \initial {@}
% as its first line, TeX doesn't complain about mismatched braces
% (because it thinks @} is a control sequence).
- \catcode`\@ = 11
+ \catcode`\@ = 12
% See comment in \requireopenindexfile.
\def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
\openin 1 \jobname.\indexname s
@@ -5388,7 +5493,7 @@
\let\indexlbrace\{ % Likewise, set these sequences for braces
\let\indexrbrace\} % used in the sort key.
\begindoublecolumns
- \let\entryorphanpenalty=\indexorphanpenalty
+ \let\entrywidowpenalty=\indexwidowpenalty
%
% Read input from the index file line by line.
\loopdo
@@ -5489,6 +5594,12 @@
\def\entry{%
\begingroup
%
+ % For pdfTeX and XeTeX.
+ % The redefinition of \domark stops marks being added in \pdflink to
+ % preserve coloured links across page boundaries. Otherwise the marks
+ % would get in the way of \lastbox in \insertindexentrybox.
+ \let\domark\relax
+ %
% Start a new paragraph if necessary, so our assignments below can't
% affect previous text.
\par
@@ -5502,10 +5613,6 @@
\def\*{\unskip\space\ignorespaces}%
\def\entrybreak{\hfil\break}% An undocumented command
%
- % A bit of stretch before each entry for the benefit of balancing
- % columns.
- \vskip 0pt plus0.5pt
- %
% Swallow the left brace of the text (first parameter):
\afterassignment\doentry
\let\temp =
@@ -5539,20 +5646,13 @@
%
\ifpdf
\pdfgettoks#1.%
- \bgroup\let\domark\relax
- \hskip\skip\thinshrinkable\the\toksA
- \egroup
- % The redefinion of \domark stops marks being added in \pdflink to
- % preserve coloured links across page boundaries. Otherwise the marks
- % would get in the way of \lastbox in \insertindexentrybox.
+ \hskip\skip\thinshrinkable\the\toksA
\else
\ifx\XeTeXrevision\thisisundefined
\hskip\skip\thinshrinkable #1%
\else
\pdfgettoks#1.%
- \bgroup\let\domark\relax
- \hskip\skip\thinshrinkable\the\toksA
- \egroup
+ \hskip\skip\thinshrinkable\the\toksA
\fi
\fi
\fi
@@ -5561,11 +5661,10 @@
\global\setbox\entryindexbox=\vbox{\unhbox\boxA}%
\else
\global\setbox\entryindexbox=\vbox\bgroup
- \prevdepth=\entrylinedepth
- \noindent
% We want the text of the entries to be aligned to the left, and the
% page numbers to be aligned to the right.
%
+ \parindent = 0pt
\advance\leftskip by 0pt plus 1fil
\advance\leftskip by 0pt plus -1fill
\rightskip = 0pt plus -1fil
@@ -5574,8 +5673,6 @@
% if the list of page numbers is long, to be aligned to the right.
\parfillskip=0pt plus -1fill
%
- \hangindent=1em
- %
\advance\rightskip by \entryrightmargin
% Determine how far we can stretch into the margin.
% This allows, e.g., "Appendix H GNU Free Documentation License" to
@@ -5595,7 +5692,6 @@
\ifdim\dimen@ > 0.8\dimen at ii % due to long index text
\dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
\dimen at ii = \hsize
- \advance \dimen at ii by -1em
\ifnum\dimen@>\dimen at ii
% If the entry is too long, use the whole line
\dimen@ = \dimen at ii
@@ -5602,10 +5698,15 @@
\fi
\advance\leftskip by 0pt plus 1fill % ragged right
\advance \dimen@ by 1\rightskip
- \parshape = 2 0pt \dimen@ 1em \dimen at ii
- % Ideally we'd add a finite glue at the end of the first line only, but
- % TeX doesn't seem to provide a way to do such a thing.
+ \parshape = 2 0pt \dimen@ 0em \dimen at ii
+ % Ideally we'd add a finite glue at the end of the first line only,
+ % instead of using \parshape with explicit line lengths, but TeX
+ % doesn't seem to provide a way to do such a thing.
+ %
+ \leftskip = 1em
+ \parindent = -1em
\fi\fi
+ \indent % start paragraph
\unhbox\boxA
%
% Do not prefer a separate line ending with a hyphen to fewer lines.
@@ -5623,7 +5724,7 @@
\endgroup
% delay text of entry until after penalty
\bgroup\aftergroup\insertindexentrybox
- \entryorphanpenalty
+ \entrywidowpenalty
}}
\newskip\thinshrinkable
@@ -5631,40 +5732,43 @@
\newbox\entryindexbox
\def\insertindexentrybox{%
- \copy\entryindexbox
- % The following gets the depth of the last box. This is for even
- % line spacing when entries span several lines.
- \setbox\dummybox\vbox{%
- \unvbox\entryindexbox
- \nointerlineskip
- \lastbox
- \global\entrylinedepth=\prevdepth
+ \ourunvbox\entryindexbox
+}
+
+% Use \lastbox to take apart vbox box by box, and add each sub-box
+% to the current vertical list.
+\def\ourunvbox#1{%
+\bgroup % for local binding of \delayedbox
+ % Remove the last box from box #1
+ \global\setbox#1=\vbox{%
+ \unvbox#1%
+ \unskip % remove any glue
+ \unpenalty
+ \global\setbox\interbox=\lastbox
}%
- % Note that we couldn't simply \unvbox\entryindexbox followed by
- % \nointerlineskip\lastbox to remove the last box and then reinstate it,
- % because this resets how far the box has been \moveleft'ed to 0. \unvbox
- % doesn't affect \prevdepth either.
+ \setbox\delayedbox=\box\interbox
+ \ifdim\ht#1=0pt\else
+ \ourunvbox#1 % Repeat on what's left of the box
+ \nobreak
+ \fi
+ \box\delayedbox
+\egroup
}
-\newdimen\entrylinedepth
+\newbox\delayedbox
+\newbox\interbox
% Default is no penalty
-\let\entryorphanpenalty\egroup
+\let\entrywidowpenalty\egroup
% Used from \printindex. \firsttoken should be the first token
% after the \entry. If it's not another \entry, we are at the last
% line of a group of index entries, so insert a penalty to discourage
-% orphaned index entries.
-\long\def\indexorphanpenalty{%
+% widowed index entries.
+\long\def\indexwidowpenalty{%
\def\isentry{\entry}%
\ifx\firsttoken\isentry
\else
- \unskip\penalty 9000
- % The \unskip here stops breaking before the glue. It relies on the
- % \vskip above being there, otherwise there is an error
- % "You can't use `\unskip' in vertical mode". There has to be glue
- % in the current vertical list that hasn't been added to the
- % "current page". See Chapter 24 of the TeXbook. This contradicts
- % Section 8.3.7 in "TeX by Topic," though.
+ \penalty 9000
\fi
\egroup % now comes the box added with \aftergroup
}
@@ -5704,8 +5808,6 @@
\newbox\partialpage
\newdimen\doublecolumnhsize
-\newdimen\doublecolumntopgap
-\doublecolumntopgap = 0pt
% Use inside an output routine to save \topmark and \firstmark
\def\savemarks{%
@@ -5788,12 +5890,10 @@
%
% Double the \vsize as well. (We don't need a separate register here,
% since nobody clobbers \vsize.)
- \global\doublecolumntopgap = \topskip
- \global\advance\doublecolumntopgap by -1\baselineskip
- \advance\vsize by -1\doublecolumntopgap
\vsize = 2\vsize
- \topskip=0pt
- \global\entrylinedepth=0pt\relax
+ %
+ % For the benefit of balancing columns
+ \advance\baselineskip by 0pt plus 0.5pt
}
% The double-column output routine for all double-column pages except
@@ -5823,9 +5923,7 @@
%
\hsize = \doublecolumnhsize
\wd0=\hsize \wd2=\hsize
- \vbox{%
- \vskip\doublecolumntopgap
- \hbox to\txipagewidth{\box0\hfil\box2}}%
+ \hbox to\txipagewidth{\box0\hfil\box2}%
}
@@ -5892,7 +5990,7 @@
\dimen@ = \ht0
\advance\dimen@ by \topskip
\advance\dimen@ by-\baselineskip
- \ifdim\dimen@<14\baselineskip
+ \ifdim\dimen@<5\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
\else
@@ -5899,31 +5997,38 @@
\divide\dimen@ by 2 % target to split to
\dimen at ii = \dimen@
\splittopskip = \topskip
- % Loop until the second column is no higher than the first
+ % Loop until left column is at least as high as the right column.
{%
\vbadness = 10000
\loop
\global\setbox3 = \copy0
\global\setbox1 = \vsplit3 to \dimen@
- % Remove glue from bottom of first column to
- % make sure it is higher than the second.
- \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
- \ifdim\ht3>\ht1
+ \ifdim\ht1<\ht3
\global\advance\dimen@ by 1pt
\repeat
}%
- \multiply\dimen at ii by 4
- \divide\dimen at ii by 5
- \ifdim\ht3<\dimen at ii
- % Column heights are too different, so don't make their bottoms
- % flush with each other. The glue at the end of the second column
- % allows a second column to stretch, reducing the difference in
- % height between the two.
- \setbox0=\vbox to\dimen@{\unvbox1\vfill}%
- \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}%
+ % Now the left column is in box 1, and the right column in box 3.
+ % Check whether the left column has come out higher than the page itself.
+ % (Note that we have doubled \vsize for the double columns, so
+ % the actual height of the page is 0.5\vsize).
+ \ifdim2\ht1>\vsize
+ % Just split the last of the double column material roughly in half.
+ \setbox2=\box0
+ \setbox0 = \vsplit2 to \dimen at ii
+ \setbox0=\vbox to \dimen at ii {\unvbox0\vfill}%
+ \setbox2=\vbox to \dimen at ii {\unvbox2\vfill}%
\else
- \setbox0=\vbox to\dimen@{\unvbox1}%
- \setbox2=\vbox to\dimen@{\unvbox3}%
+ % Compare the heights of the two columns.
+ \ifdim4\ht1>5\ht3
+ % Column heights are too different, so don't make their bottoms
+ % flush with each other.
+ \setbox2=\vbox to \ht1 {\unvbox3\vfill}%
+ \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
+ \else
+ % Make column bottoms flush with each other.
+ \setbox2=\vbox to\ht1{\unvbox3\unskip}%
+ \setbox0=\vbox to\ht1{\unvbox1\unskip}%
+ \fi
\fi
\fi
%
@@ -5942,7 +6047,7 @@
\null
\vskip.3\vsize % move it down on the page a bit
\begingroup
- \noindent \titlefonts\rmisbold #1\par % the text
+ \noindent \titlefonts\rm #1\par % the text
\let\lastnode=\empty % no node to associate with
\writetocentry{part}{#1}{}% but put it in the toc
\headingsoff % no headline or footline on the part page
@@ -6428,7 +6533,7 @@
\domark
%
{%
- \chapfonts \rmisbold
+ \chapfonts \rm
\let\footnote=\errfootnoteheading % give better error message
%
% Have to define \lastsection before calling \donoderef, because the
@@ -6520,7 +6625,7 @@
\let\footnote=\errfootnoteheading
%
% Switch to the right set of fonts.
- \csname #2fonts\endcsname \rmisbold
+ \csname #2fonts\endcsname \rm
%
% Insert first mark before the heading break (see notes for \domark).
\let\prevsectiondefs=\lastsectiondefs
@@ -7793,7 +7898,7 @@
\fi % no return type
#3% output function name
}%
- {\rm\enskip}% hskip 0.5 em of \tenrm
+ {\rm\enskip}% hskip 0.5 em of \rmfont
%
\boldbrax
% arguments will be output next, if any.
@@ -7922,9 +8027,6 @@
}
\fi
-\let\aftermacroxxx\relax
-\def\aftermacro{\aftermacroxxx}
-
% alias because \c means cedilla in @tex or @math
\let\texinfoc=\c
@@ -7946,7 +8048,7 @@
\catcode`\\=\active
%
% Process the macro body under the current catcode regime.
- \scantokens{#1 at texinfoc}\aftermacro%
+ \scantokens{#1 at texinfoc}%
%
\catcode`\@=\savedcatcodeone
\catcode`\\=\savedcatcodetwo
@@ -7953,11 +8055,6 @@
%
% The \texinfoc is to remove the \newlinechar added by \scantokens, and
% can be noticed by \parsearg.
- % The \aftermacro allows a \comment at the end of the macro definition
- % to duplicate itself past the final \newlinechar added by \scantokens:
- % this is used in the definition of \group to comment out a newline. We
- % don't do the same for \c to support Texinfo files with macros that ended
- % with a @c, which should no longer be necessary.
% We avoid surrounding the call to \scantokens with \bgroup and \egroup
% to allow macros to open or close groups themselves.
}
@@ -7972,7 +8069,7 @@
\newif\ifrecursive % Is it recursive?
% List of all defined macros in the form
-% \definedummyword\macro1\definedummyword\macro2...
+% \commondummyword\macro1\commondummyword\macro2...
% Currently is also contains all @aliases; the list can be split
% if there is a need.
\def\macrolist{}
@@ -7980,7 +8077,7 @@
% Add the macro to \macrolist
\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
\def\addtomacrolistxxx#1{%
- \toks0 = \expandafter{\macrolist\definedummyword#1}%
+ \toks0 = \expandafter{\macrolist\commondummyword#1}%
\xdef\macrolist{\the\toks0}%
}
@@ -8121,7 +8218,7 @@
% Remove the macro name from \macrolist:
\begingroup
\expandafter\let\csname#1\endcsname \relax
- \let\definedummyword\unmacrodo
+ \let\commondummyword\unmacrodo
\xdef\macrolist{\macrolist}%
\endgroup
\else
@@ -8136,7 +8233,7 @@
\ifx #1\relax
% remove this
\else
- \noexpand\definedummyword \noexpand#1%
+ \noexpand\commondummyword \noexpand#1%
\fi
}
@@ -8411,8 +8508,7 @@
% its parameters, looking like "\xeatspaces{\hash 1}".
% \paramno is the number of parameters
% \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
-% There are eight cases: recursive and nonrecursive macros of zero, one,
-% up to nine, and many arguments.
+% There are four cases: macros of zero, one, up to nine, and many arguments.
% \xdef is used so that macro definitions will survive the file
% they're defined in: @include reads the file inside a group.
%
@@ -8427,91 +8523,55 @@
\else
\let\xeatspaces\relax % suppress expansion
\fi
- \ifrecursive %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \ifcase\paramno
- % 0
+ \ifcase\paramno
+ % 0
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup
+ \noexpand\spaceisspace
+ \noexpand\endlineisspace
+ \noexpand\expandafter % skip any whitespace after the macro name.
+ \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+ \expandafter\xdef\csname\the\macname @@@\endcsname{%
+ \egroup
+ \noexpand\scanmacro{\macrobody}}%
+ \or % 1
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup
+ \noexpand\braceorline
+ \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+ \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
+ \egroup
+ \noexpand\scanmacro{\macrobody}%
+ }%
+ \else % at most 9
+ \ifnum\paramno<10\relax
+ % @MACNAME sets the context for reading the macro argument
+ % @MACNAME@@ gets the argument, processes backslashes and appends a
+ % comma.
+ % @MACNAME@@@ removes braces surrounding the argument list.
+ % @MACNAME@@@@ scans the macro body with arguments substituted.
\expandafter\xdef\csname\the\macname\endcsname{%
- \noexpand\scanmacro{\macrobody}}%
- \or % 1
- \expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
- \noexpand\braceorline
- \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+ \bgroup
+ \noexpand\expandafter % This \expandafter skip any spaces after the
+ \noexpand\macroargctxt % macro before we change the catcode of space.
+ \noexpand\expandafter
+ \expandafter\noexpand\csname\the\macname @@\endcsname}%
+ \expandafter\xdef\csname\the\macname @@\endcsname##1{%
+ \noexpand\passargtomacro
+ \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
\expandafter\xdef\csname\the\macname @@@\endcsname##1{%
- \egroup
- \noexpand\scanmacro{\macrobody}%
- }%
- \else
- \ifnum\paramno<10\relax % at most 9
- % See non-recursive section below for comments
- \expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
- \noexpand\expandafter
- \noexpand\macroargctxt
- \noexpand\expandafter
- \expandafter\noexpand\csname\the\macname @@\endcsname}%
- \expandafter\xdef\csname\the\macname @@\endcsname##1{%
- \noexpand\passargtomacro
- \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
- \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
- \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
- \expandafter\expandafter
- \expandafter\xdef
- \expandafter\expandafter
- \csname\the\macname @@@@\endcsname\paramlist{%
- \egroup\noexpand\scanmacro{\macrobody}}%
- \else % 10 or more
- \expandafter\xdef\csname\the\macname\endcsname{%
- \noexpand\getargvals@{\the\macname}{\argl}%
- }%
- \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
- \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
- \fi
- \fi
- \else %%%%%%%%%%%%%%%%%%%%%% Non-recursive %%%%%%%%%%%%%%%%%%%%%%%%%%
- \ifcase\paramno
- % 0
+ \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
+ \expandafter\expandafter
+ \expandafter\xdef
+ \expandafter\expandafter
+ \csname\the\macname @@@@\endcsname\paramlist{%
+ \egroup\noexpand\scanmacro{\macrobody}}%
+ \else % 10 or more:
\expandafter\xdef\csname\the\macname\endcsname{%
- \noexpand\scanmacro{\macrobody}}%
- \or % 1
- \expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
- \noexpand\braceorline
- \expandafter\noexpand\csname\the\macname @@@\endcsname}%
- \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
- \egroup
- \noexpand\scanmacro{\macrobody}%
- }%
- \else % at most 9
- \ifnum\paramno<10\relax
- % @MACNAME sets the context for reading the macro argument
- % @MACNAME@@ gets the argument, processes backslashes and appends a
- % comma.
- % @MACNAME@@@ removes braces surrounding the argument list.
- % @MACNAME@@@@ scans the macro body with arguments substituted.
- \expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
- \noexpand\expandafter % This \expandafter skip any spaces after the
- \noexpand\macroargctxt % macro before we change the catcode of space.
- \noexpand\expandafter
- \expandafter\noexpand\csname\the\macname @@\endcsname}%
- \expandafter\xdef\csname\the\macname @@\endcsname##1{%
- \noexpand\passargtomacro
- \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}%
- \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
- \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}%
- \expandafter\expandafter
- \expandafter\xdef
- \expandafter\expandafter
- \csname\the\macname @@@@\endcsname\paramlist{%
- \egroup\noexpand\scanmacro{\macrobody}}%
- \else % 10 or more:
- \expandafter\xdef\csname\the\macname\endcsname{%
- \noexpand\getargvals@{\the\macname}{\argl}%
- }%
- \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
- \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
- \fi
+ \noexpand\getargvals@{\the\macname}{\argl}%
+ }%
+ \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody
+ \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
\fi
\fi}
@@ -8707,6 +8767,8 @@
{%
\requireauxfile
\atdummies % preserve commands, but don't expand them
+ % match definition in \xrdef, \refx, \xrefX.
+ \def\value##1{##1}%
\edef\writexrdef##1##2{%
\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
@@ -8799,8 +8861,8 @@
\ifpdf
% For pdfTeX and LuaTeX
{\indexnofonts
+ \makevalueexpandable
\turnoffactive
- \makevalueexpandable
% This expands tokens, so do it after making catcode changes, so _
% etc. don't get their TeX definitions. This ignores all spaces in
% #4, including (wrongly) those in the middle of the filename.
@@ -8808,19 +8870,18 @@
%
% This (wrongly) does not take account of leading or trailing
% spaces in #1, which should be ignored.
- \edef\pdfxrefdest{#1}%
- \ifx\pdfxrefdest\empty
- \def\pdfxrefdest{Top}% no empty targets
- \else
- \txiescapepdf\pdfxrefdest % escape PDF special chars
+ \setpdfdestname{#1}%
+ %
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{Top}% no empty targets
\fi
%
\leavevmode
\startlink attr{/Border [0 0 0]}%
\ifnum\filenamelength>0
- goto file{\the\filename.pdf} name{\pdfxrefdest}%
+ goto file{\the\filename.pdf} name{\pdfdestname}%
\else
- goto name{\pdfmkpgn{\pdfxrefdest}}%
+ goto name{\pdfmkpgn{\pdfdestname}}%
\fi
}%
\setcolor{\linkcolor}%
@@ -8829,8 +8890,8 @@
\else
% For XeTeX
{\indexnofonts
+ \makevalueexpandable
\turnoffactive
- \makevalueexpandable
% This expands tokens, so do it after making catcode changes, so _
% etc. don't get their TeX definitions. This ignores all spaces in
% #4, including (wrongly) those in the middle of the filename.
@@ -8838,29 +8899,27 @@
%
% This (wrongly) does not take account of leading or trailing
% spaces in #1, which should be ignored.
- \iftxiuseunicodedestname
- \def\pdfxrefdest{#1}% Pass through Unicode characters.
- \else
- \edef\pdfxrefdest{#1}% Replace Unicode characters to ASCII.
+ \setpdfdestname{#1}%
+ %
+ \ifx\pdfdestname\empty
+ \def\pdfdestname{Top}% no empty targets
\fi
- \ifx\pdfxrefdest\empty
- \def\pdfxrefdest{Top}% no empty targets
- \else
- \txiescapepdf\pdfxrefdest % escape PDF special chars
- \fi
%
\leavevmode
\ifnum\filenamelength>0
- % By the default settings,
+ % With default settings,
% XeTeX (xdvipdfmx) replaces link destination names with integers.
% In this case, the replaced destination names of
- % remote PDF cannot be known. In order to avoid replacement,
- % you can use commandline option `-C 0x0010' for xdvipdfmx.
+ % remote PDFs are no longer known. In order to avoid a replacement,
+ % you can use xdvipdfmx's command line option `-C 0x0010'.
+ % If you use XeTeX 0.99996+ (TeX Live 2016+),
+ % this command line option is no longer necessary
+ % because we can use the `dvipdfmx:config' special.
\special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
- << /S /GoToR /F (\the\filename.pdf) /D (name\pdfxrefdest) >> >>}%
+ << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
\else
\special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A
- << /S /GoTo /D (name\pdfxrefdest) >> >>}%
+ << /S /GoTo /D (\pdfdestname) >> >>}%
\fi
}%
\setcolor{\linkcolor}%
@@ -9767,9 +9826,9 @@
\global\righthyphenmin = #3\relax
}
-% XeTeX and LuaTeX can handle native Unicode.
-% Their default I/O is UTF-8 sequence instead of byte-wise.
-% Other TeX engine (pdfTeX etc.) I/O is byte-wise.
+% XeTeX and LuaTeX can handle Unicode natively.
+% Their default I/O uses UTF-8 sequences instead of a byte-wise operation.
+% Other TeX engines' I/O (pdfTeX, etc.) is byte-wise.
%
\newif\iftxinativeunicodecapable
\newif\iftxiusebytewiseio
@@ -9893,14 +9952,15 @@
%
\else \ifx \declaredencoding \utfeight
\iftxinativeunicodecapable
- % For native Unicode (XeTeX and LuaTeX)
+ % For native Unicode handling (XeTeX and LuaTeX)
\nativeunicodechardefs
\else
- % For UTF-8 byte sequence (TeX, eTeX and pdfTeX)
+ % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX)
\setnonasciicharscatcode\active
% since we already invoked \utfeightchardefs at the top level
- % (below), do not re-invoke it, then our check for duplicated
- % definitions triggers. Making non-ascii chars active is enough.
+ % (below), do not re-invoke it, otherwise our check for duplicated
+ % definitions gets triggered. Making non-ascii chars active is
+ % sufficient.
\fi
%
\else
@@ -9911,6 +9971,18 @@
\fi % latone
\fi % lattwo
\fi % ascii
+ %
+ \ifx\XeTeXrevision\thisisundefined
+ \else
+ \ifx \declaredencoding \utfeight
+ \else
+ \ifx \declaredencoding \ascii
+ \else
+ \message{Warning: XeTeX with non-UTF-8 encodings cannot handle %
+ non-ASCII characters in auxiliary files.}%
+ \fi
+ \fi
+ \fi
}
% emacs-page
@@ -9942,18 +10014,18 @@
\gdefchar^^a0{\tie}
\gdefchar^^a1{\exclamdown}
\gdefchar^^a2{{\tcfont \char162}} % cent
- \gdefchar^^a3{\pounds}
+ \gdefchar^^a3{\pounds{}}
\gdefchar^^a4{{\tcfont \char164}} % currency
\gdefchar^^a5{{\tcfont \char165}} % yen
\gdefchar^^a6{{\tcfont \char166}} % broken bar
\gdefchar^^a7{\S}
\gdefchar^^a8{\"{}}
- \gdefchar^^a9{\copyright}
+ \gdefchar^^a9{\copyright{}}
\gdefchar^^aa{\ordf}
- \gdefchar^^ab{\guillemetleft}
+ \gdefchar^^ab{\guillemetleft{}}
\gdefchar^^ac{\ensuremath\lnot}
\gdefchar^^ad{\-}
- \gdefchar^^ae{\registeredsymbol}
+ \gdefchar^^ae{\registeredsymbol{}}
\gdefchar^^af{\={}}
%
\gdefchar^^b0{\textdegree}
@@ -9967,7 +10039,7 @@
\gdefchar^^b8{\cedilla\ }
\gdefchar^^b9{$^1$}
\gdefchar^^ba{\ordm}
- \gdefchar^^bb{\guillemetright}
+ \gdefchar^^bb{\guillemetright{}}
\gdefchar^^bc{$1\over4$}
\gdefchar^^bd{$1\over2$}
\gdefchar^^be{$3\over4$}
@@ -10047,7 +10119,7 @@
% Encoding is almost identical to Latin1.
\latonechardefs
%
- \gdefchar^^a4{\euro}
+ \gdefchar^^a4{\euro{}}
\gdefchar^^a6{\v S}
\gdefchar^^a8{\v s}
\gdefchar^^b4{\v Z}
@@ -10076,7 +10148,7 @@
\gdefchar^^ae{\v Z}
\gdefchar^^af{\dotaccent Z}
%
- \gdefchar^^b0{\textdegree}
+ \gdefchar^^b0{\textdegree{}}
\gdefchar^^b1{\ogonek{a}}
\gdefchar^^b2{\ogonek{ }}
\gdefchar^^b3{\l}
@@ -10212,7 +10284,7 @@
\countUTFx = "80
\countUTFy = "C2
\def\UTFviiiTmp{%
- \gdef~{
+ \gdef~{%
\ifpassthroughchars $\fi}}%
\UTFviiiLoop
@@ -10248,8 +10320,9 @@
\def\U#1{%
\expandafter\ifx\csname uni:#1\endcsname \relax
\iftxinativeunicodecapable
- % Any Unicode characters can be used by native Unicode.
- % However, if the font does not have the glyph, the letter will miss.
+ % All Unicode characters can be used if native Unicode handling is
+ % active. However, if the font does not have the glyph,
+ % letters are missing.
\begingroup
\uccode`\.="#1\relax
\uppercase{.}
@@ -10263,9 +10336,18 @@
\fi
}
-% For UTF-8 byte sequence (TeX, e-TeX and pdfTeX)
-% Definition macro to replace the Unicode character
-% Definition macro that is used by @U command
+% These macros are used here to construct the name of a control
+% sequence to be defined.
+\def\UTFviiiTwoOctetsName#1#2{%
+ \csname u8:#1\string #2\endcsname}%
+\def\UTFviiiThreeOctetsName#1#2#3{%
+ \csname u8:#1\string #2\string #3\endcsname}%
+\def\UTFviiiFourOctetsName#1#2#3#4{%
+ \csname u8:#1\string #2\string #3\string #4\endcsname}%
+
+% For UTF-8 byte sequences (TeX, e-TeX and pdfTeX),
+% provide a definition macro to replace a Unicode character;
+% this gets used by the @U command
%
\begingroup
\catcode`\"=12
@@ -10279,17 +10361,18 @@
\countUTFz = "#1\relax
\begingroup
\parseXMLCharref
+
+ % Give \u8:... its definition. The sequence of seven \expandafter's
+ % expands after the \gdef three times, e.g.
%
- % Access definitions of characters given UTF-8 sequences
- \def\UTFviiiTwoOctets##1##2{%
- \csname u8:##1\string ##2\endcsname}%
- \def\UTFviiiThreeOctets##1##2##3{%
- \csname u8:##1\string ##2\string ##3\endcsname}%
- \def\UTFviiiFourOctets##1##2##3##4{%
- \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
- \expandafter\expandafter\expandafter\expandafter
- \expandafter\expandafter\expandafter
- \gdef\UTFviiiTmp{#2}%
+ % 1. \UTFviiTwoOctetsName B1 B2
+ % 2. \csname u8:B1 \string B2 \endcsname
+ % 3. \u8: B1 B2 (a single control sequence token)
+ %
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter\expandafter
+ \expandafter\gdef \UTFviiiTmp{#2}%
%
\expandafter\ifx\csname uni:#1\endcsname \relax \else
\message{Internal error, already defined: #1}%
@@ -10299,7 +10382,8 @@
\expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
\endgroup}
%
- % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp.
+ % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp
+ % to the corresponding UTF-8 sequence.
\gdef\parseXMLCharref{%
\ifnum\countUTFz < "A0\relax
\errhelp = \EMsimple
@@ -10306,30 +10390,45 @@
\errmessage{Cannot define Unicode char value < 00A0}%
\else\ifnum\countUTFz < "800\relax
\parseUTFviiiA,%
- \parseUTFviiiB C\UTFviiiTwoOctets.,%
+ \parseUTFviiiB C\UTFviiiTwoOctetsName.,%
\else\ifnum\countUTFz < "10000\relax
\parseUTFviiiA;%
\parseUTFviiiA,%
- \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+ \parseUTFviiiB E\UTFviiiThreeOctetsName.{,;}%
\else
\parseUTFviiiA;%
\parseUTFviiiA,%
\parseUTFviiiA!%
- \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+ \parseUTFviiiB F\UTFviiiFourOctetsName.{!,;}%
\fi\fi\fi
}
+ % Extract a byte from the end of the UTF-8 representation of \countUTFx.
+ % It must be a non-initial byte in the sequence.
+ % Change \uccode of #1 for it to be used in \parseUTFviiiB as one
+ % of the bytes.
\gdef\parseUTFviiiA#1{%
\countUTFx = \countUTFz
\divide\countUTFz by 64
- \countUTFy = \countUTFz
+ \countUTFy = \countUTFz % Save to be the future value of \countUTFz.
\multiply\countUTFz by 64
+
+ % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract
+ % in order to get the last five bits.
\advance\countUTFx by -\countUTFz
+
+ % Convert this to the byte in the UTF-8 sequence.
\advance\countUTFx by 128
\uccode `#1\countUTFx
\countUTFz = \countUTFy}
- % Used to set \UTFviiiTmp to a UTF-8 byte sequence
+ % Used to put a UTF-8 byte sequence into \UTFviiiTmp
+ % #1 is the increment for \countUTFz to yield a the first byte of the UTF-8
+ % sequence.
+ % #2 is one of the \UTFviii*OctetsName macros.
+ % #3 is always a full stop (.)
+ % #4 is a template for the other bytes in the sequence. The values for these
+ % bytes is substituted in here with \uppercase using the \uccode's.
\gdef\parseUTFviiiB#1#2#3#4{%
\advance\countUTFz by "#10\relax
\uccode `#3\countUTFz
@@ -10336,8 +10435,8 @@
\uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
\endgroup
-% For native Unicode (XeTeX and LuaTeX)
-% Definition macro that is set catcode other non global
+% For native Unicode handling (XeTeX and LuaTeX),
+% provide a definition macro that sets a catcode to `other' non-globally
%
\def\DeclareUnicodeCharacterNativeOther#1#2{%
\catcode"#1=\other
@@ -10361,18 +10460,18 @@
\DeclareUnicodeCharacter{00A0}{\tie}%
\DeclareUnicodeCharacter{00A1}{\exclamdown}%
\DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
- \DeclareUnicodeCharacter{00A3}{\pounds}%
+ \DeclareUnicodeCharacter{00A3}{\pounds{}}%
\DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency
\DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen
\DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar
\DeclareUnicodeCharacter{00A7}{\S}%
\DeclareUnicodeCharacter{00A8}{\"{ }}%
- \DeclareUnicodeCharacter{00A9}{\copyright}%
+ \DeclareUnicodeCharacter{00A9}{\copyright{}}%
\DeclareUnicodeCharacter{00AA}{\ordf}%
- \DeclareUnicodeCharacter{00AB}{\guillemetleft}%
+ \DeclareUnicodeCharacter{00AB}{\guillemetleft{}}%
\DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}%
\DeclareUnicodeCharacter{00AD}{\-}%
- \DeclareUnicodeCharacter{00AE}{\registeredsymbol}%
+ \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}%
\DeclareUnicodeCharacter{00AF}{\={ }}%
%
\DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
@@ -10386,7 +10485,7 @@
\DeclareUnicodeCharacter{00B8}{\cedilla{ }}%
\DeclareUnicodeCharacter{00B9}{$^1$}%
\DeclareUnicodeCharacter{00BA}{\ordm}%
- \DeclareUnicodeCharacter{00BB}{\guillemetright}%
+ \DeclareUnicodeCharacter{00BB}{\guillemetright{}}%
\DeclareUnicodeCharacter{00BC}{$1\over4$}%
\DeclareUnicodeCharacter{00BD}{$1\over2$}%
\DeclareUnicodeCharacter{00BE}{$3\over4$}%
@@ -10858,36 +10957,36 @@
% Punctuation
\DeclareUnicodeCharacter{2013}{--}%
\DeclareUnicodeCharacter{2014}{---}%
- \DeclareUnicodeCharacter{2018}{\quoteleft}%
- \DeclareUnicodeCharacter{2019}{\quoteright}%
- \DeclareUnicodeCharacter{201A}{\quotesinglbase}%
- \DeclareUnicodeCharacter{201C}{\quotedblleft}%
- \DeclareUnicodeCharacter{201D}{\quotedblright}%
- \DeclareUnicodeCharacter{201E}{\quotedblbase}%
+ \DeclareUnicodeCharacter{2018}{\quoteleft{}}%
+ \DeclareUnicodeCharacter{2019}{\quoteright{}}%
+ \DeclareUnicodeCharacter{201A}{\quotesinglbase{}}%
+ \DeclareUnicodeCharacter{201C}{\quotedblleft{}}%
+ \DeclareUnicodeCharacter{201D}{\quotedblright{}}%
+ \DeclareUnicodeCharacter{201E}{\quotedblbase{}}%
\DeclareUnicodeCharacter{2020}{\ensuremath\dagger}%
\DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}%
- \DeclareUnicodeCharacter{2022}{\bullet}%
+ \DeclareUnicodeCharacter{2022}{\bullet{}}%
\DeclareUnicodeCharacter{202F}{\thinspace}%
- \DeclareUnicodeCharacter{2026}{\dots}%
- \DeclareUnicodeCharacter{2039}{\guilsinglleft}%
- \DeclareUnicodeCharacter{203A}{\guilsinglright}%
+ \DeclareUnicodeCharacter{2026}{\dots{}}%
+ \DeclareUnicodeCharacter{2039}{\guilsinglleft{}}%
+ \DeclareUnicodeCharacter{203A}{\guilsinglright{}}%
%
- \DeclareUnicodeCharacter{20AC}{\euro}%
+ \DeclareUnicodeCharacter{20AC}{\euro{}}%
%
- \DeclareUnicodeCharacter{2192}{\expansion}%
- \DeclareUnicodeCharacter{21D2}{\result}%
+ \DeclareUnicodeCharacter{2192}{\expansion{}}%
+ \DeclareUnicodeCharacter{21D2}{\result{}}%
%
% Mathematical symbols
\DeclareUnicodeCharacter{2200}{\ensuremath\forall}%
\DeclareUnicodeCharacter{2203}{\ensuremath\exists}%
\DeclareUnicodeCharacter{2208}{\ensuremath\in}%
- \DeclareUnicodeCharacter{2212}{\minus}%
+ \DeclareUnicodeCharacter{2212}{\minus{}}%
\DeclareUnicodeCharacter{2217}{\ast}%
\DeclareUnicodeCharacter{221E}{\ensuremath\infty}%
\DeclareUnicodeCharacter{2225}{\ensuremath\parallel}%
\DeclareUnicodeCharacter{2227}{\ensuremath\wedge}%
\DeclareUnicodeCharacter{2229}{\ensuremath\cap}%
- \DeclareUnicodeCharacter{2261}{\equiv}%
+ \DeclareUnicodeCharacter{2261}{\equiv{}}%
\DeclareUnicodeCharacter{2264}{\ensuremath\leq}%
\DeclareUnicodeCharacter{2265}{\ensuremath\geq}%
\DeclareUnicodeCharacter{2282}{\ensuremath\subset}%
@@ -11043,8 +11142,8 @@
\newif\ifpassthroughchars
\passthroughcharsfalse
-% For native Unicode (XeTeX and LuaTeX)
-% Definition macro to replace / pass-through the Unicode character
+% For native Unicode handling (XeTeX and LuaTeX),
+% provide a definition macro to replace/pass-through a Unicode character
%
\def\DeclareUnicodeCharacterNative#1#2{%
\catcode"#1=\active
@@ -11067,14 +11166,15 @@
\endgroup
}
-% Native Unicode (XeTeX and LuaTeX) character replacing definitions
-% It makes the setting that replace the Unicode characters.
+% Native Unicode handling (XeTeX and LuaTeX) character replacing definition.
+% It activates the setting that replaces Unicode characters.
\def\nativeunicodechardefs{%
\let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative
\unicodechardefs
}
-% For native Unicode (XeTeX and LuaTeX). Make the character token expand
+% For native Unicode handling (XeTeX and LuaTeX),
+% make the character token expand
% to the sequences given in \unicodechardefs for printing.
\def\DeclareUnicodeCharacterNativeAtU#1#2{%
\def\UTFAtUTmp{#2}
@@ -11081,7 +11181,7 @@
\expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp
}
-% Native Unicode (XeTeX and LuaTeX) @U command definitions
+% @U command definitions for native Unicode handling (XeTeX and LuaTeX).
\def\nativeunicodechardefsatu{%
\let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU
\unicodechardefs
@@ -11092,7 +11192,7 @@
\relax
}
-% define all the unicode characters we know about, for the sake of @U.
+% define all Unicode characters we know about, for the sake of @U.
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
@@ -11568,7 +11668,4 @@
@c vim:sw=2:
- at ignore
- arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
- at end ignore
@enablebackslashhack
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live 2015-06-12.
+# Generated by GNU Autoconf 2.69 for TeX Live 2016-05-23.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live'
PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2015-06-12'
-PACKAGE_STRING='TeX Live 2015-06-12'
+PACKAGE_VERSION='2016-05-23'
+PACKAGE_STRING='TeX Live 2016-05-23'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1509,7 +1509,7 @@
# 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 TeX Live 2015-06-12 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2016-05-23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1583,7 +1583,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live 2015-06-12:";;
+ short | recursive ) echo "Configuration of TeX Live 2016-05-23:";;
esac
cat <<\_ACEOF
@@ -1901,7 +1901,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live configure 2015-06-12
+TeX Live configure 2016-05-23
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2678,7 +2678,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live $as_me 2015-06-12, which was
+It was created by TeX Live $as_me 2016-05-23, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -10809,7 +10809,7 @@
# Define the identity of the package.
PACKAGE='tex-live'
- VERSION='2015-06-12'
+ VERSION='2016-05-23'
cat >>confdefs.h <<_ACEOF
@@ -22784,7 +22784,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live $as_me 2015-06-12, which was
+This file was extended by TeX Live $as_me 2016-05-23, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22841,7 +22841,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live config.status 2015-06-12
+TeX Live config.status 2016-05-23
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -24797,11 +24797,11 @@
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2016$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2017/dev$with_banner_add):
$msg_compiling" >&5
$as_echo "
-** Configuration summary for $PACKAGE_STRING (2016$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2017/dev$with_banner_add):
$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/doc/build-tools.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,5 +3,5 @@
bison (GNU Bison) 3.0.4
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
-m4 (GNU M4) 1.4.17
+m4 (GNU M4) 1.4.18
makeinfo (GNU texinfo) 6.1
Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/doc/tlbuild.info 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,10 +1,10 @@
-This is tlbuild.info, produced by makeinfo version 6.1 from
+This is tlbuild.info, produced by makeinfo version 6.3 from
tlbuild.texi.
This file documents the TeX Live build system and more.
- Copyright (C) 2016 Karl Berry.
-Copyright (C) 2013, 2014, 2015 Karl Berry & Peter Breitenlohner.
+Copyright (C) 2016-2017 Karl Berry.
+Copyright (C) 2013-2015 Karl Berry & Peter Breitenlohner.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -53,7 +53,8 @@
1 Introduction
**************
-This manual (dated April 2016) corresponds to the TeX Live 2016 release.
+This manual (dated February 2017) corresponds to the TeX Live 2016
+release.
This manual is aimed at system installers and programmers, and
focuses on how to configure, build, and develop the TeX Live (TL)
@@ -90,8 +91,8 @@
As an exception, the full documentation for 'install-tl' and 'tlmgr'
is included here, just because it is convenient to do so. The same text
is available online (linked from <http://tug.org/texlive/doc.html>, or
-by invoking the program with '--help' (or look at the end of the source
-file).
+by invoking the program with '--help' (or look at the end of the
+source).
File: tlbuild.info, Node: Overview of build system, Next: Prerequisites, Prev: Introduction, Up: Top
@@ -127,8 +128,8 @@
program and library module (or package) specifies its own requirements
and properties, such as required libraries, whether an installed
(system) version of a library can be used, 'configure' options to be
-seen at the top-level, and more. An explicit list of all available
-modules is kept in only one, central, place ('m4/kpse-pkgs.m4').
+seen at the top level, and more. An explicit list of all available
+modules is kept in only one central place, namely 'm4/kpse-pkgs.m4'.
A second, related goal is to configure and build each library before
configuring any other (program or library) module which uses that
@@ -140,9 +141,9 @@
independently. The corresponding modules use (most of) the distributed
source tree and document any modifications of that source.
- All this is for the sake of simplifying both upgrading of modules
-maintained independently and integrating new modules into the TL build
-system. (Not to say that either task is trivial.)
+ All this is for the sake of simplifying both upgrading of modules and
+integrating new modules into the TL build system. (Not to say that
+either task is trivial.)
File: tlbuild.info, Node: Prerequisites, Next: Building, Prev: Overview of build system, Up: Top
@@ -155,13 +156,17 @@
(If 'make' from your 'PATH' is not GNU make, you can set 'MAKE' in the
environment to whatever is necessary.)
- Indeed, GNU 'make' is required only because of some third-party
-libraries, notably FreeType; all the TL-maintained directories (and
+ GNU 'make' is required only because of some third-party libraries,
+notably FreeType; all the TL-maintained directories (and
Automake/Autoconf output in general) should work with any reasonable
'make'.
However, a few programs in the tree have additional requirements:
+'dvisvgm'
+ requires a C++11 compiler, such as gcc 4.8.1 (or later) or clang
+ 3.3 (or later).
+
'web2c'
requires 'perl' for some tests run by 'make check'.
@@ -267,7 +272,7 @@
If configuring or building a module fails, you should first find and fix
the problem, then perhaps remove the subdirectory for that module from
-the build tree, and finally rerun the top-level 'make' (or 'Build' with
+the build tree, and finally rerun the top level 'make' (or 'Build' with
'--no-clean' as its first argument).
@@ -291,7 +296,7 @@
4.4 Build distribution
======================
-Running 'make dist' at the top-level creates a tarball
+Running 'make dist' at the top level creates a tarball
'tex-live-YYYY-MM-DD.tar.xz' from the TL source tree. Running 'make
distcheck' also verifies that this tarball suffices to build and install
all of TL.
@@ -557,12 +562,12 @@
* Menu:
-* Build system tools:: If modifying infrastructure files.
-* Top-level directories::
-* Autoconf macros:: TL-specific Autoconf macros.
-* Library modules:: Details on some specific libraries,
-* Program modules:: and on some programs.
-* Extending TeX Live:: Adding a new module.
+* Build system tools:: Modifying infrastructure files.
+* Top-level directories:: libs texk utils; am auxdir build-aux m4; doc extra.
+* Autoconf macros:: TL-specific Autoconf macros.
+* Library modules:: Handling libraries, with examples.
+* Program modules:: Handling programs, with examples.
+* Extending TeX Live:: Adding a new module.
File: tlbuild.info, Node: Build system tools, Next: Top-level directories, Up: Layout and infrastructure
@@ -589,7 +594,7 @@
bison (GNU Bison) 3.0.4
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
- m4 (GNU M4) 1.4.17
+ m4 (GNU M4) 1.4.18
makeinfo (GNU texinfo) 6.1
These versions should be used to update the generated files (e.g.,
@@ -623,11 +628,11 @@
libraries), 'utils/' (additional programs), and 'libs/' (generic
libraries).
- The top-level directories 'am/' and 'm4/' contain 'Makefile.am'
-fragments and Autoconf macros, respectively, used in many places.
-Specifically, the file 'm4/kpse-pkgs.m4' contains lists of all program
-and library modules; missing modules are silently ignored. (This helps
-in creating cut-down source trees.)
+ In addition, the top-level directories 'am/' and 'm4/' contain
+'Makefile.am' fragments and Autoconf macros, respectively, used in many
+places. Specifically, the file 'm4/kpse-pkgs.m4' contains lists of all
+program and library modules; missing modules are silently ignored.
+(This helps in creating cut-down source trees.)
Each module contributes fragments (in separate files) defining its
capabilities and requirements to the 'configure.ac' scripts at the
@@ -640,18 +645,24 @@
'distcheck'.
The top-level 'build-aux/' directory contains the common files
-'compile', 'config.guess', 'config.sub', 'depcomp', etc. for most
-packages, pulled from the GNU Gnulib sources
+'compile', 'config.guess', 'config.sub', 'depcomp', etc. used by most
+packages. These are from the GNU Gnulib sources
(<http://www.gnu.org/software/gnulib>), which in turn synchronizes with
the appropriate ultimate upstream repository. There are, however,
independent copies in, e.g., 'libs/freetype2/freetype-*/builds/unix/',
-and similar places. The 'reautoconf' script does not touch those, but a
-TL cron job keeps them in sync (nightly).
+and a few other places. The 'reautoconf' script does not touch those,
+but a TL cron job keeps them in sync (nightly).
The directory 'extra/' contains things which are not part of the TL
-build, but are present just for (someone's) convenience, e.g.,
-'epstopdf' which is developed here.
+build, but are present just for (someone's) convenience, e.g., is
+'epstopdf' development source is here.
+ When the top-level './Build' script is used to build TL, two more two
+more top-level directories appear: 'Work/' for the build tree, and
+'inst/' for the install tree (from 'make install'). These names (and
+everything else about 'Build''s operation) can be changed by setting
+environment variables before running it; see the script file.
+
File: tlbuild.info, Node: Autoconf macros, Next: Library modules, Prev: Top-level directories, Up: Layout and infrastructure
@@ -881,9 +892,8 @@
----------------------------------------
This generic library uses the source tree in, e.g., the subdirectory
-'libpng-1.6.16' with all modifications for TL recorded in
-'libpng-1.6.16-PATCHES/*'. The 'configure.ac' fragment
-'ac/withenable.ac' contains
+'libpng-src/' with all modifications for TL recorded in 'TLPATCHES/*'.
+The 'configure.ac' fragment 'ac/withenable.ac' contains
KPSE_WITH_LIB([libpng], [zlib])
@@ -1002,9 +1012,9 @@
6.5.1 The 't1utils' package in 'utils/t1utils'
----------------------------------------------
-Once again we use the distributed source tree 't1utils-1.39' with
-modifications documented in 't1utils-1.39-PATCHES/*' and a proxy build
-system consisting of 'configure.ac' and 'Makefile.am'. The fragment
+Once again we use the distributed source tree 't1utils-src' with
+modifications documented in 'TLPATCHES/*' and a proxy build system
+consisting of 'configure.ac' and 'Makefile.am'. The fragment
'ac/withenable.ac' contains
KPSE_ENABLE_PROG([t1utils])
@@ -1018,12 +1028,11 @@
6.5.2 The 'xindy' package in 'utils/xindy'
------------------------------------------
-This module uses the distributed source tree 'xindy-2.5.1' with
-modifications documented in 'xindy-2.5.1-PATCHES/*', a proxy
-'configure.ac', and a wrapper 'Makefile.am' that descends into
-'xindy-2.5.1'. The 'xindy' build requires that the distributed
-'Makefile's allow a 'VPATH' build, can handle all targets, and do not
-refer to '${top_srcdir}' or '${top_builddir}'. The fragment
+This module uses the distributed source tree 'xindy-src/' with
+modifications documented in 'TLPATCHES/*', a proxy 'configure.ac', and a
+wrapper 'Makefile.am' that descends into 'xindy-src'. The 'xindy' build
+requires a 'make' that supports a 'VPATH' build, can handle all targets,
+and do not refer to '${top_srcdir}' or '${top_builddir}'. The fragment
'ac/withenable.ac' contains
KPSE_ENABLE_PROG([xindy], , [disable native])
@@ -1083,6 +1092,13 @@
This section outlines the basic process for adding new packages to the
TL build system.
+ In any case, a new package directory 'foo' should contain the
+original sources, as modified for TL, in 'foo/foo-src', and the changes
+should be documented in 'foo/TLPATCHES/*'; changes should also be
+submitted upstream whenever reasonable, of course. In addition, 'foo/'
+will need the usual Automake build-related files ('configure.ac',
+'Makefile.am', etc. Please keep a 'ChangeLog' for all TL changes.
+
* Menu:
* Adding a new program module::
@@ -1857,8 +1873,9 @@
considerable efforts into that direction we are still far from that goal
and there are reasons that we may never fully reach it. Below are some
rules about declarations of functions or variables and the use of
-'const'. These rules should be applied to all parts of the TeX Live
-tree, except some of those maintained independently.
+'const'. These rules should be applied to most of the TeX Live tree,
+the exception being code that is maintained independently and whose
+maintainers don't want to accept patches.
* Menu:
@@ -4510,7 +4527,7 @@
* ANSI C: Declarations and definitions.
(line 6)
* ApplicationServices Mac framework, required by xetex: Prerequisites.
- (line 27)
+ (line 31)
* asymptote: Linked scripts. (line 22)
* asymptote <1>: asymptote. (line 6)
* Autoconf: Overview of build system.
@@ -4534,10 +4551,13 @@
* Build script: Building. (line 6)
* build system, design of: Overview of build system.
(line 6)
+* build-aux/ top-level directory: Top-level directories.
+ (line 30)
* BUILDCC, BUILDCFLAGS, ...: Cross configuring. (line 42)
* building: Building. (line 6)
* building a distribution: Build distribution. (line 6)
* building in parallel: Build in parallel. (line 6)
+* C++11, required by dvisvgm: Prerequisites. (line 19)
* C, ANSI, required: Declarations and definitions.
(line 6)
* C99, avoided: Declarations and definitions.
@@ -4558,11 +4578,11 @@
(line 17)
* CLISP <1>: Configure options for utils/xindy.
(line 14)
-* clisp, required by xindy: Prerequisites. (line 31)
-* Cocoa Mac framework, required by xetex: Prerequisites. (line 27)
+* clisp, required by xindy: Prerequisites. (line 35)
+* Cocoa Mac framework, required by xetex: Prerequisites. (line 31)
* coding conventions: Coding conventions. (line 6)
* compilers, C and C++: Prerequisites. (line 6)
-* config.guess, config.sub: Top-level directories.
+* config.guess, config.sub, ...: Top-level directories.
(line 30)
* configure options: Configure options. (line 6)
* configure options, for bibtex-x: Configure options for texk/bibtex-x.
@@ -4604,7 +4624,7 @@
* CXX: Variables for configure.
(line 11)
* CXX=C++-COMPILER: Build one package. (line 74)
-* Debian installation of build prerequisites: Prerequisites. (line 56)
+* Debian installation of build prerequisites: Prerequisites. (line 60)
* declarations and definitions, in source code: Declarations and definitions.
(line 6)
* dependencies, with several output files: Build in parallel. (line 6)
@@ -4622,6 +4642,7 @@
(line 6)
* dvisvgm: Configure options for texk/dvisvgm.
(line 6)
+* dvisvgm requirement for C++11: Prerequisites. (line 19)
* environment variables, for configure: Configure options. (line 16)
* exec_prefix: --enable-multiplatform.
(line 6)
@@ -4631,10 +4652,10 @@
* extra/ top-level directory: Top-level directories.
(line 39)
* failure to build: Build problems. (line 6)
-* ffcall, required by xindy: Prerequisites. (line 31)
+* ffcall, required by xindy: Prerequisites. (line 35)
* flags, macros for library and header: Macros for library and header flags.
(line 6)
-* fontconfig library, required by xetex: Prerequisites. (line 27)
+* fontconfig library, required by xetex: Prerequisites. (line 31)
* FreeType: Prerequisites. (line 11)
* freetype cross compiling: Cross problems. (line 13)
* freetype library: freetype library. (line 6)
@@ -4663,6 +4684,8 @@
* ICU_CONFIG: Variables for configure.
(line 22)
* infrastructure, tools needed for: Build system tools. (line 6)
+* inst/ top-level directory: Top-level directories.
+ (line 43)
* install-tl, TeX Live installer: Installing. (line 8)
* installation directories: Installation directories.
(line 6)
@@ -4674,7 +4697,7 @@
(line 6)
* kpathsea library: kpathsea library. (line 6)
* kpathsea.ac: kpathsea library. (line 20)
-* kpse-libpng-flags.m4: png library. (line 43)
+* kpse-libpng-flags.m4: png library. (line 42)
* kpse-pkgs.m4: Overview of build system.
(line 30)
* kpse-zlib-flags.m4: zlib library. (line 6)
@@ -4707,7 +4730,7 @@
* KPSE_LARGEFILE: Macros for libraries. (line 8)
* KPSE_LIBPNG_FLAGS: Macros for library and header flags.
(line 10)
-* KPSE_LIBPNG_FLAGS <1>: png library. (line 43)
+* KPSE_LIBPNG_FLAGS <1>: png library. (line 42)
* kpse_libs_pkgs: Adding a new generic library module.
(line 6)
* KPSE_LIB_FLAGS: Macros for library and header flags.
@@ -4723,10 +4746,10 @@
(line 6)
* kpse_texlibs_pkgs: Adding a new TeX-specific library module.
(line 11)
-* KPSE_TRY_LIB: png library. (line 18)
+* KPSE_TRY_LIB: png library. (line 17)
* KPSE_TRY_LIB <1>: Adding a new generic library module.
(line 20)
-* KPSE_TRY_LIBXX: png library. (line 31)
+* KPSE_TRY_LIBXX: png library. (line 30)
* KPSE_TRY_LIBXX <1>: Adding a new generic library module.
(line 20)
* kpse_utils_pkgs: Adding a new program module.
@@ -4803,7 +4826,7 @@
(line 41)
* PERL: Variables for configure.
(line 39)
-* perl, required by web2c, etc.: Prerequisites. (line 19)
+* perl, required by web2c, etc.: Prerequisites. (line 23)
* PKG_CONFIG: Variables for configure.
(line 23)
* plain.tex, not in source tree: Installing. (line 8)
@@ -4884,11 +4907,13 @@
* Windows, macros for: Macros for Windows. (line 6)
* withenable.ac, for new modules: Adding a new program module.
(line 14)
+* Work/ top-level directory: Top-level directories.
+ (line 43)
* wrapper binary for scripts on Windows: Linked scripts. (line 6)
* X toolkit: Configure options for texk/web2c.
(line 22)
* X11 headers, and const: Const. (line 21)
-* X11, required by X clients: Prerequisites. (line 23)
+* X11, required by X clients: Prerequisites. (line 27)
* xasy: asymptote. (line 6)
* xaw: Configure options for texk/xdvik.
(line 9)
@@ -4914,313 +4939,313 @@
Tag Table:
-Node: Top1030
-Node: Introduction1948
-Node: Overview of build system3705
-Node: Prerequisites5769
-Node: Building8073
-Node: Build iteration9321
-Node: Build problems10393
-Node: Build in parallel10796
-Node: Build distribution11388
-Node: Build one package11959
-Node: Installing15545
-Node: Installation directories16560
-Node: Linked scripts18376
-Node: Distro builds19857
-Node: Layout and infrastructure22247
-Node: Build system tools23036
-Node: Top-level directories25045
-Node: Autoconf macros27086
-Node: General setup macros27787
-Node: Macros for programs28654
-Node: Macros for compilers29466
-Node: Macros for libraries30900
-Node: Macros for library and header flags31326
-Node: Macros for Windows33206
-Node: Library modules34783
-Node: png library35272
-Node: zlib library37561
-Node: freetype library38076
-Node: kpathsea library38604
-Node: Program modules40003
-Node: t1utils package40431
-Node: xindy package40994
-Node: xdvik package42173
-Node: asymptote43246
-Node: Extending TeX Live43697
-Node: Adding a new program module44065
-Node: Adding a new generic library module45584
-Node: Adding a new TeX-specific library module47797
-Node: Configure options48484
-Node: Global configure options49866
-Node: --disable-native-texlive-build50408
-Node: --prefix --bindir ...51398
-Node: --disable-largefile51938
-Node: --disable-missing52623
-Node: --enable-compiler-warnings=LEVEL53024
-Node: --enable-cxx-runtime-hack53763
-Node: --enable-maintainer-mode54190
-Node: --enable-multiplatform54719
-Node: --enable-shared55257
-Node: --enable-silent-rules55628
-Node: --without-ln-s56084
-Node: --without-x56435
-Node: Program-specific configure options56623
-Node: --enable-PROG --disable-PROG57266
-Node: --disable-all-pkgs57543
-Node: Configure options for texk/web2c58529
-Node: Configure options for texk/bibtex-x61047
-Node: Configure options for texk/dvipdfm-x61590
-Node: Configure options for texk/dvisvgm62363
-Node: Configure options for texk/texlive63249
-Node: Configure options for texk/xdvik63670
-Node: Configure options for utils/xindy64274
-Node: Library-specific configure options65175
-Node: Configure options for kpathsea66186
-Node: Configure options for system poppler66895
-Node: Variables for configure67686
-Node: Cross compilation69114
-Node: Cross configuring70413
-Node: Cross problems72086
-Node: Coding conventions73733
-Node: Declarations and definitions74402
-Node: Const76584
-Node: install-tl78447
-Node: install-tl NAME78788
-Node: install-tl SYNOPSIS78946
-Node: install-tl DESCRIPTION79154
-Node: install-tl REFERENCES80155
-Node: install-tl OPTIONS80671
-Ref: install-tl *-gui* [[=]_module_]81025
-Ref: install-tl text81234
-Ref: install-tl wizard81357
-Ref: install-tl perltk81511
-Ref: install-tl *-no-gui*81945
-Ref: install-tl *-lang* _llcode_82026
-Ref: install-tl *-repository* _url|path_82713
-Ref: install-tl *-select-repository*84524
-Ref: install-tl *-all-options*84960
-Ref: install-tl *-custom-bin* _path_85267
-Ref: install-tl *-debug-translation*85922
-Ref: install-tl *-force-platform* _platform_86141
-Ref: install-tl *-help*, *--help*, *-?*86385
-Ref: install-tl *-in-place*86778
-Ref: install-tl *-logfile* _file_87305
-Ref: install-tl *-no-cls*87656
-Ref: install-tl *-non-admin*87787
-Ref: install-tl *--persistent-downloads*87892
-Ref: install-tl *--no-persistent-downloads*87920
-Ref: install-tl *-portable*88528
-Ref: install-tl *-print-platform*88667
-Ref: install-tl *-profile* _profile_88860
-Ref: install-tl *-q*90354
-Ref: install-tl *-scheme* _scheme_90416
-Ref: install-tl *-v*90890
-Ref: install-tl *-version*, *--version*91051
-Node: install-tl ENVIRONMENT VARIABLES91182
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK91571
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE91773
-Ref: install-tl TEXLIVE_INSTALL_PREFIX91879
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG91910
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME91939
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL91969
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG92003
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR92034
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR92062
-Ref: install-tl NOPERLDOC92117
-Node: install-tl AUTHORS AND COPYRIGHT92181
-Node: tlmgr92539
-Node: tlmgr NAME92976
-Node: tlmgr SYNOPSIS93101
-Node: tlmgr DESCRIPTION93291
-Node: tlmgr EXAMPLES94387
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet94678
-Ref: tlmgr tlmgr update --list94859
-Ref: tlmgr tlmgr update --all94952
-Ref: tlmgr tlmgr info _pkg_95108
-Node: tlmgr OPTIONS95314
-Ref: tlmgr *--repository* _url|path_95834
-Ref: tlmgr *--gui* [_action_]96559
-Ref: tlmgr *--gui-lang* _llcode_96966
-Ref: tlmgr *--debug-translation*97649
-Ref: tlmgr *--machine-readable*97852
-Ref: tlmgr *--no-execute-actions*98120
-Ref: tlmgr *--package-logfile* _file_98313
-Ref: tlmgr *--pause*98568
-Ref: tlmgr *--persistent-downloads*98723
-Ref: tlmgr *--no-persistent-downloads*98751
-Ref: tlmgr *--pin-file*99245
-Ref: tlmgr *--usermode*99463
-Ref: tlmgr *--usertree* _dir_99583
-Node: tlmgr ACTIONS100133
-Node: tlmgr help101365
-Node: tlmgr version101841
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...102159
-Ref: tlmgr *--backupdir* _directory_103253
-Ref: tlmgr *--all*103450
-Ref: tlmgr *--clean*[=_N_]103672
-Ref: tlmgr *--dry-run*103969
-Node: tlmgr candidates _pkg_104089
-Ref: tlmgr *candidates _pkg_* 1104376
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]104520
-Ref: tlmgr *files*104963
-Ref: tlmgr *depends*105098
-Ref: tlmgr *executes*105440
-Ref: tlmgr *runfiles*105558
-Ref: tlmgr *--use-svn*105670
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]105787
-Node: tlmgr dump-tlpdb [--local|--remote]107859
-Ref: tlmgr *--local*108369
-Ref: tlmgr *--remote*108408
-Node: tlmgr generate [_option_]... _what_108830
-Ref: tlmgr *generate language*109071
-Ref: tlmgr *generate language.dat*109096
-Ref: tlmgr *generate language.def*109121
-Ref: tlmgr *generate language.dat.lua*109150
-Ref: tlmgr *generate fmtutil*109170
-Ref: tlmgr *--dest* _output_file_111407
-Ref: tlmgr *--localcfg* _local_conf_file_111983
-Ref: tlmgr *--rebuild-sys*112106
-Node: tlmgr gui112967
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]113211
-Ref: tlmgr *--list*114416
-Ref: tlmgr *--only-installed*114695
-Ref: tlmgr *--taxonomy*114910
-Ref: tlmgr *--keyword*114922
-Ref: tlmgr *--functionality*114940
-Ref: tlmgr *--characterization*114961
-Node: tlmgr init-usertree115174
-Node: tlmgr install [_option_]... _pkg_...115600
-Ref: tlmgr *--file*115964
-Ref: tlmgr *--reinstall*116190
-Ref: tlmgr *--no-depends*116570
-Ref: tlmgr *--no-depends-at-all*116729
-Ref: tlmgr *--dry-run* 1117127
-Ref: tlmgr *--force*117245
-Node: tlmgr option117451
-Ref: tlmgr *option [show]*117624
-Ref: tlmgr *option showall*117642
-Ref: tlmgr *option _key_ [_value_]*117668
-Node: tlmgr paper121516
-Ref: tlmgr *paper [a4|letter]*121701
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*121775
-Node: tlmgr path [--w32mode=user|admin] [add|remove]122802
-Node: tlmgr pinning124285
-Ref: tlmgr pinning show124592
-Ref: tlmgr pinning add _repo_ _pkgglob_...124665
-Ref: tlmgr pinning remove _repo_ _pkgglob_...124784
-Ref: tlmgr pinning remove _repo_ --all124937
-Node: tlmgr platform list|add|remove _platform_...124991
-Node: tlmgr platform set _platform_125239
-Node: tlmgr platform set auto125467
-Ref: tlmgr *--dry-run* 2126584
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...126693
-Node: tlmgr print-platform127995
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]128467
-Ref: tlmgr *--all* 1129363
-Ref: tlmgr *--backupdir* _directory_ 1129557
-Ref: tlmgr *--dry-run* 3129713
-Ref: tlmgr *--force* 1129830
-Node: tlmgr remove [_option_]... _pkg_...129858
-Ref: tlmgr *--no-depends* 1130381
-Ref: tlmgr *--no-depends-at-all* 1130443
-Ref: tlmgr *--force* 2130499
-Ref: tlmgr *--dry-run* 4130971
-Node: tlmgr repository131078
-Ref: tlmgr *repository list*131286
-Ref: tlmgr *repository list _path|tag_*131316
-Ref: tlmgr *repository add _path_ [_tag_]*131349
-Ref: tlmgr *repository remove _path|tag_*131381
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*131435
-Node: tlmgr search [_option_...] _what_132519
-Node: tlmgr search [_option_...] --file _what_133030
-Node: tlmgr search [_option_...] --taxonomy _what_133281
-Node: tlmgr search [_option_...] --keyword _what_133592
-Node: tlmgr search [_option_...] --functionality _what_133910
-Node: tlmgr search [_option_...] --characterization _what_134248
-Node: tlmgr search [_option_...] --all _what_134588
-Ref: tlmgr *--global*135036
-Ref: tlmgr *--word*135148
-Ref: tlmgr *--list* 1135387
-Ref: tlmgr *--file* 1135733
-Ref: tlmgr *--taxonomy* 1135790
-Ref: tlmgr *--keyword* 1135802
-Ref: tlmgr *--functionality* 1135820
-Ref: tlmgr *--characterization* 1135841
-Ref: tlmgr *--all* 2135996
-Node: tlmgr uninstall136079
-Ref: tlmgr *--force* 3136333
-Node: tlmgr update [_option_]... [_pkg_]...136389
-Ref: tlmgr *--all* 3136760
-Ref: tlmgr *--self*138501
-Ref: tlmgr *--dry-run* 5139265
-Ref: tlmgr *--list* [_pkg_]139442
-Ref: tlmgr *--exclude* _pkg_140131
-Ref: tlmgr *--no-auto-remove* [_pkg_]...140824
-Ref: tlmgr *--no-auto-install* [_pkg_]...141275
-Ref: tlmgr *--reinstall-forcibly-removed*141931
-Ref: tlmgr *--backup* and *--backupdir* _directory_142495
-Ref: tlmgr *--no-depends* 2143676
-Ref: tlmgr *--no-depends-at-all* 2143879
-Ref: tlmgr *--force* 4143935
-Node: tlmgr USER MODE144361
-Node: tlmgr user mode install147172
-Node: tlmgr user mode backup; restore; remove; update148119
-Node: tlmgr user mode generate; option; paper148561
-Node: tlmgr CONFIGURATION FILE FOR TLMGR148937
-Node: tlmgr TAXONOMIES150028
-Ref: tlmgr --keyword 2150654
-Ref: tlmgr --functionality 2150739
-Ref: tlmgr --characterization 2150895
-Ref: tlmgr --taxonomy 2151036
-Node: tlmgr MULTIPLE REPOSITORIES151577
-Node: tlmgr Pinning153298
-Node: tlmgr GUI FOR TLMGR155273
-Node: tlmgr Main display156495
-Node: tlmgr Display configuration area156747
-Ref: tlmgr Status157108
-Ref: tlmgr Category157272
-Ref: tlmgr Match157458
-Ref: tlmgr Selection157718
-Ref: tlmgr Display configuration buttons157922
-Node: tlmgr Package list area158105
-Ref: tlmgr a checkbox158689
-Ref: tlmgr package name158825
-Ref: tlmgr local revision (and version)158924
-Ref: tlmgr remote revision (and version)159299
-Ref: tlmgr short description159596
-Node: tlmgr Main display action buttons159641
-Ref: tlmgr Update all installed159907
-Ref: tlmgr Update160279
-Ref: tlmgr Install160329
-Ref: tlmgr Remove160515
-Ref: tlmgr Backup160693
-Node: tlmgr Menu bar160850
-Ref: tlmgr tlmgr menu161047
-Ref: tlmgr Options menu161355
-Ref: tlmgr Actions menu162438
-Ref: tlmgr Help menu162866
-Node: tlmgr MACHINE-READABLE OUTPUT162999
-Node: tlmgr Machine-readable update and install output163809
-Ref: tlmgr location-url _location_165085
-Ref: tlmgr total-bytes _count_165301
-Ref: tlmgr _pkgname_165711
-Ref: tlmgr _status_165921
-Ref: tlmgr d165999
-Ref: tlmgr f166059
-Ref: tlmgr u166238
-Ref: tlmgr r166284
-Ref: tlmgr a166407
-Ref: tlmgr i166585
-Ref: tlmgr I166704
-Ref: tlmgr _localrev_166806
-Ref: tlmgr _serverrev_166913
-Ref: tlmgr _size_167025
-Ref: tlmgr _runtime_167194
-Ref: tlmgr _esttot_167264
-Node: tlmgr Machine-readable option output167297
-Node: tlmgr AUTHORS AND COPYRIGHT167809
-Node: Index168156
+Node: Top1025
+Node: Introduction1943
+Node: Overview of build system3698
+Node: Prerequisites5741
+Node: Building8139
+Node: Build iteration9387
+Node: Build problems10459
+Node: Build in parallel10862
+Node: Build distribution11454
+Node: Build one package12025
+Node: Installing15611
+Node: Installation directories16626
+Node: Linked scripts18442
+Node: Distro builds19923
+Node: Layout and infrastructure22313
+Node: Build system tools23141
+Node: Top-level directories25150
+Node: Autoconf macros27564
+Node: General setup macros28265
+Node: Macros for programs29132
+Node: Macros for compilers29944
+Node: Macros for libraries31378
+Node: Macros for library and header flags31804
+Node: Macros for Windows33684
+Node: Library modules35261
+Node: png library35750
+Node: zlib library38024
+Node: freetype library38539
+Node: kpathsea library39067
+Node: Program modules40466
+Node: t1utils package40894
+Node: xindy package41445
+Node: xdvik package42595
+Node: asymptote43668
+Node: Extending TeX Live44119
+Node: Adding a new program module44896
+Node: Adding a new generic library module46415
+Node: Adding a new TeX-specific library module48628
+Node: Configure options49315
+Node: Global configure options50697
+Node: --disable-native-texlive-build51239
+Node: --prefix --bindir ...52229
+Node: --disable-largefile52769
+Node: --disable-missing53454
+Node: --enable-compiler-warnings=LEVEL53855
+Node: --enable-cxx-runtime-hack54594
+Node: --enable-maintainer-mode55021
+Node: --enable-multiplatform55550
+Node: --enable-shared56088
+Node: --enable-silent-rules56459
+Node: --without-ln-s56915
+Node: --without-x57266
+Node: Program-specific configure options57454
+Node: --enable-PROG --disable-PROG58097
+Node: --disable-all-pkgs58374
+Node: Configure options for texk/web2c59360
+Node: Configure options for texk/bibtex-x61878
+Node: Configure options for texk/dvipdfm-x62421
+Node: Configure options for texk/dvisvgm63194
+Node: Configure options for texk/texlive64080
+Node: Configure options for texk/xdvik64501
+Node: Configure options for utils/xindy65105
+Node: Library-specific configure options66006
+Node: Configure options for kpathsea67017
+Node: Configure options for system poppler67726
+Node: Variables for configure68517
+Node: Cross compilation69945
+Node: Cross configuring71244
+Node: Cross problems72917
+Node: Coding conventions74564
+Node: Declarations and definitions75291
+Node: Const77473
+Node: install-tl79336
+Node: install-tl NAME79677
+Node: install-tl SYNOPSIS79835
+Node: install-tl DESCRIPTION80043
+Node: install-tl REFERENCES81044
+Node: install-tl OPTIONS81560
+Ref: install-tl *-gui* [[=]_module_]81914
+Ref: install-tl text82123
+Ref: install-tl wizard82246
+Ref: install-tl perltk82400
+Ref: install-tl *-no-gui*82834
+Ref: install-tl *-lang* _llcode_82915
+Ref: install-tl *-repository* _url|path_83602
+Ref: install-tl *-select-repository*85413
+Ref: install-tl *-all-options*85849
+Ref: install-tl *-custom-bin* _path_86156
+Ref: install-tl *-debug-translation*86811
+Ref: install-tl *-force-platform* _platform_87030
+Ref: install-tl *-help*, *--help*, *-?*87274
+Ref: install-tl *-in-place*87667
+Ref: install-tl *-logfile* _file_88194
+Ref: install-tl *-no-cls*88545
+Ref: install-tl *-non-admin*88676
+Ref: install-tl *--persistent-downloads*88781
+Ref: install-tl *--no-persistent-downloads*88809
+Ref: install-tl *-portable*89417
+Ref: install-tl *-print-platform*89556
+Ref: install-tl *-profile* _profile_89749
+Ref: install-tl *-q*91243
+Ref: install-tl *-scheme* _scheme_91305
+Ref: install-tl *-v*91779
+Ref: install-tl *-version*, *--version*91940
+Node: install-tl ENVIRONMENT VARIABLES92071
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK92460
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE92662
+Ref: install-tl TEXLIVE_INSTALL_PREFIX92768
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG92799
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME92828
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL92858
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG92892
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR92923
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR92951
+Ref: install-tl NOPERLDOC93006
+Node: install-tl AUTHORS AND COPYRIGHT93070
+Node: tlmgr93428
+Node: tlmgr NAME93865
+Node: tlmgr SYNOPSIS93990
+Node: tlmgr DESCRIPTION94180
+Node: tlmgr EXAMPLES95276
+Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet95567
+Ref: tlmgr tlmgr update --list95748
+Ref: tlmgr tlmgr update --all95841
+Ref: tlmgr tlmgr info _pkg_95997
+Node: tlmgr OPTIONS96203
+Ref: tlmgr *--repository* _url|path_96723
+Ref: tlmgr *--gui* [_action_]97448
+Ref: tlmgr *--gui-lang* _llcode_97855
+Ref: tlmgr *--debug-translation*98538
+Ref: tlmgr *--machine-readable*98741
+Ref: tlmgr *--no-execute-actions*99009
+Ref: tlmgr *--package-logfile* _file_99202
+Ref: tlmgr *--pause*99457
+Ref: tlmgr *--persistent-downloads*99612
+Ref: tlmgr *--no-persistent-downloads*99640
+Ref: tlmgr *--pin-file*100134
+Ref: tlmgr *--usermode*100352
+Ref: tlmgr *--usertree* _dir_100472
+Node: tlmgr ACTIONS101022
+Node: tlmgr help102254
+Node: tlmgr version102730
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...103048
+Ref: tlmgr *--backupdir* _directory_104142
+Ref: tlmgr *--all*104339
+Ref: tlmgr *--clean*[=_N_]104561
+Ref: tlmgr *--dry-run*104858
+Node: tlmgr candidates _pkg_104978
+Ref: tlmgr *candidates _pkg_* 1105265
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]105409
+Ref: tlmgr *files*105852
+Ref: tlmgr *depends*105987
+Ref: tlmgr *executes*106329
+Ref: tlmgr *runfiles*106447
+Ref: tlmgr *--use-svn*106559
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]106676
+Node: tlmgr dump-tlpdb [--local|--remote]108748
+Ref: tlmgr *--local*109258
+Ref: tlmgr *--remote*109297
+Node: tlmgr generate [_option_]... _what_109719
+Ref: tlmgr *generate language*109960
+Ref: tlmgr *generate language.dat*109985
+Ref: tlmgr *generate language.def*110010
+Ref: tlmgr *generate language.dat.lua*110039
+Ref: tlmgr *generate fmtutil*110059
+Ref: tlmgr *--dest* _output_file_112296
+Ref: tlmgr *--localcfg* _local_conf_file_112872
+Ref: tlmgr *--rebuild-sys*112995
+Node: tlmgr gui113856
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]114100
+Ref: tlmgr *--list*115305
+Ref: tlmgr *--only-installed*115584
+Ref: tlmgr *--taxonomy*115799
+Ref: tlmgr *--keyword*115811
+Ref: tlmgr *--functionality*115829
+Ref: tlmgr *--characterization*115850
+Node: tlmgr init-usertree116063
+Node: tlmgr install [_option_]... _pkg_...116489
+Ref: tlmgr *--file*116853
+Ref: tlmgr *--reinstall*117079
+Ref: tlmgr *--no-depends*117459
+Ref: tlmgr *--no-depends-at-all*117618
+Ref: tlmgr *--dry-run* 1118016
+Ref: tlmgr *--force*118134
+Node: tlmgr option118340
+Ref: tlmgr *option [show]*118513
+Ref: tlmgr *option showall*118531
+Ref: tlmgr *option _key_ [_value_]*118557
+Node: tlmgr paper122405
+Ref: tlmgr *paper [a4|letter]*122590
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*122664
+Node: tlmgr path [--w32mode=user|admin] [add|remove]123691
+Node: tlmgr pinning125174
+Ref: tlmgr pinning show125481
+Ref: tlmgr pinning add _repo_ _pkgglob_...125554
+Ref: tlmgr pinning remove _repo_ _pkgglob_...125673
+Ref: tlmgr pinning remove _repo_ --all125826
+Node: tlmgr platform list|add|remove _platform_...125880
+Node: tlmgr platform set _platform_126128
+Node: tlmgr platform set auto126356
+Ref: tlmgr *--dry-run* 2127473
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...127582
+Node: tlmgr print-platform128884
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]129356
+Ref: tlmgr *--all* 1130252
+Ref: tlmgr *--backupdir* _directory_ 1130446
+Ref: tlmgr *--dry-run* 3130602
+Ref: tlmgr *--force* 1130719
+Node: tlmgr remove [_option_]... _pkg_...130747
+Ref: tlmgr *--no-depends* 1131270
+Ref: tlmgr *--no-depends-at-all* 1131332
+Ref: tlmgr *--force* 2131388
+Ref: tlmgr *--dry-run* 4131860
+Node: tlmgr repository131967
+Ref: tlmgr *repository list*132175
+Ref: tlmgr *repository list _path|tag_*132205
+Ref: tlmgr *repository add _path_ [_tag_]*132238
+Ref: tlmgr *repository remove _path|tag_*132270
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*132324
+Node: tlmgr search [_option_...] _what_133408
+Node: tlmgr search [_option_...] --file _what_133919
+Node: tlmgr search [_option_...] --taxonomy _what_134170
+Node: tlmgr search [_option_...] --keyword _what_134481
+Node: tlmgr search [_option_...] --functionality _what_134799
+Node: tlmgr search [_option_...] --characterization _what_135137
+Node: tlmgr search [_option_...] --all _what_135477
+Ref: tlmgr *--global*135925
+Ref: tlmgr *--word*136037
+Ref: tlmgr *--list* 1136276
+Ref: tlmgr *--file* 1136622
+Ref: tlmgr *--taxonomy* 1136679
+Ref: tlmgr *--keyword* 1136691
+Ref: tlmgr *--functionality* 1136709
+Ref: tlmgr *--characterization* 1136730
+Ref: tlmgr *--all* 2136885
+Node: tlmgr uninstall136968
+Ref: tlmgr *--force* 3137222
+Node: tlmgr update [_option_]... [_pkg_]...137278
+Ref: tlmgr *--all* 3137649
+Ref: tlmgr *--self*139390
+Ref: tlmgr *--dry-run* 5140154
+Ref: tlmgr *--list* [_pkg_]140331
+Ref: tlmgr *--exclude* _pkg_141020
+Ref: tlmgr *--no-auto-remove* [_pkg_]...141713
+Ref: tlmgr *--no-auto-install* [_pkg_]...142164
+Ref: tlmgr *--reinstall-forcibly-removed*142820
+Ref: tlmgr *--backup* and *--backupdir* _directory_143384
+Ref: tlmgr *--no-depends* 2144565
+Ref: tlmgr *--no-depends-at-all* 2144768
+Ref: tlmgr *--force* 4144824
+Node: tlmgr USER MODE145250
+Node: tlmgr user mode install148061
+Node: tlmgr user mode backup; restore; remove; update149008
+Node: tlmgr user mode generate; option; paper149450
+Node: tlmgr CONFIGURATION FILE FOR TLMGR149826
+Node: tlmgr TAXONOMIES150917
+Ref: tlmgr --keyword 2151543
+Ref: tlmgr --functionality 2151628
+Ref: tlmgr --characterization 2151784
+Ref: tlmgr --taxonomy 2151925
+Node: tlmgr MULTIPLE REPOSITORIES152466
+Node: tlmgr Pinning154187
+Node: tlmgr GUI FOR TLMGR156162
+Node: tlmgr Main display157384
+Node: tlmgr Display configuration area157636
+Ref: tlmgr Status157997
+Ref: tlmgr Category158161
+Ref: tlmgr Match158347
+Ref: tlmgr Selection158607
+Ref: tlmgr Display configuration buttons158811
+Node: tlmgr Package list area158994
+Ref: tlmgr a checkbox159578
+Ref: tlmgr package name159714
+Ref: tlmgr local revision (and version)159813
+Ref: tlmgr remote revision (and version)160188
+Ref: tlmgr short description160485
+Node: tlmgr Main display action buttons160530
+Ref: tlmgr Update all installed160796
+Ref: tlmgr Update161168
+Ref: tlmgr Install161218
+Ref: tlmgr Remove161404
+Ref: tlmgr Backup161582
+Node: tlmgr Menu bar161739
+Ref: tlmgr tlmgr menu161936
+Ref: tlmgr Options menu162244
+Ref: tlmgr Actions menu163327
+Ref: tlmgr Help menu163755
+Node: tlmgr MACHINE-READABLE OUTPUT163888
+Node: tlmgr Machine-readable update and install output164698
+Ref: tlmgr location-url _location_165974
+Ref: tlmgr total-bytes _count_166190
+Ref: tlmgr _pkgname_166600
+Ref: tlmgr _status_166810
+Ref: tlmgr d166888
+Ref: tlmgr f166948
+Ref: tlmgr u167127
+Ref: tlmgr r167173
+Ref: tlmgr a167296
+Ref: tlmgr i167474
+Ref: tlmgr I167593
+Ref: tlmgr _localrev_167695
+Ref: tlmgr _serverrev_167802
+Ref: tlmgr _size_167914
+Ref: tlmgr _runtime_168083
+Ref: tlmgr _esttot_168153
+Node: tlmgr Machine-readable option output168186
+Node: tlmgr AUTHORS AND COPYRIGHT168698
+Node: Index169045
End Tag Table
Modified: branches/stable/source/src/doc/tlbuild.texi
===================================================================
--- branches/stable/source/src/doc/tlbuild.texi 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/doc/tlbuild.texi 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,7 +2,7 @@
@setfilename tlbuild.info
@set version 2016
- at set month-year April 2016
+ at set month-year February 2017
@set mytitle Building @TeX{} Live (@value{version})
@settitle @value{mytitle}
@@ -14,8 +14,9 @@
@copying
This file documents the @TL{} build system and more.
-Copyright @copyright{} 2016 Karl Berry.@*
-Copyright @copyright{} 2013, 2014, 2015 Karl Berry & Peter Breitenlohner.
+ at noindent
+Copyright @copyright{} 2016--2017 Karl Berry.@*
+Copyright @copyright{} 2013--2015 Karl Berry & Peter Breitenlohner.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -138,7 +139,7 @@
@code{tlmgr} is included here, just because it is convenient to do so.
The same text is available online (linked from
@url{http://tug.org/texlive/doc.html}, or by invoking the program with
- at samp{--help} (or look at the end of the source file).
+ at samp{--help} (or look at the end of the source).
@c The first word of the chapter/section title here is used to
@@ -185,8 +186,8 @@
program and library module (or package) specifies its own requirements
and properties, such as required libraries, whether an installed
(system) version of a library can be used, @code{configure} options to
-be seen at the top-level, and more. An explicit list of all available
-modules is kept in only one, central, place (@file{m4/kpse-pkgs.m4}).
+be seen at the top level, and more. An explicit list of all available
+modules is kept in only one central place, namely @file{m4/kpse-pkgs.m4}.
A second, related goal is to configure and build each library before
configuring any other (program or library) module which uses that
@@ -198,9 +199,9 @@
independently. The corresponding modules use (most of) the
distributed source tree and document any modifications of that source.
-All this is for the sake of simplifying both upgrading of modules
-maintained independently and integrating new modules into the
-TL build system. (Not to say that either task is trivial.)
+All this is for the sake of simplifying both upgrading of modules and
+integrating new modules into the TL build system. (Not to say that
+either task is trivial.)
@node Prerequisites
@@ -218,14 +219,20 @@
@cindex GNU @code{make}, required
@cindex @code{gmake}, required
@cindex FreeType
-Indeed, GNU @code{make} is required only because of some
-third-party libraries, notably FreeType; all the TL-maintained
-directories (and Automake/Autoconf output in general) should work with
-any reasonable @code{make}.
+GNU @code{make} is required only because of some third-party
+libraries, notably FreeType; all the TL-maintained directories (and
+Automake/Autoconf output in general) should work with any reasonable
+ at code{make}.
However, a few programs in the tree have additional requirements:
@table @file
+ at item dvisvgm
+ at cindex @code{dvisvgm} requirement for C++11
+ at cindex C++11, required by @code{dvisvgm}
+requires a C++11 compiler, such as gcc 4.8.1 (or later) or clang 3.3
+(or later).
+
@item web2c
@cindex @code{perl}, required by @code{web2c}, etc.
requires @code{perl} for some tests run by @code{make check}.
@@ -367,7 +374,7 @@
@vindex --no-clean Build @r{option}
If configuring or building a module fails, you should first find and fix the
problem, then perhaps remove the subdirectory for that module from the build
-tree, and finally rerun the top-level @code{make} (or @file{Build} with
+tree, and finally rerun the top level @code{make} (or @file{Build} with
@code{--no-clean} as its first argument).
@@ -400,7 +407,7 @@
@cindex distribution tarball, making
@cindex @code{dist} and @code{distcheck} targets for @code{make}
-Running @code{make dist} at the top-level creates a tarball
+Running @code{make dist} at the top level creates a tarball
@file{tex-live- at var{yyyy}- at var{mm}- at var{dd}.tar.xz} from the TL source
tree. Running @code{make distcheck} also verifies that this tarball
suffices to build and install all of TL.
@@ -724,12 +731,12 @@
files.
@menu
-* Build system tools:: If modifying infrastructure files.
-* Top-level directories::
-* Autoconf macros:: TL-specific Autoconf macros.
-* Library modules:: Details on some specific libraries,
-* Program modules:: and on some programs.
-* Extending @TL{}:: Adding a new module.
+* Build system tools:: Modifying infrastructure files.
+* Top-level directories:: libs texk utils; am auxdir build-aux m4; doc extra.
+* Autoconf macros:: TL-specific Autoconf macros.
+* Library modules:: Handling libraries, with examples.
+* Program modules:: Handling programs, with examples.
+* Extending @TL{}:: Adding a new module.
@end menu
@@ -804,11 +811,12 @@
@cindex @file{am/} top-level directory
@cindex @file{m4/} top-level directory
-The top-level directories @file{am/} and @file{m4/} contain
- at file{Makefile.am} fragments and Autoconf macros, respectively, used
-in many places. Specifically, the file @file{m4/kpse-pkgs.m4}
-contains lists of all program and library modules; missing modules are
-silently ignored. (This helps in creating cut-down source trees.)
+In addition, the top-level directories @file{am/} and @file{m4/}
+contain @file{Makefile.am} fragments and Autoconf macros,
+respectively, used in many places. Specifically, the file
+ at file{m4/kpse-pkgs.m4} contains lists of all program and library
+modules; missing modules are silently ignored. (This helps in
+creating cut-down source trees.)
Each module contributes fragments (in separate files) defining its
capabilities and requirements to the @file{configure.ac} scripts at
@@ -820,15 +828,16 @@
be built---although all modules must be configured for the benefit of
@file{make} targets such as @code{dist} or @code{distcheck}.
- at pindex config.guess at r{,} config.sub
+ at cindex @file{build-aux/} top-level directory
+ at pindex config.guess at r{,} config.sub, @dots{}
@cindex Gnulib, used for common files
The top-level @file{build-aux/} directory contains the common files
@file{compile}, @file{config.guess}, @file{config.sub},
- at file{depcomp}, etc.@ for most packages, pulled from the GNU Gnulib
-sources (@url{http://www.gnu.org/software/gnulib}), which in turn
-synchronizes with the appropriate ultimate upstream repository. There
-are, however, independent copies in, e.g.,
- at file{libs/freetype2/freetype-*/builds/unix/}, and similar places.
+ at file{depcomp}, etc.@ used by most packages. These are from the GNU
+Gnulib sources (@url{http://www.gnu.org/software/gnulib}), which in
+turn synchronizes with the appropriate ultimate upstream repository.
+There are, however, independent copies in, e.g.,
+ at file{libs/freetype2/freetype-*/builds/unix/}, and a few other places.
The @code{reautoconf} script does not touch those, but a TL cron job
keeps them in sync (nightly).
@@ -835,9 +844,18 @@
@cindex @file{extra/} top-level directory
The directory @file{extra/} contains things which are not part of the
TL build, but are present just for (someone's) convenience, e.g.,
- at file{epstopdf} which is developed here.
+is @file{epstopdf} development source is here.
+ at cindex @file{Work/} top-level directory
+ at cindex @file{inst/} top-level directory
+When the top-level @file{./Build} script is used to build TL, two more
+two more top-level directories appear: @file{Work/} for the build tree,
+and @file{inst/} for the install tree (from @code{make install}).
+These names (and everything else about @file{Build}'s operation) can
+be changed by setting environment variables before running it; see the
+script file.
+
@node Autoconf macros
@section Autoconf macros
@@ -1121,10 +1139,9 @@
@pindex png @r{library}
@pindex libpng @r{library}
- at set libpngversion libpng-1.6.16
This generic library uses the source tree in, e.g., the subdirectory
- at file{@value{libpngversion}} with all modifications for TL recorded in
- at file{@value{libpngversion}-PATCHES/*}. The @file{configure.ac} fragment
+ at file{libpng-src/} with all modifications for TL recorded in
+ at file{TLPATCHES/*}. The @file{configure.ac} fragment
@file{ac/withenable.ac} contains
@example
@@ -1267,10 +1284,9 @@
@subsection The @code{t1utils} package in @file{utils/t1utils}
@pindex t1utils @r{package}
- at set t1utilsversion t1utils-1.39
-Once again we use the distributed source tree @file{@value{t1utilsversion}}
-with modifications documented in @file{@value{t1utilsversion}-PATCHES/*} and
+Once again we use the distributed source tree @file{t1utils-src}
+with modifications documented in @file{TLPATCHES/*} and
a proxy build system consisting of @file{configure.ac} and
@file{Makefile.am}. The fragment @file{ac/withenable.ac} contains
@@ -1286,15 +1302,14 @@
@subsection The @code{xindy} package in @file{utils/xindy}
@pindex xindy
- at set xindyversion xindy-2.5.1
-This module uses the distributed source tree @file{@value{xindyversion}}
-with modifications documented in @file{@value{xindyversion}-PATCHES/*}, a
-proxy @file{configure.ac}, and a wrapper @file{Makefile.am} that descends
-into @file{@value{xindyversion}}. The @code{xindy} build requires that the
-distributed @file{Makefile}s allow a @code{VPATH} build, can handle all
-targets, and do not refer to @code{$@{top_srcdir@}} or
- at code{$@{top_builddir@}}. The fragment @code{ac/withenable.ac} contains
+This module uses the distributed source tree @file{xindy-src/} with
+modifications documented in @file{TLPATCHES/*}, a proxy
+ at file{configure.ac}, and a wrapper @file{Makefile.am} that descends
+into @file{xindy-src}. The @code{xindy} build requires a @file{make}
+that supports a @code{VPATH} build, can handle all targets, and do not
+refer to @code{$@{top_srcdir@}} or @code{$@{top_builddir@}}. The
+fragment @code{ac/withenable.ac} contains
@example
KPSE_ENABLE_PROG([xindy], , [disable native])
@@ -1366,6 +1381,14 @@
This section outlines the basic process for adding new packages to the
TL build system.
+In any case, a new package directory @file{foo} should contain the
+original sources, as modified for TL, in @file{foo/foo-src}, and the
+changes should be documented in @file{foo/TLPATCHES/*}; changes should
+also be submitted upstream whenever reasonable, of course. In
+addition, @file{foo/} will need the usual Automake build-related files
+(@file{configure.ac}, @file{Makefile.am}, etc. Please keep a
+ at file{ChangeLog} for all TL changes.
+
@menu
* Adding a new program module::
* Adding a new generic library module::
@@ -2284,8 +2307,9 @@
considerable efforts into that direction we are still far from that goal and
there are reasons that we may never fully reach it. Below are some rules
about declarations of functions or variables and the use of @code{const}.
-These rules should be applied to all parts of the @TL{} tree, except some of
-those maintained independently.
+These rules should be applied to most of the @TL{} tree, the exception
+being code that is maintained independently and whose maintainers
+don't want to accept patches.
@menu
* Declarations and definitions::
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-$Id: README 40358 2016-04-09 00:38:06Z kakuto $
+$Id: README 43048 2017-01-25 07:36:33Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -9,22 +9,22 @@
See also comments in ../texk/README.
-cairo 1.14.6 - checked 28dec15
+cairo 1.14.8 - checked 09dec16
http://cairographics.org/releases/
-freetype2 2.6.3 - checked 12feb16
+freetype2 2.7.1 - checked 30dec16
http://savannah.nongnu.org/download/freetype/
-gd 2.1.1 - checked 14jan15
- https://bitbucket.org/libgd/gd-libgd/downloads/
+gd 2.2.4 - checked 18jan17
+ https://github.com/libgd/libgd/releases
-gmp 6.1.0 - checked 28dec15
+gmp 6.1.2 - checked 16dec16
http://ftp.gnu.org/gnu/gmp/
-graphite2 1.3.8 - checked 31mar16
+graphite2 1.3.9 - checked 13nov16
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 1.2.6 - checked 09apr16
+harfbuzz 1.4.2 - checked 25jan17
http://www.freedesktop.org/software/harfbuzz/release/
icu 57.1 (release) - checked 27mar16
@@ -33,7 +33,7 @@
libpaper 1.1.24+nmu2 - checked 24oct13
ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
-libpng 1.6.21 - checked 15jan16
+libpng 1.6.28 - checked 05jan17
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
@@ -43,27 +43,26 @@
luajit 2.1.0-beta2 - checked 09mar16
http://luajit.org/download/LuaJIT-2.1.0-beta1.tar.gz
-mpfr 3.1.4 - checked 07mar16
+mpfr 3.1.5 - checked 28sep16
http://ftp.gnu.org/gnu/mpfr/
pixman 0.34.0 - checked 04feb16
http://cairographics.org/releases/
-poppler 0.42.0 - checked 18mar16
+poppler 0.51.0 - checked 15jan17
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.13 - checked 28dec15
http://potrace.sourceforge.net
-teckit 2.5.4 - checked 18jul14
- http://scripts.sil.org/svn-public/teckit/TRUNK
- (svn r139 2014-07-09 14:47:39 UTC).
+teckit 2.5.6 - checked 30dec16
+ https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz
xpdf 3.04 - checked 28may14
ftp://ftp.foolabs.com/pub/xpdf/
with modifications for pdftex
-zlib 1.2.8 - checked 18may13
+zlib 1.2.11 - checked 15jan17
http://www.zlib.net/ - used by many
zziplib 0.13.62 - checked 31mar16
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2016.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2017/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live libs'
PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2016'
-PACKAGE_STRING='TeX Live libs 2016'
+PACKAGE_VERSION='2017/dev'
+PACKAGE_STRING='TeX Live libs 2017/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1418,7 +1418,7 @@
# 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 TeX Live libs 2016 to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2017/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live libs 2016:";;
+ short | recursive ) echo "Configuration of TeX Live libs 2017/dev:";;
esac
cat <<\_ACEOF
@@ -1783,7 +1783,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live libs configure 2016
+TeX Live libs configure 2017/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1884,7 +1884,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live libs $as_me 2016, which was
+It was created by TeX Live libs $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -6126,7 +6126,7 @@
# Define the identity of the package.
PACKAGE='tex-live-libs'
- VERSION='2016'
+ VERSION='2017/dev'
cat >>confdefs.h <<_ACEOF
@@ -7192,7 +7192,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live libs $as_me 2016, which was
+This file was extended by TeX Live libs $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7249,7 +7249,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live libs config.status 2016
+TeX Live libs config.status 2017/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,38 @@
+2017-01-05 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.28.
+ * version.ac: Adjust.
+
+2016-12-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.27.
+ * version.ac: Adjust.
+
+2016-10-20 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.26.
+ * version.ac: Adjust.
+
+2016-09-01 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.25.
+ * version.ac: Adjust.
+
+2016-08-04 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.24.
+ * version.ac: Adjust.
+
+2016-06-09 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.23.
+ * version.ac: Adjust.
+
+2016-05-26 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.22.
+ * version.ac: Adjust.
+
2016-03-30 Karl Berry <karl at tug.org>
* Makefile.am (AM_CPPFLAGS): remove LIBPNG_USER_CPPFLAGS per Mojca.
Modified: branches/stable/source/src/libs/libpng/README
===================================================================
--- branches/stable/source/src/libs/libpng/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
- Building libpng-1.6.21 as part of the TL tree
+ Building libpng-1.6.28 as part of the TL tree
=============================================
This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library
@@ -5,7 +5,7 @@
from the unmodified (*) source tree in libs/libpng/libpng-src/, bypassing
the original build system.
-(*) The directory libpng-src-PATCHES contains patches (if any) applied to
+(*) The directory libpng-PATCHES contains patches (if any) applied to
the original source tree.
As far as applicable, the tests in libs/libpng-src/configure.ac have been
@@ -14,5 +14,4 @@
=============================
2009-07-23 Peter Breitenlohner <peb at mppmu.mpg.de>
-2015-12-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
-2016-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+2017-01-05 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Added: branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/ChangeLog (rev 0)
+++ branches/stable/source/src/libs/libpng/TLpatches/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,52 @@
+2017-01-05 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.28.
+
+2016-12-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.27.
+
+2016-10-20 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.26.
+
+2016-09-01 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.25.
+
+2016-08-04 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.24.
+
+2016-06-09 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import libpng-1.6.23.
+ Forgot to remove patch-02-backport-20160314-12e63e9 in 1.6.22.
+ Here really remove patch-02-backport-20160314-12e63e9.
+
+2016-05-26 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Remove patch-02-backport-20160314-12e63e9, since it is now
+ in the original libpng-1.6.22.
+
+2016-03-28 Mojca Miklavec <mojca.miklavec.lists at gmail.com>
+
+ Create patch-02-backport-20160314-12e63e9:
+ * libpng-src/configure.ac: Force back to C89 if needed
+ (needed on Solaris with GCC 5 and later)
+
+2009-08-13 Martin Schröder <martin at oneiros.de>
+
+ * patch-01-static: Remove; has been integrated into libpng-1.2.39.
+
+2009-07-17 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-01-static: Adjust for libpng-1.2.38.
+
+2009-06-19 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Create patch-01-static:
+ * libpng-1.2.37/png.c (png_64bit_product): declare as static to
+ avoid compiler warning.
+
+(This ChangeLog is public domain.)
Added: branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/TL-Changes (rev 0)
+++ branches/stable/source/src/libs/libpng/TLpatches/TL-Changes 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,18 @@
+Changes applied to the libpng-1.6.28/ tree as obtained from:
+ http://www.libpng.org/ libpng-1.6.28.tar.xz
+
+Copied:
+ scripts/pnglibconf.h.prebuilt -> pnglibconf.h
+
+Removed:
+ Makefile.in
+ aclocal.m4
+ compile
+ config.guess
+ config.sub
+ configure
+ depcomp
+ install-sh
+ ltmain.sh
+ missing
+ test-driver
Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.21.
+# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.28.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='libpng (TeX Live)'
PACKAGE_TARNAME='libpng--tex-live-'
-PACKAGE_VERSION='1.6.21'
-PACKAGE_STRING='libpng (TeX Live) 1.6.21'
+PACKAGE_VERSION='1.6.28'
+PACKAGE_STRING='libpng (TeX Live) 1.6.28'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1287,7 +1287,7 @@
# 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 libpng (TeX Live) 1.6.21 to adapt to many kinds of systems.
+\`configure' configures libpng (TeX Live) 1.6.28 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1354,7 +1354,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.21:";;
+ short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.28:";;
esac
cat <<\_ACEOF
@@ -1459,7 +1459,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng (TeX Live) configure 1.6.21
+libpng (TeX Live) configure 1.6.28
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1882,7 +1882,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng (TeX Live) $as_me 1.6.21, which was
+It was created by libpng (TeX Live) $as_me 1.6.28, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3805,7 +3805,7 @@
# Define the identity of the package.
PACKAGE='libpng--tex-live-'
- VERSION='1.6.21'
+ VERSION='1.6.28'
cat >>confdefs.h <<_ACEOF
@@ -6358,7 +6358,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng (TeX Live) $as_me 1.6.21, which was
+This file was extended by libpng (TeX Live) $as_me 1.6.28, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6424,7 +6424,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libpng (TeX Live) config.status 1.6.21
+libpng (TeX Live) config.status 1.6.28
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-Libpng 1.6.21 - January 15, 2016
+Libpng 1.6.28 - January 5, 2017
This is a public release of libpng, intended for use in production codes.
@@ -7,50 +7,29 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.6.21.tar.xz (LZMA-compressed, recommended)
- libpng-1.6.21.tar.gz
+ libpng-1.6.28.tar.xz (LZMA-compressed, recommended)
+ libpng-1.6.28.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
- /scratch/glennrp/Libpng16/lpng1621.7z (LZMA-compressed, recommended)
- /scratch/glennrp/Libpng16/lpng1621.zip
+ lpng1628.7z (LZMA-compressed, recommended)
+ lpng1628.zip
Other information:
- libpng-1.6.21-README.txt
- libpng-1.6.21-LICENSE.txt
- libpng-1.6.21-*.asc (armored detached GPG signatures)
+ libpng-1.6.28-README.txt
+ libpng-1.6.28-LICENSE.txt
+ libpng-1.6.28-*.asc (armored detached GPG signatures)
-Changes since the last public release (1.6.20):
+Changes since the last public release (1.6.27):
+ Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna).
+ Added option to Cmake build allowing a custom location of zlib to be
+ specified in a scenario where libpng is being built as a subproject
+ alongside zlib by another project (Sam Serrels).
+ Changed png_ptr->options from a png_byte to png_uint_32, to accomodate
+ up to 16 options.
- Fixed syntax "$(command)" in tests/pngstest that some shells other than
- bash could not parse (Bug report by Nelson Beebe). Use `command` instead.
- Moved png_check_keyword() from pngwutil.c to pngset.c
- Removed LE/BE dependencies in pngvalid, to 'fix' the current problem
- in the BigEndian tests by not testing it, making the BE code the same
- as the LE version.
- Fixes to pngvalid for various reduced build configurations (eliminate unused
- statics) and a fix for the case in rgb_to_gray when the digitize option
- reduces graylo to 0, producing a large error.
- Widened the 'limit' check on the internally calculated error limits in
- the 'DIGITIZE' case (the code used prior to 1.7 for rgb_to_gray error
- checks) and changed the check to only operate in non-release builds
- (base build type not RC or RELEASE.)
- Fixed undefined behavior in pngvalid.c, undefined because
- (png_byte) << shift is undefined if it changes the signed bit
- (because png_byte is promoted to int). The libpng exported functions
- png_get_uint_32 and png_get_uint_16 handle this. (Bug reported by
- David Drysdale as a result of reports from UBSAN in clang 3.8).
- This changes pngvalid to use BE random numbers; this used to produce
- errors but these should not be fixed as a result of the previous changes.
- In projects/vstudio, combined readme.txt and WARNING into README.txt
- Relocated assert() in contrib/tools/pngfix.c, bug found by American
- Fuzzy Lop, reported by Brian Carpenter.
- Marked 'limit' UNUSED in transform_range_check(). This only affects
- release builds.
- Worked around a false-positive Coverity issue in pngvalid.c.
-
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Modified: branches/stable/source/src/libs/libpng/libpng-src/CHANGES
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2017-02-16 16:38:15 UTC (rev 766)
@@ -593,7 +593,7 @@
with trailing compressed parts easier in the future, and added new functions
png_free_iCCP, png_free_pCAL, png_free_sPLT, png_free_text, png_get_iCCP,
png_get_spalettes, png_set_iCCP, png_set_spalettes (Eric S. Raymond).
- NOTE: Applications that write text chunks MUST define png_text->lang
+ NOTE: Applications that write text chunks MUST define png_text->lang
before calling png_set_text(). It must be set to NULL if you want to
write tEXt or zTXt chunks. If you want your application to be able to
run with older versions of libpng, use
@@ -5063,7 +5063,8 @@
Version 1.6.15beta05 [November 5, 2014]
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
- Avoid out-of-bounds memory access in png_user_version_check().
+ Fixed an out-of-range read in png_user_version_check() (Bug report from
+ Qixue Xiao, CVE-2015-8540).
Simplified and future-proofed png_user_version_check().
Fixed GCC unsigned int->float warnings. Various versions of GCC
seem to generate warnings when an unsigned value is implicitly
@@ -5484,6 +5485,315 @@
Version 1.6.21 [January 15, 2016]
Worked around a false-positive Coverity issue in pngvalid.c.
+Version 1.6.22beta01 [January 23, 2016]
+ Changed PNG_USE_MKSTEMP to __COVERITY__ to select alternate
+ "tmpfile()" implementation in contrib/libtests/pngstest.c
+ Fixed NO_STDIO build of pngunknown.c to skip calling png_init_io()
+ if there is no stdio.h support.
+ Added a png_image_write_to_memory() API and a number of assist macros
+ to allow an application that uses the simplified API write to bypass
+ stdio and write directly to memory.
+ Added some warnings (png.h) and some check code to detect *possible*
+ overflow in the ROW_STRIDE and simplified image SIZE macros. This
+ disallows image width/height/format that *might* overflow. This is
+ a quiet API change that limits in-memory image size (uncompressed) to
+ less than 4GByte and image row size (stride) to less than 2GByte.
+ Revised workaround for false-positive Coverity issue in pngvalid.c.
+
+Version 1.6.22beta02 [February 8, 2016]
+ Only use exit(77) in configure builds.
+ Corrected error in PNG_IMAGE_PNG_SIZE_MAX. This new macro underreported
+ the palette size because it failed to take into account that the memory
+ palette has to be expanded to full RGB when it is written to PNG.
+ Updated CMakeLists.txt, added supporting scripts/gen*.cmake.in
+ and test.cmake.in (Roger Leigh).
+ Relaxed limit checks on gamma values in pngrtran.c. As suggested in
+ the comments gamma values outside the range currently permitted
+ by png_set_alpha_mode are useful for HDR data encoding. These values
+ are already permitted by png_set_gamma so it is reasonable caution to
+ extend the png_set_alpha_mode range as HDR imaging systems are starting
+ to emerge.
+
+Version 1.6.22beta03 [March 9, 2016]
+ Added a common-law trademark notice and export control information
+ to the LICENSE file, png.h, and the man page.
+ Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
+ were accidentally removed from libpng-1.6.17.
+ Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
+ (Robert C. Seacord).
+ Removed dubious "#if INT_MAX" test from png.h that was added to
+ libpng-1.6.19beta02 (John Bowler).
+ Add ${INCLUDES} in scripts/genout.cmake.in (Bug report by Nixon Kwok).
+ Updated LICENSE to say files in the contrib directory are not
+ necessarily under the libpng license, and that some makefiles have
+ other copyright owners.
+ Added INTEL-SSE2 support (Mike Klein and Matt Sarett, Google, Inc.).
+ Made contrib/libtests/timepng more robust. The code no longer gives
+ up/fails on invalid PNG data, it just skips it (with error messages).
+ The code no longer fails on PNG files with data beyond IEND. Options
+ exist to use png_read_png (reading the whole image, not by row) and, in
+ that case, to apply any of the supported transforms. This makes for
+ more realistic testing; the decoded data actually gets used in a
+ meaningful fashion (John Bowler).
+ Fixed some misleading indentation (Krishnaraj Bhat).
+
+Version 1.6.22beta04 [April 5, 2016]
+ Force GCC compilation to C89 if needed (Dagobert Michelsen).
+ SSE filter speed improvements for bpp=3:
+ memcpy-free implementations of load3() / store3().
+ call load3() only when needed at the end of a scanline.
+
+Version 1.6.22beta05 [April 27, 2016]
+ Added PNG_FAST_FILTERS macro (defined as
+ PNG_FILTER_NONE|PNG_FILTER_SUB|PNG_FILTER_UP).
+ Various fixes for contrib/libtests/timepng.c
+ Moved INTEL-SSE code from pngpriv.h into contrib/intel/intel_sse.patch.
+ Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED
+ (Bug report by Y.Ohashik).
+
+Version 1.6.22beta06 [May 5, 2016]
+ Rebased contrib/intel_sse.patch.
+ Quieted two Coverity issues in contrib/libtests/timepng.c.
+ Fixed issues with scripts/genout.cmake.in (David Capello, Nixon Kwok):
+ Added support to use multiple directories in ZLIBINCDIR variable,
+ Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC,
+ Fixed pnglibconf.c compilation on OS X including the sysroot path.
+
+Version 1.6.22rc01 [May 14, 2016]
+ No changes.
+
+Version 1.6.22rc02 [May 16, 2016]
+ Removed contrib/timepng from default build; it does not build on platforms
+ that don't supply clock_gettime().
+
+Version 1.6.22rc03 [May 17, 2016]
+ Restored contrib/timepng to default build but check for the presence
+ of clock_gettime() in configure.ac and Makefile.am.
+
+Version 1.6.22 [May 26, 2016]
+ No changes.
+
+Version 1.6.23beta01 [May 29, 2016]
+ Stop a potential memory leak in png_set_tRNS() (Bug report by Ted Ying).
+ Fixed the progressive reader to handle empty first IDAT chunk properly
+ (patch by Timothy Nikkel). This bug was introduced in libpng-1.6.0 and
+ only affected the libpng16 branch.
+ Added tests in pngvalid.c to check zero-length IDAT chunks in various
+ positions. Fixed the sequential reader to handle these more robustly
+ (John Bowler).
+
+Version 1.6.23rc01 [June 2, 2016]
+ Corrected progressive read input buffer in pngvalid.c. The previous version
+ the code invariably passed just one byte at a time to libpng. The intent
+ was to pass a random number of bytes in the range 0..511.
+ Moved sse2 prototype from pngpriv.h to contrib/intel/intel_sse.patch.
+ Added missing ")" in pngerror.c (Matt Sarrett).
+
+Version 1.6.23rc02 [June 4, 2016]
+ Fixed undefined behavior in png_push_save_buffer(). Do not call
+ memcpy() with a null source, even if count is zero (Leon Scroggins III).
+
+Version 1.6.23 [June 9, 2016]
+ Fixed bad link to RFC2083 in png.5 (Nikola Forro).
+
+Version 1.6.24beta01 [June 11, 2016]
+ Avoid potential overflow of the PNG_IMAGE_SIZE macro. This macro
+ is not used within libpng, but is used in some of the examples.
+
+Version 1.6.24beta02 [June 23, 2016]
+ Correct filter heuristic overflow handling. This was broken when the
+ write filter code was moved out-of-line; if there is a single filter and
+ the heuristic sum overflows the calculation of the filtered line is not
+ completed. In versions prior to 1.6 the code was duplicated in-line
+ and the check not performed, so the filter operation completed; however,
+ in the multi-filter case where the sum is performed the 'none' filter would
+ be selected if all the sums overflowed, even if it wasn't in the filter
+ list. The fix to the first problem is simply to provide PNG_SIZE_MAX as
+ the current lmins sum value; this means the sum can never exceed it and
+ overflows silently. A reasonable compiler that does choose to inline
+ the code will simply eliminate the sum check.
+ The fix to the second problem is to use high precision arithmetic (this is
+ implemented in 1.7), however a simple safe fix here is to chose the lowest
+ numbered filter in the list from png_set_filter (this only works if the
+ first problem is also fixed) (John Bowler).
+ Use a more efficient absolute value calculation on SSE2 (Matthieu Darbois).
+ Fixed the case where PNG_IMAGE_BUFFER_SIZE can overflow in the application
+ as a result of the application using an increased 'row_stride'; previously
+ png_image_finish_read only checked for overflow on the base calculation of
+ components. (I.e. it checked for overflow of a 32-bit number on the total
+ number of pixel components in the output format, not the possibly padded row
+ length and not the number of bytes, which for linear formats is twice the
+ number of components.)
+ MSVC does not like '-(unsigned)', so replaced it with 0U-(unsigned)
+ MSVC does not like (uInt) = -(unsigned) (i.e. as an initializer), unless
+ the conversion is explicitly invoked by a cast.
+ Put the SKIP definition in the correct place. It needs to come after the
+ png.h include (see all the other .c files in contrib/libtests) because it
+ depends on PNG_LIBPNG_VER.
+ Removed the three compile warning options from the individual project
+ files into the zlib.props globals. It increases the warning level from 4
+ to All and adds a list of the warnings that need to be turned off. This is
+ semi-documentary; the intent is to tell libpng users which warnings have
+ been examined and judged non-fixable at present. The warning about
+ structure padding is fixable, but it would be a signficant change (moving
+ structure members around).
+
+Version 1.6.24beta03 [July 4, 2016]
+ Optimized absolute value calculation in filter selection, similar to
+ code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to
+ use this.
+ Added pngcp to the build together with a pngcp.dfa configuration test.
+ Added high resolution timing to pngcp.
+ Added "Common linking failures" section to INSTALL.
+ Relocated misplaced #endif in png.c sRGB profile checking.
+ Fixed two Coverity issues in pngcp.c.
+
+Version 1.6.24beta04 [July 8, 2016]
+ Avoid filter-selection heuristic sum calculations in cases where only one
+ filter is a candidate for selection. This trades off code size (added
+ private png_setup_*_row_only() functions) for speed.
+
+Version 1.6.24beta05 [July 13, 2016]
+ Fixed some indentation to comply with our coding style.
+ Added contrib/tools/reindent.
+
+Version 1.6.24beta06 [July 18, 2016]
+ Fixed more indentation to comply with our coding style.
+ Eliminated unnecessary tests of boolean png_isaligned() vs 0.
+
+Version 1.6.24rc01 [July 25, 2016]
+ No changes.
+
+Version 1.6.24rc02 [August 1, 2016]
+ Conditionally compile SSE2 headers in contrib/intel/intel_sse.patch
+ Conditionally compile png_decompress_chunk().
+
+Version 1.6.24rc03 [August 2, 2016]
+ Conditionally compile ARM_NEON headers in pngpriv.h
+ Updated contrib/intel/intel_sse.patch
+
+Version 1.6.24[August 4, 2016]
+ No changes.
+
+Version 1.6.25beta01 [August 12, 2016]
+ Reject oversized iCCP profile immediately.
+ Cleaned up PNG_DEBUG compile of pngtest.c.
+ Conditionally compile png_inflate().
+
+Version 1.6.25beta02 [August 18, 2016]
+ Don't install pngcp; it conflicts with pngcp in the pngtools package.
+ Minor editing of INSTALL, (whitespace, added copyright line)
+
+Version 1.6.25rc01 [August 24, 2016]
+ No changes.
+
+Version 1.6.25rc02 [August 29, 2016]
+ Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe at imgtec.com>).
+ Only the UP filter is currently implemented.
+
+Version 1.6.25rc03 [August 29, 2016]
+ Rebased contrib/intel/intel_sse.patch after the MIPS implementation.
+
+Version 1.6.25rc04 [August 30, 2016]
+ Added MIPS support for SUB, AVG, and PAETH filters (Mandar Sahastrabuddhe).
+
+Version 1.6.25rc05 [August 30, 2016]
+ Rebased contrib/intel/intel_sse.patch after the MIPS implementation update..
+
+Version 1.6.25 [September 1, 2016]
+ No changes.
+
+Version 1.6.26beta01 [September 26, 2016]
+ Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
+ bugfix by John Bowler).
+ Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL
+ has allocated memory that libpng needs to free.
+ Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c
+ Issue a png_benign_error instead of a png_error on ADLER32 mismatch
+ while decoding compressed data chunks.
+ Changed PNG_ZLIB_VERNUM to ZLIB_VERNUM in pngpriv.h, pngstruct.h, and
+ pngrutil.c.
+ If CRC handling of critical chunks has been set to PNG_CRC_QUIET_USE,
+ ignore the ADLER32 checksum in the IDAT chunk as well as the chunk CRCs.
+ Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
+ Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
+ Merged pngtest.c with libpng-1.7.0beta84/pngtest.c
+
+Version 1.6.26beta02 [October 1, 2016]
+ Updated the documentation about CRC and ADLER32 handling.
+ Quieted 117 warnings from clang-3.8 in pngtrans.c, pngread.c,
+ pngwrite.c, pngunknown.c, and pngvalid.c.
+ Quieted 58 (out of 144) -Wconversion compiler warnings by changing
+ flag definitions in pngpriv.h from 0xnnnn to 0xnnnnU and trivial changes
+ in png.c, pngread.c, and pngwutil.c.
+
+Version 1.6.26beta03 [October 2, 2016]
+ Removed contrib/libtests/*.orig and *.rej that slipped into the tarballs.
+ Quieted the 86 remaining -Wconversion compiler warnings by
+ revising the png_isaligned() macro and trivial changes in png.c,
+ pngerror.c, pngget.c, pngmem.c, pngset.c, pngrtran.c, pngrutil.c,
+ pngwtran.c, pngwrite.c, and pngwutil.c.
+
+Version 1.6.26beta04 [October 3, 2016]
+ Quieted (bogus?) clang warnings about "absolute value has no effect"
+ when PNG_USE_ABS is defined.
+ Fixed offsets in contrib/intel/intel_sse.patch
+
+Version 1.6.26beta05 [October 6, 2016]
+ Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h
+ to avoid a signed/unsigned compare in the preprocessor.
+
+Version 1.6.26beta06 [October 7, 2016]
+ Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to
+ optionally avoid ADLER32 evaluation.
+
+Version 1.6.26rc01 [October 12, 2016]
+ No changes.
+
+Version 1.6.26 [October 20, 2016]
+ Cosmetic change, "ptr != 0" to "ptr != NULL" in png.c and pngrutil.c
+ Despammed email addresses (replaced "@" with " at ").
+
+Version 1.6.27beta01 [November 2, 2016]
+ Restrict the new ADLER32-skipping to IDAT chunks. It broke iCCP chunk
+ handling: an erroneous iCCP chunk would throw a png_error and reject the
+ entire PNG image instead of rejecting just the iCCP chunk with a warning,
+ if built with zlib-1.2.8.1.
+
+Version 1.6.27rc01 [December 27, 2016]
+ Control ADLER32 checking with new PNG_IGNORE_ADLER32 option.
+ Removed the use of a macro containing the pre-processor 'defined'
+ operator. It is unclear whether this is valid; a macro that
+ "generates" 'defined' is not permitted, but the use of the word
+ "generates" within the C90 standard seems to imply more than simple
+ substitution of an expression itself containing a well-formed defined
+ operation.
+ Added ARM support to CMakeLists.txt (Andreas Franek).
+
+Version 1.6.27 [December 29, 2016]
+ Fixed a potential null pointer dereference in png_set_text_2() (bug report
+ and patch by Patrick Keshishian, CVE-2016-10087).
+
+Version 1.6.28rc01 [January 3, 2017]
+ Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna).
+ Added option to Cmake build allowing a custom location of zlib to be
+ specified in a scenario where libpng is being built as a subproject
+ alongside zlib by another project (Sam Serrels).
+ Changed png_ptr->options from a png_byte to png_uint_32, to accomodate
+ up to 16 options.
+
+Version 1.6.28rc02 [January 4, 2017]
+ Added "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna).
+ Moved SSE2 optimization code into the main libpng source directory.
+ Configure libpng with "configure --enable-intel-sse" or compile
+ libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it.
+
+Version 1.6.28rc03 [January 4, 2017]
+ Backed out the SSE optimization and last CMakeLists.txt to allow time for QA.
+
+Version 1.6.28 [January 5, 2017]
+ No changes.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Modified: branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,14 +1,34 @@
# CMakeLists.txt
-# Copyright (C) 2007-2015 Glenn Randers-Pehrson
+# Copyright (C) 2007,2009-2016 Glenn Randers-Pehrson
+# Written by Christian Ehrlicher, 2007
+# Revised by Roger Lowman, 2009-2010
+# Revised by Clifford Yapp, 2011-2012
+# Revised by Roger Leigh, 2016
+# Revised by Andreas Franek, 2016
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+cmake_minimum_required(VERSION 2.8.3)
+cmake_policy(VERSION 2.8.3)
+# Set MacOSX @rpath usage globally.
+if (POLICY CMP0020)
+ cmake_policy(SET CMP0020 NEW)
+endif(POLICY CMP0020)
+if (POLICY CMP0042)
+ cmake_policy(SET CMP0042 NEW)
+endif(POLICY CMP0042)
+# Use new variable expansion policy.
+if (POLICY CMP0053)
+ cmake_policy(SET CMP0053 NEW)
+endif(POLICY CMP0053)
+if (POLICY CMP0054)
+ cmake_policy(SET CMP0054 NEW)
+endif(POLICY CMP0054)
+
set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
project(libpng C)
@@ -16,14 +36,21 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 21)
+set(PNGLIB_RELEASE 28)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
# needed packages
-find_package(ZLIB REQUIRED)
-include_directories(${ZLIB_INCLUDE_DIR})
+#Allow users to specify location of Zlib,
+# Useful if zlib is being built alongside this as a sub-project
+option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF)
+
+IF(NOT PNG_BUILD_ZLIB)
+ find_package(ZLIB REQUIRED)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ENDIF(NOT PNG_BUILD_ZLIB)
+
if(NOT WIN32)
find_library(M_LIBRARY
NAMES m
@@ -47,6 +74,39 @@
option(PNG_DEBUG "Build with debug output" OFF)
option(PNGARG "Disable ANSI-C prototypes" OFF)
+set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
+set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
+
+# set definitions and sources for arm
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm" OR
+ ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64")
+ set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
+ set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
+ check: (default) use internal checking code;
+ off: disable the optimizations;
+ on: turn on unconditionally.")
+ set_property(CACHE PNG_ARM_NEON PROPERTY STRINGS
+ ${PNG_ARM_NEON_POSSIBLE_VALUES})
+ list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
+ if(index EQUAL -1)
+ message(FATAL_ERROR
+ " PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
+ elseif(NOT ${PNG_ARM_NEON} STREQUAL "no")
+ set(libpng_arm_sources
+ arm/arm_init.c
+ arm/filter_neon.S
+ arm/filter_neon_intrinsics.c)
+
+ if(${PNG_ARM_NEON} STREQUAL "on")
+ add_definitions(-DPNG_ARM_NEON_OPT=2)
+ elseif(${PNG_ARM_NEON} STREQUAL "check")
+ add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
+ endif()
+ else()
+ add_definitions(-DPNG_ARM_NEON_OPT=0)
+ endif()
+endif()
+
# SET LIBNAME
set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
@@ -53,26 +113,275 @@
# to distinguish between debug and release lib
set(CMAKE_DEBUG_POSTFIX "d")
-# Use the prebuilt pnglibconf.h file from the scripts folder
-# TODO: fix this by building with awk; without this no cmake build can be
-# configured directly (to do so indirectly use your local awk to build a
-# pnglibconf.h in the build directory.)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
- ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
+include(CheckCSourceCompiles)
+option(ld-version-script "Enable linker version script" ON)
+if(ld-version-script AND NOT APPLE)
+ # Check if LD supports linker scripts.
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "VERS_1 {
+ global: sym;
+ local: *;
+};
+
+VERS_2 {
+ global: sym2;
+ main;
+} VERS_1;
+")
+ set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
+ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/conftest.map'")
+ check_c_source_compiles("void sym(void) {}
+void sym2(void) {}
+int main(void) {return 0;}
+" HAVE_LD_VERSION_SCRIPT)
+ if(NOT HAVE_LD_VERSION_SCRIPT)
+ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE} "-Wl,-M -Wl,${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
+ check_c_source_compiles("void sym(void) {}
+void sym2(void) {}
+int main(void) {return 0;}
+" HAVE_SOLARIS_LD_VERSION_SCRIPT)
+ endif()
+ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
+ file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
+endif()
+
+# Find symbol prefix. Likely obsolete and unnecessary with recent
+# toolchains (it's not done in many other projects).
+function(symbol_prefix)
+ set(SYMBOL_PREFIX)
+
+ execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E" "-"
+ INPUT_FILE /dev/null
+ OUTPUT_VARIABLE OUT
+ RESULT_VARIABLE STATUS)
+
+ if(CPP_FAIL)
+ message(WARNING "Failed to run the C preprocessor")
+ endif()
+
+ string(REPLACE "\n" ";" OUT "${OUT}")
+ foreach(line ${OUT})
+ string(REGEX MATCH "^PREFIX=" found_match "${line}")
+ if(found_match)
+ STRING(REGEX REPLACE "^PREFIX=(.*\)" "\\1" prefix "${line}")
+ string(REGEX MATCH "__USER_LABEL_PREFIX__" found_match "${prefix}")
+ if(found_match)
+ STRING(REGEX REPLACE "(.*)__USER_LABEL_PREFIX__(.*)" "\\1\\2" prefix "${prefix}")
+ endif()
+ set(SYMBOL_PREFIX "${prefix}")
+ endif()
+ endforeach()
+
+ message(STATUS "Symbol prefix: ${SYMBOL_PREFIX}")
+ set(SYMBOL_PREFIX "${SYMBOL_PREFIX}" PARENT_SCOPE)
+endfunction()
+
+if(UNIX)
+ symbol_prefix()
+endif()
+
+find_program(AWK NAMES gawk awk)
+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
+if(NOT AWK)
+ # No awk available to generate sources; use pre-built pnglibconf.h
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
+ ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
+ add_custom_target(genfiles) # Dummy
+else()
+ include(CMakeParseArguments)
+ # Generate .chk from .out with awk
+ # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
+ function(generate_chk)
+ set(options)
+ set(oneValueArgs INPUT OUTPUT)
+ set(multiValueArgs DEPENDS)
+ cmake_parse_arguments(_GC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ if (NOT _GC_INPUT)
+ message(FATAL_ERROR "Invalid arguments. generate_out requires input.")
+ endif()
+ if (NOT _GC_OUTPUT)
+ message(FATAL_ERROR "Invalid arguments. generate_out requires output.")
+ endif()
+
+ add_custom_command(OUTPUT "${_GC_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DINPUT=${_GC_INPUT}"
+ "-DOUTPUT=${_GC_OUTPUT}"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake"
+ DEPENDS "${_GC_INPUT}" ${_GC_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+
+ # Generate .out from .c with awk
+ # generate_out(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
+ function(generate_out)
+ set(options)
+ set(oneValueArgs INPUT OUTPUT)
+ set(multiValueArgs DEPENDS)
+ cmake_parse_arguments(_GO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ if (NOT _GO_INPUT)
+ message(FATAL_ERROR "Invalid arguments. generate_out requires input.")
+ endif()
+ if (NOT _GO_OUTPUT)
+ message(FATAL_ERROR "Invalid arguments. generate_out requires output.")
+ endif()
+
+ add_custom_command(OUTPUT "${_GO_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DINPUT=${_GO_INPUT}"
+ "-DOUTPUT=${_GO_OUTPUT}"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake"
+ DEPENDS "${_GO_INPUT}" ${_GO_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+
+ # Generate specific source file with awk
+ # generate_source(OUTPUT outputfile [DEPENDS dep1 [dep2...]])
+ function(generate_source)
+ set(options)
+ set(oneValueArgs OUTPUT)
+ set(multiValueArgs DEPENDS)
+ cmake_parse_arguments(_GSO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ if (NOT _GSO_OUTPUT)
+ message(FATAL_ERROR "Invalid arguments. generate_source requires output.")
+ endif()
+
+ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_GSO_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DOUTPUT=${_GSO_OUTPUT}"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
+ DEPENDS ${_GSO_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+
+ # Copy file
+ function(generate_copy source destination)
+ add_custom_command(OUTPUT "${destination}"
+ COMMAND "${CMAKE_COMMAND}" -E remove "${destination}"
+ COMMAND "${CMAKE_COMMAND}" -E copy "${source}"
+ "${destination}"
+ DEPENDS "${source}")
+ endfunction()
+
+ # Generate scripts/pnglibconf.h
+ generate_source(OUTPUT "scripts/pnglibconf.c"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
+ "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
+
+ # Generate pnglibconf.c
+ generate_source(OUTPUT "pnglibconf.c"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
+ "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
+
+ if(PNG_PREFIX)
+ set(PNGLIBCONF_H_EXTRA_DEPENDS
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/macro.lst")
+ set(PNGPREFIX_H_EXTRA_DEPENDS
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
+ endif()
+
+ generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
+
+ # Generate pnglibconf.h
+ generate_source(OUTPUT "pnglibconf.h"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
+ ${PNGLIBCONF_H_EXTRA_DEPENDS})
+
+ generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/intprefix.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+
+ generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/prefix.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
+
+ # Generate pngprefix.h
+ generate_source(OUTPUT "pngprefix.h"
+ DEPENDS ${PNGPREFIX_H_EXTRA_DEPENDS})
+
+ generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/sym.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+
+ generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt")
+
+ generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/vers.c"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+
+ generate_chk(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk"
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.def")
+
+ add_custom_target(symbol-check DEPENDS
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk")
+
+ generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
+ generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
+
+ add_custom_target(genvers DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
+ add_custom_target(gensym DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
+
+ add_custom_target("genprebuilt"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DOUTPUT=scripts/pnglibconf.h.prebuilt"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+ # A single target handles generation of all generated files. If
+ # they are dependend upon separately by multiple targets, this
+ # confuses parallel make (it would require a separate top-level
+ # target for each file to track the dependencies properly).
+ add_custom_target(genfiles DEPENDS
+ "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym"
+ "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers"
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out")
+endif(NOT AWK)
+
# OUR SOURCES
set(libpng_public_hdrs
png.h
pngconf.h
- ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
)
-set(libpng_sources
- ${libpng_public_hdrs}
+set(libpng_private_hdrs
+ pngpriv.h
pngdebug.h
pnginfo.h
- pngpriv.h
pngstruct.h
+)
+if(AWK)
+ list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
+endif()
+set(libpng_sources
+ ${libpng_public_hdrs}
+ ${libpng_private_hdrs}
png.c
pngerror.c
pngget.c
@@ -88,6 +397,7 @@
pngwrite.c
pngwtran.c
pngwutil.c
+ ${libpng_arm_sources}
)
set(pngtest_sources
pngtest.c
@@ -98,7 +408,18 @@
set(pngstest_sources
contrib/libtests/pngstest.c
)
-# SOME NEEDED DEFINITIONS
+set(pngunknown_sources
+ contrib/libtests/pngunknown.c
+)
+set(pngimage_sources
+ contrib/libtests/pngimage.c
+)
+set(pngfix_sources
+ contrib/tools/pngfix.c
+)
+set(png_fix_itxt_sources
+ contrib/tools/png-fix-itxt.c
+)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
@@ -114,33 +435,59 @@
unset(PNG_LIB_TARGETS)
if(PNG_SHARED)
- add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
- set(PNG_LIB_TARGETS ${PNG_LIB_NAME})
+ add_library(png SHARED ${libpng_sources})
+ set(PNG_LIB_TARGETS png)
+ set_target_properties(png PROPERTIES OUTPUT_NAME ${PNG_LIB_NAME})
+ add_dependencies(png genfiles)
if(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")
- set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")
+ set_target_properties(png PROPERTIES PREFIX "lib")
+ set_target_properties(png PROPERTIES IMPORT_PREFIX "lib")
endif()
- target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY})
+
+ if(UNIX AND AWK)
+ if(HAVE_LD_VERSION_SCRIPT)
+ set_target_properties(png PROPERTIES LINK_FLAGS
+ "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
+ elseif(HAVE_SOLARIS_LD_VERSION_SCRIPT)
+ set_target_properties(png PROPERTIES LINK_FLAGS
+ "-Wl,-M -Wl,'${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
+ endif()
+ endif()
endif()
if(PNG_STATIC)
# does not work without changing name
- set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
- add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
- list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_STATIC})
+ set(PNG_LIB_NAME_STATIC png_static)
+ add_library(png_static STATIC ${libpng_sources})
+ add_dependencies(png_static genfiles)
+ # MSVC doesn't use a different file extension for shared vs. static
+ # libs. We are able to change OUTPUT_NAME to remove the _static
+ # for all other platforms.
+ if(NOT MSVC)
+ set_target_properties(png_static PROPERTIES
+ OUTPUT_NAME "${PNG_LIB_NAME}"
+ CLEAN_DIRECT_OUTPUT 1)
+ else()
+ set_target_properties(png_static PROPERTIES
+ OUTPUT_NAME "${PNG_LIB_NAME}_static"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif()
+ list(APPEND PNG_LIB_TARGETS png_static)
if(MSVC)
# msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
+ set_target_properties(png_static PROPERTIES PREFIX "lib")
endif()
- target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY})
endif()
if(PNG_FRAMEWORK)
- set(PNG_LIB_NAME_FRAMEWORK ${PNG_LIB_NAME}_framework)
- add_library(${PNG_LIB_NAME_FRAMEWORK} SHARED ${libpng_sources})
- list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_FRAMEWORK})
- set_target_properties(${PNG_LIB_NAME_FRAMEWORK} PROPERTIES
+ set(PNG_LIB_NAME_FRAMEWORK png_framework)
+ add_library(png_framework SHARED ${libpng_sources})
+ add_dependencies(png_framework genfiles)
+ list(APPEND PNG_LIB_TARGETS png_framework)
+ set_target_properties(png_framework PROPERTIES
FRAMEWORK TRUE
FRAMEWORK_VERSION ${PNGLIB_VERSION}
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR}
@@ -149,7 +496,7 @@
XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
PUBLIC_HEADER "${libpng_public_hdrs}"
OUTPUT_NAME png)
- target_link_libraries(${PNG_LIB_NAME_FRAMEWORK} ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY})
endif()
if(NOT PNG_LIB_TARGETS)
@@ -160,54 +507,172 @@
endif()
if(PNG_SHARED AND WIN32)
- set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
+ set_target_properties(png PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
endif()
+function(png_add_test)
+ set(options)
+ set(oneValueArgs NAME COMMAND)
+ set(multiValueArgs OPTIONS FILES)
+ cmake_parse_arguments(_PAT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if (NOT _PAT_NAME)
+ message(FATAL_ERROR "Invalid arguments. png_add_test requires name.")
+ endif()
+ if (NOT _PAT_COMMAND)
+ message(FATAL_ERROR "Invalid arguments. png_add_test requires command.")
+ endif()
+
+ set(TEST_OPTIONS "${_PAT_OPTIONS}")
+ set(TEST_FILES "${_PAT_FILES}")
+
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/test.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake" @ONLY)
+ if(CMAKE_MAJOR_VERSION GREATER 2) # have generator expressions
+ add_test(NAME "${_PAT_NAME}"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DLIBPNG=$<TARGET_FILE:png>"
+ "-DTEST_COMMAND=$<TARGET_FILE:${_PAT_COMMAND}>"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
+ else() # old 2.x add_test; limited and won't work well on Windows
+ # Note LIBPNG is a dummy value as there are no generator expressions
+ add_test("${_PAT_NAME}" "${CMAKE_COMMAND}"
+ "-DLIBPNG=${CMAKE_CURRENT_BINARY_DIR}/libpng.so"
+ "-DTEST_COMMAND=./${_PAT_COMMAND}"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
+ endif()
+endfunction()
+
if(PNG_TESTS AND PNG_SHARED)
- # does not work with msvc due to png_lib_ver issue
+ # Find test PNG files by globbing, but sort lists to ensure
+ # consistency between different filesystems.
+ file(GLOB PNGSUITE_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/*.png")
+ list(SORT PNGSUITE_PNGS)
+ file(GLOB TEST_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/testpngs/*.png")
+ list(SORT TEST_PNGS)
+
+ set(PNGTEST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png")
+
add_executable(pngtest ${pngtest_sources})
- target_link_libraries(pngtest ${PNG_LIB_NAME})
- add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png)
- #
+ target_link_libraries(pngtest png)
+
+ png_add_test(NAME pngtest COMMAND pngtest FILES "${PNGTEST_PNG}")
+
add_executable(pngvalid ${pngvalid_sources})
- target_link_libraries(pngvalid ${PNG_LIB_NAME})
- add_test(pngvalid ./pngvalid)
+ target_link_libraries(pngvalid png)
+
+ png_add_test(NAME pngvalid-gamma-16-to-8
+ COMMAND pngvalid OPTIONS --gamma-16-to-8)
+ png_add_test(NAME pngvalid-gamma-alpha-mode
+ COMMAND pngvalid OPTIONS --gamma-alpha-mode)
+ png_add_test(NAME pngvalid-gamma-background
+ COMMAND pngvalid OPTIONS --gamma-background)
+ png_add_test(NAME pngvalid-gamma-expand16-alpha-mode
+ COMMAND pngvalid OPTIONS --gamma-alpha-mode --expand16)
+ png_add_test(NAME pngvalid-gamma-expand16-background
+ COMMAND pngvalid OPTIONS --gamma-background --expand16)
+ png_add_test(NAME pngvalid-gamma-expand16-transform
+ COMMAND pngvalid OPTIONS --gamma-transform --expand16)
+ png_add_test(NAME pngvalid-gamma-sbit
+ COMMAND pngvalid OPTIONS --gamma-sbit)
+ png_add_test(NAME pngvalid-gamma-threshold
+ COMMAND pngvalid OPTIONS --gamma-threshold)
+ png_add_test(NAME pngvalid-gamma-transform
+ COMMAND pngvalid OPTIONS --gamma-transform)
+ png_add_test(NAME pngvalid-progressive-interlace-standard
+ COMMAND pngvalid OPTIONS --standard --progressive-read --interlace)
+ png_add_test(NAME pngvalid-progressive-size
+ COMMAND pngvalid OPTIONS --size --progressive-read)
+ png_add_test(NAME pngvalid-progressive-standard
+ COMMAND pngvalid OPTIONS --standard --progressive-read)
+ png_add_test(NAME pngvalid-standard
+ COMMAND pngvalid OPTIONS --standard)
+ png_add_test(NAME pngvalid-transform
+ COMMAND pngvalid OPTIONS --transform)
+
add_executable(pngstest ${pngstest_sources})
- target_link_libraries(pngstest ${PNG_LIB_NAME})
- add_test(pngstest ./pngstest
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g01.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g02.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g04.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p01.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p02.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p04.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g01.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g02.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g04.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn2c16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn2c16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbrn2c08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn0g16.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbyn3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n0g08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n2c08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n3p08.png
- ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp1n3p08.png
- )
+ target_link_libraries(pngstest png)
+
+ foreach(gamma_type 1.8 linear none sRGB)
+ foreach(alpha_type none alpha)
+ set(PNGSTEST_FILES)
+ foreach(test_png ${TEST_PNGS})
+ string(REGEX MATCH ".*-linear[-.].*" TEST_PNG_LINEAR "${test_png}")
+ string(REGEX MATCH ".*-sRGB[-.].*" TEST_PNG_SRGB "${test_png}")
+ string(REGEX MATCH ".*-1.8[-.].*" TEST_PNG_G18 "${test_png}")
+ string(REGEX MATCH ".*-alpha-.*" TEST_PNG_ALPHA "${test_png}")
+
+ set(TEST_PNG_VALID TRUE)
+
+ if(TEST_PNG_ALPHA)
+ if (NOT "${alpha_type}" STREQUAL "alpha")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ else()
+ if ("${alpha_type}" STREQUAL "alpha")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ endif()
+
+ if(TEST_PNG_LINEAR)
+ if(NOT "${gamma_type}" STREQUAL "linear")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ elseif(TEST_PNG_SRGB)
+ if(NOT "${gamma_type}" STREQUAL "sRGB")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ elseif(TEST_PNG_G18)
+ if(NOT "${gamma_type}" STREQUAL "1.8")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ else()
+ if(NOT "${gamma_type}" STREQUAL "none")
+ set(TEST_PNG_VALID FALSE)
+ endif()
+ endif()
+
+ if(TEST_PNG_VALID)
+ list(APPEND PNGSTEST_FILES "${test_png}")
+ endif()
+ endforeach()
+ # Should already be sorted, but sort anyway to be certain.
+ list(SORT PNGSTEST_FILES)
+ png_add_test(NAME pngstest-${gamma_type}-${alpha_type}
+ COMMAND pngstest
+ OPTIONS --tmpfile "${gamma_type}-${alpha_type}-" --log
+ FILES ${PNGSTEST_FILES})
+ endforeach()
+ endforeach()
+
+ add_executable(pngunknown ${pngunknown_sources})
+ target_link_libraries(pngunknown png)
+
+ png_add_test(NAME pngunknown-discard COMMAND pngunknown OPTIONS --strict default=discard FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-IDAT COMMAND pngunknown OPTIONS --strict default=discard IDAT=save FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-if-safe COMMAND pngunknown OPTIONS --strict default=if-safe FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-sAPI COMMAND pngunknown OPTIONS --strict bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-save COMMAND pngunknown OPTIONS --strict default=save FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-sTER COMMAND pngunknown OPTIONS --strict sTER=if-safe FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-vpAg COMMAND pngunknown OPTIONS --strict vpAg=if-safe FILES "${PNGTEST_PNG}")
+
+ add_executable(pngimage ${pngimage_sources})
+ target_link_libraries(pngimage png)
+
+ png_add_test(NAME pngimage-quick COMMAND pngimage OPTIONS --list-combos --log FILES ${PNGSUITE_PNGS})
+ png_add_test(NAME pngimage-full COMMAND pngimage OPTIONS --exhaustive --list-combos --log FILES ${PNGSUITE_PNGS})
endif()
+if(PNG_SHARED)
+ add_executable(pngfix ${pngfix_sources})
+ target_link_libraries(pngfix png)
+ set(PNG_BIN_TARGETS pngfix)
+
+ add_executable(png-fix-itxt ${png_fix_itxt_sources})
+ target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY})
+ list(APPEND PNG_BIN_TARGETS png-fix-itxt)
+endif()
+
# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set
IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
@@ -234,6 +699,15 @@
endif(WIN32 AND NOT CYGWIN AND NOT MSYS)
endmacro()
+# Create source generation scripts.
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genchk.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genout.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gensrc.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake @ONLY)
+
+
# libpng is a library so default to 'lib'
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR lib)
@@ -260,22 +734,12 @@
# SET UP LINKS
if(PNG_SHARED)
- set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.21
+ set_target_properties(png PROPERTIES
+# VERSION 16.${PNGLIB_RELEASE}.1.6.28
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
endif()
-if(PNG_STATIC)
- # MSVC doesn't use a different file extension for shared vs. static
- # libs. We are able to change OUTPUT_NAME to remove the _static
- # for all other platforms.
- if(NOT MSVC)
- set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
- OUTPUT_NAME ${PNG_LIB_NAME}
- CLEAN_DIRECT_OUTPUT 1)
- endif()
-endif()
# If CMake > 2.4.x, we set a variable used below to export
# targets to an export file.
@@ -298,7 +762,7 @@
if(PNG_SHARED)
# Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
if(CYGWIN OR MINGW)
- get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
+ get_target_property(BUILD_TARGET_LOCATION png LOCATION_${CMAKE_BUILD_TYPE})
CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -305,7 +769,7 @@
endif(CYGWIN OR MINGW)
if(NOT WIN32)
- get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
+ get_target_property(BUILD_TARGET_LOCATION png LOCATION_${CMAKE_BUILD_TYPE})
CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -314,7 +778,7 @@
if(PNG_STATIC)
if(NOT WIN32 OR CYGWIN OR MINGW)
- get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE})
+ get_target_property(BUILD_TARGET_LOCATION png_static LOCATION_${CMAKE_BUILD_TYPE})
CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -334,6 +798,11 @@
endif(NOT WIN32 OR CYGWIN OR MINGW)
endif()
+if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL )
+ install(TARGETS ${PNG_BIN_TARGETS}
+ RUNTIME DESTINATION bin)
+endif()
+
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
# Install man pages
if(NOT PNG_MAN_DIR)
Modified: branches/stable/source/src/libs/libpng/libpng-src/INSTALL
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,24 +1,25 @@
-Installing libpng
+ Installing libpng
Contents
- I. Simple installation
- II. Rebuilding the configure scripts
- III. Using scripts/makefile*
- IV. Using cmake
- V. Directory structure
- VI. Building with project files
- VII. Building with makefiles
-VIII. Configuring libpng for 16-bit platforms
- IX. Configuring for DOS
- X. Configuring for Medium Model
- XI. Prepending a prefix to exported symbols
- XII. Configuring for compiler xxx:
-XIII. Removing unwanted object code
- XIV. Changes to the build and configuration of libpng in libpng-1.5.x
- XV. Setjmp/longjmp issues
- XVI. Other sources of information about libpng
+ I. Simple installation
+ II. Rebuilding the configure scripts
+ III. Using scripts/makefile*
+ IV. Using cmake
+ V. Directory structure
+ VI. Building with project files
+ VII. Building with makefiles
+ VIII. Configuring libpng for 16-bit platforms
+ IX. Configuring for DOS
+ X. Configuring for Medium Model
+ XI. Prepending a prefix to exported symbols
+ XII. Configuring for compiler xxx:
+ XIII. Removing unwanted object code
+ XIV. Changes to the build and configuration of libpng in libpng-1.5.x
+ XV. Setjmp/longjmp issues
+ XVI. Common linking failures
+ XVII. Other sources of information about libpng
I. Simple installation
@@ -47,7 +48,9 @@
change configure.ac or Makefile.am, and you have a reasonably
up-to-date set of tools, running ./autogen.sh in a git clone before
running ./configure may fix the problem. To be really sure that you
-aren't using any of the included pre-built scripts, you can do this:
+aren't using any of the included pre-built scripts, especially if you
+are building from a tar distribution instead of a git distribution,
+do this:
./configure --enable-maintainer-mode
make maintainer-clean
@@ -76,7 +79,7 @@
Before installing libpng, you must first install zlib, if it
is not already on your system. zlib can usually be found
wherever you got libpng; otherwise go to http://zlib.net. You can place
-zlib in in the same directory as libpng or in another directory.
+zlib in the same directory as libpng or in another directory.
If your system already has a preinstalled zlib you will still need
to have access to the zlib.h and zconf.h include files that
@@ -87,22 +90,24 @@
and LD_LIBRARY_PATH in your environment before running "make test"
or "make distcheck":
-ZLIBLIB=/path/to/lib export ZLIBLIB
-ZLIBINC=/path/to/include export ZLIBINC
-CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
-LDFLAGS="-L$ZLIBLIB" export LDFLAGS
-LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
+ ZLIBLIB=/path/to/lib export ZLIBLIB
+ ZLIBINC=/path/to/include export ZLIBINC
+ CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
+ LDFLAGS="-L$ZLIBLIB" export LDFLAGS
+ LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
-in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test".
+in your environment and type
+ make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test
+
IV. Using cmake
If you want to use "cmake" (see www.cmake.org), type
- cmake . -DCMAKE_INSTALL_PREFIX=/path
- make
- make install
+ cmake . -DCMAKE_INSTALL_PREFIX=/path
+ make
+ make install
As when using the simple configure method described above, "/path" points to
the installation directory where you want to put the libpng "lib", "include",
@@ -116,8 +121,8 @@
Your directory structure should look like this:
- .. (the parent directory)
- libpng (this directory)
+ .. (the parent directory)
+ libpng (this directory)
INSTALL (this file)
README
*.h, *.c => libpng source files
@@ -160,11 +165,16 @@
Copy the file (or files) that you need from the
scripts directory into this directory, for example
- MSDOS example: copy scripts\makefile.msc makefile
- copy scripts\pnglibconf.h.prebuilt pnglibconf.h
- UNIX example: cp scripts/makefile.std makefile
- cp scripts/pnglibconf.h.prebuilt pnglibconf.h
+MSDOS example:
+ copy scripts\makefile.msc makefile
+ copy scripts\pnglibconf.h.prebuilt pnglibconf.h
+
+UNIX example:
+
+ cp scripts/makefile.std makefile
+ cp scripts/pnglibconf.h.prebuilt pnglibconf.h
+
Read the makefile to see if you need to change any source or
target directories to match your preferences.
@@ -239,7 +249,7 @@
never going to use a capability, you can change the #define to #undef
before recompiling libpng and save yourself code and data space, or
you can turn off individual capabilities with defines that begin with
-PNG_NO_.
+"PNG_NO_".
In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead.
@@ -307,7 +317,7 @@
approach is documented in pngconf.h
Despite these changes, libpng 1.5.0 only supports the native C function
-calling standard on those platforms tested so far (__cdecl on Microsoft
+calling standard on those platforms tested so far ("__cdecl" on Microsoft
Windows). This is because the support requirements for alternative
calling conventions seem to no longer exist. Developers who find it
necessary to set PNG_API_RULE to 1 should advise the mailing list
@@ -371,7 +381,7 @@
configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with
-DPNG_NO_SETJMP on your compile line, or with
- #undef PNG_SETJMP_SUPPORTED
+ #undef PNG_SETJMP_SUPPORTED
in your pnglibconf.h or pngusr.h.
@@ -380,28 +390,25 @@
with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED
and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined.
-XVI. Other sources of information about libpng:
+XVI. Common linking failures
-Further information can be found in the README and libpng-manual.txt
-files, in the individual makefiles, in png.h, and the manual pages
-libpng.3 and png.5.
+If your application fails to find libpng or zlib entries while linking:
-Using the ./configure script -- 16 December 2002.
-=================================================
+ Be sure "-lz" appears after "-lpng" on your linking command.
-The ./configure script should work compatibly with what scripts/makefile.*
-did, however there are some options you might need to add to configure
-explicitly, which previously was done semi-automatically (if you didn't edit
-scripts/makefile.* yourself, that is)
+ Be sure you have built libpng, zlib, and your application for the
+ same platform (e.g., 32-bit or 64-bit).
-CFLAGS="-Wall -O -funroll-loops \
--malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
---with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
+ If you are using the vstudio project, observe the WARNING in
+ project/vstudio/README.txt.
-You can alternatively specify --includedir=/usr/include, /usr/local/include,
-/usr/include/libpng16, or whatever.
+XVII. Other sources of information about libpng:
-If you find that the configure script is out-of-date or is not supporting
-your platform properly, try running autogen.sh to regenerate "configure",
-"Makefile.in", and the other configuration files. Then try configure again.
+Further information can be found in the README and libpng-manual.txt
+files, in the individual makefiles, in png.h, and the manual pages
+libpng.3 and png.5.
+Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson
+This document is released under the libpng license.
+For conditions of distribution and use, see the disclaimer
+and license in png.h.
Modified: branches/stable/source/src/libs/libpng/libpng-src/LICENSE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/LICENSE 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/LICENSE 2017-02-16 16:38:15 UTC (rev 766)
@@ -10,8 +10,8 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
-Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are
+Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors:
@@ -22,6 +22,7 @@
Cosmin Truta
Gilles Vollant
James Yu
+ Mandar Sahastrabuddhe
and with the following additions to the disclaimer:
@@ -32,6 +33,10 @@
risk of satisfactory quality, performance, accuracy, and effort is with
the user.
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
libpng-0.96, and are distributed according to the same disclaimer and
@@ -55,6 +60,9 @@
Greg Roelofs
Tom Tanner
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -95,18 +103,29 @@
END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
+TRADEMARK:
- printf("%s", png_get_copyright(NULL));
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction. However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+OSI CERTIFICATION:
Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
a certification mark of the Open Source Initiative. OSI has not addressed
the additional disclaimers inserted at version 1.0.7.
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software. See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 15, 2016
+January 5, 2017
Modified: branches/stable/source/src/libs/libpng/libpng-src/Makefile.am
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,11 @@
-# Makefile.am:
-# Source file for Makefile.in (and hence Makefile)
+# Makefile.am, the source file for Makefile.in (and hence Makefile), is
#
+# Copyright (c) 2004-2016 Glenn Randers-Pehrson
+# Last changed in libpng 1.6.25 [September 1, 2016]
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
PNGLIB_BASENAME= libpng at PNGLIB_MAJOR@@PNGLIB_MINOR@
@@ -7,7 +12,10 @@
ACLOCAL_AMFLAGS = -I scripts
# test programs - run on make check, make distcheck
-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
+check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp
+if HAVE_CLOCK_GETTIME
+check_PROGRAMS += timepng
+endif
# Utilities - installed
bin_PROGRAMS= pngfix png-fix-itxt
@@ -37,11 +45,17 @@
pngimage_SOURCES = contrib/libtests/pngimage.c
pngimage_LDADD = libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at .la
+timepng_SOURCES = contrib/libtests/timepng.c
+timepng_LDADD = libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at .la
+
pngfix_SOURCES = contrib/tools/pngfix.c
pngfix_LDADD = libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at .la
png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c
+pngcp_SOURCES = contrib/tools/pngcp.c
+pngcp_LDADD = libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at .la
+
# Generally these are single line shell scripts to run a test with a particular
# set of parameters:
TESTS =\
@@ -83,6 +97,11 @@
arm/filter_neon.S arm/filter_neon_intrinsics.c
endif
+if PNG_MIPS_MSA
+libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES += mips/mips_init.c\
+ mips/filter_msa_intrinsics.c
+endif
+
nodist_libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES = pnglibconf.h
libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_LDFLAGS = -no-undefined -export-dynamic \
@@ -219,6 +238,7 @@
contrib/tools/makesRGB.o: pnglibconf.h
contrib/tools/pngfix.o: pnglibconf.h
+contrib/tools/pngcp.o: pnglibconf.h
# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
# be built with PNG_USE_READ_MACROS; this prevents the read macros from
Modified: branches/stable/source/src/libs/libpng/libpng-src/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-README for libpng version 1.6.21 - January 15, 2016 (shared library 16.0)
+README for libpng version 1.6.28 - January 5, 2017 (shared library 16.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -180,15 +180,18 @@
pngwutil.c => Write utility functions
arm => Contains optimized code for the ARM platform
contrib => Contributions
+ arm-neon => Optimized code for ARM-NEON platform
examples => Example programs
gregbook => source code for PNG reading and writing, from
Greg Roelofs' "PNG: The Definitive Guide",
O'Reilly, 1999
+ intel => Optimized code for INTEL-SSE2 platform
libtests => Test programs
pngminim => Minimal decoder, encoder, and progressive decoder
programs demonstrating use of pngusr.dfa
pngminus => Simple pnm2png and png2pnm programs
pngsuite => Test images
+ testpngs
tools => Various tools
visupng => Contains a MSVC workspace for VisualPng
projects => Contains project files and workspaces for
Modified: branches/stable/source/src/libs/libpng/libpng-src/TODO
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/TODO 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/TODO 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,13 +5,14 @@
Better C++ wrapper/full C++ implementation?
Fix problem with C++ and EXTERN "C".
cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes.
+Remove setjmp/longjmp usage in favor of returning error codes. As a start on
+ this, minimize the use of png_error(), replacing them with
+ png_warning(); return(0); or similar.
Palette creation.
Add "grayscale->palette" transformation and "palette->grayscale" detection.
Improved dithering.
Multi-lingual error and warning message support.
Complete sRGB transformation (presently it simply uses gamma=0.45455).
-Make profile checking optional via a png_set_something() call.
Man pages for function calls.
Better documentation.
Better filter selection
@@ -23,7 +24,6 @@
background and doing rgb-to-gray transformation.
Investigate pre-incremented loop counters and other loop constructions.
Add interpolated method of handling interlacing.
-Switch to the simpler zlib (zlib/libpng) license if legally possible.
Extend pngvalid.c to validate more of the libpng transformations.
*/
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,9 @@
/* arm_init.c - NEON optimised filter functions
*
- * Copyright (c) 2014 Glenn Randers-Pehrson
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.16 [December 22, 2014]
+ * Last changed in libpng 1.6.22 [May 26, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -66,6 +66,7 @@
* wrong order of the 'ON' and 'default' cases. UNSET now defaults to OFF,
* as documented in png.h
*/
+ png_debug(1, "in png_init_filter_functions_neon");
#ifdef PNG_ARM_NEON_API_SUPPORTED
switch ((pp->options >> PNG_ARM_NEON) & 3)
{
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,11 +1,11 @@
/* filter_neon_intrinsics.c - NEON optimised filter functions
*
- * Copyright (c) 2014 Glenn Randers-Pehrson
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
* Written by James Yu <james.yu at linaro.org>, October 2013.
* Based on filter_neon.S, written by Mans Rullgard, 2011.
*
- * Last changed in libpng 1.6.16 [December 22, 2014]
+ * Last changed in libpng 1.6.22 [May 26, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -47,6 +47,8 @@
png_bytep rp_stop = row + row_info->rowbytes;
png_const_bytep pp = prev_row;
+ png_debug(1, "in png_read_filter_row_up_neon");
+
for (; rp < rp_stop; rp += 16, pp += 16)
{
uint8x16_t qrp, qpp;
@@ -72,6 +74,8 @@
uint8x8x4_t vdest;
vdest.val[3] = vdup_n_u8(0);
+ png_debug(1, "in png_read_filter_row_sub3_neon");
+
for (; rp < rp_stop;)
{
uint8x8_t vtmp1, vtmp2;
@@ -113,6 +117,8 @@
uint8x8x4_t vdest;
vdest.val[3] = vdup_n_u8(0);
+ png_debug(1, "in png_read_filter_row_sub4_neon");
+
for (; rp < rp_stop; rp += 16)
{
uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp));
@@ -148,6 +154,8 @@
vrpt = png_ptr(uint8x8x2_t,&vtmp);
vrp = *vrpt;
+ png_debug(1, "in png_read_filter_row_avg3_neon");
+
for (; rp < rp_stop; pp += 12)
{
uint8x8_t vtmp1, vtmp2, vtmp3;
@@ -207,6 +215,8 @@
uint8x8x4_t vdest;
vdest.val[3] = vdup_n_u8(0);
+ png_debug(1, "in png_read_filter_row_avg4_neon");
+
for (; rp < rp_stop; rp += 16, pp += 16)
{
uint32x2x4_t vtmp;
@@ -280,6 +290,8 @@
vrpt = png_ptr(uint8x8x2_t,&vtmp);
vrp = *vrpt;
+ png_debug(1, "in png_read_filter_row_paeth3_neon");
+
for (; rp < rp_stop; pp += 12)
{
uint8x8x2_t *vppt;
@@ -339,6 +351,8 @@
uint8x8x4_t vdest;
vdest.val[3] = vdup_n_u8(0);
+ png_debug(1, "in png_read_filter_row_paeth4_neon");
+
for (; rp < rp_stop; rp += 16, pp += 16)
{
uint32x2x4_t vtmp;
Modified: branches/stable/source/src/libs/libpng/libpng-src/config.h.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/config.h.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/config.h.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -78,6 +78,15 @@
/* Enable ARM Neon optimizations */
#undef PNG_ARM_NEON_OPT
+/* Turn on MIPS MSA optimizations at run-time */
+#undef PNG_MIPS_MSA_API_SUPPORTED
+
+/* Check for MIPS MSA support at run-time */
+#undef PNG_MIPS_MSA_CHECK_SUPPORTED
+
+/* Enable MIPS MSA optimizations */
+#undef PNG_MIPS_MSA_OPT
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
Modified: branches/stable/source/src/libs/libpng/libpng-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,12 @@
# configure.ac
+# Copyright (c) 2004-2016 Glenn Randers-Pehrson
+# Last changed in libpng 1.6.25 [September 1, 2016]
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Minor upgrades (compatible ABI): increment the package version
@@ -18,7 +25,7 @@
dnl Version number stuff here:
-AC_INIT([libpng],[1.6.21],[png-mng-implement at lists.sourceforge.net])
+AC_INIT([libpng],[1.6.28],[png-mng-implement at lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
@@ -29,7 +36,7 @@
# 1.13 is required for parallel tests
AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
# The following line causes --disable-maintainer-mode to be the default to
-# configure, this is necessary because libpng distributions cannot rely on the
+# configure. This is necessary because libpng distributions cannot rely on the
# time stamps of the autotools generated files being correct
AM_MAINTAINER_MODE
@@ -39,10 +46,10 @@
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
-PNGLIB_VERSION=1.6.21
+PNGLIB_VERSION=1.6.28
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
-PNGLIB_RELEASE=21
+PNGLIB_RELEASE=28
dnl End of version number stuff
@@ -60,7 +67,7 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
-dnl libtool/libtoolize; version 2.4.2 is the tested version, this or any
+dnl libtool/libtoolize; version 2.4.2 is the tested version. This or any
dnl compatible later version may be used
LT_INIT([win32-dll])
LT_PREREQ([2.4.2])
@@ -107,6 +114,25 @@
CFLAGS="$sav_CFLAGS"
fi],)
+# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89
+# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1
+# This is incompatible with the new default mode, so we test for that and force the
+# "-std=c89" compiler option:
+AC_MSG_CHECKING([if we need to force back C standard to C89])
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([
+ [#define _POSIX_SOURCE 1]
+ [#include <stdio.h>]
+ ])],
+ AC_MSG_RESULT(no),[
+ if test "x$GCC" != "xyes"; then
+ AC_MSG_ERROR(
+ [Forcing back to C89 is required but the flags are only known for GCC])
+ fi
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -std=c89"
+])
+
# Checks for header files.
AC_HEADER_STDC
@@ -120,6 +146,12 @@
AC_FUNC_STRTOD
AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc))
AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) )
+
+# Some later POSIX 1003.1 functions are required for test programs, failure here
+# is soft (the corresponding test program is not built).
+AC_CHECK_FUNC([clock_gettime],,[AC_MSG_WARN([not building timepng])])
+AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "$ac_cv_func_clock_gettime" = "yes"])
+
AC_ARG_WITH(zlib-prefix,
AS_HELP_STRING([[[--with-zlib-prefix]]],
[prefix that may have been used in installed zlib]),
@@ -314,6 +346,51 @@
*) test "$enable_arm_neon" != '';;
esac])
+# MIPS
+# ===
+#
+# MIPS MSA (SIMD) support.
+
+AC_ARG_ENABLE([mips-msa],
+ AS_HELP_STRING([[[--enable-mips-msa]]],
+ [Enable MIPS MSA optimizations: =no/off, check, api, yes/on:]
+ [no/off: disable the optimizations; check: use internal checking code]
+ [(deprecated and poorly supported); api: disable by default, enable by]
+ [a call to png_set_option; yes/on: turn on unconditionally.]
+ [If not specified: determined by the compiler.]),
+ [case "$enableval" in
+ no|off)
+ # disable the default enabling on __mips_msa systems:
+ AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
+ [Disable MIPS MSA optimizations])
+ # Prevent inclusion of the assembler files below:
+ enable_mips_msa=no;;
+ check)
+ AC_DEFINE([PNG_MIPS_MSA_CHECK_SUPPORTED], [],
+ [Check for MIPS MSA support at run-time]);;
+ api)
+ AC_DEFINE([PNG_MIPS_MSA_API_SUPPORTED], [],
+ [Turn on MIPS MSA optimizations at run-time]);;
+ yes|on)
+ AC_DEFINE([PNG_MIPS_MSA_OPT], [2],
+ [Enable MIPS MSA optimizations])
+ AC_MSG_WARN([--enable-mips-msa: please specify 'check' or 'api', if]
+ [you want the optimizations unconditionally pass '-mmsa -mfp64']
+ [to the compiler.]);;
+ *)
+ AC_MSG_ERROR([--enable-mips-msa=${enable_mips_msa}: invalid value])
+ esac])
+
+# Add MIPS specific files to all builds where the host_cpu is mips ('mips*') or
+# where MIPS optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'mips*')
+
+AM_CONDITIONAL([PNG_MIPS_MSA],
+ [test "$enable_mips_msa" != 'no' &&
+ case "$host_cpu" in
+ mipsel*|mips64el*) :;;
+ esac])
+
AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
# Config files, substituting as above
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/conftest/pngcp.dfa 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,57 @@
+# pngcp.dfa
+# Build time configuration of libpng
+#
+# Author: John Bowler
+# Copyright: (c) John Bowler, 2016
+# Usage rights:
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. This work is published from:
+# United States.
+#
+# Build libpng with support for pngcp. This means just png_read_png,
+# png_write_png and small number of configuration settings.
+#
+everything = off
+
+# This option is specific to this configuration; it adds a #define to the
+# generated pnglibconf.h which turns on the (not portable) timing option for
+# pngcp. Note that any option is automatically preceded by PNG_; there is no
+# way round this and this is deliberate.
+option PNGCP_TIMING
+
+# Because of the everything off above the option must also be turned on. This
+# may not be done in one step because it is safer and avoids mis-spelled options
+# in user .dfa files to error out if an unrecognized option is turned on.
+option PNGCP_TIMING on
+
+# Options to turn on png_read_png and png_write_png:
+option INFO_IMAGE on
+option SEQUENTIAL_READ on
+option EASY_ACCESS on
+option WRITE on
+option WRITE_16BIT on
+option WRITE_FILTER on
+
+# pngcp needs this to preserve unknown chunks, switching all these on means that
+# pngcp can work without explicit known chunk reading suppport
+option UNKNOWN_CHUNKS on
+option SET_UNKNOWN_CHUNKS on
+option HANDLE_AS_UNKNOWN on
+option SAVE_UNKNOWN_CHUNKS on
+option WRITE_UNKNOWN_CHUNKS on
+
+# pngcp needs this to handle palette files with invalid indices:
+option CHECK_FOR_INVALID_INDEX on
+option GET_PALETTE_MAX on
+
+# Pre-libpng 1.7 pngcp has to stash text chunks manually, post 1.7 without this
+# text chunks should be handled as unknown ok.
+option TEXT on
+
+# this is used to turn off limits:
+option USER_LIMITS on
+option SET_USER_LIMITS on
+
+# these are are just required for specific customizations
+option WRITE_CUSTOMIZE_ZTXT_COMPRESSION on
+option WRITE_CUSTOMIZE_COMPRESSION on
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/README.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/README.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,4 +21,4 @@
of the people below claim any rights with regard to the contents of this
directory.
- John Bowler <jbowler at acm.org>
+ John Bowler <jbowler at acm.org>
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
The source code for all three demo programs currently compiles under
Unix, OpenVMS, and 32-bit Windows. (Special thanks to Martin Zinser,
-zinser at decus.de, for making the necessary changes for OpenVMS and for
+zinser at decus.de, for making the necessary changes for OpenVMS and for
providing an appropriate build script.) Build instructions can be found
below.
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/readpng2.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/readpng2.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/readpng2.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -54,7 +54,7 @@
---------------------------------------------------------------------------
Changelog:
- %RDATE% - Check return value of png_get_bKGD() (Glenn R-P)
+ 2015-11-12 - Check return value of png_get_bKGD() (Glenn R-P)
---------------------------------------------------------------------------*/
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng-win.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng-win.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng-win.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -182,7 +182,7 @@
#ifndef __CYGWIN__
/* First reenable console output, which normally goes to the bit bucket
* for windowed apps. Closing the console window will terminate the
- * app. Thanks to David.Geldreich at realviz.com for supplying the magical
+ * app. Thanks to David.Geldreich at realviz.com for supplying the magical
* incantation. */
AllocConsole();
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng2-win.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng2-win.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/gregbook/rpng2-win.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -301,7 +301,7 @@
#ifndef __CYGWIN__
/* Next reenable console output, which normally goes to the bit bucket
* for windowed apps. Closing the console window will terminate the
- * app. Thanks to David.Geldreich at realviz.com for supplying the magical
+ * app. Thanks to David.Geldreich at realviz.com for supplying the magical
* incantation. */
AllocConsole();
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/INSTALL
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/INSTALL (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/INSTALL 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,158 @@
+Enabling SSE support
+
+Copyright (c) 2016 Google, Inc.
+Written by Mike Klein, Matt Sarett
+
+This INSTALL file written by Glenn Randers-Pehrson, 2016.
+
+If you have moved intel_init.c and filter_sse2_intrinsics.c to a different
+directory, be sure to update the '#include "../../pngpriv.h"' line in both
+files if necessary to point to the correct relative location of pngpriv.h
+with respect to the new location of those files.
+
+To enable SSE support in libpng, follow the instructions in I, II, or III,
+below:
+
+I. Using patched "configure" scripts:
+
+First, apply intel_sse.patch in your build directory.
+
+ patch -i contrib/intel/intel_sse.patch -p1
+
+Then, if you are not building in a new GIT clone, e.g., in a tar
+distribution, remove any existing pre-built configure scripts:
+
+ ./configure --enable-maintainer-mode
+ make maintainer-clean
+ ./autogen.sh --maintainer --clean
+
+Finally, configure libpng with -DPNG_INTEL_SSE in CPPFLAGS:
+
+ ./autogen.sh --maintainer
+ CPPFLAGS="-DPNG_INTEL_SSE" ./configure [options]
+ make CPPFLAGS="-DPNG_INTEL_SSE" [options]
+ make
+
+II. Using a custom makefile:
+
+If you are using a custom makefile makefile, you will have to update it
+manually to include contrib/intel/*.o in the dependencies, and to define
+PNG_INTEL_SSE.
+
+III. Using manually updated "configure" scripts:
+
+If you prefer, manually edit pngpriv.h, configure.ac, and Makefile.am,
+following the instructions below, then follow the instructions in
+section II of INSTALL in the main libpng directory, then configure libpng
+with -DPNG_INTEL_SSE in CPPFLAGS.
+
+1. Add the following code to configure.ac under HOST SPECIFIC OPTIONS
+directly beneath the section for ARM:
+
+-----------------cut----------------
+# INTEL
+# =====
+#
+# INTEL SSE (SIMD) support.
+
+AC_ARG_ENABLE([intel-sse],
+ AS_HELP_STRING([[[--enable-intel-sse]]],
+ [Enable Intel SSE optimizations: =no/off, yes/on:]
+ [no/off: disable the optimizations;]
+ [yes/on: enable the optimizations.]
+ [If not specified: determined by the compiler.]),
+ [case "$enableval" in
+ no|off)
+ # disable the default enabling:
+ AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
+ [Disable Intel SSE optimizations])
+ # Prevent inclusion of the assembler files below:
+ enable_intel_sse=no;;
+ yes|on)
+ AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
+ [Enable Intel SSE optimizations]);;
+ *)
+ AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}: invalid value])
+ esac])
+
+# Add Intel specific files to all builds where the host_cpu is Intel ('x86*')
+# or where Intel optimizations were explicitly requested (this allows a
+# fallback if a future host CPU does not match 'x86*')
+AM_CONDITIONAL([PNG_INTEL_SSE],
+ [test "$enable_intel_sse" != 'no' &&
+ case "$host_cpu" in
+ i?86|x86_64) :;;
+ *) test "$enable_intel_sse" != '';;
+ esac])
+-----------------cut----------------
+
+2. Add the following code to Makefile.am under HOST SPECIFIC OPTIONS
+directly beneath the "if PNG_ARM_NEON ... endif" statement:
+
+-----------------cut----------------
+if PNG_INTEL_SSE
+libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES += contrib/intel/intel_init.c\
+ contrib/intel/filter_sse2_intrinsics.c
+endif
+-----------------cut----------------
+
+3. Add the following lines to pngpriv.h, following the PNG_ARM_NEON_OPT
+code:
+
+-----------------cut----------------
+#ifndef PNG_INTEL_SSE_OPT
+# ifdef PNG_INTEL_SSE
+ /* Only check for SSE if the build configuration has been modified to
+ * enable SSE optimizations. This means that these optimizations will
+ * be off by default. See contrib/intel for more details.
+ */
+# if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
+ defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
+ (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+# define PNG_INTEL_SSE_OPT 1
+# endif
+# endif
+#endif
+
+#if PNG_INTEL_SSE_OPT > 0
+# ifndef PNG_INTEL_SSE_IMPLEMENTATION
+# if defined(__SSE4_1__) || defined(__AVX__)
+ /* We are not actually using AVX, but checking for AVX is the best
+ way we can detect SSE4.1 and SSSE3 on MSVC.
+ */
+# define PNG_INTEL_SSE_IMPLEMENTATION 3
+# elif defined(__SSSE3__)
+# define PNG_INTEL_SSE_IMPLEMENTATION 2
+# elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
+ (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
+# define PNG_INTEL_SSE_IMPLEMENTATION 1
+# else
+# define PNG_INTEL_SSE_IMPLEMENTATION 0
+# endif
+# endif
+
+# if PNG_INTEL_SSE_IMPLEMENTATION > 0
+# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2
+# endif
+#endif
+
+-----------------cut----------------
+
+4. Add the following lines to pngpriv.h, following the prototype for
+png_read_filter_row_paeth4_neon:
+
+-----------------cut----------------
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+
+-----------------cut----------------
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/filter_sse2_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/filter_sse2_intrinsics.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/filter_sse2_intrinsics.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,379 @@
+
+/* filter_sse2_intrinsics.c - SSE2 optimized filter functions
+ *
+ * Copyright (c) 2016 Google, Inc.
+ * Written by Mike Klein and Matt Sarett
+ * Derived from arm/filter_neon_intrinsics.c, which was
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
+ *
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#include "../../pngpriv.h"
+
+#ifdef PNG_READ_SUPPORTED
+
+#if PNG_INTEL_SSE_IMPLEMENTATION > 0
+
+#include <immintrin.h>
+
+/* Functions in this file look at most 3 pixels (a,b,c) to predict the 4th (d).
+ * They're positioned like this:
+ * prev: c b
+ * row: a d
+ * The Sub filter predicts d=a, Avg d=(a+b)/2, and Paeth predicts d to be
+ * whichever of a, b, or c is closest to p=a+b-c.
+ */
+
+static __m128i load4(const void* p) {
+ return _mm_cvtsi32_si128(*(const int*)p);
+}
+
+static void store4(void* p, __m128i v) {
+ *(int*)p = _mm_cvtsi128_si32(v);
+}
+
+static __m128i load3(const void* p) {
+ /* We'll load 2 bytes, then 1 byte,
+ * then mask them together, and finally load into SSE.
+ */
+ const png_uint_16* p01 = p;
+ const png_byte* p2 = (const png_byte*)(p01+1);
+
+ png_uint_32 v012 = (png_uint_32)(*p01)
+ | (png_uint_32)(*p2) << 16;
+ return load4(&v012);
+}
+
+static void store3(void* p, __m128i v) {
+ /* We'll pull from SSE as a 32-bit int, then write
+ * its bottom two bytes, then its third byte.
+ */
+ png_uint_32 v012;
+ store4(&v012, v);
+
+ png_uint_16* p01 = p;
+ png_byte* p2 = (png_byte*)(p01+1);
+ *p01 = v012;
+ *p2 = v012 >> 16;
+}
+
+void png_read_filter_row_sub3_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* The Sub filter predicts each pixel as the previous pixel, a.
+ * There is no pixel to the left of the first pixel. It's encoded directly.
+ * That works with our main loop if we just say that left pixel was zero.
+ */
+ png_debug(1, "in png_read_filter_row_sub3_sse2");
+ __m128i a, d = _mm_setzero_si128();
+
+ int rb = row_info->rowbytes;
+ while (rb >= 4) {
+ a = d; d = load4(row);
+ d = _mm_add_epi8(d, a);
+ store3(row, d);
+
+ row += 3;
+ rb -= 3;
+ }
+ if (rb > 0) {
+ a = d; d = load3(row);
+ d = _mm_add_epi8(d, a);
+ store3(row, d);
+
+ row += 3;
+ rb -= 3;
+ }
+}
+
+void png_read_filter_row_sub4_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* The Sub filter predicts each pixel as the previous pixel, a.
+ * There is no pixel to the left of the first pixel. It's encoded directly.
+ * That works with our main loop if we just say that left pixel was zero.
+ */
+ png_debug(1, "in png_read_filter_row_sub4_sse2");
+ __m128i a, d = _mm_setzero_si128();
+
+ int rb = row_info->rowbytes;
+ while (rb > 0) {
+ a = d; d = load4(row);
+ d = _mm_add_epi8(d, a);
+ store4(row, d);
+
+ row += 4;
+ rb -= 4;
+ }
+}
+
+void png_read_filter_row_avg3_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* The Avg filter predicts each pixel as the (truncated) average of a and b.
+ * There's no pixel to the left of the first pixel. Luckily, it's
+ * predicted to be half of the pixel above it. So again, this works
+ * perfectly with our loop if we make sure a starts at zero.
+ */
+ png_debug(1, "in png_read_filter_row_avg3_sse2");
+ const __m128i zero = _mm_setzero_si128();
+ __m128i b;
+ __m128i a, d = zero;
+
+ int rb = row_info->rowbytes;
+ while (rb >= 4) {
+ b = load4(prev);
+ a = d; d = load4(row );
+
+ /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
+ __m128i avg = _mm_avg_epu8(a,b);
+ /* ...but we can fix it up by subtracting off 1 if it rounded up. */
+ avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
+ _mm_set1_epi8(1)));
+ d = _mm_add_epi8(d, avg);
+ store3(row, d);
+
+ prev += 3;
+ row += 3;
+ rb -= 3;
+ }
+ if (rb > 0) {
+ b = load3(prev);
+ a = d; d = load3(row );
+
+ /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
+ __m128i avg = _mm_avg_epu8(a,b);
+ /* ...but we can fix it up by subtracting off 1 if it rounded up. */
+ avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
+ _mm_set1_epi8(1)));
+
+ d = _mm_add_epi8(d, avg);
+ store3(row, d);
+
+ prev += 3;
+ row += 3;
+ rb -= 3;
+ }
+}
+
+void png_read_filter_row_avg4_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* The Avg filter predicts each pixel as the (truncated) average of a and b.
+ * There's no pixel to the left of the first pixel. Luckily, it's
+ * predicted to be half of the pixel above it. So again, this works
+ * perfectly with our loop if we make sure a starts at zero.
+ */
+ png_debug(1, "in png_read_filter_row_avg4_sse2");
+ const __m128i zero = _mm_setzero_si128();
+ __m128i b;
+ __m128i a, d = zero;
+
+ int rb = row_info->rowbytes;
+ while (rb > 0) {
+ b = load4(prev);
+ a = d; d = load4(row );
+
+ /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
+ __m128i avg = _mm_avg_epu8(a,b);
+ /* ...but we can fix it up by subtracting off 1 if it rounded up. */
+ avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
+ _mm_set1_epi8(1)));
+
+ d = _mm_add_epi8(d, avg);
+ store4(row, d);
+
+ prev += 4;
+ row += 4;
+ rb -= 4;
+ }
+}
+
+/* Returns |x| for 16-bit lanes. */
+static __m128i abs_i16(__m128i x) {
+#if PNG_INTEL_SSE_IMPLEMENTATION >= 2
+ return _mm_abs_epi16(x);
+#else
+ /* Read this all as, return x<0 ? -x : x.
+ * To negate two's complement, you flip all the bits then add 1.
+ */
+ __m128i is_negative = _mm_cmplt_epi16(x, _mm_setzero_si128());
+
+ /* Flip negative lanes. */
+ x = _mm_xor_si128(x, is_negative);
+
+ /* +1 to negative lanes, else +0. */
+ x = _mm_sub_epi16(x, is_negative);
+ return x;
+#endif
+}
+
+/* Bytewise c ? t : e. */
+static __m128i if_then_else(__m128i c, __m128i t, __m128i e) {
+#if PNG_INTEL_SSE_IMPLEMENTATION >= 3
+ return _mm_blendv_epi8(e,t,c);
+#else
+ return _mm_or_si128(_mm_and_si128(c, t), _mm_andnot_si128(c, e));
+#endif
+}
+
+void png_read_filter_row_paeth3_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* Paeth tries to predict pixel d using the pixel to the left of it, a,
+ * and two pixels from the previous row, b and c:
+ * prev: c b
+ * row: a d
+ * The Paeth function predicts d to be whichever of a, b, or c is nearest to
+ * p=a+b-c.
+ *
+ * The first pixel has no left context, and so uses an Up filter, p = b.
+ * This works naturally with our main loop's p = a+b-c if we force a and c
+ * to zero.
+ * Here we zero b and d, which become c and a respectively at the start of
+ * the loop.
+ */
+ png_debug(1, "in png_read_filter_row_paeth3_sse2");
+ const __m128i zero = _mm_setzero_si128();
+ __m128i c, b = zero,
+ a, d = zero;
+
+ int rb = row_info->rowbytes;
+ while (rb >= 4) {
+ /* It's easiest to do this math (particularly, deal with pc) with 16-bit
+ * intermediates.
+ */
+ c = b; b = _mm_unpacklo_epi8(load4(prev), zero);
+ a = d; d = _mm_unpacklo_epi8(load4(row ), zero);
+
+ /* (p-a) == (a+b-c - a) == (b-c) */
+ __m128i pa = _mm_sub_epi16(b,c);
+
+ /* (p-b) == (a+b-c - b) == (a-c) */
+ __m128i pb = _mm_sub_epi16(a,c);
+
+ /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
+ __m128i pc = _mm_add_epi16(pa,pb);
+
+ pa = abs_i16(pa); /* |p-a| */
+ pb = abs_i16(pb); /* |p-b| */
+ pc = abs_i16(pc); /* |p-c| */
+
+ __m128i smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
+
+ /* Paeth breaks ties favoring a over b over c. */
+ __m128i nearest = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
+ if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
+ c));
+
+ /* Note `_epi8`: we need addition to wrap modulo 255. */
+ d = _mm_add_epi8(d, nearest);
+ store3(row, _mm_packus_epi16(d,d));
+
+ prev += 3;
+ row += 3;
+ rb -= 3;
+ }
+ if (rb > 0) {
+ /* It's easiest to do this math (particularly, deal with pc) with 16-bit
+ * intermediates.
+ */
+ c = b; b = _mm_unpacklo_epi8(load3(prev), zero);
+ a = d; d = _mm_unpacklo_epi8(load3(row ), zero);
+
+ /* (p-a) == (a+b-c - a) == (b-c) */
+ __m128i pa = _mm_sub_epi16(b,c);
+
+ /* (p-b) == (a+b-c - b) == (a-c) */
+ __m128i pb = _mm_sub_epi16(a,c);
+
+ /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
+ __m128i pc = _mm_add_epi16(pa,pb);
+
+ pa = abs_i16(pa); /* |p-a| */
+ pb = abs_i16(pb); /* |p-b| */
+ pc = abs_i16(pc); /* |p-c| */
+
+ __m128i smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
+
+ /* Paeth breaks ties favoring a over b over c. */
+ __m128i nearest = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
+ if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
+ c));
+
+ /* Note `_epi8`: we need addition to wrap modulo 255. */
+ d = _mm_add_epi8(d, nearest);
+ store3(row, _mm_packus_epi16(d,d));
+
+ prev += 3;
+ row += 3;
+ rb -= 3;
+ }
+}
+
+void png_read_filter_row_paeth4_sse2(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev)
+{
+ /* Paeth tries to predict pixel d using the pixel to the left of it, a,
+ * and two pixels from the previous row, b and c:
+ * prev: c b
+ * row: a d
+ * The Paeth function predicts d to be whichever of a, b, or c is nearest to
+ * p=a+b-c.
+ *
+ * The first pixel has no left context, and so uses an Up filter, p = b.
+ * This works naturally with our main loop's p = a+b-c if we force a and c
+ * to zero.
+ * Here we zero b and d, which become c and a respectively at the start of
+ * the loop.
+ */
+ png_debug(1, "in png_read_filter_row_paeth4_sse2");
+ const __m128i zero = _mm_setzero_si128();
+ __m128i c, b = zero,
+ a, d = zero;
+
+ int rb = row_info->rowbytes;
+ while (rb > 0) {
+ /* It's easiest to do this math (particularly, deal with pc) with 16-bit
+ * intermediates.
+ */
+ c = b; b = _mm_unpacklo_epi8(load4(prev), zero);
+ a = d; d = _mm_unpacklo_epi8(load4(row ), zero);
+
+ /* (p-a) == (a+b-c - a) == (b-c) */
+ __m128i pa = _mm_sub_epi16(b,c);
+
+ /* (p-b) == (a+b-c - b) == (a-c) */
+ __m128i pb = _mm_sub_epi16(a,c);
+
+ /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
+ __m128i pc = _mm_add_epi16(pa,pb);
+
+ pa = abs_i16(pa); /* |p-a| */
+ pb = abs_i16(pb); /* |p-b| */
+ pc = abs_i16(pc); /* |p-c| */
+
+ __m128i smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
+
+ /* Paeth breaks ties favoring a over b over c. */
+ __m128i nearest = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
+ if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
+ c));
+
+ /* Note `_epi8`: we need addition to wrap modulo 255. */
+ d = _mm_add_epi8(d, nearest);
+ store4(row, _mm_packus_epi16(d,d));
+
+ prev += 4;
+ row += 4;
+ rb -= 4;
+ }
+}
+
+#endif /* PNG_INTEL_SSE_IMPLEMENTATION > 0 */
+#endif /* READ */
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/filter_sse2_intrinsics.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_init.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_init.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_init.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,54 @@
+
+/* intel_init.c - SSE2 optimized filter functions
+ *
+ * Copyright (c) 2016 Google, Inc.
+ * Written by Mike Klein and Matt Sarett
+ * Derived from arm/arm_init.c, which was
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
+ *
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#include "../../pngpriv.h"
+
+#ifdef PNG_READ_SUPPORTED
+#if PNG_INTEL_SSE_IMPLEMENTATION > 0
+
+void
+png_init_filter_functions_sse2(png_structp pp, unsigned int bpp)
+{
+ /* The techniques used to implement each of these filters in SSE operate on
+ * one pixel at a time.
+ * So they generally speed up 3bpp images about 3x, 4bpp images about 4x.
+ * They can scale up to 6 and 8 bpp images and down to 2 bpp images,
+ * but they'd not likely have any benefit for 1bpp images.
+ * Most of these can be implemented using only MMX and 64-bit registers,
+ * but they end up a bit slower than using the equally-ubiquitous SSE2.
+ */
+ png_debug(1, "in png_init_filter_functions_sse2");
+ if (bpp == 3)
+ {
+ pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_sse2;
+ pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_sse2;
+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
+ png_read_filter_row_paeth3_sse2;
+ }
+ else if (bpp == 4)
+ {
+ pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_sse2;
+ pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_sse2;
+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
+ png_read_filter_row_paeth4_sse2;
+ }
+
+ /* No need optimize PNG_FILTER_VALUE_UP. The compiler should
+ * autovectorize.
+ */
+}
+
+#endif /* PNG_INTEL_SSE_IMPLEMENTATION > 0 */
+#endif /* PNG_READ_SUPPORTED */
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_init.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_sse.patch
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_sse.patch (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_sse.patch 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,190 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac 2016-08-29 11:46:27.000000000 -0400
++++ b/configure.ac 2016-08-29 16:57:03.866355018 -0400
+@@ -386,16 +386,51 @@ AC_ARG_ENABLE([mips-msa],
+ # future host CPU does not match 'mips*')
+
+ AM_CONDITIONAL([PNG_MIPS_MSA],
+ [test "$enable_mips_msa" != 'no' &&
+ case "$host_cpu" in
+ mipsel*|mips64el*) :;;
+ esac])
+
++# INTEL
++# =====
++#
++# INTEL SSE (SIMD) support.
++
++AC_ARG_ENABLE([intel-sse],
++ AS_HELP_STRING([[[--enable-intel-sse]]],
++ [Enable Intel SSE optimizations: =no/off, yes/on:]
++ [no/off: disable the optimizations;]
++ [yes/on: enable the optimizations.]
++ [If not specified: determined by the compiler.]),
++ [case "$enableval" in
++ no|off)
++ # disable the default enabling:
++ AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
++ [Disable Intel SSE optimizations])
++ # Prevent inclusion of the assembler files below:
++ enable_intel_sse=no;;
++ yes|on)
++ AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
++ [Enable Intel SSE optimizations]);;
++ *)
++ AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}: invalid value])
++ esac])
++
++# Add Intel specific files to all builds where the host_cpu is Intel ('x86*')
++# or where Intel optimizations were explicitly requested (this allows a
++# fallback if a future host CPU does not match 'x86*')
++AM_CONDITIONAL([PNG_INTEL_SSE],
++ [test "$enable_intel_sse" != 'no' &&
++ case "$host_cpu" in
++ i?86|x86_64) :;;
++ *) test "$enable_intel_sse" != '';;
++ esac])
++
+ AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
+
+ # Config files, substituting as above
+ AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in])
+ AC_CONFIG_FILES([libpng-config:libpng-config.in],
+ [chmod +x libpng-config])
+
+ AC_OUTPUT
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2016-08-29 11:46:27.000000000 -0400
++++ b/Makefile.am 2016-08-29 16:57:45.955528215 -0400
+@@ -97,16 +97,21 @@ libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SO
+ arm/filter_neon.S arm/filter_neon_intrinsics.c
+ endif
+
+ if PNG_MIPS_MSA
+ libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES += mips/mips_init.c\
+ mips/filter_msa_intrinsics.c
+ endif
+
++if PNG_INTEL_SSE
++libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES += contrib/intel/intel_init.c\
++ contrib/intel/filter_sse2_intrinsics.c
++endif
++
+ nodist_libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_SOURCES = pnglibconf.h
+
+ libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at _la_LDFLAGS = -no-undefined -export-dynamic \
+ -version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
+
+ if HAVE_LD_VERSION_SCRIPT
+ # Versioned symbols and restricted exports
+ if HAVE_SOLARIS_LD
+diff --git a/pngpriv.h b/pngpriv.h
+--- debug16/pngpriv.h 2016-08-30 10:46:36.000000000 -0400
++++ libpng16/pngpriv.h 2016-08-30 11:57:25.672280202 -0400
+@@ -185,16 +185,52 @@
+ #ifndef PNG_MIPS_MSA_OPT
+ # if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+ # define PNG_MIPS_MSA_OPT 2
+ # else
+ # define PNG_MIPS_MSA_OPT 0
+ # endif
+ #endif
+
++#ifndef PNG_INTEL_SSE_OPT
++# ifdef PNG_INTEL_SSE
++ /* Only check for SSE if the build configuration has been modified to
++ * enable SSE optimizations. This means that these optimizations will
++ * be off by default. See contrib/intel for more details.
++ */
++# if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
++ defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
++ (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
++# define PNG_INTEL_SSE_OPT 1
++# endif
++# endif
++#endif
++
++#if PNG_INTEL_SSE_OPT > 0
++# ifndef PNG_INTEL_SSE_IMPLEMENTATION
++# if defined(__SSE4_1__) || defined(__AVX__)
++ /* We are not actually using AVX, but checking for AVX is the best
++ way we can detect SSE4.1 and SSSE3 on MSVC.
++ */
++# define PNG_INTEL_SSE_IMPLEMENTATION 3
++# elif defined(__SSSE3__)
++# define PNG_INTEL_SSE_IMPLEMENTATION 2
++# elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
++ (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
++# define PNG_INTEL_SSE_IMPLEMENTATION 1
++# else
++# define PNG_INTEL_SSE_IMPLEMENTATION 0
++# endif
++# endif
++
++# if PNG_INTEL_SSE_IMPLEMENTATION > 0
++# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2
++# endif
++#endif
++
+ #if PNG_MIPS_MSA_OPT > 0
+ # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
+ # ifndef PNG_MIPS_MSA_IMPLEMENTATION
+ # if defined(__mips_msa)
+ # if defined(__clang__)
+ # elif defined(__GNUC__)
+ # if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
+ # define PNG_MIPS_MSA_IMPLEMENTATION 2
+@@ -1251,16 +1287,31 @@ PNG_INTERNAL_FUNCTION(void,png_read_filt
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+ #endif
+
++#if PNG_INTEL_SSE_IMPLEMENTATION > 0
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
++ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
++#endif
++
+ /* Choose the best filter to use and filter the row data */
+ PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
+ png_row_infop row_info),PNG_EMPTY);
+
+ #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+ PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
+ png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
+ /* Read 'avail_out' bytes of data from the IDAT stream. If the output buffer
+@@ -1986,16 +2037,21 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_O
+ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+ #endif
+
+ #if PNG_MIPS_MSA_OPT > 0
+ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+ #endif
++
++# if PNG_INTEL_SSE_IMPLEMENTATION > 0
++PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
++ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
++# endif
+ #endif
+
+ PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
+ png_const_charp key, png_bytep new_key), PNG_EMPTY);
+
+ /* Maintainer: Put new private prototypes here ^ */
+
+ #include "pngdebug.h"
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/intel/intel_sse.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngimage.c
*
- * Copyright (c) 2015 John Cunningham Bowler
+ * Copyright (c) 2015,2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.20 [December 3, 2015]
+ * Last changed in libpng 1.6.24 [August 4, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -36,8 +36,28 @@
# include <setjmp.h> /* because png.h did *not* include this */
#endif
-#if defined(PNG_INFO_IMAGE_SUPPORTED) && defined(PNG_SEQUENTIAL_READ_SUPPORTED)\
- && (defined(PNG_READ_PNG_SUPPORTED) || PNG_LIBPNG_VER < 10700)
+/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
+ * a skipped test, in earlier versions we need to succeed on a skipped test, so:
+ */
+#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
+# define SKIP 77
+#else
+# define SKIP 0
+#endif
+
+#if PNG_LIBPNG_VER < 10700
+ /* READ_PNG and WRITE_PNG were not defined, so: */
+# ifdef PNG_INFO_IMAGE_SUPPORTED
+# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+# define PNG_READ_PNG_SUPPORTED
+# endif /* SEQUENTIAL_READ */
+# ifdef PNG_WRITE_SUPPORTED
+# define PNG_WRITE_PNG_SUPPORTED
+# endif /* WRITE */
+# endif /* INFO_IMAGE */
+#endif /* pre 1.7.0 */
+
+#ifdef PNG_READ_PNG_SUPPORTED
/* If a transform is valid on both read and write this implies that if the
* transform is applied to read it must also be applied on write to produce
* meaningful data. This is because these transforms when performed on read
@@ -386,7 +406,7 @@
buffer_destroy_list(list);
}
-#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_PNG_SUPPORTED
static void
buffer_start_write(struct buffer *buffer)
{
@@ -556,7 +576,7 @@
png_structp read_pp;
png_infop read_ip;
-# ifdef PNG_WRITE_SUPPORTED
+# ifdef PNG_WRITE_PNG_SUPPORTED
/* Used to write a new image (the original info_ptr is used) */
png_structp write_pp;
struct buffer written_file; /* where the file gets written */
@@ -583,7 +603,7 @@
dp->read_ip = NULL;
buffer_init(&dp->original_file);
-# ifdef PNG_WRITE_SUPPORTED
+# ifdef PNG_WRITE_PNG_SUPPORTED
dp->write_pp = NULL;
buffer_init(&dp->written_file);
# endif
@@ -596,7 +616,7 @@
png_destroy_read_struct(&dp->read_pp, &dp->read_ip, NULL);
}
-#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_PNG_SUPPORTED
static void
display_clean_write(struct display *dp)
{
@@ -608,7 +628,7 @@
static void
display_clean(struct display *dp)
{
-# ifdef PNG_WRITE_SUPPORTED
+# ifdef PNG_WRITE_PNG_SUPPORTED
display_clean_write(dp);
# endif
display_clean_read(dp);
@@ -626,7 +646,7 @@
display_destroy(struct display *dp)
{
/* Release any memory held in the display. */
-# ifdef PNG_WRITE_SUPPORTED
+# ifdef PNG_WRITE_PNG_SUPPORTED
buffer_destroy(&dp->written_file);
# endif
@@ -1073,6 +1093,7 @@
}
else
+# ifdef PNG_sBIT_SUPPORTED
{
unsigned long y;
int bpp; /* bits-per-pixel then bytes-per-pixel */
@@ -1234,12 +1255,16 @@
}
} /* for y */
}
+# else /* !sBIT */
+ display_log(dp, INTERNAL_ERROR,
+ "active shift transform but no sBIT support");
+# endif /* !sBIT */
}
return 1; /* compare succeeded */
}
-#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_PNG_SUPPORTED
static void
buffer_write(struct display *dp, struct buffer *buffer, png_bytep data,
png_size_t size)
@@ -1338,7 +1363,7 @@
*/
display_clean_write(dp);
}
-#endif /* WRITE_SUPPORTED */
+#endif /* WRITE_PNG */
static int
skip_transform(struct display *dp, int tr)
@@ -1400,7 +1425,7 @@
return; /* no point testing more */
}
-#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_PNG_SUPPORTED
/* Second test: write the original PNG data out to a new file (to test the
* write side) then read the result back in and make sure that it hasn't
* changed.
@@ -1441,7 +1466,7 @@
* out and read it back in again (without the reversible transforms)
* we should get back to the place where we started.
*/
-#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNG_WRITE_PNG_SUPPORTED
if ((current & write_transforms) == current)
{
/* All transforms reversible: write the PNG with the transformations
@@ -1677,11 +1702,11 @@
return errors != 0;
}
}
-#else /* !INFO_IMAGE || !SEQUENTIAL_READ || !READ_PNG*/
+#else /* !READ_PNG */
int
main(void)
{
fprintf(stderr, "pngimage: no support for png_read/write_image\n");
- return 77;
+ return SKIP;
}
#endif
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,9 @@
/*-
* pngstest.c
*
- * Copyright (c) 2013-2015 John Cunningham Bowler
+ * Copyright (c) 2013-2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.19 [November 12, 2015]
+ * Last changed in libpng 1.6.24 [August 4, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -35,6 +35,15 @@
# include "../../png.h"
#endif
+/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
+ * a skipped test, in earlier versions we need to succeed on a skipped test, so:
+ */
+#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
+# define SKIP 77
+#else
+# define SKIP 0
+#endif
+
#ifdef PNG_SIMPLIFIED_READ_SUPPORTED /* Else nothing can be done */
#include "../tools/sRGB.h"
@@ -99,10 +108,18 @@
seed[1] = u1;
}
+static png_uint_32 color_seed[2];
+
static void
+reseed(void)
+{
+ color_seed[0] = 0x12345678U;
+ color_seed[1] = 0x9abcdefU;
+}
+
+static void
random_color(png_colorp color)
{
- static png_uint_32 color_seed[2] = { 0x12345678, 0x9abcdef };
make_random_bytes(color_seed, color, sizeof *color);
}
@@ -307,7 +324,7 @@
}
#endif /* unused */
-#define READ_FILE 1 /* else memory */
+#define USE_FILE 1 /* else memory */
#define USE_STDIO 2 /* else use file name */
#define STRICT 4 /* fail on warnings too */
#define VERBOSE 8
@@ -316,16 +333,19 @@
#define ACCUMULATE 64
#define FAST_WRITE 128
#define sRGB_16BIT 256
+#define NO_RESEED 512 /* do not reseed on each new file */
+#define GBG_ERROR 1024 /* do not ignore the gamma+background_rgb_to_gray
+ * libpng warning. */
static void
print_opts(png_uint_32 opts)
{
- if (opts & READ_FILE)
+ if (opts & USE_FILE)
printf(" --file");
if (opts & USE_STDIO)
printf(" --stdio");
- if (opts & STRICT)
- printf(" --strict");
+ if (!(opts & STRICT))
+ printf(" --nostrict");
if (opts & VERBOSE)
printf(" --verbose");
if (opts & KEEP_TMPFILES)
@@ -338,6 +358,12 @@
printf(" --slow");
if (opts & sRGB_16BIT)
printf(" --sRGB-16bit");
+ if (opts & NO_RESEED)
+ printf(" --noreseed");
+#if PNG_LIBPNG_VER < 10700 /* else on by default */
+ if (opts & GBG_ERROR)
+ printf(" --fault-gbg-warning");
+#endif
}
#define FORMAT_NO_CHANGE 0x80000000 /* additional flag */
@@ -741,8 +767,15 @@
return logerror(image, image->file_name, ": opaque not NULL", "");
}
- else if (image->image.warning_or_error != 0 && (image->opts & STRICT) != 0)
- return logerror(image, image->file_name, " --strict", "");
+ /* Separate out the gamma+background_rgb_to_gray warning because it may
+ * produce opaque component errors:
+ */
+ else if (image->image.warning_or_error != 0 &&
+ (strcmp(image->image.message,
+ "libpng does not support gamma+background+rgb_to_gray") == 0 ?
+ (image->opts & GBG_ERROR) != 0 : (image->opts & STRICT) != 0))
+ return logerror(image, image->file_name, (image->opts & GBG_ERROR) != 0 ?
+ " --fault-gbg-warning" : " --strict", "");
else
return 1;
@@ -3008,7 +3041,7 @@
static int
read_one_file(Image *image)
{
- if (!(image->opts & READ_FILE) || (image->opts & USE_STDIO))
+ if (!(image->opts & USE_FILE) || (image->opts & USE_STDIO))
{
/* memory or stdio. */
FILE *f = fopen(image->file_name, "rb");
@@ -3015,7 +3048,7 @@
if (f != NULL)
{
- if (image->opts & READ_FILE)
+ if (image->opts & USE_FILE)
image->input_file = f;
else /* memory */
@@ -3096,7 +3129,8 @@
if (image->opts & USE_STDIO)
{
-#ifndef PNG_USE_MKSTEMP
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+#ifndef __COVERITY__
FILE *f = tmpfile();
#else
/* Experimental. Coverity says tmpfile() is insecure because it
@@ -3158,10 +3192,14 @@
else
return logerror(image, "tmpfile", ": open: ", strerror(errno));
+#else /* SIMPLIFIED_WRITE_STDIO */
+ return logerror(image, "tmpfile", ": open: unsupported", "");
+#endif /* SIMPLIFIED_WRITE_STDIO */
}
- else
+ else if (image->opts & USE_FILE)
{
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
static int counter = 0;
char name[32];
@@ -3181,8 +3219,53 @@
else
return logerror(image, name, ": write failed", "");
+#else /* SIMPLIFIED_WRITE_STDIO */
+ return logerror(image, "stdio", ": open: unsupported", "");
+#endif /* SIMPLIFIED_WRITE_STDIO */
}
+ else /* use memory */
+ {
+ png_alloc_size_t size;
+
+ if (png_image_write_get_memory_size(image->image, size, convert_to_8bit,
+ image->buffer+16, (png_int_32)image->stride, image->colormap))
+ {
+ /* This is non-fatal but ignoring it was causing serious problems in
+ * the macro to be ignored:
+ */
+ if (size > PNG_IMAGE_PNG_SIZE_MAX(image->image))
+ return logerror(image, "memory", ": PNG_IMAGE_SIZE_MAX wrong", "");
+
+ initimage(output, image->opts, "memory", image->stride_extra);
+ output->input_memory = malloc(size);
+
+ if (output->input_memory != NULL)
+ {
+ output->input_memory_size = size;
+
+ if (png_image_write_to_memory(&image->image, output->input_memory,
+ &output->input_memory_size, convert_to_8bit, image->buffer+16,
+ (png_int_32)image->stride, image->colormap))
+ {
+ /* This is also non-fatal but it safes safer to error out anyway:
+ */
+ if (size != output->input_memory_size)
+ return logerror(image, "memory", ": memory size wrong", "");
+ }
+
+ else
+ return logerror(image, "memory", ": write failed", "");
+ }
+
+ else
+ return logerror(image, "memory", ": out of memory", "");
+ }
+
+ else
+ return logerror(image, "memory", ": get size:", "");
+ }
+
/* 'output' has an initialized temporary image, read this back in and compare
* this against the original: there should be no change since the original
* format was written unmodified unless 'convert_to_8bit' was specified.
@@ -3356,6 +3439,8 @@
int result;
Image image;
+ if (!(opts & NO_RESEED))
+ reseed(); /* ensure that the random numbers don't depend on file order */
newimage(&image);
initimage(&image, opts, file_name, stride_extra);
result = read_one_file(&image);
@@ -3393,7 +3478,7 @@
int
main(int argc, char **argv)
{
- png_uint_32 opts = FAST_WRITE;
+ png_uint_32 opts = FAST_WRITE | STRICT;
format_list formats;
const char *touch = NULL;
int log_pass = 0;
@@ -3402,11 +3487,17 @@
int retval = 0;
int c;
+#if PNG_LIBPNG_VER >= 10700
+ /* This error should not exist in 1.7 or later: */
+ opts |= GBG_ERROR;
+#endif
+
init_sRGB_to_d();
#if 0
init_error_via_linear();
#endif
format_init(&formats);
+ reseed(); /* initialize random number seeds */
for (c=1; c<argc; ++c)
{
@@ -3421,17 +3512,17 @@
}
else if (strcmp(arg, "--file") == 0)
# ifdef PNG_STDIO_SUPPORTED
- opts |= READ_FILE;
+ opts |= USE_FILE;
# else
- return 77; /* skipped: no support */
+ return SKIP; /* skipped: no support */
# endif
else if (strcmp(arg, "--memory") == 0)
- opts &= ~READ_FILE;
+ opts &= ~USE_FILE;
else if (strcmp(arg, "--stdio") == 0)
# ifdef PNG_STDIO_SUPPORTED
opts |= USE_STDIO;
# else
- return 77; /* skipped: no support */
+ return SKIP; /* skipped: no support */
# endif
else if (strcmp(arg, "--name") == 0)
opts &= ~USE_STDIO;
@@ -3457,10 +3548,16 @@
opts &= ~KEEP_GOING;
else if (strcmp(arg, "--strict") == 0)
opts |= STRICT;
+ else if (strcmp(arg, "--nostrict") == 0)
+ opts &= ~STRICT;
else if (strcmp(arg, "--sRGB-16bit") == 0)
opts |= sRGB_16BIT;
else if (strcmp(arg, "--linear-16bit") == 0)
opts &= ~sRGB_16BIT;
+ else if (strcmp(arg, "--noreseed") == 0)
+ opts |= NO_RESEED;
+ else if (strcmp(arg, "--fault-gbg-warning") == 0)
+ opts |= GBG_ERROR;
else if (strcmp(arg, "--tmpfile") == 0)
{
if (c+1 < argc)
@@ -3717,6 +3814,6 @@
{
fprintf(stderr, "pngstest: no read support in libpng, test skipped\n");
/* So the test is skipped: */
- return 77;
+ return SKIP;
}
#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngunknown.c - test the read side unknown chunk handling
*
- * Last changed in libpng 1.6.10 [March 6, 2014]
- * Copyright (c) 2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 2015,2016 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*
* This code is released under the libpng license.
@@ -30,10 +30,21 @@
# include "../../png.h"
#endif
+/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
+ * a skipped test, in earlier versions we need to succeed on a skipped test, so:
+ */
+#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
+# define SKIP 77
+#else
+# define SKIP 0
+#endif
+
+
/* Since this program tests the ability to change the unknown chunk handling
* these must be defined:
*/
#if defined(PNG_SET_UNKNOWN_CHUNKS_SUPPORTED) &&\
+ defined(PNG_STDIO_SUPPORTED) &&\
defined(PNG_READ_SUPPORTED)
/* One of these must be defined to allow us to find out what happened. It is
@@ -467,7 +478,7 @@
png_textp text;
png_uint_32 ntext = png_get_text(d->png_ptr, info_ptr, &text, NULL);
- while (ntext-- > 0) switch (text[ntext].compression)
+ while (ntext > 0) switch (text[--ntext].compression)
{
case -1:
flags |= PNG_INFO_tEXt;
@@ -615,7 +626,7 @@
return flags;
}
-#else
+#else /* SAVE_UNKNOWN_CHUNKS */
static png_uint_32
get_unknown(display *d, png_infop info_ptr, int after_IDAT)
/* Otherwise this will return the cached values set by any user callback */
@@ -634,8 +645,8 @@
* a check to ensure the logic is correct.
*/
# error No store support and no user chunk support, this will not work
-# endif
-#endif
+# endif /* READ_USER_CHUNKS */
+#endif /* SAVE_UNKNOWN_CHUNKS */
static int
check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
@@ -1001,6 +1012,20 @@
def = check(fp, argc, argv, flags[1], d, set_callback);
+ /* If IDAT is being handled as unknown the image read is skipped and all the
+ * IDATs after the first end up in the end info struct, so in this case add
+ * IDAT to the list of unknowns. (Do this after 'check' above sets the
+ * chunk_info 'keep' fields.)
+ *
+ * Note that the flag setting has to be in the 'known' field to avoid
+ * triggering the consistency check below and the flag must only be set if
+ * there are multiple IDATs, so if the check above did find an unknown IDAT
+ * after IDAT.
+ */
+ if (chunk_info[0/*IDAT*/].keep != PNG_HANDLE_CHUNK_AS_DEFAULT &&
+ (flags[1][3] & PNG_INFO_IDAT) != 0)
+ flags[0][2] |= PNG_INFO_IDAT;
+
/* Chunks should either be known or unknown, never both and this should apply
* whether the chunk is before or after the IDAT (actually, the app can
* probably change this by swapping the handling after the image, but this
@@ -1245,7 +1270,7 @@
fprintf(stderr,
" test ignored: no support to find out about unknown chunks\n");
/* So the test is skipped: */
- return 77;
+ return SKIP;
}
#endif /* READ_USER_CHUNKS || SAVE_UNKNOWN_CHUNKS */
@@ -1256,6 +1281,6 @@
fprintf(stderr,
" test ignored: no support to modify unknown chunk handling\n");
/* So the test is skipped: */
- return 77;
+ return SKIP;
}
#endif /* SET_UNKNOWN_CHUNKS && READ*/
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,8 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
- * Last changed in libpng 1.6.21 [January 15, 2016]
- * Copyright (c) 2014-2016 Glenn Randers-Pehrson
- * Written by John Cunningham Bowler
+ * Last changed in libpng 1.6.27 [December 29, 2016]
+ * Copyright (c) 2014-2016 John Cunningham Bowler
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -62,10 +61,10 @@
/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
* a skipped test, in earlier versions we need to succeed on a skipped test, so:
*/
-#if PNG_LIBPNG_VER < 10601
+#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
+# define SKIP 77
+#else
# define SKIP 0
-#else
-# define SKIP 77
#endif
/* pngvalid requires write support and one of the fixed or floating point APIs.
@@ -131,6 +130,17 @@
#include <string.h> /* For memcpy, memset */
#include <math.h> /* For floor */
+/* Convenience macros. */
+#define CHUNK(a,b,c,d) (((a)<<24)+((b)<<16)+((c)<<8)+(d))
+#define CHUNK_IHDR CHUNK(73,72,68,82)
+#define CHUNK_PLTE CHUNK(80,76,84,69)
+#define CHUNK_IDAT CHUNK(73,68,65,84)
+#define CHUNK_IEND CHUNK(73,69,78,68)
+#define CHUNK_cHRM CHUNK(99,72,82,77)
+#define CHUNK_gAMA CHUNK(103,65,77,65)
+#define CHUNK_sBIT CHUNK(115,66,73,84)
+#define CHUNK_sRGB CHUNK(115,82,71,66)
+
/* Unused formal parameter errors are removed using the following macro which is
* expected to have no bad effects on performance.
*/
@@ -297,48 +307,33 @@
#define R8(this) randomize(&(this), sizeof (this))
-static void r16(png_uint_16p p16, size_t count)
+#ifdef PNG_READ_SUPPORTED
+static png_byte
+random_byte(void)
{
- size_t i;
+ unsigned char b1[1];
+ randomize(b1, sizeof b1);
+ return b1[0];
+}
+#endif /* READ */
- for (i=0; i<count; ++i)
- {
- unsigned char b2[2];
- randomize(b2, sizeof b2);
- *p16++ = png_get_uint_16(b2);
- }
+static png_uint_16
+random_u16(void)
+{
+ unsigned char b2[2];
+ randomize(b2, sizeof b2);
+ return png_get_uint_16(b2);
}
-#ifdef __COVERITY__
-# define R16(this)\
- r16(&(this), (sizeof (this))/2U/*(sizeof (png_uint_16))*/)
-#else
-# define R16(this)\
- r16(&(this), (sizeof (this))/(sizeof (png_uint_16)))
-#endif
-
#if defined PNG_READ_RGB_TO_GRAY_SUPPORTED ||\
defined PNG_READ_FILLER_SUPPORTED
-static void r32(png_uint_32p p32, size_t count)
+static png_uint_32
+random_u32(void)
{
- size_t i;
-
- for (i=0; i<count; ++i)
- {
- unsigned char b4[4];
- randomize(b4, sizeof b4);
- *p32++ = png_get_uint_32(b4);
- }
+ unsigned char b4[4];
+ randomize(b4, sizeof b4);
+ return png_get_uint_32(b4);
}
-
-#ifdef __COVERITY__
-# define R32(this)\
- r32(&(this), (sizeof (this))/4U/*(sizeof (png_uint_32))*/)
-#else
-# define R32(this)\
- r32(&(this), (sizeof (this))/(sizeof (png_uint_32)))
-#endif
-
#endif /* READ_FILLER || READ_RGB_TO_GRAY */
#endif /* READ || WRITE_tRNS || WRITE_FILTER */
@@ -348,11 +343,7 @@
static unsigned int
random_mod(unsigned int max)
{
- png_uint_16 x;
-
- R16(x);
-
- return x % max; /* 0 .. max-1 */
+ return random_u16() % max; /* 0 .. max-1 */
}
#endif /* READ_TRANSFORMS || WRITE_FILTER */
@@ -361,11 +352,7 @@
static int
random_choice(void)
{
- unsigned char x;
-
- R8(x);
-
- return x & 1;
+ return random_byte() & 1;
}
#endif /* READ_RGB_TO_GRAY || READ_FILLER */
@@ -721,6 +708,8 @@
{
struct png_store_file* next; /* as many as you like... */
char name[FILE_NAME_SIZE];
+ unsigned int IDAT_bits; /* Number of bits in IDAT size */
+ png_uint_32 IDAT_size; /* Total size of IDAT data */
png_uint_32 id; /* must be correct (see FILEID) */
png_size_t datacount; /* In this (the last) buffer */
png_store_buffer data; /* Last buffer in file */
@@ -776,6 +765,13 @@
char test[128]; /* Name of test */
char error[256];
+ /* Share fields */
+ png_uint_32 chunklen; /* Length of chunk+overhead (chunkpos >= 8) */
+ png_uint_32 chunktype;/* Type of chunk (valid if chunkpos >= 4) */
+ png_uint_32 chunkpos; /* Position in chunk */
+ png_uint_32 IDAT_size;/* Accumulated IDAT size in .new */
+ unsigned int IDAT_bits;/* Cache of the file store value */
+
/* Read fields */
png_structp pread; /* Used to read a saved file */
png_infop piread;
@@ -785,6 +781,9 @@
png_byte* image; /* Buffer for reading interlaced images */
png_size_t cb_image; /* Size of this buffer */
png_size_t cb_row; /* Row size of the image(s) */
+ uLong IDAT_crc;
+ png_uint_32 IDAT_len; /* Used when re-chunking IDAT chunks */
+ png_uint_32 IDAT_pos; /* Used when re-chunking IDAT chunks */
png_uint_32 image_h; /* Number of rows in a single image */
store_pool read_memory_pool;
@@ -871,6 +870,11 @@
ps->pwrite = NULL;
ps->piwrite = NULL;
ps->writepos = 0;
+ ps->chunkpos = 8;
+ ps->chunktype = 0;
+ ps->chunklen = 16;
+ ps->IDAT_size = 0;
+ ps->IDAT_bits = 0;
ps->new.prev = NULL;
ps->palette = NULL;
ps->npalette = 0;
@@ -893,6 +897,11 @@
{
store_freebuffer(&ps->new);
ps->writepos = 0;
+ ps->chunkpos = 8;
+ ps->chunktype = 0;
+ ps->chunklen = 16;
+ ps->IDAT_size = 0;
+ ps->IDAT_bits = 0;
if (ps->palette != NULL)
{
free(ps->palette);
@@ -906,9 +915,6 @@
{
png_store_buffer *pb;
- if (ps->writepos != STORE_BUFFER_SIZE)
- png_error(ps->pwrite, "invalid store call");
-
pb = voidcast(png_store_buffer*, malloc(sizeof *pb));
if (pb == NULL)
@@ -939,6 +945,22 @@
}
}
+static unsigned int
+bits_of(png_uint_32 num)
+{
+ /* Return the number of bits in 'num' */
+ unsigned int b = 0;
+
+ if (num & 0xffff0000U) b += 16U, num >>= 16;
+ if (num & 0xff00U) b += 8U, num >>= 8;
+ if (num & 0xf0U) b += 4U, num >>= 4;
+ if (num & 0xcU) b += 2U, num >>= 2;
+ if (num & 0x2U) ++b, num >>= 1;
+ if (num) ++b;
+
+ return b; /* 0..32 */
+}
+
/* Main interface to file storeage, after writing a new PNG file (see the API
* below) call store_storefile to store the result with the given name and id.
*/
@@ -945,7 +967,13 @@
static void
store_storefile(png_store *ps, png_uint_32 id)
{
- png_store_file *pf = voidcast(png_store_file*, malloc(sizeof *pf));
+ png_store_file *pf;
+
+ if (ps->chunkpos != 0U || ps->chunktype != 0U || ps->chunklen != 0U ||
+ ps->IDAT_size == 0)
+ png_error(ps->pwrite, "storefile: incomplete write");
+
+ pf = voidcast(png_store_file*, malloc(sizeof *pf));
if (pf == NULL)
png_error(ps->pwrite, "storefile: OOM");
safecat(pf->name, sizeof pf->name, 0, ps->wname);
@@ -952,8 +980,17 @@
pf->id = id;
pf->data = ps->new;
pf->datacount = ps->writepos;
+ pf->IDAT_size = ps->IDAT_size;
+ pf->IDAT_bits = bits_of(ps->IDAT_size);
+ /* Because the IDAT always has zlib header stuff this must be true: */
+ if (pf->IDAT_bits == 0U)
+ png_error(ps->pwrite, "storefile: 0 sized IDAT");
ps->new.prev = NULL;
ps->writepos = 0;
+ ps->chunkpos = 8;
+ ps->chunktype = 0;
+ ps->chunklen = 16;
+ ps->IDAT_size = 0;
pf->palette = ps->palette;
pf->npalette = ps->npalette;
ps->palette = 0;
@@ -1204,7 +1241,7 @@
image += 2; /* skip image first row markers */
- while (rows-- > 0)
+ for (; rows > 0; --rows)
{
if (image[-2] != 190 || image[-1] != 239)
png_error(pp, "row start overwritten");
@@ -1219,32 +1256,119 @@
}
#endif /* PNG_READ_SUPPORTED */
+static int
+valid_chunktype(png_uint_32 chunktype)
+{
+ /* Each byte in the chunk type must be in one of the ranges 65..90, 97..122
+ * (both inclusive), so:
+ */
+ unsigned int i;
+
+ for (i=0; i<4; ++i)
+ {
+ unsigned int c = chunktype & 0xffU;
+
+ if (!((c >= 65U && c <= 90U) || (c >= 97U && c <= 122U)))
+ return 0;
+
+ chunktype >>= 8;
+ }
+
+ return 1; /* It's valid */
+}
+
static void PNGCBAPI
store_write(png_structp ppIn, png_bytep pb, png_size_t st)
{
png_const_structp pp = ppIn;
png_store *ps = voidcast(png_store*, png_get_io_ptr(pp));
+ size_t writepos = ps->writepos;
+ png_uint_32 chunkpos = ps->chunkpos;
+ png_uint_32 chunktype = ps->chunktype;
+ png_uint_32 chunklen = ps->chunklen;
if (ps->pwrite != pp)
png_error(pp, "store state damaged");
+ /* Technically this is legal, but in practice libpng never writes more than
+ * the maximum chunk size at once so if it happens something weird has
+ * changed inside libpng (probably).
+ */
+ if (st > 0x7fffffffU)
+ png_error(pp, "unexpected write size");
+
+ /* Now process the bytes to be written. Do this in units of the space in the
+ * output (write) buffer or, at the start 4 bytes for the chunk type and
+ * length limited in any case by the amount of data.
+ */
while (st > 0)
{
- size_t cb;
+ if (writepos >= STORE_BUFFER_SIZE)
+ store_storenew(ps), writepos = 0;
- if (ps->writepos >= STORE_BUFFER_SIZE)
- store_storenew(ps);
+ if (chunkpos < 4)
+ {
+ png_byte b = *pb++;
+ --st;
+ chunklen = (chunklen << 8) + b;
+ ps->new.buffer[writepos++] = b;
+ ++chunkpos;
+ }
- cb = st;
+ else if (chunkpos < 8)
+ {
+ png_byte b = *pb++;
+ --st;
+ chunktype = (chunktype << 8) + b;
+ ps->new.buffer[writepos++] = b;
- if (cb > STORE_BUFFER_SIZE - ps->writepos)
- cb = STORE_BUFFER_SIZE - ps->writepos;
+ if (++chunkpos == 8)
+ {
+ chunklen &= 0xffffffffU;
+ if (chunklen > 0x7fffffffU)
+ png_error(pp, "chunk length too great");
- memcpy(ps->new.buffer + ps->writepos, pb, cb);
- pb += cb;
- st -= cb;
- ps->writepos += cb;
- }
+ chunktype &= 0xffffffffU;
+ if (chunktype == CHUNK_IDAT)
+ {
+ if (chunklen > ~ps->IDAT_size)
+ png_error(pp, "pngvalid internal image too large");
+
+ ps->IDAT_size += chunklen;
+ }
+
+ else if (!valid_chunktype(chunktype))
+ png_error(pp, "invalid chunk type");
+
+ chunklen += 12; /* for header and CRC */
+ }
+ }
+
+ else /* chunkpos >= 8 */
+ {
+ png_size_t cb = st;
+
+ if (cb > STORE_BUFFER_SIZE - writepos)
+ cb = STORE_BUFFER_SIZE - writepos;
+
+ if (cb > chunklen - chunkpos/* bytes left in chunk*/)
+ cb = (png_size_t)/*SAFE*/(chunklen - chunkpos);
+
+ memcpy(ps->new.buffer + writepos, pb, cb);
+ chunkpos += (png_uint_32)/*SAFE*/cb;
+ pb += cb;
+ writepos += cb;
+ st -= cb;
+
+ if (chunkpos >= chunklen) /* must be equal */
+ chunkpos = chunktype = chunklen = 0;
+ }
+ } /* while (st > 0) */
+
+ ps->writepos = writepos;
+ ps->chunkpos = chunkpos;
+ ps->chunktype = chunktype;
+ ps->chunklen = chunklen;
}
static void PNGCBAPI
@@ -1264,7 +1388,6 @@
return ps->current->datacount;
}
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
/* Return total bytes available for read. */
static size_t
store_read_buffer_avail(png_store *ps)
@@ -1289,7 +1412,6 @@
return 0;
}
-#endif
static int
store_read_buffer_next(png_store *ps)
@@ -1341,6 +1463,240 @@
}
}
+static png_size_t
+store_read_chunk(png_store *ps, png_bytep pb, const png_size_t max,
+ const png_size_t min)
+{
+ png_uint_32 chunklen = ps->chunklen;
+ png_uint_32 chunktype = ps->chunktype;
+ png_uint_32 chunkpos = ps->chunkpos;
+ png_size_t st = max;
+
+ if (st > 0) do
+ {
+ if (chunkpos >= chunklen) /* end of last chunk */
+ {
+ png_byte buffer[8];
+
+ /* Read the header of the next chunk: */
+ store_read_imp(ps, buffer, 8U);
+ chunklen = png_get_uint_32(buffer) + 12U;
+ chunktype = png_get_uint_32(buffer+4U);
+ chunkpos = 0U; /* Position read so far */
+ }
+
+ if (chunktype == CHUNK_IDAT)
+ {
+ png_uint_32 IDAT_pos = ps->IDAT_pos;
+ png_uint_32 IDAT_len = ps->IDAT_len;
+ png_uint_32 IDAT_size = ps->IDAT_size;
+
+ /* The IDAT headers are constructed here; skip the input header. */
+ if (chunkpos < 8U)
+ chunkpos = 8U;
+
+ if (IDAT_pos == IDAT_len)
+ {
+ png_byte random = random_byte();
+
+ /* Make a new IDAT chunk, if IDAT_len is 0 this is the first IDAT,
+ * if IDAT_size is 0 this is the end. At present this is set up
+ * using a random number so that there is a 25% chance before
+ * the start of the first IDAT chunk being 0 length.
+ */
+ if (IDAT_len == 0U) /* First IDAT */
+ {
+ switch (random & 3U)
+ {
+ case 0U: IDAT_len = 12U; break; /* 0 bytes */
+ case 1U: IDAT_len = 13U; break; /* 1 byte */
+ default: IDAT_len = random_u32();
+ IDAT_len %= IDAT_size;
+ IDAT_len += 13U; /* 1..IDAT_size bytes */
+ break;
+ }
+ }
+
+ else if (IDAT_size == 0U) /* all IDAT data read */
+ {
+ /* The last (IDAT) chunk should be positioned at the CRC now: */
+ if (chunkpos != chunklen-4U)
+ png_error(ps->pread, "internal: IDAT size mismatch");
+
+ /* The only option here is to add a zero length IDAT, this
+ * happens 25% of the time. Because of the check above
+ * chunklen-4U-chunkpos must be zero, we just need to skip the
+ * CRC now.
+ */
+ if ((random & 3U) == 0U)
+ IDAT_len = 12U; /* Output another 0 length IDAT */
+
+ else
+ {
+ /* End of IDATs, skip the CRC to make the code above load the
+ * next chunk header next time round.
+ */
+ png_byte buffer[4];
+
+ store_read_imp(ps, buffer, 4U);
+ chunkpos += 4U;
+ ps->IDAT_pos = IDAT_pos;
+ ps->IDAT_len = IDAT_len;
+ ps->IDAT_size = 0U;
+ continue; /* Read the next chunk */
+ }
+ }
+
+ else
+ {
+ /* Middle of IDATs, use 'random' to determine the number of bits
+ * to use in the IDAT length.
+ */
+ IDAT_len = random_u32();
+ IDAT_len &= (1U << (1U + random % ps->IDAT_bits)) - 1U;
+ if (IDAT_len > IDAT_size)
+ IDAT_len = IDAT_size;
+ IDAT_len += 12U; /* zero bytes may occur */
+ }
+
+ IDAT_pos = 0U;
+ ps->IDAT_crc = 0x35af061e; /* Ie: crc32(0UL, "IDAT", 4) */
+ } /* IDAT_pos == IDAT_len */
+
+ if (IDAT_pos < 8U) /* Return the header */ do
+ {
+ png_uint_32 b;
+ unsigned int shift;
+
+ if (IDAT_pos < 4U)
+ b = IDAT_len - 12U;
+
+ else
+ b = CHUNK_IDAT;
+
+ shift = 3U & IDAT_pos;
+ ++IDAT_pos;
+
+ if (shift < 3U)
+ b >>= 8U*(3U-shift);
+
+ *pb++ = 0xffU & b;
+ }
+ while (--st > 0 && IDAT_pos < 8);
+
+ else if (IDAT_pos < IDAT_len - 4U) /* I.e not the CRC */
+ {
+ if (chunkpos < chunklen-4U)
+ {
+ uInt avail = (uInt)-1;
+
+ if (avail > (IDAT_len-4U) - IDAT_pos)
+ avail = (uInt)/*SAFE*/((IDAT_len-4U) - IDAT_pos);
+
+ if (avail > st)
+ avail = (uInt)/*SAFE*/st;
+
+ if (avail > (chunklen-4U) - chunkpos)
+ avail = (uInt)/*SAFE*/((chunklen-4U) - chunkpos);
+
+ store_read_imp(ps, pb, avail);
+ ps->IDAT_crc = crc32(ps->IDAT_crc, pb, avail);
+ pb += (png_size_t)/*SAFE*/avail;
+ st -= (png_size_t)/*SAFE*/avail;
+ chunkpos += (png_uint_32)/*SAFE*/avail;
+ IDAT_size -= (png_uint_32)/*SAFE*/avail;
+ IDAT_pos += (png_uint_32)/*SAFE*/avail;
+ }
+
+ else /* skip the input CRC */
+ {
+ png_byte buffer[4];
+
+ store_read_imp(ps, buffer, 4U);
+ chunkpos += 4U;
+ }
+ }
+
+ else /* IDAT crc */ do
+ {
+ uLong b = ps->IDAT_crc;
+ unsigned int shift = (IDAT_len - IDAT_pos); /* 4..1 */
+ ++IDAT_pos;
+
+ if (shift > 1U)
+ b >>= 8U*(shift-1U);
+
+ *pb++ = 0xffU & b;
+ }
+ while (--st > 0 && IDAT_pos < IDAT_len);
+
+ ps->IDAT_pos = IDAT_pos;
+ ps->IDAT_len = IDAT_len;
+ ps->IDAT_size = IDAT_size;
+ }
+
+ else /* !IDAT */
+ {
+ /* If there is still some pending IDAT data after the IDAT chunks have
+ * been processed there is a problem:
+ */
+ if (ps->IDAT_len > 0 && ps->IDAT_size > 0)
+ png_error(ps->pread, "internal: missing IDAT data");
+
+ if (chunktype == CHUNK_IEND && ps->IDAT_len == 0U)
+ png_error(ps->pread, "internal: missing IDAT");
+
+ if (chunkpos < 8U) /* Return the header */ do
+ {
+ png_uint_32 b;
+ unsigned int shift;
+
+ if (chunkpos < 4U)
+ b = chunklen - 12U;
+
+ else
+ b = chunktype;
+
+ shift = 3U & chunkpos;
+ ++chunkpos;
+
+ if (shift < 3U)
+ b >>= 8U*(3U-shift);
+
+ *pb++ = 0xffU & b;
+ }
+ while (--st > 0 && chunkpos < 8);
+
+ else /* Return chunk bytes, including the CRC */
+ {
+ png_size_t avail = st;
+
+ if (avail > chunklen - chunkpos)
+ avail = (png_size_t)/*SAFE*/(chunklen - chunkpos);
+
+ store_read_imp(ps, pb, avail);
+ pb += avail;
+ st -= avail;
+ chunkpos += (png_uint_32)/*SAFE*/avail;
+
+ /* Check for end of chunk and end-of-file; don't try to read a new
+ * chunk header at this point unless instructed to do so by 'min'.
+ */
+ if (chunkpos >= chunklen && max-st >= min &&
+ store_read_buffer_avail(ps) == 0)
+ break;
+ }
+ } /* !IDAT */
+ }
+ while (st > 0);
+
+ ps->chunklen = chunklen;
+ ps->chunktype = chunktype;
+ ps->chunkpos = chunkpos;
+
+ return st; /* space left */
+}
+
static void PNGCBAPI
store_read(png_structp ppIn, png_bytep pb, png_size_t st)
{
@@ -1350,26 +1706,33 @@
if (ps == NULL || ps->pread != pp)
png_error(pp, "bad store read call");
- store_read_imp(ps, pb, st);
+ store_read_chunk(ps, pb, st, st);
}
static void
store_progressive_read(png_store *ps, png_structp pp, png_infop pi)
{
- /* Notice that a call to store_read will cause this function to fail because
- * readpos will be set.
- */
if (ps->pread != pp || ps->current == NULL || ps->next == NULL)
png_error(pp, "store state damaged (progressive)");
- do
+ /* This is another Horowitz and Hill random noise generator. In this case
+ * the aim is to stress the progressive reader with truly horrible variable
+ * buffer sizes in the range 1..500, so a sequence of 9 bit random numbers
+ * is generated. We could probably just count from 1 to 32767 and get as
+ * good a result.
+ */
+ while (store_read_buffer_avail(ps) > 0)
{
- if (ps->readpos != 0)
- png_error(pp, "store_read called during progressive read");
+ static png_uint_32 noise = 2;
+ png_size_t cb;
+ png_byte buffer[512];
- png_process_data(pp, pi, ps->next->buffer, store_read_buffer_size(ps));
+ /* Generate 15 more bits of stuff: */
+ noise = (noise << 9) | ((noise ^ (noise >> (9-5))) & 0x1ff);
+ cb = noise & 0x1ff;
+ cb -= store_read_chunk(ps, buffer, cb, 1);
+ png_process_data(pp, pi, buffer, cb);
}
- while (store_read_buffer_next(ps));
}
#endif /* PNG_READ_SUPPORTED */
@@ -1740,6 +2103,11 @@
ps->next = NULL;
ps->readpos = 0;
ps->validated = 0;
+
+ ps->chunkpos = 8;
+ ps->chunktype = 0;
+ ps->chunklen = 16;
+ ps->IDAT_size = 0;
}
#ifdef PNG_READ_SUPPORTED
@@ -1754,6 +2122,11 @@
{
ps->current = pf;
ps->next = NULL;
+ ps->IDAT_size = pf->IDAT_size;
+ ps->IDAT_bits = pf->IDAT_bits; /* just a cache */
+ ps->IDAT_len = 0;
+ ps->IDAT_pos = 0;
+ ps->IDAT_crc = 0UL;
store_read_buffer_next(ps);
return;
}
@@ -2591,17 +2964,6 @@
return pm->current_gamma != 0;
}
-/* Convenience macros. */
-#define CHUNK(a,b,c,d) (((a)<<24)+((b)<<16)+((c)<<8)+(d))
-#define CHUNK_IHDR CHUNK(73,72,68,82)
-#define CHUNK_PLTE CHUNK(80,76,84,69)
-#define CHUNK_IDAT CHUNK(73,68,65,84)
-#define CHUNK_IEND CHUNK(73,69,78,68)
-#define CHUNK_cHRM CHUNK(99,72,82,77)
-#define CHUNK_gAMA CHUNK(103,65,77,65)
-#define CHUNK_sBIT CHUNK(115,66,73,84)
-#define CHUNK_sRGB CHUNK(115,82,71,66)
-
/* The guts of modification are performed during a read. */
static void
modifier_crc(png_bytep buffer)
@@ -2641,7 +3003,7 @@
{
static png_byte sign[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
case modifier_start:
- store_read_imp(&pm->this, pm->buffer, 8); /* size of signature. */
+ store_read_chunk(&pm->this, pm->buffer, 8, 8); /* signature. */
pm->buffer_count = 8;
pm->buffer_position = 0;
@@ -2651,7 +3013,7 @@
break;
case modifier_signature:
- store_read_imp(&pm->this, pm->buffer, 13+12); /* size of IHDR */
+ store_read_chunk(&pm->this, pm->buffer, 13+12, 13+12); /* IHDR */
pm->buffer_count = 13+12;
pm->buffer_position = 0;
@@ -2692,7 +3054,7 @@
{
if (cb > st) cb = st;
pm->flush -= cb;
- store_read_imp(&pm->this, pb, cb);
+ store_read_chunk(&pm->this, pb, cb, cb);
pb += cb;
st -= cb;
if (st == 0) return;
@@ -2709,7 +3071,7 @@
pm->pending_chunk = 0;
}
else
- store_read_imp(&pm->this, pm->buffer, 8);
+ store_read_chunk(&pm->this, pm->buffer, 8, 8);
pm->buffer_count = 8;
pm->buffer_position = 0;
@@ -2775,8 +3137,8 @@
*/
if (len+12 <= sizeof pm->buffer)
{
- store_read_imp(&pm->this, pm->buffer+pm->buffer_count,
- len+12-pm->buffer_count);
+ png_size_t s = len+12-pm->buffer_count;
+ store_read_chunk(&pm->this, pm->buffer+pm->buffer_count, s, s);
pm->buffer_count = len+12;
/* Check for a modification, else leave it be. */
@@ -3317,10 +3679,10 @@
for (; i<256; ++i)
tRNS[i] = 24;
-# ifdef PNG_WRITE_tRNS_SUPPORTED
- if (j > 0)
- png_set_tRNS(pp, pi, tRNS, j, 0/*color*/);
-# endif
+#ifdef PNG_WRITE_tRNS_SUPPORTED
+ if (j > 0)
+ png_set_tRNS(pp, pi, tRNS, j, 0/*color*/);
+#endif
}
}
@@ -3343,8 +3705,8 @@
{
if (bit_depth == 8)
{
- R16(tRNS.red);
- R16(tRNS.green);
+ tRNS.red = random_u16();
+ tRNS.green = random_u16();
tRNS.blue = tRNS.red ^ tRNS.green;
tRNS.red &= mask;
tRNS.green &= mask;
@@ -3353,7 +3715,7 @@
else /* bit_depth == 16 */
{
- R16(tRNS.red);
+ tRNS.red = random_u16();
tRNS.green = (png_uint_16)(tRNS.red * 257);
tRNS.blue = (png_uint_16)(tRNS.green * 17);
}
@@ -3361,7 +3723,7 @@
else
{
- R16(tRNS.gray);
+ tRNS.gray = random_u16();
tRNS.gray &= mask;
}
@@ -3648,8 +4010,11 @@
# define do_own_interlace 1
#endif /* WRITE_INTERLACING tests */
-#define CAN_WRITE_INTERLACE\
- PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED
+#if PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED
+# define CAN_WRITE_INTERLACE 1
+#else
+# define CAN_WRITE_INTERLACE 0
+#endif
/* Do the same thing for read interlacing; this controls whether read tests do
* their own de-interlace or use libpng.
@@ -7313,7 +7678,7 @@
png_uint_32 ru;
double total;
- R32(ru);
+ ru = random_u32();
data.green_coefficient = total = (ru & 0xffff) / 65535.;
ru >>= 16;
data.red_coefficient = (1 - total) * (ru & 0xffff) / 65535.;
@@ -7947,11 +8312,11 @@
else
back.gray = (png_uint_16)data.red;
-# ifdef PNG_FLOATING_POINT_SUPPORTED
- png_set_background(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
-# else
- png_set_background_fixed(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
-# endif
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+ png_set_background(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
+#else
+ png_set_background_fixed(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
+#endif
this->next->set(this->next, that, pp, pi);
}
@@ -8241,7 +8606,7 @@
* filler. The 'filler' value has all 32 bits set, but only bit_depth
* will be used. At this point we don't know bit_depth.
*/
- R32(data.filler);
+ data.filler = random_u32();
data.flags = random_choice();
png_set_filler(pp, data.filler, data.flags);
@@ -8314,7 +8679,7 @@
* filler. The 'filler' value has all 32 bits set, but only bit_depth
* will be used. At this point we don't know bit_depth.
*/
- R32(data.filler);
+ data.filler = random_u32();
data.flags = random_choice();
png_set_add_alpha(pp, data.filler, data.flags);
@@ -11064,23 +11429,36 @@
*/
for (v=0;;)
{
+ /* The first two tests overflow if the pass row or column is outside
+ * the possible range for a 32-bit result. In fact the values should
+ * never be outside the range for a 31-bit result, but checking for 32
+ * bits here ensures that if an app uses a bogus pass row or column
+ * (just so long as it fits in a 32 bit integer) it won't get a
+ * possibly dangerous overflow.
+ */
/* First the base 0 stuff: */
- m = PNG_ROW_FROM_PASS_ROW(v, pass);
- f = png_row_from_pass_row(v, pass);
- if (m != f)
+ if (v < png_pass_rows(0xFFFFFFFFU, pass))
{
- fprintf(stderr, "PNG_ROW_FROM_PASS_ROW(%u, %d) = %u != %x\n",
- v, pass, m, f);
- exit(99);
+ m = PNG_ROW_FROM_PASS_ROW(v, pass);
+ f = png_row_from_pass_row(v, pass);
+ if (m != f)
+ {
+ fprintf(stderr, "PNG_ROW_FROM_PASS_ROW(%u, %d) = %u != %x\n",
+ v, pass, m, f);
+ exit(99);
+ }
}
- m = PNG_COL_FROM_PASS_COL(v, pass);
- f = png_col_from_pass_col(v, pass);
- if (m != f)
+ if (v < png_pass_cols(0xFFFFFFFFU, pass))
{
- fprintf(stderr, "PNG_COL_FROM_PASS_COL(%u, %d) = %u != %x\n",
- v, pass, m, f);
- exit(99);
+ m = PNG_COL_FROM_PASS_COL(v, pass);
+ f = png_col_from_pass_col(v, pass);
+ if (m != f)
+ {
+ fprintf(stderr, "PNG_COL_FROM_PASS_COL(%u, %d) = %u != %x\n",
+ v, pass, m, f);
+ exit(99);
+ }
}
m = PNG_ROW_IN_INTERLACE_PASS(v, pass);
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* timepng.c
*
- * Copyright (c) 2013 John Cunningham Bowler
+ * Copyright (c) 2013,2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.1 [March 28, 2013]
+ * Last changed in libpng 1.6.22 [May 26, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -10,9 +10,9 @@
*
* Load an arbitrary number of PNG files (from the command line, or, if there
* are no arguments on the command line, from stdin) then run a time test by
- * reading each file by row. The test does nothing with the read result and
- * does no transforms. The only output is a time as a floating point number of
- * seconds with 9 decimal digits.
+ * reading each file by row or by image (possibly with transforms in the latter
+ * case). The only output is a time as a floating point number of seconds with
+ * 9 decimal digits.
*/
#define _POSIX_C_SOURCE 199309L /* for clock_gettime */
@@ -19,6 +19,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <errno.h>
+#include <limits.h>
#include <time.h>
@@ -35,28 +37,65 @@
# include "../../png.h"
#endif
-static int read_png(FILE *fp)
+/* The following is to support direct compilation of this file as C++ */
+#ifdef __cplusplus
+# define voidcast(type, value) static_cast<type>(value)
+#else
+# define voidcast(type, value) (value)
+#endif /* __cplusplus */
+
+/* 'CLOCK_PROCESS_CPUTIME_ID' is one of the clock timers for clock_gettime. It
+ * need not be supported even when clock_gettime is available. It returns the
+ * 'CPU' time the process has consumed. 'CPU' time is assumed to include time
+ * when the CPU is actually blocked by a pending cache fill but not time
+ * waiting for page faults. The attempt is to get a measure of the actual time
+ * the implementation takes to read a PNG ignoring the potentially very large IO
+ * overhead.
+ */
+#if defined (CLOCK_PROCESS_CPUTIME_ID) && defined(PNG_STDIO_SUPPORTED) &&\
+ defined(PNG_EASY_ACCESS_SUPPORTED) &&\
+ (PNG_LIBPNG_VER >= 10700 ? defined(PNG_READ_PNG_SUPPORTED) :\
+ defined (PNG_SEQUENTIAL_READ_SUPPORTED) &&\
+ defined(PNG_INFO_IMAGE_SUPPORTED))
+
+typedef struct
{
- png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
- png_infop info_ptr = NULL;
- png_bytep row = NULL, display = NULL;
+ FILE *input;
+ FILE *output;
+} io_data;
- if (png_ptr == NULL)
- return 0;
+static PNG_CALLBACK(void, read_and_copy,
+ (png_structp png_ptr, png_bytep buffer, png_size_t cb))
+{
+ io_data *io = (io_data*)png_get_io_ptr(png_ptr);
- if (setjmp(png_jmpbuf(png_ptr)))
+ if (fread(buffer, cb, 1, io->input) != 1)
+ png_error(png_ptr, strerror(errno));
+
+ if (fwrite(buffer, cb, 1, io->output) != 1)
{
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- if (row != NULL) free(row);
- if (display != NULL) free(display);
- return 0;
+ perror("temporary file");
+ fprintf(stderr, "temporary file PNG write failed\n");
+ exit(1);
}
+}
- png_init_io(png_ptr, fp);
+static void read_by_row(png_structp png_ptr, png_infop info_ptr,
+ FILE *write_ptr, FILE *read_ptr)
+{
+ /* These don't get freed on error, this is fine; the program immediately
+ * exits.
+ */
+ png_bytep row = NULL, display = NULL;
+ io_data io_copy;
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
- png_error(png_ptr, "OOM allocating info structure");
+ if (write_ptr != NULL)
+ {
+ /* Set up for a copy to the temporary file: */
+ io_copy.input = read_ptr;
+ io_copy.output = write_ptr;
+ png_set_read_fn(png_ptr, &io_copy, read_and_copy);
+ }
png_read_info(png_ptr, info_ptr);
@@ -63,8 +102,8 @@
{
png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- row = malloc(rowbytes);
- display = malloc(rowbytes);
+ row = voidcast(png_bytep,malloc(rowbytes));
+ display = voidcast(png_bytep,malloc(rowbytes));
if (row == NULL || display == NULL)
png_error(png_ptr, "OOM allocating row buffers");
@@ -81,7 +120,8 @@
png_uint_32 y = height;
/* NOTE: this trashes the row each time; interlace handling won't
- * work, but this avoids memory thrashing for speed testing.
+ * work, but this avoids memory thrashing for speed testing and is
+ * somewhat representative of an application that works row-by-row.
*/
while (y-- > 0)
png_read_row(png_ptr, row, display);
@@ -91,9 +131,51 @@
/* Make sure to read to the end of the file: */
png_read_end(png_ptr, info_ptr);
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* Free this up: */
free(row);
free(display);
+}
+
+static PNG_CALLBACK(void, no_warnings, (png_structp png_ptr,
+ png_const_charp warning))
+{
+ (void)png_ptr;
+ (void)warning;
+}
+
+static int read_png(FILE *fp, png_int_32 transforms, FILE *write_file)
+{
+ png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,
+ no_warnings);
+ png_infop info_ptr = NULL;
+
+ if (png_ptr == NULL)
+ return 0;
+
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return 0;
+ }
+
+# ifdef PNG_BENIGN_ERRORS_SUPPORTED
+ png_set_benign_errors(png_ptr, 1/*allowed*/);
+# endif
+ png_init_io(png_ptr, fp);
+
+ info_ptr = png_create_info_struct(png_ptr);
+
+ if (info_ptr == NULL)
+ png_error(png_ptr, "OOM allocating info structure");
+
+ if (transforms < 0)
+ read_by_row(png_ptr, info_ptr, write_file, fp);
+
+ else
+ png_read_png(png_ptr, info_ptr, transforms, NULL/*params*/);
+
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return 1;
}
@@ -108,7 +190,7 @@
return 0;
}
-static int perform_one_test(FILE *fp, int nfiles)
+static int perform_one_test(FILE *fp, int nfiles, png_int_32 transforms)
{
int i;
struct timespec before, after;
@@ -120,7 +202,7 @@
{
for (i=0; i<nfiles; ++i)
{
- if (read_png(fp))
+ if (read_png(fp, transforms, NULL/*write*/))
{
if (ferror(fp))
{
@@ -184,120 +266,343 @@
if (ip != NULL)
{
- int ch;
- for (;;)
+ /* Read the file using libpng; this detects errors and also deals with
+ * files which contain data beyond the end of the file.
+ */
+ int ok = 0;
+ fpos_t pos;
+
+ if (fgetpos(fp, &pos))
{
- ch = getc(ip);
- if (ch == EOF) break;
- putc(ch, fp);
+ /* Fatal error reading the start: */
+ perror("temporary file");
+ fprintf(stderr, "temporary file fgetpos error\n");
+ exit(1);
}
- if (ferror(ip))
+ if (read_png(ip, -1/*by row*/, fp/*output*/))
{
- perror(name);
- fprintf(stderr, "%s: read error\n", name);
- return 0;
+ if (ferror(ip))
+ {
+ perror(name);
+ fprintf(stderr, "%s: read error\n", name);
+ }
+
+ else
+ ok = 1; /* read ok */
}
+ else
+ fprintf(stderr, "%s: file not added\n", name);
+
(void)fclose(ip);
+ /* An error in the output is fatal; exit immediately: */
if (ferror(fp))
{
perror("temporary file");
fprintf(stderr, "temporary file write error\n");
- return 0;
+ exit(1);
}
+
+ if (ok)
+ return 1;
+
+ /* Did not read the file successfully, simply rewind the temporary
+ * file. This must happen after the ferror check above to avoid clearing
+ * the error.
+ */
+ if (fsetpos(fp, &pos))
+ {
+ perror("temporary file");
+ fprintf(stderr, "temporary file fsetpos error\n");
+ exit(1);
+ }
}
else
{
+ /* file open error: */
perror(name);
fprintf(stderr, "%s: open failed\n", name);
- return 0;
}
- return 1;
+ return 0; /* file not added */
}
+static void
+usage(FILE *fp)
+{
+ if (fp != NULL) fclose(fp);
+
+ fprintf(stderr,
+"Usage:\n"
+" timepng --assemble <assembly> {files}\n"
+" Read the files into <assembly>, output the count. Options are ignored.\n"
+" timepng --dissemble <assembly> <count> [options]\n"
+" Time <count> files from <assembly>, additional files may not be given.\n"
+" Otherwise:\n"
+" Read the files into a temporary file and time the decode\n"
+"Transforms:\n"
+" --by-image: read by image with png_read_png\n"
+" --<transform>: implies by-image, use PNG_TRANSFORM_<transform>\n"
+" Otherwise: read by row using png_read_row (to a single row buffer)\n"
+ /* ISO C90 string length max 509 */);fprintf(stderr,
+"{files}:\n"
+" PNG files to copy into the assembly and time. Invalid files are skipped\n"
+" with appropriate error messages. If no files are given the list of files\n"
+" is read from stdin with each file name terminated by a newline\n"
+"Output:\n"
+" For --assemble the output is the name of the assembly file followed by the\n"
+" count of the files it contains; the arguments for --dissemble. Otherwise\n"
+" the output is the total decode time in seconds.\n");
+
+ exit(99);
+}
+
int main(int argc, char **argv)
{
int ok = 0;
- FILE *fp = tmpfile();
+ int err = 0;
+ int nfiles = 0;
+ int transforms = -1; /* by row */
+ const char *assembly = NULL;
+ FILE *fp;
- if (fp != NULL)
+ if (argc > 2 && strcmp(argv[1], "--assemble") == 0)
{
- int err = 0;
- int nfiles = 0;
+ /* Just build the test file, argv[2] is the file name. */
+ assembly = argv[2];
+ fp = fopen(assembly, "wb");
+ if (fp == NULL)
+ {
+ perror(assembly);
+ fprintf(stderr, "timepng --assemble %s: could not open for write\n",
+ assembly);
+ usage(NULL);
+ }
- if (argc > 1)
+ argv += 2;
+ argc -= 2;
+ }
+
+ else if (argc > 3 && strcmp(argv[1], "--dissemble") == 0)
+ {
+ fp = fopen(argv[2], "rb");
+
+ if (fp == NULL)
{
- int i;
+ perror(argv[2]);
+ fprintf(stderr, "timepng --dissemble %s: could not open for read\n",
+ argv[2]);
+ usage(NULL);
+ }
- for (i=1; i<argc; ++i)
- {
- if (add_one_file(fp, argv[i]))
- ++nfiles;
+ nfiles = atoi(argv[3]);
+ if (nfiles <= 0)
+ {
+ fprintf(stderr,
+ "timepng --dissemble <file> <count>: %s is not a count\n",
+ argv[3]);
+ exit(99);
+ }
+#ifdef __COVERITY__
+ else
+ {
+ nfiles &= PNG_UINT_31_MAX;
+ }
+#endif
- else
- {
- err = 1;
- break;
- }
- }
+ argv += 3;
+ argc -= 3;
+ }
+
+ else /* Else use a temporary file */
+ {
+#ifndef __COVERITY__
+ fp = tmpfile();
+#else
+ /* Experimental. Coverity says tmpfile() is insecure because it
+ * generates predictable names.
+ *
+ * It is possible to satisfy Coverity by using mkstemp(); however,
+ * any platform supporting mkstemp() undoubtedly has a secure tmpfile()
+ * implementation as well, and doesn't need the fix. Note that
+ * the fix won't work on platforms that don't support mkstemp().
+ *
+ * https://www.securecoding.cert.org/confluence/display/c/
+ * FIO21-C.+Do+not+create+temporary+files+in+shared+directories
+ * says that most historic implementations of tmpfile() provide
+ * only a limited number of possible temporary file names
+ * (usually 26) before file names are recycled. That article also
+ * provides a secure solution that unfortunately depends upon mkstemp().
+ */
+ char tmpfile[] = "timepng-XXXXXX";
+ int filedes;
+ umask(0177);
+ filedes = mkstemp(tmpfile);
+ if (filedes < 0)
+ fp = NULL;
+ else
+ {
+ fp = fdopen(filedes,"w+");
+ /* Hide the filename immediately and ensure that the file does
+ * not exist after the program ends
+ */
+ (void) unlink(tmpfile);
}
+#endif
+ if (fp == NULL)
+ {
+ perror("tmpfile");
+ fprintf(stderr, "timepng: could not open the temporary file\n");
+ exit(1); /* not a user error */
+ }
+ }
+
+ /* Handle the transforms: */
+ while (argc > 1 && argv[1][0] == '-' && argv[1][1] == '-')
+ {
+ const char *opt = *++argv + 2;
+
+ --argc;
+
+ /* Transforms turn on the by-image processing and maybe set some
+ * transforms:
+ */
+ if (transforms == -1)
+ transforms = PNG_TRANSFORM_IDENTITY;
+
+ if (strcmp(opt, "by-image") == 0)
+ {
+ /* handled above */
+ }
+
+# define OPT(name) else if (strcmp(opt, #name) == 0)\
+ transforms |= PNG_TRANSFORM_ ## name
+
+ OPT(STRIP_16);
+ OPT(STRIP_ALPHA);
+ OPT(PACKING);
+ OPT(PACKSWAP);
+ OPT(EXPAND);
+ OPT(INVERT_MONO);
+ OPT(SHIFT);
+ OPT(BGR);
+ OPT(SWAP_ALPHA);
+ OPT(SWAP_ENDIAN);
+ OPT(INVERT_ALPHA);
+ OPT(STRIP_FILLER);
+ OPT(STRIP_FILLER_BEFORE);
+ OPT(STRIP_FILLER_AFTER);
+ OPT(GRAY_TO_RGB);
+ OPT(EXPAND_16);
+ OPT(SCALE_16);
+
else
{
- char filename[FILENAME_MAX+1];
+ fprintf(stderr, "timepng %s: unrecognized transform\n", opt);
+ usage(fp);
+ }
+ }
- while (fgets(filename, FILENAME_MAX+1, stdin))
+ /* Handle the files: */
+ if (argc > 1 && nfiles > 0)
+ usage(fp); /* Additional files not valid with --dissemble */
+
+ else if (argc > 1)
+ {
+ int i;
+
+ for (i=1; i<argc; ++i)
+ {
+ if (nfiles == INT_MAX)
{
- size_t len = strlen(filename);
+ fprintf(stderr, "%s: skipped, too many files\n", argv[i]);
+ break;
+ }
- if (filename[len-1] == '\n')
- {
- filename[len-1] = 0;
- if (add_one_file(fp, filename))
- ++nfiles;
+ else if (add_one_file(fp, argv[i]))
+ ++nfiles;
+ }
+ }
- else
- {
- err = 1;
- break;
- }
- }
+ else if (nfiles == 0) /* Read from stdin withoout --dissemble */
+ {
+ char filename[FILENAME_MAX+1];
- else
+ while (fgets(filename, FILENAME_MAX+1, stdin))
+ {
+ size_t len = strlen(filename);
+
+ if (filename[len-1] == '\n')
+ {
+ filename[len-1] = 0;
+ if (nfiles == INT_MAX)
{
- fprintf(stderr, "timepng: truncated file name ...%s\n",
- filename+len-32);
- err = 1;
+ fprintf(stderr, "%s: skipped, too many files\n", filename);
break;
}
+
+ else if (add_one_file(fp, filename))
+ ++nfiles;
}
- if (ferror(stdin))
+ else
{
- fprintf(stderr, "timepng: stdin: read error\n");
+ fprintf(stderr, "timepng: file name too long: ...%s\n",
+ filename+len-32);
err = 1;
+ break;
}
}
- if (!err)
+ if (ferror(stdin))
{
- if (nfiles > 0)
- ok = perform_one_test(fp, nfiles);
+ fprintf(stderr, "timepng: stdin: read error\n");
+ err = 1;
+ }
+ }
+ /* Perform the test, or produce the --assemble output: */
+ if (!err)
+ {
+ if (nfiles > 0)
+ {
+ if (assembly != NULL)
+ {
+ if (fflush(fp) && !ferror(fp) && fclose(fp))
+ {
+ perror(assembly);
+ fprintf(stderr, "%s: close failed\n", assembly);
+ }
+
+ else
+ {
+ printf("%s %d\n", assembly, nfiles);
+ fflush(stdout);
+ ok = !ferror(stdout);
+ }
+ }
+
else
- fprintf(stderr, "usage: timepng {files} or ls files | timepng\n");
+ {
+ ok = perform_one_test(fp, nfiles, transforms);
+ (void)fclose(fp);
+ }
}
- (void)fclose(fp);
+ else
+ usage(fp);
}
else
- fprintf(stderr, "timepng: could not open temporary file\n");
+ (void)fclose(fp);
/* Exit code 0 on success. */
return ok == 0;
}
+#else /* !sufficient support */
+int main(void) { return 77; }
+#endif /* !sufficient support */
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/README (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,83 @@
+OPERATING SYSTEM SPECIFIC MIPS MSA DETECTION
+--------------------------------------------
+
+Detection of the ability to execute MIPS MSA on an MIPS processor requires
+operating system support. (The information is not available in user mode.)
+
+HOW TO USE THIS
+---------------
+
+This directory contains C code fragments that can be included in mips/mips_init.c
+by setting the macro PNG_MIPS_MSA_FILE to the file name in "" or <> at build
+time. This setting is not recorded in pnglibconf.h and can be changed simply by
+rebuilding mips/msa_init.o with the required macro definition.
+
+For any of this code to be used the MIPS MSA code must be enabled and run time
+checks must be supported. I.e.:
+
+#if PNG_MIPS_MSA_OPT > 0
+#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED
+
+This is done in a 'configure' build by passing configure the argument:
+
+ --enable-mips-msa=check
+
+Apart from the basic Linux implementation in contrib/mips-msa/linux.c this code
+is unsupported. That means that it is not even compiled on a regular basis and
+may be broken in any given minor release.
+
+FILE FORMAT
+-----------
+
+Each file documents its testing status as of the last time it was tested (which
+may have been a long time ago):
+
+STATUS: one of:
+ SUPPORTED: This indicates that the file is included in the regularly
+ performed test builds and bugs are fixed when discovered.
+ COMPILED: This indicates that the code did compile at least once. See the
+ more detailed description for the extent to which the result was
+ successful.
+ TESTED: This means the code was fully compiled into the libpng test programs
+ and these were run at least once.
+
+BUG REPORTS: an email address to which to send reports of problems
+
+The file is a fragment of C code. It should not define any 'extern' symbols;
+everything should be static. It must define the function:
+
+static int png_have_msa(png_structp png_ptr);
+
+That function must return 1 if MIPS MSA instructions are supported, 0 if not.
+It must not execute png_error unless it detects a bug. A png_error will prevent
+the reading of the PNG and in the future, writing too.
+
+BUG REPORTS
+-----------
+
+If you mail a bug report for any file that is not SUPPORTED there may only be
+limited response. Consider fixing it and sending a patch to fix the problem -
+this is more likely to result in action.
+
+CONTRIBUTIONS
+-------------
+
+You may send contributions of new implementations to
+png-mng-implement at sourceforge.net. Please write code in strict C90 C where
+possible. Obviously OS dependencies are to be expected. If you submit code you
+must have the authors permission and it must have a license that is acceptable
+to the current maintainer; in particular that license must permit modification
+and redistribution.
+
+Please try to make the contribution a single file and give the file a clear and
+unambiguous name that identifies the target OS. If multiple files really are
+required put them all in a sub-directory.
+
+You must also be prepared to handle bug reports from users of the code, either
+by joining the png-mng-implement mailing list or by providing an email for the
+"BUG REPORTS" entry or both. Please make sure that the header of the file
+contains the STATUS and BUG REPORTS fields as above.
+
+Please list the OS requirements as precisely as possible. Ideally you should
+also list the environment in which the code has been tested and certainly list
+any environments where you suspect it might not work.
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,64 @@
+/* contrib/mips-msa/linux.c
+ *
+ * Copyright (c) 2016 Glenn Randers-Pehrson
+ * Written by Mandar Sahastrabuddhe, 2016.
+ * Last changed in libpng 1.6.25beta03 [August 29, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * SEE contrib/mips-msa/README before reporting bugs
+ *
+ * STATUS: SUPPORTED
+ * BUG REPORTS: png-mng-implement at sourceforge.net
+ *
+ * png_have_msa implemented for Linux by reading the widely available
+ * pseudo-file /proc/cpuinfo.
+ *
+ * This code is strict ANSI-C and is probably moderately portable; it does
+ * however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int
+png_have_msa(png_structp png_ptr)
+{
+ FILE *f = fopen("/proc/cpuinfo", "rb");
+
+ char *string = "msa";
+ char word[10];
+
+ if (f != NULL)
+ {
+ while(!feof(f))
+ {
+ int ch = fgetc(f);
+ static int i = 0;
+
+ while(!(ch <= 32))
+ {
+ word[i++] = ch;
+ ch = fgetc(f);
+ }
+
+ int val = strcmp(string, word);
+
+ if (val == 0)
+ return 1;
+
+ i = 0;
+ memset(word, 0, 10);
+ }
+
+ fclose(f);
+ }
+#ifdef PNG_WARNINGS_SUPPORTED
+ else
+ png_warning(png_ptr, "/proc/cpuinfo open failed");
+#endif
+ return 0;
+}
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -146,7 +146,7 @@
The end
-------
Willem van Schaik
-mailto:willem at schaik.com
+mailto:willem at schaik.com
http://www.schaik.com/png/
-------
Oct 1999
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/png2pnm.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/*
* png2pnm.c --- conversion from PNG-file to PGM/PPM-file
- * copyright (C) 1999 by Willem van Schaik <willem at schaik.com>
+ * copyright (C) 1999 by Willem van Schaik <willem at schaik.com>
*
* version 1.0 - 1999.10.15 - First version.
*
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngminus/pnm2png.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/*
* pnm2png.c --- conversion from PBM/PGM/PPM-file to PNG-file
- * copyright (C) 1999 by Willem van Schaik <willem at schaik.com>
+ * copyright (C) 1999 by Willem van Schaik <willem at schaik.com>
*
* version 1.0 - 1999.10.15 - First version.
* version 1.1 - 2015.07.29 - Fixed leaks (Glenn Randers-Pehrson)
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/pngsuite/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -101,5 +101,5 @@
libpng passes test
Willem van Schaik
-<willem at schaik.com>
+<willem at schaik.com>
October 1999
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/README.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/README.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -23,4 +23,5 @@
of the people below claim any rights with regard to the contents of this
directory.
- John Bowler <jbowler at acm.org>
+ John Bowler <jbowler at acm.org>
+ Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,12 @@
#!/bin/sh
+
+# chkfmt
#
+# COPYRIGHT: Written by John Cunningham Bowler, 2010.
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. This work is published from:
+# United States.
+#
# Check the format of the source files in the current directory - checks for a
# line length of 80 characters max and no tab characters.
#
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,2453 @@
+/* pngcp.c
+ *
+ * Copyright (c) 2016 John Cunningham Bowler
+ *
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * This is an example of copying a PNG without changes using the png_read_png
+ * and png_write_png interfaces. A considerable number of options are provided
+ * to manipulate the compression of the PNG data and other compressed chunks.
+ *
+ * For a more extensive example that uses the transforms see
+ * contrib/libtests/pngimage.c in the libpng distribution.
+ */
+#include "pnglibconf.h" /* To find how libpng was configured. */
+
+#ifdef PNG_PNGCP_TIMING_SUPPORTED
+ /* WARNING:
+ *
+ * This test is here to allow POSIX.1b extensions to be used if enabled in
+ * the compile; specifically the code requires_POSIX_C_SOURCE support of
+ * 199309L or later to enable clock_gettime use.
+ *
+ * IF this causes problems THEN compile with a strict ANSI C compiler and let
+ * this code turn on the POSIX features that it minimally requires.
+ *
+ * IF this does not work there is probably a bug in your ANSI C compiler or
+ * your POSIX implementation.
+ */
+# define _POSIX_C_SOURCE 199309L
+#else /* No timing support required */
+# define _POSIX_SOURCE 1
+#endif
+
+#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
+# include <config.h>
+#endif
+
+#include <stdio.h>
+
+/* Define the following to use this test against your installed libpng, rather
+ * than the one being built here:
+ */
+#ifdef PNG_FREESTANDING_TESTS
+# include <png.h>
+#else
+# include "../../png.h"
+#endif
+
+#if PNG_LIBPNG_VER < 10700
+ /* READ_PNG and WRITE_PNG were not defined, so: */
+# ifdef PNG_INFO_IMAGE_SUPPORTED
+# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+# define PNG_READ_PNG_SUPPORTED
+# endif /* SEQUENTIAL_READ */
+# ifdef PNG_WRITE_SUPPORTED
+# define PNG_WRITE_PNG_SUPPORTED
+# endif /* WRITE */
+# endif /* INFO_IMAGE */
+#endif /* pre 1.7.0 */
+
+#if (defined(PNG_READ_PNG_SUPPORTED)) && (defined(PNG_WRITE_PNG_SUPPORTED))
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <assert.h>
+
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include <zlib.h>
+
+#ifndef PNG_SETJMP_SUPPORTED
+# include <setjmp.h> /* because png.h did *not* include this */
+#endif
+
+#ifdef __cplusplus
+# define voidcast(type, value) static_cast<type>(value)
+#else
+# define voidcast(type, value) (value)
+#endif /* __cplusplus */
+
+#ifdef __GNUC__
+ /* Many versions of GCC erroneously report that local variables unmodified
+ * within the scope of a setjmp may be clobbered. This hacks round the
+ * problem (sometimes) without harming other compilers.
+ */
+# define gv volatile
+#else
+# define gv
+#endif
+
+/* 'CLOCK_PROCESS_CPUTIME_ID' is one of the clock timers for clock_gettime. It
+ * need not be supported even when clock_gettime is available. It returns the
+ * 'CPU' time the process has consumed. 'CPU' time is assumed to include time
+ * when the CPU is actually blocked by a pending cache fill but not time
+ * waiting for page faults. The attempt is to get a measure of the actual time
+ * the implementation takes to read a PNG ignoring the potentially very large IO
+ * overhead.
+ */
+#ifdef PNG_PNGCP_TIMING_SUPPORTED
+# include <time.h> /* clock_gettime and associated definitions */
+# ifndef CLOCK_PROCESS_CPUTIME_ID
+ /* Prevent inclusion of the spurious code: */
+# undef PNG_PNGCP_TIMING_SUPPORTED
+# endif
+#endif /* PNGCP_TIMING */
+
+/* So if the timing feature has been activated: */
+
+/* This structure is used to control the test of a single file. */
+typedef enum
+{
+ VERBOSE, /* switches on all messages */
+ INFORMATION,
+ WARNINGS, /* switches on warnings */
+ LIBPNG_WARNING,
+ APP_WARNING,
+ ERRORS, /* just errors */
+ APP_FAIL, /* continuable error - no need to longjmp */
+ LIBPNG_ERROR, /* this and higher cause a longjmp */
+ LIBPNG_BUG, /* erroneous behavior in libpng */
+ APP_ERROR, /* such as out-of-memory in a callback */
+ QUIET, /* no normal messages */
+ USER_ERROR, /* such as file-not-found */
+ INTERNAL_ERROR
+} error_level;
+#define LEVEL_MASK 0xf /* where the level is in 'options' */
+
+#define STRICT 0x010 /* Fail on warnings as well as errors */
+#define LOG 0x020 /* Log pass/fail to stdout */
+#define CONTINUE 0x040 /* Continue on APP_FAIL errors */
+#define SIZES 0x080 /* Report input and output sizes */
+#define SEARCH 0x100 /* Search IDAT compression options */
+#define NOWRITE 0x200 /* Do not write an output file */
+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+# define IGNORE_INDEX 0x400 /* Ignore out of range palette indices (BAD!) */
+# ifdef PNG_GET_PALETTE_MAX_SUPPORTED
+# define FIX_INDEX 0x800 /* 'Fix' out of range palette indices (OK) */
+# endif /* GET_PALETTE_MAX */
+#endif /* CHECK_FOR_INVALID_INDEX */
+#define OPTION 0x80000000 /* Used for handling options */
+#define LIST 0x80000001 /* Used for handling options */
+
+/* Result masks apply to the result bits in the 'results' field below; these
+ * bits are simple 1U<<error_level. A pass requires either nothing worse than
+ * warnings (--relaxes) or nothing worse than information (--strict)
+ */
+#define RESULT_STRICT(r) (((r) & ~((1U<<WARNINGS)-1)) == 0)
+#define RESULT_RELAXED(r) (((r) & ~((1U<<ERRORS)-1)) == 0)
+
+/* OPTION DEFINITIONS */
+static const char range_lo[] = "low";
+static const char range_hi[] = "high";
+static const char all[] = "all";
+#define RANGE(lo,hi) { range_lo, lo }, { range_hi, hi }
+typedef struct value_list
+{
+ const char *name; /* the command line name of the value */
+ int value; /* the actual value to use */
+} value_list;
+
+static const value_list
+#ifdef PNG_SW_COMPRESS_png_level
+vl_compression[] =
+{
+ /* Overall compression control. The order controls the search order for
+ * 'all'. Since the search is for the smallest the order used is low memory
+ * then high speed.
+ */
+ { "low-memory", PNG_COMPRESSION_LOW_MEMORY },
+ { "high-speed", PNG_COMPRESSION_HIGH_SPEED },
+ { "high-read-speed", PNG_COMPRESSION_HIGH_READ_SPEED },
+ { "low", PNG_COMPRESSION_LOW },
+ { "medium", PNG_COMPRESSION_MEDIUM },
+ { "old", PNG_COMPRESSION_COMPAT },
+ { "high", PNG_COMPRESSION_HIGH },
+ { all, 0 }
+},
+#endif /* SW_COMPRESS_png_level */
+
+#if defined(PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED) ||\
+ defined(PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED)
+vl_strategy[] =
+{
+ /* This controls the order of search. */
+ { "huffman", Z_HUFFMAN_ONLY },
+ { "RLE", Z_RLE },
+ { "fixed", Z_FIXED }, /* the remainder do window searchs */
+ { "filtered", Z_FILTERED },
+ { "default", Z_DEFAULT_STRATEGY },
+ { all, 0 }
+},
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+vl_windowBits_text[] =
+{
+ { "default", MAX_WBITS/*from zlib*/ },
+ { "minimum", 8 },
+ RANGE(8, MAX_WBITS/*from zlib*/),
+ { all, 0 }
+},
+#endif /* text compression */
+vl_level[] =
+{
+ { "default", Z_DEFAULT_COMPRESSION /* this is -1 */ },
+ { "none", Z_NO_COMPRESSION },
+ { "speed", Z_BEST_SPEED },
+ { "best", Z_BEST_COMPRESSION },
+ { "0", Z_NO_COMPRESSION },
+ RANGE(1, 9), /* this deliberately excludes '0' */
+ { all, 0 }
+},
+vl_memLevel[] =
+{
+ { "max", MAX_MEM_LEVEL }, /* zlib maximum */
+ { "1", 1 }, /* zlib minimum */
+ { "default", 8 }, /* zlib default */
+ { "2", 2 },
+ { "3", 3 },
+ { "4", 4 },
+ { "5", 5 }, /* for explicit testing */
+ RANGE(6, MAX_MEM_LEVEL/*zlib*/), /* exclude 5 and below: zlib bugs */
+ { all, 0 }
+},
+#endif /* WRITE_CUSTOMIZE_*COMPRESSION */
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+vl_filter[] =
+{
+ { all, PNG_ALL_FILTERS },
+ { "off", PNG_NO_FILTERS },
+ { "none", PNG_FILTER_NONE },
+ { "sub", PNG_FILTER_SUB },
+ { "up", PNG_FILTER_UP },
+ { "avg", PNG_FILTER_AVG },
+ { "paeth", PNG_FILTER_PAETH }
+},
+#endif /* WRITE_FILTER */
+#ifdef PNG_PNGCP_TIMING_SUPPORTED
+# define PNGCP_TIME_READ 1
+# define PNGCP_TIME_WRITE 2
+vl_time[] =
+{
+ { "both", PNGCP_TIME_READ+PNGCP_TIME_WRITE },
+ { "off", 0 },
+ { "read", PNGCP_TIME_READ },
+ { "write", PNGCP_TIME_WRITE }
+},
+#endif /* PNGCP_TIMING */
+vl_IDAT_size[] = /* for png_set_IDAT_size */
+{
+ { "default", 0x7FFFFFFF },
+ { "minimal", 1 },
+ RANGE(1, 0x7FFFFFFF)
+},
+#ifndef PNG_SW_IDAT_size
+ /* Pre 1.7 API: */
+# define png_set_IDAT_size(p,v) png_set_compression_buffer_size(p, v)
+#endif /* !SW_IDAT_size */
+#define SL 8 /* stack limit in display, below */
+vl_log_depth[] = { { "on", 1 }, { "off", 0 }, RANGE(0, SL) },
+vl_on_off[] = { { "on", 1 }, { "off", 0 } };
+
+#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
+static value_list
+vl_windowBits_IDAT[] =
+{
+ { "default", MAX_WBITS },
+ { "small", 9 },
+ RANGE(8, MAX_WBITS), /* modified by set_windowBits_hi */
+ { all, 0 }
+};
+#endif /* IDAT compression */
+
+typedef struct option
+{
+ const char *name; /* name of the option */
+ png_uint_32 opt; /* an option, or OPTION or LIST */
+ png_byte search; /* Search on --search */
+ png_byte value_count; /* length of the list of values: */
+ const value_list *values; /* values for OPTION or LIST */
+} option;
+
+static const option options[] =
+{
+ /* struct display options, these are set when the command line is read */
+# define S(n,v) { #n, v, 0, 2, vl_on_off },
+ S(verbose, VERBOSE)
+ S(warnings, WARNINGS)
+ S(errors, ERRORS)
+ S(quiet, QUIET)
+ S(strict, STRICT)
+ S(log, LOG)
+ S(continue, CONTINUE)
+ S(sizes, SIZES)
+ S(search, SEARCH)
+ S(nowrite, NOWRITE)
+# ifdef IGNORE_INDEX
+ S(ignore-palette-index, IGNORE_INDEX)
+# endif /* IGNORE_INDEX */
+# ifdef FIX_INDEX
+ S(fix-palette-index, FIX_INDEX)
+# endif /* FIX_INDEX */
+# undef S
+
+ /* OPTION settings, these and LIST settings are read on demand */
+# define VLNAME(name) vl_ ## name
+# define VLSIZE(name) voidcast(png_byte,\
+ (sizeof VLNAME(name))/(sizeof VLNAME(name)[0]))
+# define VL(oname, name, type, search)\
+ { oname, type, search, VLSIZE(name), VLNAME(name) },
+# define VLO(oname, name, search) VL(oname, name, OPTION, search)
+
+# ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
+# define VLCIDAT(name) VLO(#name, name, 1/*search*/)
+# ifdef PNG_SW_COMPRESS_level
+# define VLCiCCP(name) VLO("ICC-profile-" #name, name, 0/*search*/)
+# else
+# define VLCiCCP(name)
+# endif
+# else
+# define VLCIDAT(name)
+# define VLCiCCP(name)
+# endif /* WRITE_CUSTOMIZE_COMPRESSION */
+
+# ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+# define VLCzTXt(name) VLO("text-" #name, name, 0/*search*/)
+# else
+# define VLCzTXt(name)
+# endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
+
+# define VLC(name) VLCIDAT(name) VLCiCCP(name) VLCzTXt(name)
+
+# ifdef PNG_SW_COMPRESS_png_level
+ /* The libpng compression level isn't searched beause it justs sets the
+ * other things that are searched!
+ */
+ VLO("compression", compression, 0)
+ VLO("text-compression", compression, 0)
+ VLO("ICC-profile-compression", compression, 0)
+# endif /* SW_COMPRESS_png_level */
+ VLC(strategy)
+ VLO("windowBits", windowBits_IDAT, 1)
+# ifdef PNG_SW_COMPRESS_windowBits
+ VLO("ICC-profile-windowBits", windowBits_text/*sic*/, 0)
+# endif
+ VLO("text-windowBits", windowBits_text, 0)
+ VLC(level)
+ VLC(memLevel)
+ VLO("IDAT-size", IDAT_size, 0)
+ VLO("log-depth", log_depth, 0)
+
+# undef VLO
+
+ /* LIST settings */
+# define VLL(name, search) VL(#name, name, LIST, search)
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+ VLL(filter, 0)
+#endif /* WRITE_FILTER */
+#ifdef PNG_PNGCP_TIMING_SUPPORTED
+ VLL(time, 0)
+#endif /* PNGCP_TIMING */
+# undef VLL
+# undef VL
+};
+
+#ifdef __cplusplus
+ static const size_t option_count((sizeof options)/(sizeof options[0]));
+#else /* !__cplusplus */
+# define option_count ((sizeof options)/(sizeof options[0]))
+#endif /* !__cplusplus */
+
+static const char *
+cts(int ct)
+{
+ switch (ct)
+ {
+ case PNG_COLOR_TYPE_PALETTE: return "P";
+ case PNG_COLOR_TYPE_GRAY: return "G";
+ case PNG_COLOR_TYPE_GRAY_ALPHA: return "GA";
+ case PNG_COLOR_TYPE_RGB: return "RGB";
+ case PNG_COLOR_TYPE_RGB_ALPHA: return "RGBA";
+ default: return "INVALID";
+ }
+}
+
+struct display
+{
+ jmp_buf error_return; /* Where to go to on error */
+ unsigned int errset; /* error_return is set */
+
+ const char *operation; /* What is happening */
+ const char *filename; /* The name of the original file */
+ const char *output_file; /* The name of the output file */
+
+ /* Used on both read and write: */
+ FILE *fp;
+
+ /* Used on a read, both the original read and when validating a written
+ * image.
+ */
+ png_alloc_size_t read_size;
+ png_structp read_pp;
+ png_infop ip;
+# if PNG_LIBPNG_VER < 10700 && defined PNG_TEXT_SUPPORTED
+ png_textp text_ptr; /* stash of text chunks */
+ int num_text;
+ int text_stashed;
+# endif /* pre 1.7 */
+
+# ifdef PNG_PNGCP_TIMING_SUPPORTED
+ struct timespec read_time;
+ struct timespec read_time_total;
+ struct timespec write_time;
+ struct timespec write_time_total;
+# endif /* PNGCP_TIMING */
+
+ /* Used to write a new image (the original info_ptr is used) */
+# define MAX_SIZE ((png_alloc_size_t)(-1))
+ png_alloc_size_t write_size;
+ png_alloc_size_t best_size;
+ png_structp write_pp;
+
+ /* Base file information */
+ png_alloc_size_t size;
+ png_uint_32 w;
+ png_uint_32 h;
+ int bpp;
+ png_byte ct;
+ int no_warnings; /* Do not output libpng warnings */
+ int min_windowBits; /* The windowBits range is 8..8 */
+
+ /* Options handling */
+ png_uint_32 results; /* A mask of errors seen */
+ png_uint_32 options; /* See display_log below */
+ png_byte entry[option_count]; /* The selected entry+1 of an option
+ * that appears on the command line, or
+ * 0 if it was not given. */
+ int value[option_count]; /* Corresponding value */
+
+ /* Compression exhaustive testing */
+ /* Temporary variables used only while testing a single collection of
+ * settings:
+ */
+ unsigned int csp; /* next stack entry to use */
+ unsigned int nsp; /* highest active entry+1 found so far */
+
+ /* Values used while iterating through all the combinations of settings for a
+ * single file:
+ */
+ unsigned int tsp; /* nsp from the last run; this is the
+ * index+1 of the highest active entry on
+ * this run; this entry will be advanced.
+ */
+ int opt_string_start; /* Position in buffer for the first
+ * searched option; non-zero if earlier
+ * options were set on the command line.
+ */
+ struct stack
+ {
+ png_alloc_size_t best_size; /* Best so far for this option */
+ png_alloc_size_t lo_size;
+ png_alloc_size_t hi_size;
+ int lo, hi; /* For binary chop of a range */
+ int best_val; /* Best value found so far */
+ int opt_string_end; /* End of the option string in 'curr' */
+ png_byte opt; /* The option being tested */
+ png_byte entry; /* The next value entry to be tested */
+ png_byte end; /* This is the last entry */
+ } stack[SL]; /* Stack of entries being tested */
+ char curr[32*SL]; /* current options being tested */
+ char best[32*SL]; /* best options */
+
+ char namebuf[FILENAME_MAX]; /* output file name */
+};
+
+static void
+display_init(struct display *dp)
+ /* Call this only once right at the start to initialize the control
+ * structure, the (struct buffer) lists are maintained across calls - the
+ * memory is not freed.
+ */
+{
+ memset(dp, 0, sizeof *dp);
+ dp->operation = "internal error";
+ dp->filename = "command line";
+ dp->output_file = "no output file";
+ dp->options = WARNINGS; /* default to !verbose, !quiet */
+ dp->fp = NULL;
+ dp->read_pp = NULL;
+ dp->ip = NULL;
+ dp->write_pp = NULL;
+ dp->min_windowBits = -1; /* this is an OPTIND, so -1 won't match anything */
+# if PNG_LIBPNG_VER < 10700 && defined PNG_TEXT_SUPPORTED
+ dp->text_ptr = NULL;
+ dp->num_text = 0;
+ dp->text_stashed = 0;
+# endif /* pre 1.7 */
+}
+
+static void
+display_clean_read(struct display *dp)
+{
+ if (dp->read_pp != NULL)
+ png_destroy_read_struct(&dp->read_pp, NULL, NULL);
+
+ if (dp->fp != NULL)
+ {
+ FILE *fp = dp->fp;
+ dp->fp = NULL;
+ (void)fclose(fp);
+ }
+}
+
+static void
+display_clean_write(struct display *dp)
+{
+ if (dp->fp != NULL)
+ {
+ FILE *fp = dp->fp;
+ dp->fp = NULL;
+ (void)fclose(fp);
+ }
+
+ if (dp->write_pp != NULL)
+ png_destroy_write_struct(&dp->write_pp, dp->tsp > 0 ? NULL : &dp->ip);
+}
+
+static void
+display_clean(struct display *dp)
+{
+ display_clean_read(dp);
+ display_clean_write(dp);
+ dp->output_file = NULL;
+
+# if PNG_LIBPNG_VER < 10700 && defined PNG_TEXT_SUPPORTED
+ /* This is actually created and used by the write code, but only
+ * once; it has to be retained for subsequent writes of the same file.
+ */
+ if (dp->text_stashed)
+ {
+ dp->text_stashed = 0;
+ dp->num_text = 0;
+ free(dp->text_ptr);
+ dp->text_ptr = NULL;
+ }
+# endif /* pre 1.7 */
+
+ /* leave the filename for error detection */
+ dp->results = 0; /* reset for next time */
+}
+
+static void
+display_destroy(struct display *dp)
+{
+ /* Release any memory held in the display. */
+ display_clean(dp);
+}
+
+static struct display *
+get_dp(png_structp pp)
+ /* The display pointer is always stored in the png_struct error pointer */
+{
+ struct display *dp = (struct display*)png_get_error_ptr(pp);
+
+ if (dp == NULL)
+ {
+ fprintf(stderr, "pngcp: internal error (no display)\n");
+ exit(99); /* prevents a crash */
+ }
+
+ return dp;
+}
+
+/* error handling */
+#ifdef __GNUC__
+# define VGATTR __attribute__((__format__ (__printf__,3,4)))
+ /* Required to quiet GNUC warnings when the compiler sees a stdarg function
+ * that calls one of the stdio v APIs.
+ */
+#else
+# define VGATTR
+#endif
+static void VGATTR
+display_log(struct display *dp, error_level level, const char *fmt, ...)
+ /* 'level' is as above, fmt is a stdio style format string. This routine
+ * does not return if level is above LIBPNG_WARNING
+ */
+{
+ dp->results |= 1U << level;
+
+ if (level > (error_level)(dp->options & LEVEL_MASK))
+ {
+ const char *lp;
+ va_list ap;
+
+ switch (level)
+ {
+ case INFORMATION: lp = "information"; break;
+ case LIBPNG_WARNING: lp = "warning(libpng)"; break;
+ case APP_WARNING: lp = "warning(pngcp)"; break;
+ case APP_FAIL: lp = "error(continuable)"; break;
+ case LIBPNG_ERROR: lp = "error(libpng)"; break;
+ case LIBPNG_BUG: lp = "bug(libpng)"; break;
+ case APP_ERROR: lp = "error(pngcp)"; break;
+ case USER_ERROR: lp = "error(user)"; break;
+
+ case INTERNAL_ERROR: /* anything unexpected is an internal error: */
+ case VERBOSE: case WARNINGS: case ERRORS: case QUIET:
+ default: lp = "bug(pngcp)"; break;
+ }
+
+ fprintf(stderr, "%s: %s: %s",
+ dp->filename != NULL ? dp->filename : "<stdin>", lp, dp->operation);
+
+ fprintf(stderr, ": ");
+
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+
+ fputc('\n', stderr);
+ }
+ /* else do not output any message */
+
+ /* Errors cause this routine to exit to the fail code */
+ if (level > APP_FAIL || (level > ERRORS && !(dp->options & CONTINUE)))
+ {
+ if (dp->errset)
+ longjmp(dp->error_return, level);
+
+ else
+ exit(99);
+ }
+}
+
+#if PNG_LIBPNG_VER < 10700 && defined PNG_TEXT_SUPPORTED
+static void
+text_stash(struct display *dp)
+{
+ /* libpng 1.6 and earlier fixed a bug whereby text chunks were written
+ * multiple times by png_write_png; the issue was that png_write_png passed
+ * the same png_info to both png_write_info and png_write_end. Rather than
+ * fixing it by recording the information in the png_struct, or by recording
+ * where to write the chunks, the fix made was to change the 'compression'
+ * field of the chunk to invalid values, rendering the png_info somewhat
+ * useless.
+ *
+ * The only fix for this given that we use the png_info more than once is to
+ * make a copy of the text chunks and png_set_text it each time. This adds a
+ * text chunks, so they get replicated, but only the new set gets written
+ * each time. This uses memory like crazy but there is no way to delete the
+ * useless chunks from the png_info.
+ *
+ * To make this slightly more efficient only the top level structure is
+ * copied; since the old strings are actually preserved (in 1.6 and earlier)
+ * this happens to work.
+ */
+ png_textp chunks = NULL;
+
+ dp->num_text = png_get_text(dp->write_pp, dp->ip, &chunks, NULL);
+
+ if (dp->num_text > 0)
+ {
+ dp->text_ptr = voidcast(png_textp, malloc(dp->num_text * sizeof *chunks));
+
+ if (dp->text_ptr == NULL)
+ display_log(dp, APP_ERROR, "text chunks: stash malloc failed");
+
+ else
+ memcpy(dp->text_ptr, chunks, dp->num_text * sizeof *chunks);
+ }
+
+ dp->text_stashed = 1; /* regardless of whether there are chunks or not */
+}
+
+#define text_stash(dp) if (!dp->text_stashed) text_stash(dp)
+
+static void
+text_restore(struct display *dp)
+{
+ /* libpng makes a copy, so this is fine: */
+ if (dp->text_ptr != NULL)
+ png_set_text(dp->write_pp, dp->ip, dp->text_ptr, dp->num_text);
+}
+
+#define text_restore(dp) if (dp->text_stashed) text_restore(dp)
+
+#else
+#define text_stash(dp) ((void)0)
+#define text_restore(dp) ((void)0)
+#endif /* pre 1.7 */
+
+/* OPTIONS:
+ *
+ * The command handles options of the forms:
+ *
+ * --option
+ * Turn an option on (Option)
+ * --no-option
+ * Turn an option off (Option)
+ * --option=value
+ * Set an option to a value (Value)
+ * --option=val1,val2,val3
+ * Set an option to a bitmask constructed from the values (List)
+ */
+static png_byte
+option_index(struct display *dp, const char *opt, size_t len)
+ /* Return the index (in options[]) of the given option, outputs an error if
+ * it does not exist. Takes the name of the option and a length (number of
+ * characters in the name).
+ */
+{
+ png_byte j;
+
+ for (j=0; j<option_count; ++j)
+ if (strncmp(options[j].name, opt, len) == 0 && options[j].name[len] == 0)
+ return j;
+
+ /* If the setjmp buffer is set the code is asking for an option index; this
+ * is bad. Otherwise this is the command line option parsing.
+ */
+ display_log(dp, dp->errset ? INTERNAL_ERROR : USER_ERROR,
+ "%.*s: unknown option", (int)/*SAFE*/len, opt);
+ abort(); /* NOT REACHED */
+}
+
+/* This works for an option name (no quotes): */
+#define OPTIND(dp, name) option_index(dp, #name, (sizeof #name)-1)
+
+static int
+get_option(struct display *dp, const char *opt, int *value)
+{
+ const png_byte i = option_index(dp, opt, strlen(opt));
+
+ if (dp->entry[i]) /* option was set on command line */
+ {
+ *value = dp->value[i];
+ return 1;
+ }
+
+ else
+ return 0;
+}
+
+static int
+set_opt_string_(struct display *dp, unsigned int sp, png_byte opt,
+ const char *entry_name)
+ /* Add the appropriate option string to dp->curr. */
+{
+ int offset, add;
+
+ if (sp > 0)
+ offset = dp->stack[sp-1].opt_string_end;
+
+ else
+ offset = dp->opt_string_start;
+
+ if (entry_name == range_lo)
+ add = sprintf(dp->curr+offset, " --%s=%d", options[opt].name,
+ dp->value[opt]);
+
+ else
+ add = sprintf(dp->curr+offset, " --%s=%s", options[opt].name, entry_name);
+
+ if (add < 0)
+ display_log(dp, INTERNAL_ERROR, "sprintf failed");
+
+ assert(offset+add < (int)/*SAFE*/sizeof dp->curr);
+ return offset+add;
+}
+
+static void
+set_opt_string(struct display *dp, unsigned int sp)
+ /* Add the appropriate option string to dp->curr. */
+{
+ dp->stack[sp].opt_string_end = set_opt_string_(dp, sp, dp->stack[sp].opt,
+ options[dp->stack[sp].opt].values[dp->stack[sp].entry].name);
+}
+
+static void
+record_opt(struct display *dp, png_byte opt, const char *entry_name)
+ /* Record this option in dp->curr; called for an option not being searched,
+ * the caller passes in the name of the value, or range_lo to use the
+ * numerical value.
+ */
+{
+ const unsigned int sp = dp->csp; /* stack entry of next searched option */
+
+ if (sp >= dp->tsp)
+ {
+ /* At top of stack; add the opt string for this entry to the previous
+ * searched entry or the start of the dp->curr buffer if there is nothing
+ * on the stack yet (sp == 0).
+ */
+ const int offset = set_opt_string_(dp, sp, opt, entry_name);
+
+ if (sp > 0)
+ dp->stack[sp-1].opt_string_end = offset;
+
+ else
+ dp->opt_string_start = offset;
+ }
+
+ /* else do nothing: option already recorded */
+}
+
+static int
+opt_list_end(struct display *dp, png_byte opt, png_byte entry)
+{
+ if (options[opt].values[entry].name == range_lo)
+ return entry+1U >= options[opt].value_count /* missing range_hi */ ||
+ options[opt].values[entry+1U].name != range_hi /* likewise */ ||
+ options[opt].values[entry+1U].value <= dp->value[opt] /* range end */;
+
+ else
+ return entry+1U >= options[opt].value_count /* missing 'all' */ ||
+ options[opt].values[entry+1U].name == all /* last entry */;
+}
+
+static void
+push_opt(struct display *dp, unsigned int sp, png_byte opt, int search)
+ /* Push a new option onto the stack, initializing the new stack entry
+ * appropriately; this does all the work of next_opt (setting end/nsp) for
+ * the first entry in the list.
+ */
+{
+ png_byte entry;
+ const char *entry_name;
+
+ assert(sp == dp->tsp && sp < SL);
+
+ /* The starting entry is entry 0 unless there is a range in which case it is
+ * the entry corresponding to range_lo:
+ */
+ entry = options[opt].value_count;
+ assert(entry > 0U);
+
+ do
+ {
+ entry_name = options[opt].values[--entry].name;
+ if (entry_name == range_lo)
+ break;
+ }
+ while (entry > 0U);
+
+ dp->tsp = sp+1U;
+ dp->stack[sp].best_size =
+ dp->stack[sp].lo_size =
+ dp->stack[sp].hi_size = MAX_SIZE;
+
+ if (search && entry_name == range_lo) /* search this range */
+ {
+ dp->stack[sp].lo = options[opt].values[entry].value;
+ /* check for a mal-formed RANGE above: */
+ assert(entry+1 < options[opt].value_count &&
+ options[opt].values[entry+1].name == range_hi);
+ dp->stack[sp].hi = options[opt].values[entry+1].value;
+ }
+
+ else
+ {
+ /* next_opt will just iterate over the range. */
+ dp->stack[sp].lo = INT_MAX;
+ dp->stack[sp].hi = INT_MIN; /* Prevent range chop */
+ }
+
+ dp->stack[sp].opt = opt;
+ dp->stack[sp].entry = entry;
+ dp->stack[sp].best_val = dp->value[opt] = options[opt].values[entry].value;
+
+ set_opt_string(dp, sp);
+
+ /* This works for the search case too; if the range has only one entry 'end'
+ * will be marked here.
+ */
+ if (opt_list_end(dp, opt, entry))
+ {
+ dp->stack[sp].end = 1;
+ /* Skip the warning if pngcp did this itself. See the code in
+ * set_windowBits_hi.
+ */
+ if (opt != dp->min_windowBits)
+ display_log(dp, APP_WARNING, "%s: only testing one value",
+ options[opt].name);
+ }
+
+ else
+ {
+ dp->stack[sp].end = 0;
+ dp->nsp = dp->tsp;
+ }
+
+ /* Do a lazy cache of the text chunks for libpng 1.6 and earlier; this is
+ * because they can only be written once(!) so if we are going to re-use the
+ * png_info we need a copy.
+ */
+ text_stash(dp);
+}
+
+static void
+next_opt(struct display *dp, unsigned int sp)
+ /* Return the next value for this option. When called 'sp' is expected to be
+ * the topmost stack entry - only the topmost entry changes each time round -
+ * and there must be a valid entry to return. next_opt will set dp->nsp to
+ * sp+1 if more entries are available, otherwise it will not change it and
+ * set dp->stack[s].end to true.
+ */
+{
+ int search = 0;
+ png_byte entry, opt;
+ const char *entry_name;
+
+ /* dp->stack[sp] must be the top stack entry and it must be active: */
+ assert(sp+1U == dp->tsp && !dp->stack[sp].end);
+
+ opt = dp->stack[sp].opt;
+ entry = dp->stack[sp].entry;
+ assert(entry+1U < options[opt].value_count);
+ entry_name = options[opt].values[entry].name;
+ assert(entry_name != NULL);
+
+ /* For ranges increment the value but don't change the entry, for all other
+ * cases move to the next entry and load its value:
+ */
+ if (entry_name == range_lo) /* a range */
+ {
+ /* A range can be iterated over or searched. The default iteration option
+ * is indicated by hi < lo on the stack, otherwise the range being search
+ * is [lo..hi] (inclusive).
+ */
+ if (dp->stack[sp].lo > dp->stack[sp].hi)
+ dp->value[opt]++;
+
+ else
+ {
+ /* This is the best size found for this option value: */
+ png_alloc_size_t best_size = dp->stack[sp].best_size;
+ int lo = dp->stack[sp].lo;
+ int hi = dp->stack[sp].hi;
+ int val = dp->value[opt];
+
+ search = 1; /* end is determined here */
+ assert(best_size < MAX_SIZE);
+
+ if (val == lo)
+ {
+ /* Finding the best for the low end of the range: */
+ dp->stack[sp].lo_size = best_size;
+ assert(hi > val);
+
+ if (hi == val+1) /* only 2 entries */
+ dp->stack[sp].end = 1;
+
+ val = hi;
+ }
+
+ else if (val == hi)
+ {
+ dp->stack[sp].hi_size = best_size;
+ assert(val > lo+1); /* else 'end' set above */
+
+ if (val == lo+2) /* only three entries to test */
+ dp->stack[sp].end = 1;
+
+ val = (lo + val)/2;
+ }
+
+ else
+ {
+ png_alloc_size_t lo_size = dp->stack[sp].lo_size;
+ png_alloc_size_t hi_size = dp->stack[sp].hi_size;
+
+ /* lo and hi should have been tested. */
+ assert(lo_size < MAX_SIZE && hi_size < MAX_SIZE);
+
+ /* These cases arise with the 'probe' handling below when there is a
+ * dip or peak in the size curve.
+ */
+ if (val < lo) /* probing a new lo */
+ {
+ /* Swap lo and val: */
+ dp->stack[sp].lo = val;
+ dp->stack[sp].lo_size = best_size;
+ val = lo;
+ best_size = lo_size;
+ lo = dp->stack[sp].lo;
+ lo_size = dp->stack[sp].lo_size;
+ }
+
+ else if (val > hi) /* probing a new hi */
+ {
+ /* Swap hi and val: */
+ dp->stack[sp].hi = val;
+ dp->stack[sp].hi_size = best_size;
+ val = hi;
+ best_size = hi_size;
+ hi = dp->stack[sp].hi;
+ hi_size = dp->stack[sp].hi_size;
+ }
+
+ /* The following should be true or something got messed up above. */
+ assert(lo < val && val < hi);
+
+ /* If there are only four entries (lo, val, hi plus one more) just
+ * test the remaining entry.
+ */
+ if (hi == lo+3)
+ {
+ /* Because of the 'probe' code val can either be lo+1 or hi-1; we
+ * need to test the other.
+ */
+ val = lo + ((val == lo+1) ? 2 : 1);
+ assert(lo < val && val < hi);
+ dp->stack[sp].end = 1;
+ }
+
+ else
+ {
+ /* There are at least 2 entries still untested between lo and hi,
+ * i.e. hi >= lo+4. 'val' is the midpoint +/- 0.5
+ *
+ * Separate out the four easy cases when lo..val..hi are
+ * monotonically decreased or (more weird) increasing:
+ */
+ assert(hi > lo+3);
+
+ if (lo_size <= best_size && best_size <= hi_size)
+ {
+ /* Select the low range; testing this first favours the low
+ * range over the high range when everything comes out equal.
+ * Because of the probing 'val' may be lo+1. In that case end
+ * the search and set 'val' to lo+2.
+ */
+ if (val == lo+1)
+ {
+ ++val;
+ dp->stack[sp].end = 1;
+ }
+
+ else
+ {
+ dp->stack[sp].hi = hi = val;
+ dp->stack[sp].hi_size = best_size;
+ val = (lo + val) / 2;
+ }
+ }
+
+ else if (lo_size >= best_size && best_size >= hi_size)
+ {
+ /* Monotonically decreasing size; this is the expected case.
+ * Select the high end of the range. As above, val may be
+ * hi-1.
+ */
+ if (val == hi-1)
+ {
+ --val;
+ dp->stack[sp].end = 1;
+ }
+
+ else
+ {
+ dp->stack[sp].lo = lo = val;
+ dp->stack[sp].lo_size = best_size;
+ val = (val + hi) / 2;
+ }
+ }
+
+ /* If both those tests failed 'best_size' is either greater than
+ * or less than both lo_size and hi_size. There is a peak or dip
+ * in the curve of sizes from lo to hi and val is on the peak or
+ * dip.
+ *
+ * Because the ranges being searched as so small (level is 1..9,
+ * windowBits 8..15, memLevel 1..9) there will only be at most
+ * three untested values between lo..val and val..hi, so solve
+ * the problem by probing down from hi or up from lo, whichever
+ * is the higher.
+ *
+ * This is the place where 'val' is set to outside the range
+ * lo..hi, described as 'probing', though maybe 'narrowing' would
+ * be more accurate.
+ */
+ else if (lo_size <= hi_size) /* down from hi */
+ {
+ dp->stack[sp].hi = val;
+ dp->stack[sp].hi_size = best_size;
+ val = --hi;
+ }
+
+ else /* up from low */
+ {
+ dp->stack[sp].lo = val;
+ dp->stack[sp].lo_size = best_size;
+ val = ++lo;
+ }
+
+ /* lo and hi are still the true range limits, check for the end
+ * condition.
+ */
+ assert(hi > lo+1);
+ if (hi <= lo+2)
+ dp->stack[sp].end = 1;
+ }
+ }
+
+ assert(val != dp->stack[sp].best_val); /* should be a new value */
+ dp->value[opt] = val;
+ dp->stack[sp].best_size = MAX_SIZE;
+ }
+ }
+
+ else
+ {
+ /* Increment 'entry' */
+ dp->value[opt] = options[opt].values[++entry].value;
+ dp->stack[sp].entry = entry;
+ }
+
+ set_opt_string(dp, sp);
+
+ if (!search && opt_list_end(dp, opt, entry)) /* end of list */
+ dp->stack[sp].end = 1;
+
+ else if (!dp->stack[sp].end) /* still active after all these tests */
+ dp->nsp = dp->tsp;
+}
+
+static int
+compare_option(const struct display *dp, unsigned int sp)
+{
+ int opt = dp->stack[sp].opt;
+
+ /* If the best so far is numerically less than the current value the
+ * current set of options is invariably worse.
+ */
+ if (dp->stack[sp].best_val < dp->value[opt])
+ return -1;
+
+ /* Lists of options are searched out of numerical order (currently only
+ * strategy), so only return +1 here when a range is being searched.
+ */
+ else if (dp->stack[sp].best_val > dp->value[opt])
+ {
+ if (dp->stack[sp].lo <= dp->stack[sp].hi /*searching*/)
+ return 1;
+
+ else
+ return -1;
+ }
+
+ else
+ return 0; /* match; current value is the best one */
+}
+
+static int
+advance_opt(struct display *dp, png_byte opt, int search)
+{
+ unsigned int sp = dp->csp++; /* my stack entry */
+
+ assert(sp >= dp->nsp); /* nsp starts off zero */
+
+ /* If the entry was active in the previous run dp->stack[sp] is already
+ * set up and dp->tsp will be greater than sp, otherwise a new entry
+ * needs to be created.
+ *
+ * dp->nsp is handled this way:
+ *
+ * 1) When an option is pushed onto the stack dp->nsp and dp->tsp are
+ * both set (by push_opt) to the next stack entry *unless* there is
+ * only one entry in the new list, in which case dp->stack[sp].end
+ * is set.
+ *
+ * 2) For the top stack entry next_opt is called. The entry must be
+ * active (dp->stack[sp].end is not set) and either 'nsp' or 'end'
+ * will be updated as appropriate.
+ *
+ * 3) For lower stack entries nsp is set unless the stack entry is
+ * already at the end. This means that when all the higher entries
+ * are popped this entry will be too.
+ */
+ if (sp >= dp->tsp)
+ {
+ push_opt(dp, sp, opt, search); /* This sets tsp to sp+1 */
+ return 1; /* initialized */
+ }
+
+ else
+ {
+ int ret = 0; /* unchanged */
+
+ /* An option that is already on the stack; update best_size and best_val
+ * if appropriate. On the first run there are no previous values and
+ * dp->write_size will be MAX_SIZE, however on the first run dp->tsp
+ * starts off as 0.
+ */
+ assert(dp->write_size > 0U && dp->write_size < MAX_SIZE);
+
+ if (dp->stack[sp].best_size > dp->write_size ||
+ (dp->stack[sp].best_size == dp->write_size &&
+ compare_option(dp, sp) > 0))
+ {
+ dp->stack[sp].best_size = dp->write_size;
+ dp->stack[sp].best_val = dp->value[opt];
+ }
+
+ if (sp+1U >= dp->tsp)
+ {
+ next_opt(dp, sp);
+ ret = 1; /* advanced */
+ }
+
+ else if (!dp->stack[sp].end) /* Active, not at top of stack */
+ dp->nsp = sp+1U;
+
+ return ret; /* advanced || unchanged */
+ }
+}
+
+static int
+getallopts_(struct display *dp, const png_byte opt, int *value, int record)
+ /* Like getop but iterate over all the values if the option was set to "all".
+ */
+{
+ if (dp->entry[opt]) /* option was set on command line */
+ {
+ /* Simple, single value, entries don't have a stack frame and have a fixed
+ * value (it doesn't change once set on the command line). Otherwise the
+ * value (entry) selected from the command line is 'all':
+ */
+ const char *entry_name = options[opt].values[dp->entry[opt]-1].name;
+
+ if (entry_name == all)
+ (void)advance_opt(dp, opt, 0/*do not search; iterate*/);
+
+ else if (record)
+ record_opt(dp, opt, entry_name);
+
+ *value = dp->value[opt];
+ return 1; /* set */
+ }
+
+ else
+ return 0; /* not set */
+}
+
+static int
+getallopts(struct display *dp, const char *opt_str, int *value)
+{
+ return getallopts_(dp, option_index(dp, opt_str, strlen(opt_str)), value, 0);
+}
+
+static int
+getsearchopts(struct display *dp, const char *opt_str, int *value)
+ /* As above except that if the option was not set try a search */
+{
+ png_byte istrat;
+ const png_byte opt = option_index(dp, opt_str, strlen(opt_str));
+ int record = options[opt].search;
+ const char *entry_name;
+
+ /* If it was set on the command line honour the setting, including 'all'
+ * which will override the built in search:
+ */
+ if (getallopts_(dp, opt, value, record))
+ return 1;
+
+ else if (!record) /* not a search option */
+ return 0; /* unset and not searched */
+
+ /* Otherwise decide what to do here. */
+ istrat = OPTIND(dp, strategy);
+ entry_name = range_lo; /* record the value, not the name */
+
+ if (opt == istrat) /* search all strategies */
+ (void)advance_opt(dp, opt, 0/*iterate*/), record=0;
+
+ else if (opt == OPTIND(dp, level))
+ {
+ /* Both RLE and HUFFMAN don't benefit from level increases */
+ if (dp->value[istrat] == Z_RLE || dp->value[istrat] == Z_HUFFMAN_ONLY)
+ dp->value[opt] = 1;
+
+ else /* fixed, filtered or default */
+ (void)advance_opt(dp, opt, 1/*search*/), record=0;
+ }
+
+ else if (opt == OPTIND(dp, windowBits))
+ {
+ /* Changing windowBits for strategies that do not search the window is
+ * pointless. Huffman-only does not search, RLE only searches backwards
+ * one byte, so given that the maximum string length is 258, a windowBits
+ * of 9 is always sufficient.
+ */
+ if (dp->value[istrat] == Z_HUFFMAN_ONLY)
+ dp->value[opt] = 8;
+
+ else if (dp->value[istrat] == Z_RLE)
+ dp->value[opt] = 9;
+
+ else /* fixed, filtered or default */
+ (void)advance_opt(dp, opt, 1/*search*/), record=0;
+ }
+
+ else if (opt == OPTIND(dp, memLevel))
+ {
+# if 0
+ (void)advance_opt(dp, opt, 0/*all*/), record=0;
+# else
+ dp->value[opt] = MAX_MEM_LEVEL;
+# endif
+ }
+
+ else /* something else */
+ assert(0=="reached");
+
+ if (record)
+ record_opt(dp, opt, entry_name);
+
+ /* One of the above searched options: */
+ *value = dp->value[opt];
+ return 1;
+}
+
+static int
+find_val(struct display *dp, png_byte opt, const char *str, size_t len)
+ /* Like option_index but sets (index+i) of the entry in options[opt] that
+ * matches str[0..len-1] into dp->entry[opt] as well as returning the actual
+ * value.
+ */
+{
+ int rlo = INT_MAX, rhi = INT_MIN;
+ png_byte j, irange = 0;
+
+ for (j=1U; j<=options[opt].value_count; ++j)
+ {
+ if (strncmp(options[opt].values[j-1U].name, str, len) == 0 &&
+ options[opt].values[j-1U].name[len] == 0)
+ {
+ dp->entry[opt] = j;
+ return options[opt].values[j-1U].value;
+ }
+ else if (options[opt].values[j-1U].name == range_lo)
+ rlo = options[opt].values[j-1U].value, irange = j;
+ else if (options[opt].values[j-1U].name == range_hi)
+ rhi = options[opt].values[j-1U].value;
+ }
+
+ /* No match on the name, but there may be a range. */
+ if (irange > 0)
+ {
+ char *ep = NULL;
+ long l = strtol(str, &ep, 0);
+
+ if (ep == str+len && l >= rlo && l <= rhi)
+ {
+ dp->entry[opt] = irange; /* range_lo */
+ return (int)/*SAFE*/l;
+ }
+ }
+
+ display_log(dp, dp->errset ? INTERNAL_ERROR : USER_ERROR,
+ "%s: unknown value setting '%.*s'", options[opt].name,
+ (int)/*SAFE*/len, str);
+ abort(); /* NOT REACHED */
+}
+
+static int
+opt_check(struct display *dp, const char *arg)
+{
+ assert(dp->errset == 0);
+
+ if (arg != NULL && arg[0] == '-' && arg[1] == '-')
+ {
+ int i = 0, negate = (strncmp(arg+2, "no-", 3) == 0), val;
+ png_byte j;
+
+ if (negate)
+ arg += 5; /* --no- */
+
+ else
+ arg += 2; /* -- */
+
+ /* Find the length (expect arg\0 or arg=) */
+ while (arg[i] != 0 && arg[i] != '=') ++i;
+
+ /* So arg[0..i-1] is the argument name, this does not return if this isn't
+ * a valid option name.
+ */
+ j = option_index(dp, arg, i);
+
+ /* It matcheth an option; check the remainder. */
+ if (arg[i] == 0) /* no specified value, use the default */
+ {
+ val = options[j].values[negate].value;
+ dp->entry[j] = (png_byte)/*SAFE*/(negate + 1U);
+ }
+
+ else
+ {
+ const char *list = arg + (i+1);
+
+ /* Expect a single value here unless this is a list, in which case
+ * multiple values are combined.
+ */
+ if (options[j].opt != LIST)
+ {
+ /* find_val sets 'dp->entry[j]' to a non-zero value: */
+ val = find_val(dp, j, list, strlen(list));
+
+ if (negate)
+ {
+ if (options[j].opt < OPTION)
+ val = !val;
+
+ else
+ {
+ display_log(dp, USER_ERROR,
+ "%.*s: option=arg cannot be negated", i, arg);
+ abort(); /* NOT REACHED */
+ }
+ }
+ }
+
+ else /* multiple options separated by ',' characters */
+ {
+ /* --no-option negates list values from the default, which should
+ * therefore be 'all'. Notice that if the option list is empty in
+ * this case nothing will be removed and therefore --no-option= is
+ * the same as --option.
+ */
+ if (negate)
+ val = options[j].values[0].value;
+
+ else
+ val = 0;
+
+ while (*list != 0) /* allows option= which sets 0 */
+ {
+ /* A value is terminated by the end of the list or a ','
+ * character.
+ */
+ int v, iv;
+
+ iv = 0; /* an index into 'list' */
+ while (list[++iv] != 0 && list[iv] != ',') {}
+
+ v = find_val(dp, j, list, iv);
+
+ if (negate)
+ val &= ~v;
+
+ else
+ val |= v;
+
+ list += iv;
+ if (*list != 0)
+ ++list; /* skip the ',' */
+ }
+ }
+ }
+
+ /* 'val' is the new value, store it for use later and debugging: */
+ dp->value[j] = val;
+
+ if (options[j].opt < LEVEL_MASK)
+ {
+ /* The handling for error levels is to set the level. */
+ if (val) /* Set this level */
+ dp->options = (dp->options & ~LEVEL_MASK) | options[j].opt;
+
+ else
+ display_log(dp, USER_ERROR,
+ "%.*s: messages cannot be turned off individually; set a message level",
+ i, arg);
+ }
+
+ else if (options[j].opt < OPTION)
+ {
+ if (val)
+ dp->options |= options[j].opt;
+
+ else
+ dp->options &= ~options[j].opt;
+ }
+
+ return 1; /* this is an option */
+ }
+
+ else
+ return 0; /* not an option */
+}
+
+#ifdef PNG_PNGCP_TIMING_SUPPORTED
+static void
+set_timer(struct display *dp, struct timespec *timer)
+{
+ /* Do the timing using clock_gettime and the per-process timer. */
+ if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, timer))
+ {
+ display_log(dp, APP_ERROR,
+ "CLOCK_PROCESS_CPUTIME_ID: %s: timing disabled\n", strerror(errno));
+ dp->value[OPTIND(dp,time)] = 0; /* i.e. off */
+ }
+}
+
+static void
+start_timer(struct display *dp, int what)
+{
+ if ((dp->value[OPTIND(dp,time)] & what) != 0)
+ set_timer(dp, what == PNGCP_TIME_READ ? &dp->read_time : &dp->write_time);
+}
+
+static void
+end_timer(struct display *dp, int what)
+{
+ if ((dp->value[OPTIND(dp,time)] & what) != 0)
+ {
+ struct timespec t, tmp;
+
+ set_timer(dp, &t);
+
+ if (what == PNGCP_TIME_READ)
+ tmp = dp->read_time;
+
+ else
+ tmp = dp->write_time;
+
+ t.tv_sec -= tmp.tv_sec;
+ t.tv_nsec -= tmp.tv_nsec;
+
+ if (t.tv_nsec < 0)
+ {
+ --(t.tv_sec);
+ t.tv_nsec += 1000000000L;
+ }
+
+ if (what == PNGCP_TIME_READ)
+ dp->read_time = t, tmp = dp->read_time_total;
+
+ else
+ dp->write_time = t, tmp = dp->write_time_total;
+
+ tmp.tv_sec += t.tv_sec;
+ tmp.tv_nsec += t.tv_nsec;
+
+ if (tmp.tv_nsec >= 1000000000L)
+ {
+ ++(tmp.tv_sec);
+ tmp.tv_nsec -= 1000000000L;
+ }
+
+ if (what == PNGCP_TIME_READ)
+ dp->read_time_total = tmp;
+
+ else
+ dp->write_time_total = tmp;
+ }
+}
+
+static void
+print_time(const char *what, struct timespec t)
+{
+ printf("%s %.2lu.%.9ld", what, (unsigned long)t.tv_sec, t.tv_nsec);
+}
+#else /* !PNGCP_TIMING */
+#define start_timer(dp, what) ((void)0)
+#define end_timer(dp, what) ((void)0)
+#endif /* !PNGCP_TIMING */
+
+/* The following is used in main to verify that the final argument is a
+ * directory:
+ */
+static int
+checkdir(const char *pathname)
+{
+ struct stat buf;
+ return stat(pathname, &buf) == 0 && S_ISDIR(buf.st_mode);
+}
+
+/* Work out whether a path is valid (if not a display_log occurs), a directory
+ * (1 is returned) or a file *or* non-existent (0 is returned).
+ *
+ * Used for a write path.
+ */
+static int
+isdir(struct display *dp, const char *pathname)
+{
+ if (pathname == NULL)
+ return 0; /* stdout */
+
+ else if (pathname[0] == 0)
+ return 1; /* empty string */
+
+ else
+ {
+ struct stat buf;
+ int ret = stat(pathname, &buf);
+
+ if (ret == 0) /* the entry exists */
+ {
+ if (S_ISDIR(buf.st_mode))
+ return 1;
+
+ /* Else expect an object that exists and can be written: */
+ if (access(pathname, W_OK) != 0)
+ display_log(dp, USER_ERROR, "%s: cannot be written (%s)", pathname,
+ strerror(errno));
+
+ return 0; /* file (exists, can be written) */
+ }
+
+ else /* an error */
+ {
+ /* Non-existence is fine, other errors are not: */
+ if (errno != ENOENT)
+ display_log(dp, USER_ERROR, "%s: invalid output name (%s)",
+ pathname, strerror(errno));
+
+ return 0; /* file (does not exist) */
+ }
+ }
+}
+
+static void
+makename(struct display *dp, const char *dir, const char *infile)
+{
+ /* Make a name for an output file (and check it). */
+ dp->namebuf[0] = 0;
+
+ if (dir == NULL || infile == NULL)
+ display_log(dp, INTERNAL_ERROR, "NULL name to makename");
+
+ else
+ {
+ size_t dsize = strlen(dir);
+
+ if (dsize <= (sizeof dp->namebuf)-2) /* Allow for name + '/' + '\0' */
+ {
+ size_t isize = strlen(infile);
+ size_t istart = isize-1;
+
+ /* This should fail before here: */
+ if (infile[istart] == '/')
+ display_log(dp, INTERNAL_ERROR, "infile with trailing /");
+
+ memcpy(dp->namebuf, dir, dsize);
+ if (dsize > 0 && dp->namebuf[dsize-1] != '/')
+ dp->namebuf[dsize++] = '/';
+
+ /* Find the rightmost non-/ character: */
+ while (istart > 0 && infile[istart-1] != '/')
+ --istart;
+
+ isize -= istart;
+ infile += istart;
+
+ if (dsize+isize < (sizeof dp->namebuf)) /* dsize + infile + '\0' */
+ {
+ memcpy(dp->namebuf+dsize, infile, isize+1);
+
+ if (isdir(dp, dp->namebuf))
+ display_log(dp, USER_ERROR, "%s: output file is a directory",
+ dp->namebuf);
+ }
+
+ else
+ {
+ dp->namebuf[dsize] = 0; /* allowed for: -2 at start */
+ display_log(dp, USER_ERROR, "%s%s: output file name too long",
+ dp->namebuf, infile);
+ }
+ }
+
+ else
+ display_log(dp, USER_ERROR, "%s: output directory name too long", dir);
+ }
+}
+
+/* error handler callbacks for libpng */
+static void PNGCBAPI
+display_warning(png_structp pp, png_const_charp warning)
+{
+ struct display *dp = get_dp(pp);
+
+ /* This is used to prevent repeated warnings while searching */
+ if (!dp->no_warnings)
+ display_log(get_dp(pp), LIBPNG_WARNING, "%s", warning);
+}
+
+static void PNGCBAPI
+display_error(png_structp pp, png_const_charp error)
+{
+ struct display *dp = get_dp(pp);
+
+ display_log(dp, LIBPNG_ERROR, "%s", error);
+}
+
+static void
+display_start_read(struct display *dp, const char *filename)
+{
+ if (filename != NULL)
+ {
+ dp->filename = filename;
+ dp->fp = fopen(filename, "rb");
+ }
+
+ else
+ {
+ dp->filename = "<stdin>";
+ dp->fp = stdin;
+ }
+
+ dp->w = dp->h = 0U;
+ dp->bpp = 0U;
+ dp->size = 0U;
+ dp->read_size = 0U;
+
+ if (dp->fp == NULL)
+ display_log(dp, USER_ERROR, "file open failed (%s)", strerror(errno));
+}
+
+static void PNGCBAPI
+read_function(png_structp pp, png_bytep data, png_size_t size)
+{
+ struct display *dp = get_dp(pp);
+
+ if (size == 0U || fread(data, size, 1U, dp->fp) == 1U)
+ dp->read_size += size;
+
+ else
+ {
+ if (feof(dp->fp))
+ display_log(dp, LIBPNG_ERROR, "PNG file truncated");
+ else
+ display_log(dp, LIBPNG_ERROR, "PNG file read failed (%s)",
+ strerror(errno));
+ }
+}
+
+static void
+read_png(struct display *dp, const char *filename)
+{
+ display_clean_read(dp); /* safety */
+ display_start_read(dp, filename);
+
+ dp->read_pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, dp,
+ display_error, display_warning);
+ if (dp->read_pp == NULL)
+ display_log(dp, LIBPNG_ERROR, "failed to create read struct");
+
+# ifdef PNG_BENIGN_ERRORS_SUPPORTED
+ png_set_benign_errors(dp->read_pp, 1/*allowed*/);
+# endif /* BENIGN_ERRORS */
+
+# ifdef FIX_INDEX
+ if ((dp->options & FIX_INDEX) != 0)
+ png_set_check_for_invalid_index(dp->read_pp, 1/*on, no warning*/);
+# ifdef IGNORE_INDEX
+ else
+# endif /* IGNORE_INDEX */
+# endif /* FIX_INDEX */
+# ifdef IGNORE_INDEX
+ if ((dp->options & IGNORE_INDEX) != 0) /* DANGEROUS */
+ png_set_check_for_invalid_index(dp->read_pp, -1/*off completely*/);
+# endif /* IGNORE_INDEX */
+
+ /* The png_read_png API requires us to make the info struct, but it does the
+ * call to png_read_info.
+ */
+ dp->ip = png_create_info_struct(dp->read_pp);
+ if (dp->ip == NULL)
+ png_error(dp->read_pp, "failed to create info struct");
+
+ /* Set the IO handling */
+ png_set_read_fn(dp->read_pp, dp, read_function);
+
+# ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ png_set_keep_unknown_chunks(dp->read_pp, PNG_HANDLE_CHUNK_ALWAYS, NULL,
+ 0);
+# endif /* HANDLE_AS_UNKNOWN */
+
+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ /* Remove the user limits, if any */
+ png_set_user_limits(dp->read_pp, 0x7fffffff, 0x7fffffff);
+# endif /* SET_USER_LIMITS */
+
+ /* Now read the PNG. */
+ start_timer(dp, PNGCP_TIME_READ);
+ png_read_png(dp->read_pp, dp->ip, 0U/*transforms*/, NULL/*params*/);
+ end_timer(dp, PNGCP_TIME_READ);
+ dp->w = png_get_image_width(dp->read_pp, dp->ip);
+ dp->h = png_get_image_height(dp->read_pp, dp->ip);
+ dp->ct = png_get_color_type(dp->read_pp, dp->ip);
+ dp->bpp = png_get_bit_depth(dp->read_pp, dp->ip) *
+ png_get_channels(dp->read_pp, dp->ip);
+ {
+ /* png_get_rowbytes should never return 0 because the value is set by the
+ * first call to png_set_IHDR, which should have happened by now, but just
+ * in case:
+ */
+ png_alloc_size_t rb = png_get_rowbytes(dp->read_pp, dp->ip);
+
+ if (rb == 0)
+ png_error(dp->read_pp, "invalid row byte count from libpng");
+
+ /* The size calc can overflow. */
+ if ((MAX_SIZE-dp->h)/rb < dp->h)
+ png_error(dp->read_pp, "image too large");
+
+ dp->size = rb * dp->h + dp->h/*filter byte*/;
+ }
+
+#ifdef FIX_INDEX
+ if (dp->ct == PNG_COLOR_TYPE_PALETTE && (dp->options & FIX_INDEX) != 0)
+ {
+ int max = png_get_palette_max(dp->read_pp, dp->ip);
+ png_colorp palette = NULL;
+ int num = -1;
+
+ if (png_get_PLTE(dp->read_pp, dp->ip, &palette, &num) != PNG_INFO_PLTE
+ || max < 0 || num <= 0 || palette == NULL)
+ display_log(dp, LIBPNG_ERROR, "invalid png_get_PLTE result");
+
+ if (max >= num)
+ {
+ /* 'Fix' the palette. */
+ int i;
+ png_color newpal[256];
+
+ for (i=0; i<num; ++i)
+ newpal[i] = palette[i];
+
+ /* Fill in any remainder with a warning color: */
+ for (; i<=max; ++i)
+ {
+ newpal[i].red = 0xbe;
+ newpal[i].green = 0xad;
+ newpal[i].blue = 0xed;
+ }
+
+ png_set_PLTE(dp->read_pp, dp->ip, newpal, i);
+ }
+ }
+#endif /* FIX_INDEX */
+
+ display_clean_read(dp);
+ dp->operation = "none";
+}
+
+static void
+display_start_write(struct display *dp, const char *filename)
+{
+ assert(dp->fp == NULL);
+
+ if ((dp->options & NOWRITE) != 0)
+ dp->output_file = "<no write>";
+
+ else
+ {
+ if (filename != NULL)
+ {
+ dp->output_file = filename;
+ dp->fp = fopen(filename, "wb");
+ }
+
+ else
+ {
+ dp->output_file = "<stdout>";
+ dp->fp = stdout;
+ }
+
+ if (dp->fp == NULL)
+ display_log(dp, USER_ERROR, "%s: file open failed (%s)",
+ dp->output_file, strerror(errno));
+ }
+}
+
+static void PNGCBAPI
+write_function(png_structp pp, png_bytep data, png_size_t size)
+{
+ struct display *dp = get_dp(pp);
+
+ /* The write fail is classed as a USER_ERROR, so --quiet does not turn it
+ * off, this seems more likely to be correct.
+ */
+ if (dp->fp == NULL || fwrite(data, size, 1U, dp->fp) == 1U)
+ {
+ dp->write_size += size;
+ if (dp->write_size < size || dp->write_size == MAX_SIZE)
+ png_error(pp, "IDAT size overflow");
+ }
+
+ else
+ display_log(dp, USER_ERROR, "%s: PNG file write failed (%s)",
+ dp->output_file, strerror(errno));
+}
+
+/* Compression option, 'method' is never set: there is no choice.
+ *
+ * IMPORTANT: the order of the entries in this macro determines the preference
+ * order when two different combos of two of these options produce an IDAT of
+ * the same size. The logic here is to put the things that affect the decoding
+ * of the PNG image ahead of those that are relevant only to the encoding.
+ */
+#define SET_COMPRESSION\
+ SET(strategy, strategy);\
+ SET(windowBits, window_bits);\
+ SET(level, level);\
+ SET(memLevel, mem_level);
+
+#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
+static void
+search_compression(struct display *dp)
+{
+ /* Like set_compression below but use a more restricted search than 'all' */
+ int val;
+
+# define SET(name, func) if (getsearchopts(dp, #name, &val))\
+ png_set_compression_ ## func(dp->write_pp, val);
+ SET_COMPRESSION
+# undef SET
+}
+
+static void
+set_compression(struct display *dp)
+{
+ int val;
+
+# define SET(name, func) if (getallopts(dp, #name, &val))\
+ png_set_compression_ ## func(dp->write_pp, val);
+ SET_COMPRESSION
+# undef SET
+}
+
+#ifdef PNG_SW_COMPRESS_level /* 1.7.0+ */
+static void
+set_ICC_profile_compression(struct display *dp)
+{
+ int val;
+
+# define SET(name, func) if (getallopts(dp, "ICC-profile-" #name, &val))\
+ png_set_ICC_profile_compression_ ## func(dp->write_pp, val);
+ SET_COMPRESSION
+# undef SET
+}
+#else
+# define set_ICC_profile_compression(dp) ((void)0)
+#endif
+#else
+# define search_compression(dp) ((void)0)
+# define set_compression(dp) ((void)0)
+# define set_ICC_profile_compression(dp) ((void)0)
+#endif /* WRITE_CUSTOMIZE_COMPRESSION */
+
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+static void
+set_text_compression(struct display *dp)
+{
+ int val;
+
+# define SET(name, func) if (getallopts(dp, "text-" #name, &val))\
+ png_set_text_compression_ ## func(dp->write_pp, val);
+ SET_COMPRESSION
+# undef SET
+}
+#else
+# define set_text_compression(dp) ((void)0)
+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
+
+static void
+write_png(struct display *dp, const char *destname)
+{
+ display_clean_write(dp); /* safety */
+ display_start_write(dp, destname);
+
+ dp->write_pp = png_create_write_struct(PNG_LIBPNG_VER_STRING, dp,
+ display_error, display_warning);
+
+ if (dp->write_pp == NULL)
+ display_log(dp, LIBPNG_ERROR, "failed to create write png_struct");
+
+# ifdef PNG_BENIGN_ERRORS_SUPPORTED
+ png_set_benign_errors(dp->write_pp, 1/*allowed*/);
+# endif /* BENIGN_ERRORS */
+
+ png_set_write_fn(dp->write_pp, dp, write_function, NULL/*flush*/);
+
+#ifdef IGNORE_INDEX
+ if ((dp->options & IGNORE_INDEX) != 0) /* DANGEROUS */
+ png_set_check_for_invalid_index(dp->write_pp, -1/*off completely*/);
+#endif /* IGNORE_INDEX */
+
+ /* Restore the text chunks when using libpng 1.6 or less; this is a macro
+ * which expands to nothing in 1.7+ In earlier versions it tests
+ * dp->text_stashed, which is only set (below) *after* the first write.
+ */
+ text_restore(dp);
+
+# ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ png_set_keep_unknown_chunks(dp->write_pp, PNG_HANDLE_CHUNK_ALWAYS, NULL,
+ 0);
+# endif /* HANDLE_AS_UNKNOWN */
+
+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ /* Remove the user limits, if any */
+ png_set_user_limits(dp->write_pp, 0x7fffffff, 0x7fffffff);
+# endif
+
+ /* OPTION HANDLING */
+ /* compression outputs, IDAT and zTXt/iTXt: */
+ dp->tsp = dp->nsp;
+ dp->nsp = dp->csp = 0;
+# ifdef PNG_SW_COMPRESS_png_level
+ {
+ int val;
+
+ /* This sets everything, but then the following options just override
+ * the specific settings for ICC profiles and text.
+ */
+ if (getallopts(dp, "compression", &val))
+ png_set_compression(dp->write_pp, val);
+
+ if (getallopts(dp, "ICC-profile-compression", &val))
+ png_set_ICC_profile_compression(dp->write_pp, val);
+
+ if (getallopts(dp, "text-compression", &val))
+ png_set_text_compression(dp->write_pp, val);
+ }
+# endif /* png_level support */
+ if (dp->options & SEARCH)
+ search_compression(dp);
+ else
+ set_compression(dp);
+ set_ICC_profile_compression(dp);
+ set_text_compression(dp);
+
+ {
+ int val;
+
+ /* The permitted range is 1..0x7FFFFFFF, so the cast is safe */
+ if (get_option(dp, "IDAT-size", &val))
+ png_set_IDAT_size(dp->write_pp, val);
+ }
+
+ /* filter handling */
+# ifdef PNG_WRITE_FILTER_SUPPORTED
+ {
+ int val;
+
+ if (get_option(dp, "filter", &val))
+ png_set_filter(dp->write_pp, PNG_FILTER_TYPE_BASE, val);
+ }
+# endif /* WRITE_FILTER */
+
+ /* This just uses the 'read' info_struct directly, it contains the image. */
+ dp->write_size = 0U;
+ start_timer(dp, PNGCP_TIME_WRITE);
+ png_write_png(dp->write_pp, dp->ip, 0U/*transforms*/, NULL/*params*/);
+ end_timer(dp, PNGCP_TIME_WRITE);
+
+ /* Make sure the file was written ok: */
+ if (dp->fp != NULL)
+ {
+ FILE *fp = dp->fp;
+ dp->fp = NULL;
+ if (fclose(fp))
+ display_log(dp, APP_ERROR, "%s: write failed (%s)",
+ destname == NULL ? "stdout" : destname, strerror(errno));
+ }
+
+ /* Clean it on the way out - if control returns to the caller then the
+ * written_file contains the required data.
+ */
+ display_clean_write(dp);
+ dp->operation = "none";
+}
+
+static void
+set_windowBits_hi(struct display *dp)
+{
+ /* windowBits is in the range 8..15 but zlib maps '8' to '9' so it is only
+ * worth using if the data size is 256 byte or less.
+ */
+ int wb = MAX_WBITS; /* for large images */
+ int i = VLSIZE(windowBits_IDAT);
+
+ while (wb > 8 && dp->size <= 1U<<(wb-1)) --wb;
+
+ while (--i >= 0) if (VLNAME(windowBits_IDAT)[i].name == range_hi) break;
+
+ assert(i > 1); /* vl_windowBits_IDAT always has a RANGE() */
+ VLNAME(windowBits_IDAT)[i].value = wb;
+
+ assert(VLNAME(windowBits_IDAT)[--i].name == range_lo);
+ VLNAME(windowBits_IDAT)[i].value = wb > 8 ? 9 : 8;
+
+ /* If wb == 8 then any search has been restricted to just one windowBits
+ * entry. Record that here to avoid producing a spurious app-level warning
+ * above.
+ */
+ if (wb == 8)
+ dp->min_windowBits = OPTIND(dp, windowBits);
+}
+
+static int
+better_options(const struct display *dp)
+{
+ /* Are these options better than the best found so far? Normally the
+ * options are tested in preference order, best first, however when doing a
+ * search operation on a range the range values are tested out of order. In
+ * that case preferable options will get tested later.
+ *
+ * This function looks through the stack from the bottom up looking for an
+ * option that does not match the current best value. When it finds one it
+ * checks to see if it is more or less desireable and returns true or false
+ * as appropriate.
+ *
+ * Notice that this means that the order options are pushed onto the stack
+ * conveys a priority; lower/earlier options are more important than later
+ * ones.
+ */
+ unsigned int sp;
+
+ for (sp=0; sp<dp->csp; ++sp)
+ {
+ int c = compare_option(dp, sp);
+
+ if (c < 0)
+ return 0; /* worse */
+
+ else if (c > 0)
+ return 1; /* better */
+ }
+
+ assert(0 && "unreached");
+}
+
+static void
+print_search_results(struct display *dp)
+{
+ assert(dp->filename != NULL);
+ printf("%s [%ld x %ld %d bpp %s, %lu bytes] %lu -> %lu with '%s'\n",
+ dp->filename, (unsigned long)dp->w, (unsigned long)dp->h, dp->bpp,
+ cts(dp->ct), (unsigned long)dp->size, (unsigned long)dp->read_size,
+ (unsigned long)dp->best_size, dp->best);
+ fflush(stdout);
+}
+
+static void
+log_search(struct display *dp, unsigned int log_depth)
+{
+ /* Log, and reset, the search so far: */
+ if (dp->nsp/*next entry to change*/ <= log_depth)
+ {
+ print_search_results(dp);
+ /* Start again with this entry: */
+ dp->best_size = MAX_SIZE;
+ }
+}
+
+static void
+cp_one_file(struct display *dp, const char *filename, const char *destname)
+{
+ unsigned int log_depth;
+
+ dp->filename = filename;
+ dp->operation = "read";
+ dp->no_warnings = 0;
+
+ /* Read it then write it: */
+ if (filename != NULL && access(filename, R_OK) != 0)
+ display_log(dp, USER_ERROR, "%s: invalid file name (%s)",
+ filename, strerror(errno));
+
+ read_png(dp, filename);
+
+ /* But 'destname' may be a directory. */
+ dp->operation = "write";
+
+ /* Limit the upper end of the windowBits range for this file */
+ set_windowBits_hi(dp);
+
+ /* For logging, depth to log: */
+ {
+ int val;
+
+ if (get_option(dp, "log-depth", &val) && val >= 0)
+ log_depth = (unsigned int)/*SAFE*/val;
+
+ else
+ log_depth = 0U;
+ }
+
+ if (destname != NULL) /* else stdout */
+ {
+ if (isdir(dp, destname))
+ {
+ makename(dp, destname, filename);
+ destname = dp->namebuf;
+ }
+
+ else if (access(destname, W_OK) != 0 && errno != ENOENT)
+ display_log(dp, USER_ERROR, "%s: invalid output name (%s)", destname,
+ strerror(errno));
+ }
+
+ dp->nsp = 0;
+ dp->curr[0] = 0; /* acts as a flag for the caller */
+ dp->opt_string_start = 0;
+ dp->best[0] = 0; /* safety */
+ dp->best_size = MAX_SIZE;
+ write_png(dp, destname);
+
+ /* Initialize the 'best' fields: */
+ strcpy(dp->best, dp->curr);
+ dp->best_size = dp->write_size;
+
+ if (dp->nsp > 0) /* interating over lists */
+ {
+ char *tmpname, tmpbuf[(sizeof dp->namebuf) + 4];
+ assert(dp->curr[0] == ' ' && dp->tsp > 0);
+
+ /* Cancel warnings on subsequent writes */
+ log_search(dp, log_depth);
+ dp->no_warnings = 1;
+
+ /* Make a temporary name for the subsequent tests: */
+ if (destname != NULL)
+ {
+ strcpy(tmpbuf, destname);
+ strcat(tmpbuf, ".tmp"); /* space for .tmp allocated above */
+ tmpname = tmpbuf;
+ }
+
+ else
+ tmpname = NULL; /* stdout */
+
+ /* Loop to find the best option. */
+ do
+ {
+ write_png(dp, tmpname);
+
+ /* And compare the sizes (the write function makes sure write_size
+ * doesn't overflow.)
+ */
+ assert(dp->csp > 0);
+
+ if (dp->write_size < dp->best_size ||
+ (dp->write_size == dp->best_size && better_options(dp)))
+ {
+ if (destname != NULL && rename(tmpname, destname) != 0)
+ display_log(dp, APP_ERROR, "rename %s %s failed (%s)", tmpname,
+ destname, strerror(errno));
+
+ strcpy(dp->best, dp->curr);
+ dp->best_size = dp->write_size;
+ }
+
+ else if (tmpname != NULL && unlink(tmpname) != 0)
+ display_log(dp, APP_WARNING, "unlink %s failed (%s)", tmpname,
+ strerror(errno));
+
+ log_search(dp, log_depth);
+ }
+ while (dp->nsp > 0);
+
+ /* Do this for the 'sizes' option so that it reports the correct size. */
+ dp->write_size = dp->best_size;
+ }
+}
+
+static int
+cppng(struct display *dp, const char *file, const char *gv dest)
+ /* Exists solely to isolate the setjmp clobbers which some versions of GCC
+ * erroneously generate.
+ */
+{
+ int ret = setjmp(dp->error_return);
+
+ if (ret == 0)
+ {
+ dp->errset = 1;
+ cp_one_file(dp, file, dest);
+ dp->errset = 0;
+ return 0;
+ }
+
+ else
+ {
+ dp->errset = 0;
+
+ if (ret < ERRORS) /* shouldn't longjmp on warnings */
+ display_log(dp, INTERNAL_ERROR, "unexpected return code %d", ret);
+
+ return ret;
+ }
+}
+
+int
+main(const int argc, const char * const * const argv)
+{
+ /* For each file on the command line test it with a range of transforms */
+ int option_end;
+ struct display d;
+
+ display_init(&d);
+
+ d.operation = "options";
+ for (option_end = 1;
+ option_end < argc && opt_check(&d, argv[option_end]);
+ ++option_end)
+ {
+ }
+
+ /* Do a quick check on the directory target case; when there are more than
+ * two arguments the last one must be a directory.
+ */
+ if (!(d.options & NOWRITE) && option_end+2 < argc && !checkdir(argv[argc-1]))
+ {
+ fprintf(stderr,
+ "pngcp: %s: directory required with more than two arguments\n",
+ argv[argc-1]);
+ return 99;
+ }
+
+ {
+ int errors = 0;
+ int i = option_end;
+
+ /* Do this at least once; if there are no arguments stdin/stdout are used.
+ */
+ d.operation = "files";
+ do
+ {
+ const char *infile = NULL;
+ const char *outfile = NULL;
+ int ret;
+
+ if (i < argc)
+ {
+ infile = argv[i++];
+ if (!(d.options & NOWRITE) && i < argc)
+ outfile = argv[argc-1];
+ }
+
+ ret = cppng(&d, infile, outfile);
+
+ if (ret)
+ {
+ if (ret > QUIET) /* abort on user or internal error */
+ return 99;
+
+ /* An error: the output is meaningless */
+ }
+
+ else if (d.best[0] != 0)
+ {
+ /* This result may already have been output, in which case best_size
+ * has been reset.
+ */
+ if (d.best_size < MAX_SIZE)
+ print_search_results(&d);
+ }
+
+ else if (d.options & SIZES)
+ {
+ printf("%s [%ld x %ld %d bpp %s, %lu bytes] %lu -> %lu [0x%lx]\n",
+ infile, (unsigned long)d.w, (unsigned long)d.h, d.bpp,
+ cts(d.ct), (unsigned long)d.size, (unsigned long)d.read_size,
+ (unsigned long)d.write_size, (unsigned long)d.results);
+ fflush(stdout);
+ }
+
+ /* Here on any return, including failures, except user/internal issues
+ */
+ {
+ const int pass = (d.options & STRICT) ?
+ RESULT_STRICT(d.results) : RESULT_RELAXED(d.results);
+
+ if (!pass)
+ ++errors;
+
+ if (d.options & LOG)
+ {
+ int j;
+
+ printf("%s: pngcp", pass ? "PASS" : "FAIL");
+
+ for (j=1; j<option_end; ++j)
+ printf(" %s", argv[j]);
+
+ if (infile != NULL)
+ printf(" %s", infile);
+
+# ifdef PNG_PNGCP_TIMING_SUPPORTED
+ /* When logging output the files for each file, if enabled. */
+ if ((d.value[OPTIND(&d,time)] & PNGCP_TIME_READ) != 0)
+ print_time(" read", d.read_time);
+
+ if ((d.value[OPTIND(&d,time)] & PNGCP_TIME_WRITE) != 0)
+ print_time(" write", d.write_time);
+# endif /* PNGCP_TIMING */
+
+ printf("\n");
+ fflush(stdout);
+ }
+ }
+
+ display_clean(&d);
+ }
+ while (i+!(d.options & NOWRITE) < argc);
+ /* I.e. for write cases after the first time through the loop require
+ * there to be at least two arguments left and for the last one to be a
+ * directory (this was checked above).
+ */
+
+ /* Release allocated memory */
+ display_destroy(&d);
+
+# ifdef PNG_PNGCP_TIMING_SUPPORTED
+ {
+ int output = 0;
+
+ if ((d.value[OPTIND(&d,time)] & PNGCP_TIME_READ) != 0)
+ print_time("read", d.read_time_total), output = 1;
+
+ if ((d.value[OPTIND(&d,time)] & PNGCP_TIME_WRITE) != 0)
+ {
+ if (output) putchar(' ');
+ print_time("write", d.write_time_total);
+ output = 1;
+ }
+
+ if (output) putchar('\n');
+ }
+# endif /* PNGCP_TIMING */
+
+ return errors != 0;
+ }
+}
+#else /* !READ_PNG || !WRITE_PNG */
+int
+main(void)
+{
+ fprintf(stderr, "pngcp: no support for png_read/write_image\n");
+ return 77;
+}
+#endif /* !READ_PNG || !WRITE_PNG */
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,7 +2,7 @@
*
* Copyright (c) 2014-2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.21 [January 15, 2016]
+ * Last changed in libpng 1.6.26 [October 20, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -1824,7 +1824,7 @@
}
static png_uint_32
-rechunk_length(struct IDAT *idat)
+rechunk_length(struct IDAT *idat, int start)
/* Return the length for the next IDAT chunk, taking into account
* rechunking.
*/
@@ -1836,7 +1836,7 @@
const struct IDAT_list *cur;
unsigned int count;
- if (idat->idat_index == 0) /* at the new chunk (first time) */
+ if (start)
return idat->idat_length; /* use the cache */
/* Otherwise rechunk_length is called at the end of a chunk for the length
@@ -1995,7 +1995,7 @@
idat->idat_index = 0; /* Index into chunk data */
/* Update the chunk length to the correct value for the IDAT chunk: */
- file->chunk->chunk_length = rechunk_length(idat);
+ file->chunk->chunk_length = rechunk_length(idat, 1/*start*/);
/* Change the state to writing IDAT chunks */
file->state = STATE_IDAT;
@@ -3473,7 +3473,8 @@
/* Write another IDAT chunk. Call rechunk_length to
* calculate the length required.
*/
- length = chunk->chunk_length = rechunk_length(file->idat);
+ length = chunk->chunk_length =
+ rechunk_length(file->idat, 0/*end*/);
assert(type == png_IDAT);
file->write_count = 0; /* for the new chunk */
--(file->write_count); /* fake out the increment below */
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# reindent a libpng C source
+
+# COPYRIGHT: Written by Glenn Randers-Pehrson, 2016.
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. This work is published from:
+# United States.
+
+# Usage:
+# reindent inputtabsize outputtabsize inputcontinuestring outputcontinuestring
+#
+# Assumes that continued lines begin with indentation plus one space, and
+# that continued comments begin with indentation plus " *".
+#
+# eg, to change libpng coding style from 3-space indentation with 4-space
+# continuations to 4-space indentation with 2-space continuations:
+#
+# reindent 3 4 "\t " " " < example.c > example.c_4_2
+# and to restore the file back to libpng coding style
+# reindent 4 3 " " " " < example.c_4_2 > example.c_3_4
+
+unexpand --first-only --t $1 | \
+ sed -e "/^ *$3[^\*]/{s/$3/$4/}" | \
+ expand -t $2
Modified: branches/stable/source/src/libs/libpng/libpng-src/example.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/example.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/example.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,8 +2,8 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
- * Last changed in libpng 1.6.15 [November 20, 2014]
- * Maintained 1998-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Maintained 1998-2016 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
* To the extent possible under law, the authors have waived
@@ -97,7 +97,7 @@
*/
if (buffer != NULL &&
png_image_finish_read(&image, NULL/*background*/, buffer,
- 0/*row_stride*/, NULL/*colormap*/) != 0)
+ 0/*row_stride*/, NULL/*colormap*/) != 0)
{
/* Now write the image out to the second argument. In the write
* call 'convert_to_8bit' allows 16-bit data to be squashed down to
@@ -105,7 +105,7 @@
* to the 8-bit format.
*/
if (png_image_write_to_file(&image, argv[2], 0/*convert_to_8bit*/,
- buffer, 0/*row_stride*/, NULL/*colormap*/) != 0)
+ buffer, 0/*row_stride*/, NULL/*colormap*/) != 0)
{
/* The image has been written successfully. */
exit(0);
@@ -295,7 +295,7 @@
* was compiled with a compatible version of the library. REQUIRED
*/
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
- png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (png_ptr == NULL)
{
@@ -375,7 +375,7 @@
* low byte.
*/
#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- png_set_scale_16(png_ptr);
+ png_set_scale_16(png_ptr);
#else
png_set_strip_16(png_ptr);
#endif
@@ -419,10 +419,10 @@
if (png_get_bKGD(png_ptr, info_ptr, &image_background) != 0)
png_set_background(png_ptr, image_background,
- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
else
png_set_background(png_ptr, &my_background,
- PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
/* Some suggestions as to how to get a screen gamma value
*
@@ -481,7 +481,7 @@
png_color std_color_cube[MAX_SCREEN_COLORS];
png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
- MAX_SCREEN_COLORS, NULL, 0);
+ MAX_SCREEN_COLORS, NULL, 0);
}
/* This reduces the image to the palette supplied in the file */
else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) != 0)
@@ -491,7 +491,7 @@
png_get_hIST(png_ptr, info_ptr, &histogram);
png_set_quantize(png_ptr, palette, num_palette,
- max_screen_colors, histogram, 0);
+ max_screen_colors, histogram, 0);
}
}
#endif /* READ_QUANTIZE */
@@ -530,7 +530,7 @@
* see the png_read_row() method below:
*/
number_passes = png_set_interlace_handling(png_ptr);
-#else
+#else /* !READ_INTERLACING */
number_passes = 1;
#endif /* READ_INTERLACING */
@@ -552,7 +552,7 @@
for (row = 0; row < height; row++)
row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
- info_ptr));
+ info_ptr));
/* Now it's time to read the image. One of these methods is REQUIRED */
#ifdef entire /* Read the entire image in one go */
@@ -574,10 +574,10 @@
{
#ifdef sparkle /* Read the image using the "sparkle" effect. */
png_read_rows(png_ptr, &row_pointers[y], NULL,
- number_of_rows);
+ number_of_rows);
#else no_sparkle /* Read the image using the "rectangle" effect */
png_read_rows(png_ptr, NULL, &row_pointers[y],
- number_of_rows);
+ number_of_rows);
#endif no_sparkle /* Use only one of these two methods */
}
@@ -614,7 +614,7 @@
* linked libraries.
*/
*png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
- png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (*png_ptr == NULL)
{
@@ -649,7 +649,7 @@
* the function png_get_progressive_ptr(png_ptr).
*/
png_set_progressive_read_fn(*png_ptr, (void *)stream_data,
- info_callback, row_callback, end_callback);
+ info_callback, row_callback, end_callback);
return (OK);
}
@@ -656,7 +656,7 @@
int
process_data(png_structp *png_ptr, png_infop *info_ptr,
- png_bytep buffer, png_uint_32 length)
+ png_bytep buffer, png_uint_32 length)
{
if (setjmp(png_jmpbuf((*png_ptr))))
{
@@ -691,7 +691,7 @@
}
row_callback(png_structp png_ptr, png_bytep new_row,
- png_uint_32 row_num, int pass)
+ png_uint_32 row_num, int pass)
{
/*
* This function is called for every row in the image. If the
@@ -780,7 +780,7 @@
* in case we are using dynamically linked libraries. REQUIRED.
*/
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
- png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (png_ptr == NULL)
{
@@ -819,7 +819,7 @@
* png_init_io() here you would call
*/
png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
- user_IO_flush_function);
+ user_IO_flush_function);
/* where user_io_ptr is a structure you want available to the callbacks */
#endif no_streams /* Only use one initialization method */
@@ -842,7 +842,7 @@
* currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
*/
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
- PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
/* Set the palette if there is one. REQUIRED for indexed-color images */
palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
@@ -988,11 +988,11 @@
png_bytep row_pointers[height];
if (height > PNG_UINT_32_MAX/(sizeof (png_bytep)))
- png_error (png_ptr, "Image is too tall to process in memory");
+ png_error (png_ptr, "Image is too tall to process in memory");
/* Set up pointers into your "image" byte array */
for (k = 0; k < height; k++)
- row_pointers[k] = image + k*width*bytes_per_pixel;
+ row_pointers[k] = image + k*width*bytes_per_pixel;
/* One of the following output methods is REQUIRED */
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.21 - January 15, 2016
+ libpng version 1.6.28 - January 5, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.21 - January 15, 2016
+ libpng versions 0.97, January 1998, through 1.6.28 - January 5, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -467,8 +467,9 @@
The values for png_set_crc_action() say how libpng is to handle CRC errors in
ancillary and critical chunks, and whether to use the data contained
-therein. Note that it is impossible to "discard" data in a critical
-chunk.
+therein. Starting with libpng-1.6.26, this also governs how an ADLER32 error
+is handled while reading the IDAT chunk. Note that it is impossible to
+"discard" data in a critical chunk.
Choices for (int) crit_action are
PNG_CRC_DEFAULT 0 error/quit
@@ -485,6 +486,9 @@
PNG_CRC_QUIET_USE 4 quiet/use data
PNG_CRC_NO_CHANGE 5 use the current value
+When the setting for crit_action is PNG_CRC_QUIET_USE, the CRC and ADLER32
+checksums are not only ignored, but they are not evaluated.
+
Setting up callback code
You can set up a callback function to handle any unknown chunks in the
@@ -559,7 +563,7 @@
passed in row number, and pass will always be 0. For the interlaced case the
same applies unless the row value is 0, in which case the row just handled was
the last one from one of the preceding passes. Because interlacing may skip a
-pass you cannot be sure that the preceding pass is just 'pass-1', if you really
+pass you cannot be sure that the preceding pass is just 'pass-1'; if you really
need to know what the last pass is record (row,pass) from the callback and use
the last recorded value each time.
@@ -2230,7 +2234,8 @@
after each pass, the "rectangle" effect is generally considered the
better looking one.
-If you only want the "sparkle" effect, just call png_read_rows() as
+If you only want the "sparkle" effect, just call png_read_row() or
+png_read_rows() as
normal, with the third parameter NULL. Make sure you make pass over
the image number_of_passes times, and you don't change the data in the
rows between calls. You can change the locations of the data, just
@@ -2239,6 +2244,8 @@
png_read_rows(png_ptr, row_pointers, NULL,
number_of_rows);
+ or
+ png_read_row(png_ptr, row_pointers, NULL);
If you only want the first effect (the rectangles), do the same as
before except pass the row buffer in the third parameter, and leave
@@ -2246,6 +2253,8 @@
png_read_rows(png_ptr, NULL, row_pointers,
number_of_rows);
+ or
+ png_read_row(png_ptr, NULL, row_pointers);
If you don't want libpng to handle the interlacing details, just call
png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.
@@ -2842,7 +2851,7 @@
PNG_FILTER_UP | PNG_FILTER_VALUE_UP |
PNG_FILTER_AVG | PNG_FILTER_VALUE_AVG |
PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
- PNG_ALL_FILTERS);
+ PNG_ALL_FILTERS | PNG_FAST_FILTERS);
If an application wants to start and stop using particular filters during
compression, it should start out with all of the filters (to ensure that
@@ -4103,6 +4112,13 @@
Write the image to the named file.
+ int png_image_write_to_memory (png_imagep image, void *memory,
+ png_alloc_size_t * PNG_RESTRICT memory_bytes,
+ int convert_to_8_bit, const void *buffer, ptrdiff_t row_stride,
+ const void *colormap));
+
+ Write the image to memory.
+
int png_image_write_to_stdio(png_imagep image, FILE *file,
int convert_to_8_bit, const void *buffer,
png_int_32 row_stride, const void *colormap)
@@ -4380,8 +4396,9 @@
The 'method' parameter sets the main filtering method, which is
currently only '0' in the PNG 1.2 specification. The 'filters'
parameter sets which filter(s), if any, should be used for each
-scanline. Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
-to turn filtering on and off, respectively.
+scanline. Possible values are PNG_ALL_FILTERS, PNG_NO_FILTERS,
+or PNG_FAST_FILTERS to turn filtering on and off, or to turn on
+just the fast-decoding subset of filters, respectively.
Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
@@ -4395,12 +4412,19 @@
currently does not allocate the filter buffers until png_write_row()
is called for the first time.)
- filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+ filters = PNG_NO_FILTERS;
+ filters = PNG_ALL_FILTERS;
+ filters = PNG_FAST_FILTERS;
+
+ or
+
+ filters = PNG_FILTER_NONE | PNG_FILTER_SUB |
PNG_FILTER_UP | PNG_FILTER_AVG |
- PNG_FILTER_PAETH | PNG_ALL_FILTERS;
+ PNG_FILTER_PAETH;
png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
filters);
+
The second parameter can also be
PNG_INTRAPIXEL_DIFFERENCING if you are
writing a PNG to be embedded in a MNG
@@ -4775,7 +4799,8 @@
the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
members of the main libpng control structures, png_struct and png_info,
deprecated in earlier versions of libpng, has been completely removed from
-libpng 1.5.
+libpng 1.5, and new private "pngstruct.h", "pnginfo.h", and "pngdebug.h"
+header files were created.
We no longer include zlib.h in png.h. The include statement has been moved
to pngstruct.h, where it is not accessible by applications. Applications that
@@ -5015,6 +5040,7 @@
png_image_free()
write functions
png_image_write_to_file()
+ png_image_write_to_memory()
png_image_write_to_stdio()
Starting with libpng-1.6.0, you can configure libpng to prefix all exported
@@ -5313,8 +5339,9 @@
We prefer to use underscores rather than camelCase in names, except
for a few type names that we inherit from zlib.h.
-We prefer "if (something != 0)" and "if (something == 0)"
-over "if (something)" and if "(!something)", respectively.
+We prefer "if (something != 0)" and "if (something == 0)" over
+"if (something)" and if "(!something)", respectively, and for pointers
+we prefer "if (some_pointer != NULL)" or "if (some_pointer == NULL)".
We do not use the TAB character for indentation in the C sources.
@@ -5328,7 +5355,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.21 are Y2K compliant. It is my belief that earlier
+upward through 1.6.28 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "January 15, 2016"
+.TH LIBPNG 3 "January 5, 2017"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -229,6 +229,8 @@
\fBint png_image_write_to_file (png_imagep \fP\fIimage\fP\fB, const char \fP\fI*file\fP\fB, int \fP\fIconvert_to_8bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap\fP\fB);\fP
+\fBint png_image_write_to_memory (png_imagep \fP\fIimage\fP\fB, void \fP\fI*memory\fP\fB, png_alloc_size_t * PNG_RESTRICT \fP\fImemory_bytes\fP\fB, int \fP\fIconvert_to_8_bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, const void \fI*colormap)\fP\fB);\fP
+
\fBint png_image_write_to_stdio (png_imagep \fP\fIimage\fP\fB, FILE \fP\fI*file\fP\fB, int \fP\fIconvert_to_8_bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap)\fP\fB);\fP
\fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
@@ -508,7 +510,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.21 - January 15, 2016
+ libpng version 1.6.28 - January 5, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -519,7 +521,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.21 - January 15, 2016
+ libpng versions 0.97, January 1998, through 1.6.28 - January 5, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -975,8 +977,9 @@
The values for png_set_crc_action() say how libpng is to handle CRC errors in
ancillary and critical chunks, and whether to use the data contained
-therein. Note that it is impossible to "discard" data in a critical
-chunk.
+therein. Starting with libpng-1.6.26, this also governs how an ADLER32 error
+is handled while reading the IDAT chunk. Note that it is impossible to
+"discard" data in a critical chunk.
Choices for (int) crit_action are
PNG_CRC_DEFAULT 0 error/quit
@@ -993,6 +996,9 @@
PNG_CRC_QUIET_USE 4 quiet/use data
PNG_CRC_NO_CHANGE 5 use the current value
+When the setting for crit_action is PNG_CRC_QUIET_USE, the CRC and ADLER32
+checksums are not only ignored, but they are not evaluated.
+
.SS Setting up callback code
You can set up a callback function to handle any unknown chunks in the
@@ -1067,7 +1073,7 @@
passed in row number, and pass will always be 0. For the interlaced case the
same applies unless the row value is 0, in which case the row just handled was
the last one from one of the preceding passes. Because interlacing may skip a
-pass you cannot be sure that the preceding pass is just 'pass\-1', if you really
+pass you cannot be sure that the preceding pass is just 'pass\-1'; if you really
need to know what the last pass is record (row,pass) from the callback and use
the last recorded value each time.
@@ -2738,7 +2744,8 @@
after each pass, the "rectangle" effect is generally considered the
better looking one.
-If you only want the "sparkle" effect, just call png_read_rows() as
+If you only want the "sparkle" effect, just call png_read_row() or
+png_read_rows() as
normal, with the third parameter NULL. Make sure you make pass over
the image number_of_passes times, and you don't change the data in the
rows between calls. You can change the locations of the data, just
@@ -2747,6 +2754,8 @@
png_read_rows(png_ptr, row_pointers, NULL,
number_of_rows);
+ or
+ png_read_row(png_ptr, row_pointers, NULL);
If you only want the first effect (the rectangles), do the same as
before except pass the row buffer in the third parameter, and leave
@@ -2754,6 +2763,8 @@
png_read_rows(png_ptr, NULL, row_pointers,
number_of_rows);
+ or
+ png_read_row(png_ptr, NULL, row_pointers);
If you don't want libpng to handle the interlacing details, just call
png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.
@@ -3350,7 +3361,7 @@
PNG_FILTER_UP | PNG_FILTER_VALUE_UP |
PNG_FILTER_AVG | PNG_FILTER_VALUE_AVG |
PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
- PNG_ALL_FILTERS);
+ PNG_ALL_FILTERS | PNG_FAST_FILTERS);
If an application wants to start and stop using particular filters during
compression, it should start out with all of the filters (to ensure that
@@ -4611,6 +4622,13 @@
Write the image to the named file.
+ int png_image_write_to_memory (png_imagep image, void *memory,
+ png_alloc_size_t * PNG_RESTRICT memory_bytes,
+ int convert_to_8_bit, const void *buffer, ptrdiff_t row_stride,
+ const void *colormap));
+
+ Write the image to memory.
+
int png_image_write_to_stdio(png_imagep image, FILE *file,
int convert_to_8_bit, const void *buffer,
png_int_32 row_stride, const void *colormap)
@@ -4888,8 +4906,9 @@
The 'method' parameter sets the main filtering method, which is
currently only '0' in the PNG 1.2 specification. The 'filters'
parameter sets which filter(s), if any, should be used for each
-scanline. Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
-to turn filtering on and off, respectively.
+scanline. Possible values are PNG_ALL_FILTERS, PNG_NO_FILTERS,
+or PNG_FAST_FILTERS to turn filtering on and off, or to turn on
+just the fast-decoding subset of filters, respectively.
Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
@@ -4903,12 +4922,19 @@
currently does not allocate the filter buffers until png_write_row()
is called for the first time.)
- filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+ filters = PNG_NO_FILTERS;
+ filters = PNG_ALL_FILTERS;
+ filters = PNG_FAST_FILTERS;
+
+ or
+
+ filters = PNG_FILTER_NONE | PNG_FILTER_SUB |
PNG_FILTER_UP | PNG_FILTER_AVG |
- PNG_FILTER_PAETH | PNG_ALL_FILTERS;
+ PNG_FILTER_PAETH;
png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
filters);
+
The second parameter can also be
PNG_INTRAPIXEL_DIFFERENCING if you are
writing a PNG to be embedded in a MNG
@@ -5283,7 +5309,8 @@
the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
members of the main libpng control structures, png_struct and png_info,
deprecated in earlier versions of libpng, has been completely removed from
-libpng 1.5.
+libpng 1.5, and new private "pngstruct.h", "pnginfo.h", and "pngdebug.h"
+header files were created.
We no longer include zlib.h in png.h. The include statement has been moved
to pngstruct.h, where it is not accessible by applications. Applications that
@@ -5523,6 +5550,7 @@
png_image_free()
write functions
png_image_write_to_file()
+ png_image_write_to_memory()
png_image_write_to_stdio()
Starting with libpng-1.6.0, you can configure libpng to prefix all exported
@@ -5821,8 +5849,9 @@
We prefer to use underscores rather than camelCase in names, except
for a few type names that we inherit from zlib.h.
-We prefer "if (something != 0)" and "if (something == 0)"
-over "if (something)" and if "(!something)", respectively.
+We prefer "if (something != 0)" and "if (something == 0)" over
+"if (something)" and if "(!something)", respectively, and for pointers
+we prefer "if (some_pointer != NULL)" or "if (some_pointer == NULL)".
We do not use the TAB character for indentation in the C sources.
@@ -5836,7 +5865,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.21 are Y2K compliant. It is my belief that earlier
+upward through 1.6.28 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -5934,11 +5963,11 @@
...
1.0.19 10 10019 10.so.0.19[.0]
...
- 1.2.53 13 10253 12.so.0.53[.0]
+ 1.2.57 13 10257 12.so.0.56[.0]
...
- 1.5.23 15 10523 15.so.15.23[.0]
+ 1.5.28 15 10528 15.so.15.28[.0]
...
- 1.6.21 16 10621 16.so.16.21[.0]
+ 1.6.28 16 10628 16.so.16.28[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -5994,7 +6023,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.21 - January 15, 2016:
+Libpng version 1.6.28 - January 5, 2017:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6019,8 +6048,8 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
-Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are
+Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors:
@@ -6031,6 +6060,7 @@
Cosmin Truta
Gilles Vollant
James Yu
+ Mandar Sahastrabuddhe
and with the following additions to the disclaimer:
@@ -6041,6 +6071,10 @@
risk of satisfactory quality, performance, accuracy, and effort is with
the user.
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
libpng-0.96, and are distributed according to the same disclaimer and
@@ -6064,6 +6098,9 @@
Greg Roelofs
Tom Tanner
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -6104,6 +6141,29 @@
END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction. However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
+
+OSI CERTIFICATION:
+
+Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
+
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software. See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
A "png_get_copyright" function is available, for convenient use in "about"
boxes and the like:
@@ -6112,13 +6172,9 @@
Also, the PNG logo (in PNG format, of course) is supplied in the
files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
-a certification mark of the Open Source Initiative. OSI has not addressed
-the additional disclaimers inserted at version 1.0.7.
-
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 15, 2016
+January 5, 2017
.\" end of man page
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "January 15, 2016"
+.TH LIBPNGPF 3 "January 5, 2017"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
Added: branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,807 @@
+
+/* filter_msa_intrinsics.c - MSA optimised filter functions
+ *
+ * Copyright (c) 2016 Glenn Randers-Pehrson
+ * Written by Mandar Sahastrabuddhe, August 2016.
+ * Last changed in libpng 1.6.25 [September 1, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+#include <stdio.h>
+#include <stdint.h>
+#include "../pngpriv.h"
+
+#ifdef PNG_READ_SUPPORTED
+
+/* This code requires -mfpu=msa on the command line: */
+#if PNG_MIPS_MSA_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
+
+#include <msa.h>
+
+/* libpng row pointers are not necessarily aligned to any particular boundary,
+ * however this code will only work with appropriate alignment. mips/mips_init.c
+ * checks for this (and will not compile unless it is done). This code uses
+ * variants of png_aligncast to avoid compiler warnings.
+ */
+#define png_ptr(type,pointer) png_aligncast(type *,pointer)
+#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer)
+
+/* The following relies on a variable 'temp_pointer' being declared with type
+ * 'type'. This is written this way just to hide the GCC strict aliasing
+ * warning; note that the code is safe because there never is an alias between
+ * the input and output pointers.
+ */
+#define png_ldr(type,pointer)\
+ (temp_pointer = png_ptr(type,pointer), *temp_pointer)
+
+#if PNG_MIPS_MSA_OPT > 0
+
+#ifdef CLANG_BUILD
+ #define MSA_SRLI_B(a, b) __msa_srli_b((v16i8) a, b)
+
+ #define LW(psrc) \
+ ( { \
+ uint8_t *psrc_lw_m = (uint8_t *) (psrc); \
+ uint32_t val_m; \
+ \
+ asm volatile ( \
+ "lw %[val_m], %[psrc_lw_m] \n\t" \
+ \
+ : [val_m] "=r" (val_m) \
+ : [psrc_lw_m] "m" (*psrc_lw_m) \
+ ); \
+ \
+ val_m; \
+ } )
+
+ #define SH(val, pdst) \
+ { \
+ uint8_t *pdst_sh_m = (uint8_t *) (pdst); \
+ uint16_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sh %[val_m], %[pdst_sh_m] \n\t" \
+ \
+ : [pdst_sh_m] "=m" (*pdst_sh_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #define SW(val, pdst) \
+ { \
+ uint8_t *pdst_sw_m = (uint8_t *) (pdst); \
+ uint32_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sw %[val_m], %[pdst_sw_m] \n\t" \
+ \
+ : [pdst_sw_m] "=m" (*pdst_sw_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #if (__mips == 64)
+ #define SD(val, pdst) \
+ { \
+ uint8_t *pdst_sd_m = (uint8_t *) (pdst); \
+ uint64_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sd %[val_m], %[pdst_sd_m] \n\t" \
+ \
+ : [pdst_sd_m] "=m" (*pdst_sd_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+ #else
+ #define SD(val, pdst) \
+ { \
+ uint8_t *pdst_sd_m = (uint8_t *) (pdst); \
+ uint32_t val0_m, val1_m; \
+ \
+ val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF); \
+ val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF); \
+ \
+ SW(val0_m, pdst_sd_m); \
+ SW(val1_m, pdst_sd_m + 4); \
+ }
+ #endif
+#else
+ #define MSA_SRLI_B(a, b) (a >> b)
+
+#if (__mips_isa_rev >= 6)
+ #define LW(psrc) \
+ ( { \
+ uint8_t *psrc_lw_m = (uint8_t *) (psrc); \
+ uint32_t val_m; \
+ \
+ asm volatile ( \
+ "lw %[val_m], %[psrc_lw_m] \n\t" \
+ \
+ : [val_m] "=r" (val_m) \
+ : [psrc_lw_m] "m" (*psrc_lw_m) \
+ ); \
+ \
+ val_m; \
+ } )
+
+ #define SH(val, pdst) \
+ { \
+ uint8_t *pdst_sh_m = (uint8_t *) (pdst); \
+ uint16_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sh %[val_m], %[pdst_sh_m] \n\t" \
+ \
+ : [pdst_sh_m] "=m" (*pdst_sh_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #define SW(val, pdst) \
+ { \
+ uint8_t *pdst_sw_m = (uint8_t *) (pdst); \
+ uint32_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sw %[val_m], %[pdst_sw_m] \n\t" \
+ \
+ : [pdst_sw_m] "=m" (*pdst_sw_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #if (__mips == 64)
+ #define SD(val, pdst) \
+ { \
+ uint8_t *pdst_sd_m = (uint8_t *) (pdst); \
+ uint64_t val_m = (val); \
+ \
+ asm volatile ( \
+ "sd %[val_m], %[pdst_sd_m] \n\t" \
+ \
+ : [pdst_sd_m] "=m" (*pdst_sd_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+ #else
+ #define SD(val, pdst) \
+ { \
+ uint8_t *pdst_sd_m = (uint8_t *) (pdst); \
+ uint32_t val0_m, val1_m; \
+ \
+ val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF); \
+ val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF); \
+ \
+ SW(val0_m, pdst_sd_m); \
+ SW(val1_m, pdst_sd_m + 4); \
+ }
+ #endif
+#else // !(__mips_isa_rev >= 6)
+ #define LW(psrc) \
+ ( { \
+ uint8_t *psrc_lw_m = (uint8_t *) (psrc); \
+ uint32_t val_m; \
+ \
+ asm volatile ( \
+ "ulw %[val_m], %[psrc_lw_m] \n\t" \
+ \
+ : [val_m] "=r" (val_m) \
+ : [psrc_lw_m] "m" (*psrc_lw_m) \
+ ); \
+ \
+ val_m; \
+ } )
+
+ #define SH(val, pdst) \
+ { \
+ uint8_t *pdst_sh_m = (uint8_t *) (pdst); \
+ uint16_t val_m = (val); \
+ \
+ asm volatile ( \
+ "ush %[val_m], %[pdst_sh_m] \n\t" \
+ \
+ : [pdst_sh_m] "=m" (*pdst_sh_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #define SW(val, pdst) \
+ { \
+ uint8_t *pdst_sw_m = (uint8_t *) (pdst); \
+ uint32_t val_m = (val); \
+ \
+ asm volatile ( \
+ "usw %[val_m], %[pdst_sw_m] \n\t" \
+ \
+ : [pdst_sw_m] "=m" (*pdst_sw_m) \
+ : [val_m] "r" (val_m) \
+ ); \
+ }
+
+ #define SD(val, pdst) \
+ { \
+ uint8_t *pdst_sd_m = (uint8_t *) (pdst); \
+ uint32_t val0_m, val1_m; \
+ \
+ val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF); \
+ val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF); \
+ \
+ SW(val0_m, pdst_sd_m); \
+ SW(val1_m, pdst_sd_m + 4); \
+ }
+
+ #define SW_ZERO(pdst) \
+ { \
+ uint8_t *pdst_m = (uint8_t *) (pdst); \
+ \
+ asm volatile ( \
+ "usw $0, %[pdst_m] \n\t" \
+ \
+ : [pdst_m] "=m" (*pdst_m) \
+ : \
+ ); \
+ }
+#endif // (__mips_isa_rev >= 6)
+#endif
+
+#define LD_B(RTYPE, psrc) *((RTYPE *) (psrc))
+#define LD_UB(...) LD_B(v16u8, __VA_ARGS__)
+#define LD_B2(RTYPE, psrc, stride, out0, out1) \
+{ \
+ out0 = LD_B(RTYPE, (psrc)); \
+ out1 = LD_B(RTYPE, (psrc) + stride); \
+}
+#define LD_UB2(...) LD_B2(v16u8, __VA_ARGS__)
+#define LD_B4(RTYPE, psrc, stride, out0, out1, out2, out3) \
+{ \
+ LD_B2(RTYPE, (psrc), stride, out0, out1); \
+ LD_B2(RTYPE, (psrc) + 2 * stride , stride, out2, out3); \
+}
+#define LD_UB4(...) LD_B4(v16u8, __VA_ARGS__)
+
+#define ST_B(RTYPE, in, pdst) *((RTYPE *) (pdst)) = (in)
+#define ST_UB(...) ST_B(v16u8, __VA_ARGS__)
+#define ST_B2(RTYPE, in0, in1, pdst, stride) \
+{ \
+ ST_B(RTYPE, in0, (pdst)); \
+ ST_B(RTYPE, in1, (pdst) + stride); \
+}
+#define ST_UB2(...) ST_B2(v16u8, __VA_ARGS__)
+#define ST_B4(RTYPE, in0, in1, in2, in3, pdst, stride) \
+{ \
+ ST_B2(RTYPE, in0, in1, (pdst), stride); \
+ ST_B2(RTYPE, in2, in3, (pdst) + 2 * stride, stride); \
+}
+#define ST_UB4(...) ST_B4(v16u8, __VA_ARGS__)
+
+#define ADD2(in0, in1, in2, in3, out0, out1) \
+{ \
+ out0 = in0 + in1; \
+ out1 = in2 + in3; \
+}
+#define ADD3(in0, in1, in2, in3, in4, in5, \
+ out0, out1, out2) \
+{ \
+ ADD2(in0, in1, in2, in3, out0, out1); \
+ out2 = in4 + in5; \
+}
+#define ADD4(in0, in1, in2, in3, in4, in5, in6, in7, \
+ out0, out1, out2, out3) \
+{ \
+ ADD2(in0, in1, in2, in3, out0, out1); \
+ ADD2(in4, in5, in6, in7, out2, out3); \
+}
+
+#define ILVR_B2(RTYPE, in0, in1, in2, in3, out0, out1) \
+{ \
+ out0 = (RTYPE) __msa_ilvr_b((v16i8) in0, (v16i8) in1); \
+ out1 = (RTYPE) __msa_ilvr_b((v16i8) in2, (v16i8) in3); \
+}
+#define ILVR_B2_SH(...) ILVR_B2(v8i16, __VA_ARGS__)
+
+#define HSUB_UB2(RTYPE, in0, in1, out0, out1) \
+{ \
+ out0 = (RTYPE) __msa_hsub_u_h((v16u8) in0, (v16u8) in0); \
+ out1 = (RTYPE) __msa_hsub_u_h((v16u8) in1, (v16u8) in1); \
+}
+#define HSUB_UB2_SH(...) HSUB_UB2(v8i16, __VA_ARGS__)
+
+#define SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val) \
+{ \
+ v16i8 zero_m = { 0 }; \
+ out0 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in0, slide_val); \
+ out1 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in1, slide_val); \
+}
+#define SLDI_B2_0_UB(...) SLDI_B2_0(v16u8, __VA_ARGS__)
+
+#define SLDI_B3_0(RTYPE, in0, in1, in2, out0, out1, out2, slide_val) \
+{ \
+ v16i8 zero_m = { 0 }; \
+ SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val); \
+ out2 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in2, slide_val); \
+}
+#define SLDI_B3_0_UB(...) SLDI_B3_0(v16u8, __VA_ARGS__)
+
+#define ILVEV_W2(RTYPE, in0, in1, in2, in3, out0, out1) \
+{ \
+ out0 = (RTYPE) __msa_ilvev_w((v4i32) in1, (v4i32) in0); \
+ out1 = (RTYPE) __msa_ilvev_w((v4i32) in3, (v4i32) in2); \
+}
+#define ILVEV_W2_UB(...) ILVEV_W2(v16u8, __VA_ARGS__)
+
+#define ADD_ABS_H3(RTYPE, in0, in1, in2, out0, out1, out2) \
+{ \
+ RTYPE zero = {0}; \
+ \
+ out0 = __msa_add_a_h((v8i16) zero, in0); \
+ out1 = __msa_add_a_h((v8i16) zero, in1); \
+ out2 = __msa_add_a_h((v8i16) zero, in2); \
+}
+#define ADD_ABS_H3_SH(...) ADD_ABS_H3(v8i16, __VA_ARGS__)
+
+#define VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1) \
+{ \
+ out0 = (RTYPE) __msa_vshf_b((v16i8) mask0, (v16i8) in1, (v16i8) in0); \
+ out1 = (RTYPE) __msa_vshf_b((v16i8) mask1, (v16i8) in3, (v16i8) in2); \
+}
+#define VSHF_B2_UB(...) VSHF_B2(v16u8, __VA_ARGS__)
+
+#define CMP_AND_SELECT(inp0, inp1, inp2, inp3, inp4, inp5, out0) \
+{ \
+ v8i16 _sel_h0, _sel_h1; \
+ v16u8 _sel_b0, _sel_b1; \
+ _sel_h0 = (v8i16) __msa_clt_u_h((v8u16) inp1, (v8u16) inp0); \
+ _sel_b0 = (v16u8) __msa_pckev_b((v16i8) _sel_h0, (v16i8) _sel_h0); \
+ inp0 = (v8i16) __msa_bmnz_v((v16u8) inp0, (v16u8) inp1, (v16u8) _sel_h0); \
+ inp4 = (v16u8) __msa_bmnz_v(inp3, inp4, _sel_b0); \
+ _sel_h1 = (v8i16) __msa_clt_u_h((v8u16) inp2, (v8u16) inp0); \
+ _sel_b1 = (v16u8) __msa_pckev_b((v16i8) _sel_h1, (v16i8) _sel_h1); \
+ inp4 = (v16u8) __msa_bmnz_v(inp4, inp5, _sel_b1); \
+ out0 += inp4; \
+}
+
+void png_read_filter_row_up_msa(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev_row)
+{
+ png_size_t i, cnt, cnt16, cnt32;
+ png_size_t istop = row_info->rowbytes;
+ png_bytep rp = row;
+ png_const_bytep pp = prev_row;
+ v16u8 src0, src1, src2, src3, src4, src5, src6, src7;
+
+ for (i = 0; i < (istop >> 6); i++)
+ {
+ LD_UB4(rp, 16, src0, src1, src2, src3);
+ LD_UB4(pp, 16, src4, src5, src6, src7);
+ pp += 64;
+
+ ADD4(src0, src4, src1, src5, src2, src6, src3, src7,
+ src0, src1, src2, src3);
+
+ ST_UB4(src0, src1, src2, src3, rp, 16);
+ rp += 64;
+ }
+
+ if (istop & 0x3F)
+ {
+ cnt32 = istop & 0x20;
+ cnt16 = istop & 0x10;
+ cnt = istop & 0xF;
+
+ if(cnt32)
+ {
+ if (cnt16 && cnt)
+ {
+ LD_UB4(rp, 16, src0, src1, src2, src3);
+ LD_UB4(pp, 16, src4, src5, src6, src7);
+
+ ADD4(src0, src4, src1, src5, src2, src6, src3, src7,
+ src0, src1, src2, src3);
+
+ ST_UB4(src0, src1, src2, src3, rp, 16);
+ rp += 64;
+ }
+ else if (cnt16 || cnt)
+ {
+ LD_UB2(rp, 16, src0, src1);
+ LD_UB2(pp, 16, src4, src5);
+ pp += 32;
+ src2 = LD_UB(rp + 32);
+ src6 = LD_UB(pp);
+
+ ADD3(src0, src4, src1, src5, src2, src6, src0, src1, src2);
+
+ ST_UB2(src0, src1, rp, 16);
+ rp += 32;
+ ST_UB(src2, rp);
+ rp += 16;
+ }
+ else
+ {
+ LD_UB2(rp, 16, src0, src1);
+ LD_UB2(pp, 16, src4, src5);
+
+ ADD2(src0, src4, src1, src5, src0, src1);
+
+ ST_UB2(src0, src1, rp, 16);
+ rp += 32;
+ }
+ }
+ else if (cnt16 && cnt)
+ {
+ LD_UB2(rp, 16, src0, src1);
+ LD_UB2(pp, 16, src4, src5);
+
+ ADD2(src0, src4, src1, src5, src0, src1);
+
+ ST_UB2(src0, src1, rp, 16);
+ rp += 32;
+ }
+ else if (cnt16 || cnt)
+ {
+ src0 = LD_UB(rp);
+ src4 = LD_UB(pp);
+ pp += 16;
+
+ src0 += src4;
+
+ ST_UB(src0, rp);
+ rp += 16;
+ }
+ }
+}
+
+void png_read_filter_row_sub4_msa(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev_row)
+{
+ png_size_t count;
+ png_size_t istop = row_info->rowbytes;
+ png_bytep src = row;
+ png_bytep nxt = row + 4;
+ int32_t inp0;
+ v16u8 src0, src1, src2, src3, src4;
+ v16u8 dst0, dst1;
+ v16u8 zero = { 0 };
+
+ istop -= 4;
+
+ inp0 = LW(src);
+ src += 4;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+
+ for (count = 0; count < istop; count += 16)
+ {
+ src1 = LD_UB(src);
+ src += 16;
+
+ src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 4);
+ src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 8);
+ src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 12);
+ src1 += src0;
+ src2 += src1;
+ src3 += src2;
+ src4 += src3;
+ src0 = src4;
+ ILVEV_W2_UB(src1, src2, src3, src4, dst0, dst1);
+ dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
+
+ ST_UB(dst0, nxt);
+ nxt += 16;
+ }
+}
+
+void png_read_filter_row_sub3_msa(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev_row)
+{
+ png_size_t count;
+ png_size_t istop = row_info->rowbytes;
+ png_bytep src = row;
+ png_bytep nxt = row + 3;
+ int64_t out0;
+ int32_t inp0, out1;
+ v16u8 src0, src1, src2, src3, src4, dst0, dst1;
+ v16u8 zero = { 0 };
+ v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
+
+ istop -= 3;
+
+ inp0 = LW(src);
+ src += 3;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+
+ for (count = 0; count < istop; count += 12)
+ {
+ src1 = LD_UB(src);
+ src += 12;
+
+ src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 3);
+ src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 6);
+ src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 9);
+ src1 += src0;
+ src2 += src1;
+ src3 += src2;
+ src4 += src3;
+ src0 = src4;
+ VSHF_B2_UB(src1, src2, src3, src4, mask0, mask0, dst0, dst1);
+ dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
+ out0 = __msa_copy_s_d((v2i64) dst0, 0);
+ out1 = __msa_copy_s_w((v4i32) dst0, 2);
+
+ SD(out0, nxt);
+ nxt += 8;
+ SW(out1, nxt);
+ nxt += 4;
+ }
+}
+
+void png_read_filter_row_avg4_msa(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev_row)
+{
+ png_size_t i;
+ png_bytep src = row;
+ png_bytep nxt = row;
+ png_const_bytep pp = prev_row;
+ png_size_t istop = row_info->rowbytes - 4;
+ int32_t inp0, inp1, out0;
+ v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
+ v16u8 zero = { 0 };
+
+ inp0 = LW(pp);
+ pp += 4;
+ inp1 = LW(src);
+ src += 4;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+ src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
+ src0 = (v16u8) MSA_SRLI_B(src0, 1);
+ src1 += src0;
+ out0 = __msa_copy_s_w((v4i32) src1, 0);
+ SW(out0, nxt);
+ nxt += 4;
+
+ for (i = 0; i < istop; i += 16)
+ {
+ src2 = LD_UB(pp);
+ pp += 16;
+ src6 = LD_UB(src);
+ src += 16;
+
+ SLDI_B2_0_UB(src2, src6, src3, src7, 4);
+ SLDI_B2_0_UB(src2, src6, src4, src8, 8);
+ SLDI_B2_0_UB(src2, src6, src5, src9, 12);
+ src2 = __msa_ave_u_b(src2, src1);
+ src6 += src2;
+ src3 = __msa_ave_u_b(src3, src6);
+ src7 += src3;
+ src4 = __msa_ave_u_b(src4, src7);
+ src8 += src4;
+ src5 = __msa_ave_u_b(src5, src8);
+ src9 += src5;
+ src1 = src9;
+ ILVEV_W2_UB(src6, src7, src8, src9, dst0, dst1);
+ dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
+
+ ST_UB(dst0, nxt);
+ nxt += 16;
+ }
+}
+
+void png_read_filter_row_avg3_msa(png_row_infop row_info, png_bytep row,
+ png_const_bytep prev_row)
+{
+ png_size_t i;
+ png_bytep src = row;
+ png_bytep nxt = row;
+ png_const_bytep pp = prev_row;
+ png_size_t istop = row_info->rowbytes - 3;
+ int64_t out0;
+ int32_t inp0, inp1, out1;
+ int16_t out2;
+ v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
+ v16u8 zero = { 0 };
+ v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
+
+ inp0 = LW(pp);
+ pp += 3;
+ inp1 = LW(src);
+ src += 3;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+ src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
+ src0 = (v16u8) MSA_SRLI_B(src0, 1);
+ src1 += src0;
+ out2 = __msa_copy_s_h((v8i16) src1, 0);
+ SH(out2, nxt);
+ nxt += 2;
+ nxt[0] = src1[2];
+ nxt++;
+
+ for (i = 0; i < istop; i += 12)
+ {
+ src2 = LD_UB(pp);
+ pp += 12;
+ src6 = LD_UB(src);
+ src += 12;
+
+ SLDI_B2_0_UB(src2, src6, src3, src7, 3);
+ SLDI_B2_0_UB(src2, src6, src4, src8, 6);
+ SLDI_B2_0_UB(src2, src6, src5, src9, 9);
+ src2 = __msa_ave_u_b(src2, src1);
+ src6 += src2;
+ src3 = __msa_ave_u_b(src3, src6);
+ src7 += src3;
+ src4 = __msa_ave_u_b(src4, src7);
+ src8 += src4;
+ src5 = __msa_ave_u_b(src5, src8);
+ src9 += src5;
+ src1 = src9;
+ VSHF_B2_UB(src6, src7, src8, src9, mask0, mask0, dst0, dst1);
+ dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
+ out0 = __msa_copy_s_d((v2i64) dst0, 0);
+ out1 = __msa_copy_s_w((v4i32) dst0, 2);
+
+ SD(out0, nxt);
+ nxt += 8;
+ SW(out1, nxt);
+ nxt += 4;
+ }
+}
+
+void png_read_filter_row_paeth4_msa(png_row_infop row_info,
+ png_bytep row,
+ png_const_bytep prev_row)
+{
+ int32_t count, rp_end;
+ png_bytep nxt;
+ png_const_bytep prev_nxt;
+ int32_t inp0, inp1, res0;
+ v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9;
+ v16u8 src10, src11, src12, src13, dst0, dst1;
+ v8i16 vec0, vec1, vec2;
+ v16u8 zero = { 0 };
+
+ nxt = row;
+ prev_nxt = prev_row;
+
+ inp0 = LW(nxt);
+ inp1 = LW(prev_nxt);
+ prev_nxt += 4;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+ src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
+
+ src1 += src0;
+ res0 = __msa_copy_s_w((v4i32) src1, 0);
+
+ SW(res0, nxt);
+ nxt += 4;
+
+ /* Remainder */
+ rp_end = row_info->rowbytes - 4;
+
+ for (count = 0; count < rp_end; count += 16)
+ {
+ src2 = LD_UB(prev_nxt);
+ prev_nxt += 16;
+ src6 = LD_UB(prev_row);
+ prev_row += 16;
+ src10 = LD_UB(nxt);
+
+ SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 4);
+ SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 8);
+ SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 12);
+ ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
+ ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
+ ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
+ ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
+ src1 = src13;
+ ILVEV_W2_UB(src10, src11, src12, src1, dst0, dst1);
+ dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
+
+ ST_UB(dst0, nxt);
+ nxt += 16;
+ }
+}
+
+void png_read_filter_row_paeth3_msa(png_row_infop row_info,
+ png_bytep row,
+ png_const_bytep prev_row)
+{
+ int32_t count, rp_end;
+ png_bytep nxt;
+ png_const_bytep prev_nxt;
+ int64_t out0;
+ int32_t inp0, inp1, out1;
+ int16_t out2;
+ v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
+ v16u8 src10, src11, src12, src13;
+ v8i16 vec0, vec1, vec2;
+ v16u8 zero = { 0 };
+ v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
+
+ nxt = row;
+ prev_nxt = prev_row;
+
+ inp0 = LW(nxt);
+ inp1 = LW(prev_nxt);
+ prev_nxt += 3;
+ src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
+ src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
+
+ src1 += src0;
+ out2 = __msa_copy_s_h((v8i16) src1, 0);
+
+ SH(out2, nxt);
+ nxt += 2;
+ nxt[0] = src1[2];
+ nxt++;
+
+ /* Remainder */
+ rp_end = row_info->rowbytes - 3;
+
+ for (count = 0; count < rp_end; count += 12)
+ {
+ src2 = LD_UB(prev_nxt);
+ prev_nxt += 12;
+ src6 = LD_UB(prev_row);
+ prev_row += 12;
+ src10 = LD_UB(nxt);
+
+ SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 3);
+ SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 6);
+ SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 9);
+ ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
+ ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
+ ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
+ ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
+ HSUB_UB2_SH(vec0, vec1, vec0, vec1);
+ vec2 = vec0 + vec1;
+ ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
+ CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
+ src1 = src13;
+ VSHF_B2_UB(src10, src11, src12, src13, mask0, mask0, dst0, dst1);
+ dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
+ out0 = __msa_copy_s_d((v2i64) dst0, 0);
+ out1 = __msa_copy_s_w((v4i32) dst0, 2);
+
+ SD(out0, nxt);
+ nxt += 8;
+ SW(out1, nxt);
+ nxt += 4;
+ }
+}
+
+#endif /* PNG_MIPS_MSA_OPT > 0 */
+#endif /* PNG_MIPS_MSA_IMPLEMENTATION == 1 (intrinsics) */
+#endif /* READ */
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/mips/filter_msa_intrinsics.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/mips/mips_init.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/mips/mips_init.c (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/mips/mips_init.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,129 @@
+
+/* mips_init.c - MSA optimised filter functions
+ *
+ * Copyright (c) 2016 Glenn Randers-Pehrson
+ * Written by Mandar Sahastrabuddhe, 2016.
+ * Last changed in libpng 1.6.25 [September 1, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
+ * called.
+ */
+#define _POSIX_SOURCE 1
+
+#include <stdio.h>
+#include "../pngpriv.h"
+
+#ifdef PNG_READ_SUPPORTED
+
+#if PNG_MIPS_MSA_OPT > 0
+#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED /* Do run-time checks */
+/* WARNING: it is strongly recommended that you do not build libpng with
+ * run-time checks for CPU features if at all possible. In the case of the MIPS
+ * MSA instructions there is no processor-specific way of detecting the
+ * presence of the required support, therefore run-time detection is extremely
+ * OS specific.
+ *
+ * You may set the macro PNG_MIPS_MSA_FILE to the file name of file containing
+ * a fragment of C source code which defines the png_have_msa function. There
+ * are a number of implementations in contrib/mips-msa, but the only one that
+ * has partial support is contrib/mips-msa/linux.c - a generic Linux
+ * implementation which reads /proc/cpufino.
+ */
+#ifndef PNG_MIPS_MSA_FILE
+# ifdef __linux__
+# define PNG_MIPS_MSA_FILE "contrib/mips-msa/linux.c"
+# endif
+#endif
+
+#ifdef PNG_MIPS_MSA_FILE
+
+#include <signal.h> /* for sig_atomic_t */
+static int png_have_msa(png_structp png_ptr);
+#include PNG_MIPS_MSA_FILE
+
+#else /* PNG_MIPS_MSA_FILE */
+# error "PNG_MIPS_MSA_FILE undefined: no support for run-time MIPS MSA checks"
+#endif /* PNG_MIPS_MSA_FILE */
+#endif /* PNG_MIPS_MSA_CHECK_SUPPORTED */
+
+#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
+# error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
+#endif
+
+void
+png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
+{
+ /* The switch statement is compiled in for MIPS_MSA_API, the call to
+ * png_have_msa is compiled in for MIPS_MSA_CHECK. If both are defined
+ * the check is only performed if the API has not set the MSA option on
+ * or off explicitly. In this case the check controls what happens.
+ */
+
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+ switch ((pp->options >> PNG_MIPS_MSA) & 3)
+ {
+ case PNG_OPTION_UNSET:
+ /* Allow the run-time check to execute if it has been enabled -
+ * thus both API and CHECK can be turned on. If it isn't supported
+ * this case will fall through to the 'default' below, which just
+ * returns.
+ */
+#endif /* PNG_MIPS_MSA_API_SUPPORTED */
+#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED
+ {
+ static volatile sig_atomic_t no_msa = -1; /* not checked */
+
+ if (no_msa < 0)
+ no_msa = !png_have_msa(pp);
+
+ if (no_msa)
+ return;
+ }
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+ break;
+#endif
+#endif /* PNG_MIPS_MSA_CHECK_SUPPORTED */
+
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+ default: /* OFF or INVALID */
+ return;
+
+ case PNG_OPTION_ON:
+ /* Option turned on */
+ break;
+ }
+#endif
+
+ /* IMPORTANT: any new external functions used here must be declared using
+ * PNG_INTERNAL_FUNCTION in ../pngpriv.h. This is required so that the
+ * 'prefix' option to configure works:
+ *
+ * ./configure --with-libpng-prefix=foobar_
+ *
+ * Verify you have got this right by running the above command, doing a build
+ * and examining pngprefix.h; it must contain a #define for every external
+ * function you add. (Notice that this happens automatically for the
+ * initialization function.)
+ */
+ pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_msa;
+
+ if (bpp == 3)
+ {
+ pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_msa;
+ pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_msa;
+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth3_msa;
+ }
+
+ else if (bpp == 4)
+ {
+ pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_msa;
+ pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_msa;
+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_msa;
+ }
+}
+#endif /* PNG_MIPS_MSA_OPT > 0 */
+#endif /* READ */
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/mips/mips_init.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.5
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.5 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.5 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 15, 2016"
+.TH PNG 5 "January 5, 2017"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
@@ -35,7 +35,7 @@
RFC 2083
.IP
.br
-ftp://ds.internic.net/rfc/rfc2083.txt
+http://www.ietf.org/rfc/rfc2083.txt
.br
or (as a W3C Recommendation) at
.br
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.6.19 [November 12, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.28 [January 5, 2017]
+ * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_21 Your_png_h_is_not_version_1_6_21;
+typedef png_libpng_version_1_6_28 Your_png_h_is_not_version_1_6_28;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@@ -85,7 +85,7 @@
if (items >= (~(png_alloc_size_t)0)/size)
{
png_warning (png_voidcast(png_structrp, png_ptr),
- "Potential overflow in png_zalloc()");
+ "Potential overflow in png_zalloc()");
return NULL;
}
@@ -172,10 +172,10 @@
int
png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
{
- /* Libpng versions 1.0.0 and later are binary compatible if the version
- * string matches through the second '.'; we must recompile any
- * applications that use any older library version.
- */
+ /* Libpng versions 1.0.0 and later are binary compatible if the version
+ * string matches through the second '.'; we must recompile any
+ * applications that use any older library version.
+ */
if (user_png_ver != NULL)
{
@@ -297,7 +297,7 @@
if (png_user_version_check(&create_struct, user_png_ver) != 0)
{
png_structrp png_ptr = png_voidcast(png_structrp,
- png_malloc_warn(&create_struct, (sizeof *png_ptr)));
+ png_malloc_warn(&create_struct, (sizeof *png_ptr)));
if (png_ptr != NULL)
{
@@ -346,7 +346,7 @@
* has always been done in 'example.c'.
*/
info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,
- (sizeof *info_ptr)));
+ (sizeof *info_ptr)));
if (info_ptr != NULL)
memset(info_ptr, 0, (sizeof *info_ptr));
@@ -402,7 +402,7 @@
*/
PNG_FUNCTION(void,PNGAPI
png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),
- PNG_DEPRECATED)
+ PNG_DEPRECATED)
{
png_inforp info_ptr = *ptr_ptr;
@@ -417,7 +417,7 @@
/* The following line is why this API should not be used: */
free(info_ptr);
info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,
- (sizeof *info_ptr)));
+ (sizeof *info_ptr)));
if (info_ptr == NULL)
return;
*ptr_ptr = info_ptr;
@@ -430,7 +430,7 @@
/* The following API is not called internally */
void PNGAPI
png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
- int freer, png_uint_32 mask)
+ int freer, png_uint_32 mask)
{
png_debug(1, "in png_data_freer");
@@ -449,7 +449,7 @@
void PNGAPI
png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
- int num)
+ int num)
{
png_debug(1, "in png_free_data");
@@ -458,7 +458,7 @@
#ifdef PNG_TEXT_SUPPORTED
/* Free text item num or (if num == -1) all text items */
- if (info_ptr->text != 0 &&
+ if (info_ptr->text != NULL &&
((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)
{
if (num != -1)
@@ -477,6 +477,7 @@
png_free(png_ptr, info_ptr->text);
info_ptr->text = NULL;
info_ptr->num_text = 0;
+ info_ptr->max_text = 0;
}
}
#endif
@@ -541,7 +542,7 @@
#ifdef PNG_sPLT_SUPPORTED
/* Free a given sPLT entry, or (if num == -1) all sPLT entries */
- if (info_ptr->splt_palettes != 0 &&
+ if (info_ptr->splt_palettes != NULL &&
((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)
{
if (num != -1)
@@ -571,7 +572,7 @@
#endif
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- if (info_ptr->unknown_chunks != 0 &&
+ if (info_ptr->unknown_chunks != NULL &&
((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
{
if (num != -1)
@@ -617,7 +618,7 @@
/* Free any image bits attached to the info structure */
if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)
{
- if (info_ptr->row_pointers != 0)
+ if (info_ptr->row_pointers != NULL)
{
png_uint_32 row;
for (row = 0; row < info_ptr->height; row++)
@@ -684,7 +685,7 @@
void PNGAPI
png_save_int_32(png_bytep buf, png_int_32 i)
{
- png_save_uint_32(buf, i);
+ png_save_uint_32(buf, (png_uint_32)i);
}
# endif
@@ -775,15 +776,15 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.21 - January 15, 2016" PNG_STRING_NEWLINE \
- "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
+ "libpng version 1.6.28 - January 5, 2017" PNG_STRING_NEWLINE \
+ "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
- return "libpng version 1.6.21 - January 15, 2016\
- Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
+ return "libpng version 1.6.28 - January 5, 2017\
+ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
# endif
@@ -1033,7 +1034,7 @@
#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
static int
png_colorspace_check_gamma(png_const_structrp png_ptr,
- png_colorspacerp colorspace, png_fixed_point gAMA, int from)
+ png_colorspacerp colorspace, png_fixed_point gAMA, int from)
/* This is called to check a new gamma value against an existing one. The
* routine returns false if the new gamma value should not be written.
*
@@ -1047,7 +1048,7 @@
png_fixed_point gtest;
if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
- (png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) == 0 ||
+ (png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) == 0 ||
png_gamma_significant(gtest) != 0))
{
/* Either this is an sRGB image, in which case the calculated gamma
@@ -1059,7 +1060,7 @@
if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
{
png_chunk_report(png_ptr, "gamma value does not match sRGB",
- PNG_CHUNK_ERROR);
+ PNG_CHUNK_ERROR);
/* Do not overwrite an sRGB value */
return from == 2;
}
@@ -1067,7 +1068,7 @@
else /* sRGB tag not involved */
{
png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
- PNG_CHUNK_WARNING);
+ PNG_CHUNK_WARNING);
return from == 1;
}
}
@@ -1077,7 +1078,7 @@
void /* PRIVATE */
png_colorspace_set_gamma(png_const_structrp png_ptr,
- png_colorspacerp colorspace, png_fixed_point gAMA)
+ png_colorspacerp colorspace, png_fixed_point gAMA)
{
/* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
* occur. Since the fixed point representation is asymetrical it is
@@ -1635,8 +1636,8 @@
static int
png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
- png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
- int preferred)
+ png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
+ int preferred)
{
if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return 0;
@@ -1683,7 +1684,7 @@
int /* PRIVATE */
png_colorspace_set_chromaticities(png_const_structrp png_ptr,
- png_colorspacerp colorspace, const png_xy *xy, int preferred)
+ png_colorspacerp colorspace, const png_xy *xy, int preferred)
{
/* We must check the end points to ensure they are reasonable - in the past
* color management systems have crashed as a result of getting bogus
@@ -1697,7 +1698,7 @@
{
case 0: /* success */
return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
- preferred);
+ preferred);
case 1:
/* We can't invert the chromaticities so we can't produce value XYZ
@@ -1720,7 +1721,7 @@
int /* PRIVATE */
png_colorspace_set_endpoints(png_const_structrp png_ptr,
- png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
+ png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
{
png_XYZ XYZ = *XYZ_in;
png_xy xy;
@@ -1729,7 +1730,7 @@
{
case 0:
return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
- preferred);
+ preferred);
case 1:
/* End points are invalid. */
@@ -1786,7 +1787,7 @@
static int
png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
- png_const_charp name, png_alloc_size_t value, png_const_charp reason)
+ png_const_charp name, png_alloc_size_t value, png_const_charp reason)
{
size_t pos;
char message[196]; /* see below for calculation */
@@ -1811,8 +1812,8 @@
char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
pos = png_safecat(message, (sizeof message), pos,
- png_format_number(number, number+(sizeof number),
- PNG_NUMBER_FORMAT_x, value));
+ png_format_number(number, number+(sizeof number),
+ PNG_NUMBER_FORMAT_x, value));
pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
}
# endif
@@ -1826,7 +1827,7 @@
* application errors the PNG won't be written.)
*/
png_chunk_report(png_ptr, message,
- (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
+ (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
return 0;
}
@@ -1835,7 +1836,7 @@
#ifdef PNG_sRGB_SUPPORTED
int /* PRIVATE */
png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
- int intent)
+ int intent)
{
/* sRGB sets known gamma, end points and (from the chunk) intent. */
/* IMPORTANT: these are not necessarily the values found in an ICC profile
@@ -1872,10 +1873,10 @@
*/
if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
return png_icc_profile_error(png_ptr, colorspace, "sRGB",
- (unsigned)intent, "invalid sRGB rendering intent");
+ (unsigned)intent, "invalid sRGB rendering intent");
if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
- colorspace->rendering_intent != intent)
+ colorspace->rendering_intent != intent)
return png_icc_profile_error(png_ptr, colorspace, "sRGB",
(unsigned)intent, "inconsistent rendering intents");
@@ -1889,8 +1890,8 @@
* warn but overwrite the value with the correct one.
*/
if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
- !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
- 100))
+ !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
+ 100))
png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
PNG_CHUNK_ERROR);
@@ -1898,7 +1899,7 @@
* returns true when the 'from' argument corresponds to sRGB (2).
*/
(void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
- 2/*from sRGB*/);
+ 2/*from sRGB*/);
/* intent: bugs in GCC force 'int' to be used as the parameter type. */
colorspace->rendering_intent = (png_uint_16)intent;
@@ -1931,21 +1932,55 @@
static const png_byte D50_nCIEXYZ[12] =
{ 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
-int /* PRIVATE */
-png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
- png_const_charp name, png_uint_32 profile_length)
+static int /* bool */
+icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
+ png_const_charp name, png_uint_32 profile_length)
{
if (profile_length < 132)
return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
- "too short");
+ "too short");
return 1;
}
+#ifdef PNG_READ_iCCP_SUPPORTED
int /* PRIVATE */
+png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
+ png_const_charp name, png_uint_32 profile_length)
+{
+ if (!icc_check_length(png_ptr, colorspace, name, profile_length))
+ return 0;
+
+ /* This needs to be here because the 'normal' check is in
+ * png_decompress_chunk, yet this happens after the attempt to
+ * png_malloc_base the required data. We only need this on read; on write
+ * the caller supplies the profile buffer so libpng doesn't allocate it. See
+ * the call to icc_check_length below (the write case).
+ */
+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ else if (png_ptr->user_chunk_malloc_max > 0 &&
+ png_ptr->user_chunk_malloc_max < profile_length)
+ return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+ "exceeds application limits");
+# elif PNG_USER_CHUNK_MALLOC_MAX > 0
+ else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)
+ return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+ "exceeds libpng limits");
+# else /* !SET_USER_LIMITS */
+ /* This will get compiled out on all 32-bit and better systems. */
+ else if (PNG_SIZE_MAX < profile_length)
+ return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+ "exceeds system limits");
+# endif /* !SET_USER_LIMITS */
+
+ return 1;
+}
+#endif /* READ_iCCP */
+
+int /* PRIVATE */
png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
- png_const_charp name, png_uint_32 profile_length,
- png_const_bytep profile/* first 132 bytes only */, int color_type)
+ png_const_charp name, png_uint_32 profile_length,
+ png_const_bytep profile/* first 132 bytes only */, int color_type)
{
png_uint_32 temp;
@@ -1957,18 +1992,18 @@
temp = png_get_uint_32(profile);
if (temp != profile_length)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "length does not match profile");
+ "length does not match profile");
temp = (png_uint_32) (*(profile+8));
if (temp > 3 && (profile_length & 3))
return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
- "invalid length");
+ "invalid length");
temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
profile_length < 132+12*temp) /* truncated tag table */
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "tag count too large");
+ "tag count too large");
/* The 'intent' must be valid or we can't store it, ICC limits the intent to
* 16 bits.
@@ -1976,7 +2011,7 @@
temp = png_get_uint_32(profile+64);
if (temp >= 0xffff) /* The ICC limit */
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "invalid rendering intent");
+ "invalid rendering intent");
/* This is just a warning because the profile may be valid in future
* versions.
@@ -1983,7 +2018,7 @@
*/
if (temp >= PNG_sRGB_INTENT_LAST)
(void)png_icc_profile_error(png_ptr, NULL, name, temp,
- "intent outside defined range");
+ "intent outside defined range");
/* At this point the tag table can't be checked because it hasn't necessarily
* been loaded; however, various header fields can be checked. These checks
@@ -2000,7 +2035,7 @@
temp = png_get_uint_32(profile+36); /* signature 'ascp' */
if (temp != 0x61637370)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "invalid signature");
+ "invalid signature");
/* Currently the PCS illuminant/adopted white point (the computational
* white point) are required to be D50,
@@ -2011,7 +2046,7 @@
*/
if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
(void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
- "PCS illuminant is not D50");
+ "PCS illuminant is not D50");
/* The PNG spec requires this:
* "If the iCCP chunk is present, the image samples conform to the colour
@@ -2039,18 +2074,18 @@
case 0x52474220: /* 'RGB ' */
if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "RGB color space not permitted on grayscale PNG");
+ "RGB color space not permitted on grayscale PNG");
break;
case 0x47524159: /* 'GRAY' */
if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "Gray color space not permitted on RGB PNG");
+ "Gray color space not permitted on RGB PNG");
break;
default:
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "invalid ICC profile color space");
+ "invalid ICC profile color space");
}
/* It is up to the application to check that the profile class matches the
@@ -2075,7 +2110,7 @@
case 0x61627374: /* 'abst' */
/* May not be embedded in an image */
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "invalid embedded Abstract ICC profile");
+ "invalid embedded Abstract ICC profile");
case 0x6c696e6b: /* 'link' */
/* DeviceLink profiles cannot be interpreted in a non-device specific
@@ -2085,7 +2120,7 @@
* PNG.
*/
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "unexpected DeviceLink ICC profile class");
+ "unexpected DeviceLink ICC profile class");
case 0x6e6d636c: /* 'nmcl' */
/* A NamedColor profile is also device specific, however it doesn't
@@ -2093,7 +2128,7 @@
* certainly it will fail the tests below.
*/
(void)png_icc_profile_error(png_ptr, NULL, name, temp,
- "unexpected NamedColor ICC profile class");
+ "unexpected NamedColor ICC profile class");
break;
default:
@@ -2103,7 +2138,7 @@
* understood profiles.
*/
(void)png_icc_profile_error(png_ptr, NULL, name, temp,
- "unrecognized ICC profile class");
+ "unrecognized ICC profile class");
break;
}
@@ -2119,7 +2154,7 @@
default:
return png_icc_profile_error(png_ptr, colorspace, name, temp,
- "unexpected ICC PCS encoding");
+ "unexpected ICC PCS encoding");
}
return 1;
@@ -2127,8 +2162,8 @@
int /* PRIVATE */
png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
- png_const_charp name, png_uint_32 profile_length,
- png_const_bytep profile /* header plus whole tag table */)
+ png_const_charp name, png_uint_32 profile_length,
+ png_const_bytep profile /* header plus whole tag table */)
{
png_uint_32 tag_count = png_get_uint_32(profile+128);
png_uint_32 itag;
@@ -2156,7 +2191,7 @@
* alignment.
*/
(void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
- "ICC profile tag start not a multiple of 4");
+ "ICC profile tag start not a multiple of 4");
}
/* This is a hard error; potentially it can cause read outside the
@@ -2164,7 +2199,7 @@
*/
if (tag_start > profile_length || tag_length > profile_length - tag_start)
return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
- "ICC profile tag outside profile");
+ "ICC profile tag outside profile");
}
return 1; /* success, maybe with warnings */
@@ -2192,22 +2227,22 @@
*/
/* adler32, crc32, MD5[4], intent, date, length, file-name */
PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
- PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
- "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
+ PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
+ "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
/* ICC sRGB v2 perceptual no black-compensation: */
PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
- PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
- "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
+ PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
+ "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
- PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
- "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
+ PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
+ "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
/* ICC sRGB v4 perceptual */
PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
- PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
- "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
+ PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
+ "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
/* The following profiles have no known MD5 checksum. If there is a match
* on the (empty) MD5 the other fields are used to attempt a match and
@@ -2215,8 +2250,8 @@
* which suggests that they were also made by Hewlett Packard.
*/
PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
- PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
- "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
+ "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
/* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
* match the D50 PCS illuminant in the header (it is in fact the D65 values,
@@ -2226,17 +2261,17 @@
* chromaticAdaptationTag.
*/
PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
- PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
- "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
+ "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
- PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
- "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
+ "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
};
static int
png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
- png_const_bytep profile, uLong adler)
+ png_const_bytep profile, uLong adler)
{
/* The quick check is to verify just the MD5 signature and trust the
* rest of the data. Because the profile has already been verified for
@@ -2320,7 +2355,7 @@
* which is made irrelevant by this error.
*/
png_chunk_report(png_ptr, "known incorrect sRGB profile",
- PNG_CHUNK_ERROR);
+ PNG_CHUNK_ERROR);
}
/* Warn that this being done; this isn't even an error since
@@ -2330,8 +2365,8 @@
else if (png_sRGB_checks[i].have_md5 == 0)
{
png_chunk_report(png_ptr,
- "out-of-date sRGB profile with no signature",
- PNG_CHUNK_WARNING);
+ "out-of-date sRGB profile with no signature",
+ PNG_CHUNK_WARNING);
}
return 1+png_sRGB_checks[i].is_broken;
@@ -2354,38 +2389,36 @@
return 0; /* no match */
}
-#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
void /* PRIVATE */
png_icc_set_sRGB(png_const_structrp png_ptr,
- png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
+ png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
{
/* Is this profile one of the known ICC sRGB profiles? If it is, just set
* the sRGB information.
*/
-#if PNG_sRGB_PROFILE_CHECKS >= 0
if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
-#endif
(void)png_colorspace_set_sRGB(png_ptr, colorspace,
(int)/*already checked*/png_get_uint_32(profile+64));
}
+#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
#endif /* sRGB */
int /* PRIVATE */
png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
- png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
- int color_type)
+ png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
+ int color_type)
{
if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return 0;
- if (png_icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
+ if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
- color_type) != 0 &&
+ color_type) != 0 &&
png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
- profile) != 0)
+ profile) != 0)
{
-# ifdef PNG_sRGB_SUPPORTED
+# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
/* If no sRGB support, don't try storing sRGB information */
png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
# endif
@@ -2444,7 +2477,7 @@
/* Check for an internal error. */
if (r+g+b != 32768)
png_error(png_ptr,
- "internal error handling cHRM coefficients");
+ "internal error handling cHRM coefficients");
else
{
@@ -2470,7 +2503,7 @@
static int /* PRIVATE */
png_gt(size_t a, size_t b)
{
- return a > b;
+ return a > b;
}
#else
# define png_gt(a,b) ((a) > (b))
@@ -2478,9 +2511,9 @@
void /* PRIVATE */
png_check_IHDR(png_const_structrp png_ptr,
- png_uint_32 width, png_uint_32 height, int bit_depth,
- int color_type, int interlace_type, int compression_type,
- int filter_type)
+ png_uint_32 width, png_uint_32 height, int bit_depth,
+ int color_type, int interlace_type, int compression_type,
+ int filter_type)
{
int error = 0;
@@ -2497,7 +2530,7 @@
error = 1;
}
- if (png_gt(((width + 7) & (~7)),
+ if (png_gt(((width + 7) & (~7U)),
((PNG_SIZE_MAX
- 48 /* big_row_buf hack */
- 1) /* filter byte */
@@ -2643,7 +2676,7 @@
int /* PRIVATE */
png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
- png_size_tp whereami)
+ png_size_tp whereami)
{
int state = *statep;
png_size_t i = *whereami;
@@ -2908,7 +2941,7 @@
*/
if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
{
- czero = -exp_b10; /* PLUS 2 digits: TOTAL 3 */
+ czero = (unsigned int)(-exp_b10); /* PLUS 2 digits: TOTAL 3 */
exp_b10 = 0; /* Dot added below before first output. */
}
else
@@ -3086,11 +3119,11 @@
if (exp_b10 < 0)
{
*ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
- uexp_b10 = -exp_b10;
+ uexp_b10 = (unsigned int)(-exp_b10);
}
else
- uexp_b10 = exp_b10;
+ uexp_b10 = (unsigned int)exp_b10;
cdigits = 0;
@@ -3152,9 +3185,9 @@
/* Avoid overflow here on the minimum integer. */
if (fp < 0)
- *ascii++ = 45, num = -fp;
+ *ascii++ = 45, num = (png_uint_32)(-fp);
else
- num = fp;
+ num = (png_uint_32)fp;
if (num <= 0x80000000) /* else overflowed */
{
@@ -3806,25 +3839,25 @@
{
if (value > 0 && value < 65535)
{
-# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
- /* The same (unsigned int)->(double) constraints apply here as above,
- * however in this case the (unsigned int) to (int) conversion can
- * overflow on an ANSI-C90 compliant system so the cast needs to ensure
- * that this is not possible.
- */
- double r = floor(65535*pow((png_int_32)value/65535.,
- gamma_val*.00001)+.5);
- return (png_uint_16)r;
-# else
- png_int_32 lg2 = png_log16bit(value);
- png_fixed_point res;
+# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+ /* The same (unsigned int)->(double) constraints apply here as above,
+ * however in this case the (unsigned int) to (int) conversion can
+ * overflow on an ANSI-C90 compliant system so the cast needs to ensure
+ * that this is not possible.
+ */
+ double r = floor(65535*pow((png_int_32)value/65535.,
+ gamma_val*.00001)+.5);
+ return (png_uint_16)r;
+# else
+ png_int_32 lg2 = png_log16bit(value);
+ png_fixed_point res;
- if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
- return png_exp16bit(res);
+ if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
+ return png_exp16bit(res);
- /* Overflow. */
- value = 0;
-# endif
+ /* Overflow. */
+ value = 0;
+# endif
}
return (png_uint_16)value;
@@ -3863,7 +3896,7 @@
*/
static void
png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
+ PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
{
/* Various values derived from 'shift': */
PNG_CONST unsigned int num = 1U << (8U - shift);
@@ -3940,7 +3973,7 @@
*/
static void
png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
+ PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
{
PNG_CONST unsigned int num = 1U << (8U - shift);
PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
@@ -4008,7 +4041,7 @@
*/
static void
png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
- PNG_CONST png_fixed_point gamma_val)
+ PNG_CONST png_fixed_point gamma_val)
{
unsigned int i;
png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
@@ -4088,131 +4121,133 @@
void /* PRIVATE */
png_build_gamma_table(png_structrp png_ptr, int bit_depth)
{
- png_debug(1, "in png_build_gamma_table");
+ png_debug(1, "in png_build_gamma_table");
- /* Remove any existing table; this copes with multiple calls to
- * png_read_update_info. The warning is because building the gamma tables
- * multiple times is a performance hit - it's harmless but the ability to call
- * png_read_update_info() multiple times is new in 1.5.6 so it seems sensible
- * to warn if the app introduces such a hit.
- */
- if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
- {
- png_warning(png_ptr, "gamma table being rebuilt");
- png_destroy_gamma_table(png_ptr);
- }
+ /* Remove any existing table; this copes with multiple calls to
+ * png_read_update_info. The warning is because building the gamma tables
+ * multiple times is a performance hit - it's harmless but the ability to
+ * call png_read_update_info() multiple times is new in 1.5.6 so it seems
+ * sensible to warn if the app introduces such a hit.
+ */
+ if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
+ {
+ png_warning(png_ptr, "gamma table being rebuilt");
+ png_destroy_gamma_table(png_ptr);
+ }
- if (bit_depth <= 8)
- {
- png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
- png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
+ if (bit_depth <= 8)
+ {
+ png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
+ png_ptr->screen_gamma > 0 ?
+ png_reciprocal2(png_ptr->colorspace.gamma,
+ png_ptr->screen_gamma) : PNG_FP_1);
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
- if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
- {
- png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
- png_reciprocal(png_ptr->colorspace.gamma));
+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
+ {
+ png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
+ png_reciprocal(png_ptr->colorspace.gamma));
- png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
- png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
- png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
- }
+ png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
+ png_ptr->screen_gamma > 0 ?
+ png_reciprocal(png_ptr->screen_gamma) :
+ png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+ }
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- }
+ }
#ifdef PNG_16BIT_SUPPORTED
- else
- {
- png_byte shift, sig_bit;
+ else
+ {
+ png_byte shift, sig_bit;
- if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- sig_bit = png_ptr->sig_bit.red;
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
+ {
+ sig_bit = png_ptr->sig_bit.red;
- if (png_ptr->sig_bit.green > sig_bit)
- sig_bit = png_ptr->sig_bit.green;
+ if (png_ptr->sig_bit.green > sig_bit)
+ sig_bit = png_ptr->sig_bit.green;
- if (png_ptr->sig_bit.blue > sig_bit)
- sig_bit = png_ptr->sig_bit.blue;
- }
- else
- sig_bit = png_ptr->sig_bit.gray;
+ if (png_ptr->sig_bit.blue > sig_bit)
+ sig_bit = png_ptr->sig_bit.blue;
+ }
+ else
+ sig_bit = png_ptr->sig_bit.gray;
- /* 16-bit gamma code uses this equation:
- *
- * ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
- *
- * Where 'iv' is the input color value and 'ov' is the output value -
- * pow(iv, gamma).
- *
- * Thus the gamma table consists of up to 256 256-entry tables. The table
- * is selected by the (8-gamma_shift) most significant of the low 8 bits of
- * the color value then indexed by the upper 8 bits:
- *
- * table[low bits][high 8 bits]
- *
- * So the table 'n' corresponds to all those 'iv' of:
- *
- * <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
- *
- */
- if (sig_bit > 0 && sig_bit < 16U)
- /* shift == insignificant bits */
- shift = (png_byte)((16U - sig_bit) & 0xff);
+ /* 16-bit gamma code uses this equation:
+ *
+ * ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
+ *
+ * Where 'iv' is the input color value and 'ov' is the output value -
+ * pow(iv, gamma).
+ *
+ * Thus the gamma table consists of up to 256 256-entry tables. The table
+ * is selected by the (8-gamma_shift) most significant of the low 8 bits
+ * of the color value then indexed by the upper 8 bits:
+ *
+ * table[low bits][high 8 bits]
+ *
+ * So the table 'n' corresponds to all those 'iv' of:
+ *
+ * <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
+ *
+ */
+ if (sig_bit > 0 && sig_bit < 16U)
+ /* shift == insignificant bits */
+ shift = (png_byte)((16U - sig_bit) & 0xff);
- else
- shift = 0; /* keep all 16 bits */
+ else
+ shift = 0; /* keep all 16 bits */
- if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
- {
- /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
- * the significant bits in the *input* when the output will
- * eventually be 8 bits. By default it is 11.
- */
- if (shift < (16U - PNG_MAX_GAMMA_8))
- shift = (16U - PNG_MAX_GAMMA_8);
- }
+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
+ {
+ /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
+ * the significant bits in the *input* when the output will
+ * eventually be 8 bits. By default it is 11.
+ */
+ if (shift < (16U - PNG_MAX_GAMMA_8))
+ shift = (16U - PNG_MAX_GAMMA_8);
+ }
- if (shift > 8U)
- shift = 8U; /* Guarantees at least one table! */
+ if (shift > 8U)
+ shift = 8U; /* Guarantees at least one table! */
- png_ptr->gamma_shift = shift;
+ png_ptr->gamma_shift = shift;
- /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
- * PNG_COMPOSE). This effectively smashed the background calculation for
- * 16-bit output because the 8-bit table assumes the result will be reduced
- * to 8 bits.
- */
- if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
- png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
- png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
+ /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
+ * PNG_COMPOSE). This effectively smashed the background calculation for
+ * 16-bit output because the 8-bit table assumes the result will be
+ * reduced to 8 bits.
+ */
+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
+ png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
+ png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
+ png_ptr->screen_gamma) : PNG_FP_1);
- else
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
- png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
+ else
+ png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
+ png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
+ png_ptr->screen_gamma) : PNG_FP_1);
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
- if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
- {
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
- png_reciprocal(png_ptr->colorspace.gamma));
+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
+ {
+ png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
+ png_reciprocal(png_ptr->colorspace.gamma));
- /* Notice that the '16 from 1' table should be full precision, however
- * the lookup on this table still uses gamma_shift, so it can't be.
- * TODO: fix this.
- */
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
- png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
- png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
- }
+ /* Notice that the '16 from 1' table should be full precision, however
+ * the lookup on this table still uses gamma_shift, so it can't be.
+ * TODO: fix this.
+ */
+ png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
+ png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
+ png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+ }
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- }
+ }
#endif /* 16BIT */
}
#endif /* READ_GAMMA */
@@ -4225,11 +4260,11 @@
if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
(option & 1) == 0)
{
- int mask = 3 << option;
- int setting = (2 + (onoff != 0)) << option;
- int current = png_ptr->options;
+ png_uint_32 mask = 3 << option;
+ png_uint_32 setting = (2 + (onoff != 0)) << option;
+ png_uint_32 current = png_ptr->options;
- png_ptr->options = (png_byte)(((current & ~mask) | setting) & 0xff);
+ png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff);
return (current & mask) >> option;
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,9 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.21, January 15, 2016
+ * libpng version 1.6.28, January 5, 2017
*
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -12,7 +12,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.21, January 15, 2016:
+ * libpng versions 0.97, January 1998, through 1.6.28, January 5, 2017:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
@@ -25,8 +25,8 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
- * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are
+ * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
* added to the list of Contributing Authors:
@@ -37,6 +37,7 @@
* Cosmin Truta
* Gilles Vollant
* James Yu
+ * Mandar Sahastrabuddhe
*
* and with the following additions to the disclaimer:
*
@@ -47,6 +48,10 @@
* risk of satisfactory quality, performance, accuracy, and effort is with
* the user.
*
+ * Some files in the "contrib" directory and some configure-generated
+ * files that are distributed with libpng have other copyright owners and
+ * are released under other open source licenses.
+ *
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
* libpng-0.96, and are distributed according to the same disclaimer and
@@ -70,6 +75,9 @@
* Greg Roelofs
* Tom Tanner
*
+ * Some files in the "scripts" directory have other copyright owners
+ * but are released under this license.
+ *
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
@@ -109,6 +117,29 @@
* appreciated.
*
* END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+ *
+ * TRADEMARK:
+ *
+ * The name "libpng" has not been registered by the Copyright owner
+ * as a trademark in any jurisdiction. However, because libpng has
+ * been distributed and maintained world-wide, continually since 1995,
+ * the Copyright owner claims "common-law trademark protection" in any
+ * jurisdiction where common-law trademark is recognized.
+ *
+ * OSI CERTIFICATION:
+ *
+ * Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
+ * a certification mark of the Open Source Initiative. OSI has not addressed
+ * the additional disclaimers inserted at version 1.0.7.
+ *
+ * EXPORT CONTROL:
+ *
+ * The Copyright owner believes that the Export Control Classification
+ * Number (ECCN) for libpng is EAR99, which means not subject to export
+ * controls or International Traffic in Arms Regulations (ITAR) because
+ * it is open source, publicly available software, that does not contain
+ * any encryption software. See the EAR, paragraphs 734.3(b)(3) and
+ * 734.7(b).
*/
/*
@@ -122,12 +153,6 @@
*/
/*
- * Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
- * a certification mark of the Open Source Initiative. OSI has not addressed
- * the additional disclaimers inserted at version 1.0.7.
- */
-
-/*
* The contributing authors would like to thank all those who helped
* with testing, bug fixes, and patience. This wouldn't have been
* possible without all of you.
@@ -182,11 +207,11 @@
* ...
* 1.0.19 10 10019 10.so.0.19[.0]
* ...
- * 1.2.53 13 10253 12.so.0.53[.0]
+ * 1.2.57 13 10257 12.so.0.57[.0]
* ...
- * 1.5.23 15 10523 15.so.15.23[.0]
+ * 1.5.28 15 10527 15.so.15.28[.0]
* ...
- * 1.6.21 16 10621 16.so.16.21[.0]
+ * 1.6.28 16 10628 16.so.16.28[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -214,13 +239,13 @@
* Y2K compliance in libpng:
* =========================
*
- * January 15, 2016
+ * January 5, 2017
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.6.21 are Y2K compliant. It is my belief that
+ * upward through 1.6.28 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -282,9 +307,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.21"
-#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.21 - January 15, 2016\n"
+#define PNG_LIBPNG_VER_STRING "1.6.28"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28 - January 5, 2017\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -292,7 +316,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 21
+#define PNG_LIBPNG_VER_RELEASE 28
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -323,20 +347,20 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
-#define PNG_LIBPNG_VER 10621 /* 1.6.21 */
+#define PNG_LIBPNG_VER 10628 /* 1.6.28 */
/* Library configuration: these options cannot be changed after
* the library has been built.
*/
#ifndef PNGLCONF_H
- /* If pnglibconf.h is missing, you can
- * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
- */
+/* If pnglibconf.h is missing, you can
+ * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
+ */
# include "pnglibconf.h"
#endif
#ifndef PNG_VERSION_INFO_ONLY
- /* Machine specific configuration. */
+/* Machine specific configuration. */
# include "pngconf.h"
#endif
@@ -433,7 +457,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_21;
+typedef char* png_libpng_version_1_6_28;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
@@ -626,17 +650,17 @@
*/
typedef struct png_unknown_chunk_t
{
- png_byte name[5]; /* Textual chunk name with '\0' terminator */
- png_byte *data; /* Data, should not be modified on read! */
- png_size_t size;
+ png_byte name[5]; /* Textual chunk name with '\0' terminator */
+ png_byte *data; /* Data, should not be modified on read! */
+ png_size_t size;
- /* On write 'location' must be set using the flag values listed below.
- * Notice that on read it is set by libpng however the values stored have
- * more bits set than are listed below. Always treat the value as a
- * bitmask. On write set only one bit - setting multiple bits may cause the
- * chunk to be written in multiple places.
- */
- png_byte location; /* mode of operation at read time */
+ /* On write 'location' must be set using the flag values listed below.
+ * Notice that on read it is set by libpng however the values stored have
+ * more bits set than are listed below. Always treat the value as a
+ * bitmask. On write set only one bit - setting multiple bits may cause the
+ * chunk to be written in multiple places.
+ */
+ png_byte location; /* mode of operation at read time */
}
png_unknown_chunk;
@@ -734,24 +758,22 @@
* data in the info_struct to be written into the output file. The values
* of the PNG_INFO_<chunk> defines should NOT be changed.
*/
-#define PNG_INFO_gAMA 0x0001
-#define PNG_INFO_sBIT 0x0002
-#define PNG_INFO_cHRM 0x0004
-#define PNG_INFO_PLTE 0x0008
-#define PNG_INFO_tRNS 0x0010
-#define PNG_INFO_bKGD 0x0020
-#define PNG_INFO_hIST 0x0040
-#define PNG_INFO_pHYs 0x0080
-#define PNG_INFO_oFFs 0x0100
-#define PNG_INFO_tIME 0x0200
-#define PNG_INFO_pCAL 0x0400
-#define PNG_INFO_sRGB 0x0800 /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000 /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
-#if INT_MAX >= 0x8000 /* else this might break */
-#define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */
-#endif
+#define PNG_INFO_gAMA 0x0001U
+#define PNG_INFO_sBIT 0x0002U
+#define PNG_INFO_cHRM 0x0004U
+#define PNG_INFO_PLTE 0x0008U
+#define PNG_INFO_tRNS 0x0010U
+#define PNG_INFO_bKGD 0x0020U
+#define PNG_INFO_hIST 0x0040U
+#define PNG_INFO_pHYs 0x0080U
+#define PNG_INFO_oFFs 0x0100U
+#define PNG_INFO_tIME 0x0200U
+#define PNG_INFO_pCAL 0x0400U
+#define PNG_INFO_sRGB 0x0800U /* GR-P, 0.96a */
+#define PNG_INFO_iCCP 0x1000U /* ESR, 1.0.6 */
+#define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */
+#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
+#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
@@ -1322,7 +1344,7 @@
#endif
#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_16_TO_8 SUPPORTED /* Name prior to 1.5.4 */
+#define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */
/* Strip the second byte of information from a 16-bit depth file. */
PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
#endif
@@ -1473,8 +1495,8 @@
#define PNG_FILTER_UP 0x20
#define PNG_FILTER_AVG 0x40
#define PNG_FILTER_PAETH 0x80
-#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
- PNG_FILTER_AVG | PNG_FILTER_PAETH)
+#define PNG_FAST_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP)
+#define PNG_ALL_FILTERS (PNG_FAST_FILTERS | PNG_FILTER_AVG | PNG_FILTER_PAETH)
/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
* These defines should NOT be changed.
@@ -1751,21 +1773,21 @@
#define PNG_SET_WILL_FREE_DATA 1
#define PNG_USER_WILL_FREE_DATA 2
/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
+#define PNG_FREE_HIST 0x0008U
+#define PNG_FREE_ICCP 0x0010U
+#define PNG_FREE_SPLT 0x0020U
+#define PNG_FREE_ROWS 0x0040U
+#define PNG_FREE_PCAL 0x0080U
+#define PNG_FREE_SCAL 0x0100U
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-# define PNG_FREE_UNKN 0x0200
+# define PNG_FREE_UNKN 0x0200U
#endif
-/* PNG_FREE_LIST 0x0400 removed in 1.6.0 because it is ignored */
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL 0x7fff
-#define PNG_FREE_MUL 0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+/* PNG_FREE_LIST 0x0400U removed in 1.6.0 because it is ignored */
+#define PNG_FREE_PLTE 0x1000U
+#define PNG_FREE_TRNS 0x2000U
+#define PNG_FREE_TEXT 0x4000U
+#define PNG_FREE_ALL 0x7fffU
+#define PNG_FREE_MUL 0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
#ifdef PNG_USER_MEM_SUPPORTED
PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
@@ -2271,8 +2293,10 @@
* except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
* be processed by libpng.
*/
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
int keep, png_const_bytep chunk_list, int num_chunks));
+#endif /* HANDLE_AS_UNKNOWN */
/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
* the result is therefore true (non-zero) if special handling is required,
@@ -2280,7 +2304,7 @@
*/
PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
png_const_bytep chunk_name));
-#endif
+#endif /* SET_UNKNOWN_CHUNKS */
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
@@ -2501,33 +2525,37 @@
/* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-# define png_composite(composite, fg, alpha, bg) \
- { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
- * (png_uint_16)(alpha) \
- + (png_uint_16)(bg)*(png_uint_16)(255 \
- - (png_uint_16)(alpha)) + 128); \
- (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); }
+# define png_composite(composite, fg, alpha, bg) \
+ { \
+ png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
+ * (png_uint_16)(alpha) \
+ + (png_uint_16)(bg)*(png_uint_16)(255 \
+ - (png_uint_16)(alpha)) + 128); \
+ (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); \
+ }
-# define png_composite_16(composite, fg, alpha, bg) \
- { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
- * (png_uint_32)(alpha) \
- + (png_uint_32)(bg)*(65535 \
- - (png_uint_32)(alpha)) + 32768); \
- (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); }
+# define png_composite_16(composite, fg, alpha, bg) \
+ { \
+ png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
+ * (png_uint_32)(alpha) \
+ + (png_uint_32)(bg)*(65535 \
+ - (png_uint_32)(alpha)) + 32768); \
+ (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); \
+ }
#else /* Standard method using integer division */
-# define png_composite(composite, fg, alpha, bg) \
- (composite) = \
- (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) + \
- (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
- 127) / 255))
+# define png_composite(composite, fg, alpha, bg) \
+ (composite) = \
+ (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) + \
+ (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
+ 127) / 255))
-# define png_composite_16(composite, fg, alpha, bg) \
- (composite) = \
- (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
- (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
- 32767) / 65535))
+# define png_composite_16(composite, fg, alpha, bg) \
+ (composite) = \
+ (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+ (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
+ 32767) / 65535))
#endif /* READ_COMPOSITE_NODIV */
#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
@@ -2563,38 +2591,38 @@
* format for negative values, which is almost certainly true.
*/
# define PNG_get_uint_32(buf) \
- (((png_uint_32)(*(buf)) << 24) + \
- ((png_uint_32)(*((buf) + 1)) << 16) + \
- ((png_uint_32)(*((buf) + 2)) << 8) + \
- ((png_uint_32)(*((buf) + 3))))
+ (((png_uint_32)(*(buf)) << 24) + \
+ ((png_uint_32)(*((buf) + 1)) << 16) + \
+ ((png_uint_32)(*((buf) + 2)) << 8) + \
+ ((png_uint_32)(*((buf) + 3))))
/* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
* function) incorrectly returned a value of type png_uint_32.
*/
# define PNG_get_uint_16(buf) \
- ((png_uint_16) \
- (((unsigned int)(*(buf)) << 8) + \
- ((unsigned int)(*((buf) + 1)))))
+ ((png_uint_16) \
+ (((unsigned int)(*(buf)) << 8) + \
+ ((unsigned int)(*((buf) + 1)))))
# define PNG_get_int_32(buf) \
- ((png_int_32)((*(buf) & 0x80) \
- ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
- : (png_int_32)png_get_uint_32(buf)))
+ ((png_int_32)((*(buf) & 0x80) \
+ ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
+ : (png_int_32)png_get_uint_32(buf)))
- /* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
- * but defining a macro name prefixed with PNG_PREFIX.
- */
+/* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
+ * but defining a macro name prefixed with PNG_PREFIX.
+ */
# ifndef PNG_PREFIX
-# define png_get_uint_32(buf) PNG_get_uint_32(buf)
-# define png_get_uint_16(buf) PNG_get_uint_16(buf)
-# define png_get_int_32(buf) PNG_get_int_32(buf)
+# define png_get_uint_32(buf) PNG_get_uint_32(buf)
+# define png_get_uint_16(buf) PNG_get_uint_16(buf)
+# define png_get_int_32(buf) PNG_get_int_32(buf)
# endif
#else
# ifdef PNG_PREFIX
- /* No macros; revert to the (redefined) function */
-# define PNG_get_uint_32 (png_get_uint_32)
-# define PNG_get_uint_16 (png_get_uint_16)
-# define PNG_get_int_32 (png_get_int_32)
+ /* No macros; revert to the (redefined) function */
+# define PNG_get_uint_32 (png_get_uint_32)
+# define PNG_get_uint_16 (png_get_uint_16)
+# define PNG_get_int_32 (png_get_int_32)
# endif
#endif
@@ -2889,6 +2917,10 @@
* is the minimum 'row stride', the minimum count of components between each
* row. For a color-mapped image this is the minimum number of bytes in a
* row.
+ *
+ * WARNING: this macro overflows for some images with more than one component
+ * and very large image widths. libpng will refuse to process an image where
+ * this macro would overflow.
*/
#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
@@ -2895,6 +2927,9 @@
(PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
/* Return the size, in bytes, of an image buffer given a png_image and a row
* stride - the number of components to leave space for in each row.
+ *
+ * WARNING: this macro overflows a 32-bit integer for some large PNG images,
+ * libpng will refuse to process an image where such an overflow would occur.
*/
#define PNG_IMAGE_SIZE(image)\
@@ -3015,7 +3050,6 @@
#endif /* SIMPLIFIED_READ */
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-#ifdef PNG_STDIO_SUPPORTED
/* WRITE APIS
* ----------
* For write you must initialize a png_image structure to describe the image to
@@ -3032,6 +3066,7 @@
* values do not correspond to the colors in sRGB.
* colormap_entries: set to the number of entries in the color-map (0 to 256)
*/
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
const char *file, int convert_to_8bit, const void *buffer,
png_int_32 row_stride, const void *colormap));
@@ -3041,8 +3076,9 @@
int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
const void *colormap));
/* Write the image to the given (FILE*). */
+#endif /* SIMPLIFIED_WRITE_STDIO */
-/* With both write APIs if image is in one of the linear formats with 16-bit
+/* With all write APIs if image is in one of the linear formats with 16-bit
* data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
* gamma encoded according to the sRGB specification, otherwise a 16-bit linear
* encoded PNG file is written.
@@ -3054,13 +3090,103 @@
*
* With all APIs row_stride is handled as in the read APIs - it is the spacing
* from one row to the next in component sized units (1 or 2 bytes) and if
- * negative indicates a bottom-up row layout in the buffer. If row_stride is zero,
- * libpng will calculate it for you from the image width and number of channels.
+ * negative indicates a bottom-up row layout in the buffer. If row_stride is
+ * zero, libpng will calculate it for you from the image width and number of
+ * channels.
*
- * Note that the write API does not support interlacing, sub-8-bit pixels, indexed
- * PNG (color_type 3) or most ancillary chunks.
+ * Note that the write API does not support interlacing, sub-8-bit pixels or
+ * most ancillary chunks. If you need to write text chunks (e.g. for copyright
+ * notices) you need to use one of the other APIs.
*/
-#endif /* STDIO */
+
+PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
+ png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,
+ const void *buffer, png_int_32 row_stride, const void *colormap));
+ /* Write the image to the given memory buffer. The function both writes the
+ * whole PNG data stream to *memory and updates *memory_bytes with the count
+ * of bytes written.
+ *
+ * 'memory' may be NULL. In this case *memory_bytes is not read however on
+ * success the number of bytes which would have been written will still be
+ * stored in *memory_bytes. On failure *memory_bytes will contain 0.
+ *
+ * If 'memory' is not NULL it must point to memory[*memory_bytes] of
+ * writeable memory.
+ *
+ * If the function returns success memory[*memory_bytes] (if 'memory' is not
+ * NULL) contains the written PNG data. *memory_bytes will always be less
+ * than or equal to the original value.
+ *
+ * If the function returns false and *memory_bytes was not changed an error
+ * occured during write. If *memory_bytes was changed, or is not 0 if
+ * 'memory' was NULL, the write would have succeeded but for the memory
+ * buffer being too small. *memory_bytes contains the required number of
+ * bytes and will be bigger that the original value.
+ */
+
+#define png_image_write_get_memory_size(image, size, convert_to_8_bit, buffer,\
+ row_stride, colormap)\
+ png_image_write_to_memory(&(image), 0, &(size), convert_to_8_bit, buffer,\
+ row_stride, colormap)
+ /* Return the amount of memory in 'size' required to compress this image.
+ * The png_image structure 'image' must be filled in as in the above
+ * function and must not be changed before the actual write call, the buffer
+ * and all other parameters must also be identical to that in the final
+ * write call. The 'size' variable need not be initialized.
+ *
+ * NOTE: the macro returns true/false, if false is returned 'size' will be
+ * set to zero and the write failed and probably will fail if tried again.
+ */
+
+/* You can pre-allocate the buffer by making sure it is of sufficient size
+ * regardless of the amount of compression achieved. The buffer size will
+ * always be bigger than the original image and it will never be filled. The
+ * following macros are provided to assist in allocating the buffer.
+ */
+#define PNG_IMAGE_DATA_SIZE(image) (PNG_IMAGE_SIZE(image)+(image).height)
+ /* The number of uncompressed bytes in the PNG byte encoding of the image;
+ * uncompressing the PNG IDAT data will give this number of bytes.
+ *
+ * NOTE: while PNG_IMAGE_SIZE cannot overflow for an image in memory this
+ * macro can because of the extra bytes used in the PNG byte encoding. You
+ * need to avoid this macro if your image size approaches 2^30 in width or
+ * height. The same goes for the remainder of these macros; they all produce
+ * bigger numbers than the actual in-memory image size.
+ */
+#ifndef PNG_ZLIB_MAX_SIZE
+# define PNG_ZLIB_MAX_SIZE(b) ((b)+(((b)+7U)>>3)+(((b)+63U)>>6)+11U)
+ /* An upper bound on the number of compressed bytes given 'b' uncompressed
+ * bytes. This is based on deflateBounds() in zlib; different
+ * implementations of zlib compression may conceivably produce more data so
+ * if your zlib implementation is not zlib itself redefine this macro
+ * appropriately.
+ */
+#endif
+
+#define PNG_IMAGE_COMPRESSED_SIZE_MAX(image)\
+ PNG_ZLIB_MAX_SIZE((png_alloc_size_t)PNG_IMAGE_DATA_SIZE(image))
+ /* An upper bound on the size of the data in the PNG IDAT chunks. */
+
+#define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\
+ ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\
+ (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\
+ 12U+3U*(image).colormap_entries/*PLTE data*/+\
+ (((image).format&PNG_FORMAT_FLAG_ALPHA)?\
+ 12U/*tRNS*/+(image).colormap_entries:0U):0U)+\
+ 12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))
+ /* A helper for the following macro; if your compiler cannot handle the
+ * following macro use this one with the result of
+ * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most
+ * compilers should handle this just fine.)
+ */
+
+#define PNG_IMAGE_PNG_SIZE_MAX(image)\
+ PNG_IMAGE_PNG_SIZE_MAX_(image, PNG_IMAGE_COMPRESSED_SIZE_MAX(image))
+ /* An upper bound on the total length of the PNG data stream for 'image'.
+ * The result is of type png_alloc_size_t, on 32-bit systems this may
+ * overflow even though PNG_IMAGE_DATA_SIZE does not overflow; the write will
+ * run out of buffer space but return a corrected size which should work.
+ */
#endif /* SIMPLIFIED_WRITE */
/*******************************************************************************
* END OF SIMPLIFIED API
@@ -3094,7 +3220,11 @@
#endif
#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+# define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */
+#endif
+#define PNG_IGNORE_ADLER32 8
+#define PNG_OPTION_NEXT 10 /* Next option - numbers must be even */
/* Return values: NOTE: there are four values and 'off' is *not* zero */
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
@@ -3118,7 +3248,7 @@
* one to use is one more than this.)
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
- PNG_EXPORT_LAST_ORDINAL(244);
+ PNG_EXPORT_LAST_ORDINAL(245);
#endif
#ifdef __cplusplus
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,9 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.21, January 15, 2016
+ * libpng version 1.6.28, January 5, 2017
*
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -188,11 +188,11 @@
* compatible with GCC or Visual C because of different calling conventions.
*/
# if PNG_API_RULE == 2
- /* If this line results in an error, either because __watcall is not
- * understood or because of a redefine just below you cannot use *this*
- * build of the library with the compiler you are using. *This* build was
- * build using Watcom and applications must also be built using Watcom!
- */
+ /* If this line results in an error, either because __watcall is not
+ * understood or because of a redefine just below you cannot use *this*
+ * build of the library with the compiler you are using. *This* build was
+ * build using Watcom and applications must also be built using Watcom!
+ */
# define PNGCAPI __watcall
# endif
@@ -199,16 +199,16 @@
# if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
# define PNGCAPI __cdecl
# if PNG_API_RULE == 1
- /* If this line results in an error __stdcall is not understood and
- * PNG_API_RULE should not have been set to '1'.
- */
+ /* If this line results in an error __stdcall is not understood and
+ * PNG_API_RULE should not have been set to '1'.
+ */
# define PNGAPI __stdcall
# endif
# else
- /* An older compiler, or one not detected (erroneously) above,
- * if necessary override on the command line to get the correct
- * variants for the compiler.
- */
+ /* An older compiler, or one not detected (erroneously) above,
+ * if necessary override on the command line to get the correct
+ * variants for the compiler.
+ */
# ifndef PNGCAPI
# define PNGCAPI _cdecl
# endif
@@ -225,10 +225,10 @@
# if (defined(_MSC_VER) && _MSC_VER < 800) ||\
(defined(__BORLANDC__) && __BORLANDC__ < 0x500)
- /* older Borland and MSC
- * compilers used '__export' and required this to be after
- * the type.
- */
+ /* older Borland and MSC
+ * compilers used '__export' and required this to be after
+ * the type.
+ */
# ifndef PNG_EXPORT_TYPE
# define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
# endif
@@ -244,9 +244,9 @@
# if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
# define PNGAPI _System
# else /* !Windows/x86 && !OS/2 */
- /* Use the defaults, or define PNG*API on the command line (but
- * this will have to be done for every compile!)
- */
+ /* Use the defaults, or define PNG*API on the command line (but
+ * this will have to be done for every compile!)
+ */
# endif /* other system, !OS/2 */
#endif /* !Windows/x86 */
@@ -267,7 +267,7 @@
*/
#ifndef PNG_IMPEXP
# if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
- /* This forces use of a DLL, disallowing static linking */
+ /* This forces use of a DLL, disallowing static linking */
# define PNG_IMPEXP PNG_DLL_IMPORT
# endif
@@ -340,7 +340,7 @@
* less efficient code.
*/
# if defined(__clang__) && defined(__has_attribute)
- /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
+ /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
# if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
# endif
@@ -507,9 +507,9 @@
# error "libpng requires a signed 32-bit (or more) type"
#endif
-#if UINT_MAX > 4294967294
+#if UINT_MAX > 4294967294U
typedef unsigned int png_uint_32;
-#elif ULONG_MAX > 4294967294
+#elif ULONG_MAX > 4294967294U
typedef unsigned long int png_uint_32;
#else
# error "libpng requires an unsigned 32-bit (or more) type"
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngerror.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngerror.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngerror.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * Last changed in libpng 1.6.15 [November 20, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -26,7 +26,7 @@
#ifdef PNG_WARNINGS_SUPPORTED
static void /* PRIVATE */
png_default_warning PNGARG((png_const_structrp png_ptr,
- png_const_charp warning_message));
+ png_const_charp warning_message));
#endif /* WARNINGS */
/* This function is called whenever there is a fatal error. This function
@@ -37,7 +37,7 @@
#ifdef PNG_ERROR_TEXT_SUPPORTED
PNG_FUNCTION(void,PNGAPI
png_error,(png_const_structrp png_ptr, png_const_charp error_message),
- PNG_NORETURN)
+ PNG_NORETURN)
{
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
char msg[16];
@@ -44,7 +44,7 @@
if (png_ptr != NULL)
{
if ((png_ptr->flags &
- (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0
+ (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
{
if (*error_message == PNG_LITERAL_SHARP)
{
@@ -65,18 +65,18 @@
else
error_message += offset;
- }
+ }
- else
- {
- if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
+ else
{
- msg[0] = '0';
- msg[1] = '\0';
- error_message = msg;
+ if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
+ {
+ msg[0] = '0';
+ msg[1] = '\0';
+ error_message = msg;
+ }
}
- }
- }
+ }
}
#endif
if (png_ptr != NULL && png_ptr->error_fn != NULL)
@@ -110,7 +110,7 @@
*/
size_t
png_safecat(png_charp buffer, size_t bufsize, size_t pos,
- png_const_charp string)
+ png_const_charp string)
{
if (buffer != NULL && pos < bufsize)
{
@@ -131,7 +131,7 @@
*/
png_charp
png_format_number(png_const_charp start, png_charp end, int format,
- png_alloc_size_t number)
+ png_alloc_size_t number)
{
int count = 0; /* number of digits output */
int mincount = 1; /* minimum number required */
@@ -233,7 +233,7 @@
}
if (png_ptr != NULL && png_ptr->warning_fn != NULL)
(*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
- warning_message + offset);
+ warning_message + offset);
else
png_default_warning(png_ptr, warning_message + offset);
}
@@ -245,7 +245,7 @@
*/
void
png_warning_parameter(png_warning_parameters p, int number,
- png_const_charp string)
+ png_const_charp string)
{
if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)
(void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);
@@ -253,7 +253,7 @@
void
png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
- png_alloc_size_t value)
+ png_alloc_size_t value)
{
char buffer[PNG_NUMBER_BUFFER_SIZE];
png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
@@ -261,7 +261,7 @@
void
png_warning_parameter_signed(png_warning_parameters p, int number, int format,
- png_int_32 value)
+ png_int_32 value)
{
png_alloc_size_t u;
png_charp str;
@@ -282,7 +282,7 @@
void
png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
- png_const_charp message)
+ png_const_charp message)
{
/* The internal buffer is just 192 bytes - enough for all our messages,
* overflow doesn't happen because this code checks! If someone figures
@@ -391,10 +391,10 @@
void /* PRIVATE */
png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
{
- if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
- png_warning(png_ptr, error_message);
- else
- png_error(png_ptr, error_message);
+ if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
+ png_warning(png_ptr, error_message);
+ else
+ png_error(png_ptr, error_message);
# ifndef PNG_ERROR_TEXT_SUPPORTED
PNG_UNUSED(error_message)
@@ -404,10 +404,10 @@
void /* PRIVATE */
png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
{
- if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
- png_warning(png_ptr, error_message);
- else
- png_error(png_ptr, error_message);
+ if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
+ png_warning(png_ptr, error_message);
+ else
+ png_error(png_ptr, error_message);
# ifndef PNG_ERROR_TEXT_SUPPORTED
PNG_UNUSED(error_message)
@@ -478,7 +478,7 @@
#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
PNG_FUNCTION(void,PNGAPI
png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
- PNG_NORETURN)
+ PNG_NORETURN)
{
char msg[18+PNG_MAX_ERROR_TEXT];
if (png_ptr == NULL)
@@ -573,7 +573,7 @@
{
# define fixed_message "fixed point overflow in "
# define fixed_message_ln ((sizeof fixed_message)-1)
- int iin;
+ unsigned int iin;
char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
memcpy(msg, fixed_message, fixed_message_ln);
iin = 0;
@@ -620,7 +620,7 @@
else
{
png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,
- png_malloc_warn(png_ptr, jmp_buf_size));
+ png_malloc_warn(png_ptr, jmp_buf_size));
if (png_ptr->jmp_buf_ptr == NULL)
return NULL; /* new NULL return on OOM */
@@ -709,7 +709,7 @@
*/
static PNG_FUNCTION(void /* PRIVATE */,
png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
- PNG_NORETURN)
+ PNG_NORETURN)
{
#ifdef PNG_CONSOLE_IO_SUPPORTED
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
@@ -883,7 +883,7 @@
*/
PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
- PNG_NORETURN)
+ PNG_NORETURN)
{
const png_const_structrp png_ptr = png_nonconst_ptr;
png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
@@ -906,7 +906,7 @@
/* Missing longjmp buffer, the following is to help debugging: */
{
size_t pos = png_safecat(image->message, (sizeof image->message), 0,
- "bad longjmp: ");
+ "bad longjmp: ");
png_safecat(image->message, (sizeof image->message), pos,
error_message);
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngget.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngget.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngget.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.6.17 [March 26, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -338,7 +338,7 @@
png_fixed_point result;
if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
5000) != 0)
- return result;
+ return (png_uint_32)result;
/* Overflow. */
return 0;
@@ -456,11 +456,11 @@
return (retval);
}
#endif /* pHYs */
-#endif /* INCH_CONVERSIONS */
+#endif /* INCH_CONVERSIONS */
/* png_get_channels really belongs in here, too, but it's been around longer */
-#endif /* EASY_ACCESS */
+#endif /* EASY_ACCESS */
png_byte PNGAPI
@@ -486,7 +486,7 @@
#ifdef PNG_bKGD_SUPPORTED
png_uint_32 PNGAPI
png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
- png_color_16p *background)
+ png_color_16p *background)
{
if (png_ptr != NULL && info_ptr != NULL &&
(info_ptr->valid & PNG_INFO_bKGD) != 0 &&
@@ -526,28 +526,28 @@
if (white_x != NULL)
*white_x = png_float(png_ptr,
- info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
+ info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
if (white_y != NULL)
*white_y = png_float(png_ptr,
- info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
+ info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
if (red_x != NULL)
*red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
- "cHRM red X");
+ "cHRM red X");
if (red_y != NULL)
*red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
- "cHRM red Y");
+ "cHRM red Y");
if (green_x != NULL)
*green_x = png_float(png_ptr,
- info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
+ info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
if (green_y != NULL)
*green_y = png_float(png_ptr,
- info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
+ info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
if (blue_x != NULL)
*blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
- "cHRM blue X");
+ "cHRM blue X");
if (blue_y != NULL)
*blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
- "cHRM blue Y");
+ "cHRM blue Y");
return (PNG_INFO_cHRM);
}
@@ -556,42 +556,42 @@
png_uint_32 PNGAPI
png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
- double *red_X, double *red_Y, double *red_Z, double *green_X,
- double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
- double *blue_Z)
+ double *red_X, double *red_Y, double *red_Z, double *green_X,
+ double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
+ double *blue_Z)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
if (red_X != NULL)
*red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
- "cHRM red X");
+ "cHRM red X");
if (red_Y != NULL)
*red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
- "cHRM red Y");
+ "cHRM red Y");
if (red_Z != NULL)
*red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
- "cHRM red Z");
+ "cHRM red Z");
if (green_X != NULL)
*green_X = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
+ info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
if (green_Y != NULL)
*green_Y = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
+ info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
if (green_Z != NULL)
*green_Z = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
+ info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
if (blue_X != NULL)
*blue_X = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
+ info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
if (blue_Y != NULL)
*blue_Y = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
+ info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
if (blue_Z != NULL)
*blue_Z = png_float(png_ptr,
- info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
+ info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
return (PNG_INFO_cHRM);
}
@@ -681,8 +681,8 @@
png_debug1(1, "in %s retrieval function", "gAMA");
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
- file_gamma != NULL)
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
+ file_gamma != NULL)
{
*file_gamma = info_ptr->colorspace.gamma;
return (PNG_INFO_gAMA);
@@ -704,7 +704,7 @@
file_gamma != NULL)
{
*file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
- "png_get_gAMA");
+ "png_get_gAMA");
return (PNG_INFO_gAMA);
}
@@ -901,7 +901,7 @@
*/
*width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
*height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
- "sCAL height");
+ "sCAL height");
return (PNG_INFO_sCAL);
}
@@ -1142,19 +1142,19 @@
return 0;
#ifdef PNG_WRITE_SUPPORTED
- if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
#endif
{
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- return png_ptr->IDAT_read_size;
+ return png_ptr->IDAT_read_size;
#else
- return PNG_IDAT_READ_SIZE;
+ return PNG_IDAT_READ_SIZE;
#endif
}
#ifdef PNG_WRITE_SUPPORTED
- else
- return png_ptr->zbuffer_size;
+ else
+ return png_ptr->zbuffer_size;
#endif
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
-/* libpng 1.6.21 STANDARD API DEFINITION */
+/* libpng 1.6.28 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.21 - January 15, 2016 */
+/* Libpng version 1.6.28 - January 5, 2017 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
@@ -109,6 +109,7 @@
#define PNG_SIMPLIFIED_READ_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_SUPPORTED
#define PNG_STDIO_SUPPORTED
#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngmem.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngmem.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngmem.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.6.15 [November 20, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -66,7 +66,7 @@
*/
PNG_FUNCTION(png_voidp /* PRIVATE */,
png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
- PNG_ALLOCATED)
+ PNG_ALLOCATED)
{
/* Moved to png_malloc_base from png_malloc_default in 1.6.0; the DOS
* allocators have also been removed in 1.6.0, so any 16-bit system now has
@@ -107,9 +107,9 @@
*/
static png_voidp
png_malloc_array_checked(png_const_structrp png_ptr, int nelements,
- size_t element_size)
+ size_t element_size)
{
- png_alloc_size_t req = nelements; /* known to be > 0 */
+ png_alloc_size_t req = (png_alloc_size_t)nelements; /* known to be > 0 */
if (req <= PNG_SIZE_MAX/element_size)
return png_malloc_base(png_ptr, req * element_size);
@@ -120,7 +120,7 @@
PNG_FUNCTION(png_voidp /* PRIVATE */,
png_malloc_array,(png_const_structrp png_ptr, int nelements,
- size_t element_size),PNG_ALLOCATED)
+ size_t element_size),PNG_ALLOCATED)
{
if (nelements <= 0 || element_size == 0)
png_error(png_ptr, "internal error: array alloc");
@@ -130,7 +130,7 @@
PNG_FUNCTION(png_voidp /* PRIVATE */,
png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
- int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
+ int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
{
/* These are internal errors: */
if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||
@@ -143,7 +143,7 @@
if (add_elements <= INT_MAX - old_elements)
{
png_voidp new_array = png_malloc_array_checked(png_ptr,
- old_elements+add_elements, element_size);
+ old_elements+add_elements, element_size);
if (new_array != NULL)
{
@@ -154,7 +154,7 @@
memcpy(new_array, old_array, element_size*(unsigned)old_elements);
memset((char*)new_array + element_size*(unsigned)old_elements, 0,
- element_size*(unsigned)add_elements);
+ element_size*(unsigned)add_elements);
return new_array;
}
@@ -187,7 +187,7 @@
#ifdef PNG_USER_MEM_SUPPORTED
PNG_FUNCTION(png_voidp,PNGAPI
png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),
- PNG_ALLOCATED PNG_DEPRECATED)
+ PNG_ALLOCATED PNG_DEPRECATED)
{
png_voidp ret;
@@ -210,7 +210,7 @@
*/
PNG_FUNCTION(png_voidp,PNGAPI
png_malloc_warn,(png_const_structrp png_ptr, png_alloc_size_t size),
- PNG_ALLOCATED)
+ PNG_ALLOCATED)
{
if (png_ptr != NULL)
{
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpread.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpread.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.6.18 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -77,11 +77,11 @@
png_uint_32 PNGAPI
png_process_data_skip(png_structrp png_ptr)
{
- /* TODO: Deprecate and remove this API.
- * Somewhere the implementation of this seems to have been lost,
- * or abandoned. It was only to support some internal back-door access
- * to png_struct) in libpng-1.4.x.
- */
+/* TODO: Deprecate and remove this API.
+ * Somewhere the implementation of this seems to have been lost,
+ * or abandoned. It was only to support some internal back-door access
+ * to png_struct) in libpng-1.4.x.
+ */
png_app_warning(png_ptr,
"png_process_data_skip is not implemented in any current version of libpng");
return 0;
@@ -210,13 +210,15 @@
(png_ptr->mode & PNG_HAVE_PLTE) == 0)
png_error(png_ptr, "Missing PLTE before IDAT");
- png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->process_mode = PNG_READ_IDAT_MODE;
- if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
- if (png_ptr->push_length == 0)
- return;
+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
+ if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
+ if (png_ptr->push_length == 0)
+ return;
+ png_ptr->mode |= PNG_HAVE_IDAT;
+
if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
png_benign_error(png_ptr, "Too many IDATs found");
}
@@ -408,7 +410,7 @@
{
PNG_PUSH_SAVE_BUFFER_IF_FULL
png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
- PNG_HANDLE_CHUNK_AS_DEFAULT);
+ PNG_HANDLE_CHUNK_AS_DEFAULT);
}
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
@@ -499,7 +501,10 @@
png_error(png_ptr, "Insufficient memory for save_buffer");
}
- memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+ if (old_buffer)
+ memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+ else if (png_ptr->save_buffer_size)
+ png_error(png_ptr, "save_buffer error");
png_free(png_ptr, old_buffer);
png_ptr->save_buffer_max = new_max;
}
@@ -516,7 +521,7 @@
void /* PRIVATE */
png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
- png_size_t buffer_length)
+ png_size_t buffer_length)
{
png_ptr->current_buffer = buffer;
png_ptr->current_buffer_size = buffer_length;
@@ -619,7 +624,7 @@
void /* PRIVATE */
png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
- png_size_t buffer_length)
+ png_size_t buffer_length)
{
/* The caller checks for a non-zero buffer length. */
if (!(buffer_length > 0) || buffer == NULL)
@@ -679,7 +684,12 @@
png_warning(png_ptr, "Truncated compressed data in IDAT");
else
- png_error(png_ptr, "Decompression error in IDAT");
+ {
+ if (ret == Z_DATA_ERROR)
+ png_benign_error(png_ptr, "IDAT: ADLER32 checksum mismatch");
+ else
+ png_error(png_ptr, "Decompression error in IDAT");
+ }
/* Skip the check on unprocessed input */
return;
@@ -777,7 +787,7 @@
{
if (png_ptr->pass < 6)
png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
- png_ptr->transformations);
+ png_ptr->transformations);
switch (png_ptr->pass)
{
@@ -1039,7 +1049,7 @@
{
if (png_ptr->row_fn != NULL)
(*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
- (int)png_ptr->pass);
+ (int)png_ptr->pass);
}
#ifdef PNG_READ_INTERLACING_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * Last changed in libpng 1.6.21 [January 15, 2016]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -182,6 +182,35 @@
# endif
#endif /* PNG_ARM_NEON_OPT > 0 */
+#ifndef PNG_MIPS_MSA_OPT
+# if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+# define PNG_MIPS_MSA_OPT 2
+# else
+# define PNG_MIPS_MSA_OPT 0
+# endif
+#endif
+
+#if PNG_MIPS_MSA_OPT > 0
+# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
+# ifndef PNG_MIPS_MSA_IMPLEMENTATION
+# if defined(__mips_msa)
+# if defined(__clang__)
+# elif defined(__GNUC__)
+# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
+# define PNG_MIPS_MSA_IMPLEMENTATION 2
+# endif /* no GNUC support */
+# endif /* __GNUC__ */
+# else /* !defined __mips_msa */
+# define PNG_MIPS_MSA_IMPLEMENTATION 2
+# endif /* __mips_msa */
+# endif /* !PNG_MIPS_MSA_IMPLEMENTATION */
+
+# ifndef PNG_MIPS_MSA_IMPLEMENTATION
+# define PNG_MIPS_MSA_IMPLEMENTATION 1
+# endif
+#endif /* PNG_MIPS_MSA_OPT > 0 */
+
+
/* Is this a build of a DLL where compilation of the object modules requires
* different preprocessor settings to those required for a simple library? If
* so PNG_BUILD_DLL must be set.
@@ -420,10 +449,10 @@
# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
- /* We need to check that <math.h> hasn't already been included earlier
- * as it seems it doesn't agree with <fp.h>, yet we should really use
- * <fp.h> if possible.
- */
+ /* We need to check that <math.h> hasn't already been included earlier
+ * as it seems it doesn't agree with <fp.h>, yet we should really use
+ * <fp.h> if possible.
+ */
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
# include <fp.h>
# endif
@@ -431,9 +460,9 @@
# include <math.h>
# endif
# if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
- /* Amiga SAS/C: We must include builtin FPU functions when compiling using
- * MATH=68881
- */
+ /* Amiga SAS/C: We must include builtin FPU functions when compiling using
+ * MATH=68881
+ */
# include <m68881.h>
# endif
#endif
@@ -504,7 +533,8 @@
/* This implicitly assumes alignment is always to a power of 2. */
#ifdef png_alignof
# define png_isaligned(ptr, type)\
- ((((const char*)ptr-(const char*)0) & (png_alignof(type)-1)) == 0)
+ (((type)((const char*)ptr-(const char*)0) & \
+ (type)(png_alignof(type)-1)) == 0)
#else
# define png_isaligned(ptr, type) 0
#endif
@@ -521,92 +551,92 @@
* are defined in png.h because they need to be visible to applications
* that call png_set_unknown_chunk().
*/
-/* #define PNG_HAVE_IHDR 0x01 (defined in png.h) */
-/* #define PNG_HAVE_PLTE 0x02 (defined in png.h) */
-#define PNG_HAVE_IDAT 0x04
-/* #define PNG_AFTER_IDAT 0x08 (defined in png.h) */
-#define PNG_HAVE_IEND 0x10
- /* 0x20 (unused) */
- /* 0x40 (unused) */
- /* 0x80 (unused) */
-#define PNG_HAVE_CHUNK_HEADER 0x100
-#define PNG_WROTE_tIME 0x200
-#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
-#define PNG_BACKGROUND_IS_GRAY 0x800
-#define PNG_HAVE_PNG_SIGNATURE 0x1000
-#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
- /* 0x4000 (unused) */
-#define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */
+/* #define PNG_HAVE_IHDR 0x01U (defined in png.h) */
+/* #define PNG_HAVE_PLTE 0x02U (defined in png.h) */
+#define PNG_HAVE_IDAT 0x04U
+/* #define PNG_AFTER_IDAT 0x08U (defined in png.h) */
+#define PNG_HAVE_IEND 0x10U
+ /* 0x20U (unused) */
+ /* 0x40U (unused) */
+ /* 0x80U (unused) */
+#define PNG_HAVE_CHUNK_HEADER 0x100U
+#define PNG_WROTE_tIME 0x200U
+#define PNG_WROTE_INFO_BEFORE_PLTE 0x400U
+#define PNG_BACKGROUND_IS_GRAY 0x800U
+#define PNG_HAVE_PNG_SIGNATURE 0x1000U
+#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
+ /* 0x4000U (unused) */
+#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
/* Flags for the transformations the PNG library does on the image data */
-#define PNG_BGR 0x0001
-#define PNG_INTERLACE 0x0002
-#define PNG_PACK 0x0004
-#define PNG_SHIFT 0x0008
-#define PNG_SWAP_BYTES 0x0010
-#define PNG_INVERT_MONO 0x0020
-#define PNG_QUANTIZE 0x0040
-#define PNG_COMPOSE 0x0080 /* Was PNG_BACKGROUND */
-#define PNG_BACKGROUND_EXPAND 0x0100
-#define PNG_EXPAND_16 0x0200 /* Added to libpng 1.5.2 */
-#define PNG_16_TO_8 0x0400 /* Becomes 'chop' in 1.5.4 */
-#define PNG_RGBA 0x0800
-#define PNG_EXPAND 0x1000
-#define PNG_GAMMA 0x2000
-#define PNG_GRAY_TO_RGB 0x4000
-#define PNG_FILLER 0x8000
-#define PNG_PACKSWAP 0x10000
-#define PNG_SWAP_ALPHA 0x20000
-#define PNG_STRIP_ALPHA 0x40000
-#define PNG_INVERT_ALPHA 0x80000
-#define PNG_USER_TRANSFORM 0x100000
-#define PNG_RGB_TO_GRAY_ERR 0x200000
-#define PNG_RGB_TO_GRAY_WARN 0x400000
-#define PNG_RGB_TO_GRAY 0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */
-#define PNG_ENCODE_ALPHA 0x800000 /* Added to libpng-1.5.4 */
-#define PNG_ADD_ALPHA 0x1000000 /* Added to libpng-1.2.7 */
-#define PNG_EXPAND_tRNS 0x2000000 /* Added to libpng-1.2.9 */
-#define PNG_SCALE_16_TO_8 0x4000000 /* Added to libpng-1.5.4 */
- /* 0x8000000 unused */
- /* 0x10000000 unused */
- /* 0x20000000 unused */
- /* 0x40000000 unused */
+#define PNG_BGR 0x0001U
+#define PNG_INTERLACE 0x0002U
+#define PNG_PACK 0x0004U
+#define PNG_SHIFT 0x0008U
+#define PNG_SWAP_BYTES 0x0010U
+#define PNG_INVERT_MONO 0x0020U
+#define PNG_QUANTIZE 0x0040U
+#define PNG_COMPOSE 0x0080U /* Was PNG_BACKGROUND */
+#define PNG_BACKGROUND_EXPAND 0x0100U
+#define PNG_EXPAND_16 0x0200U /* Added to libpng 1.5.2 */
+#define PNG_16_TO_8 0x0400U /* Becomes 'chop' in 1.5.4 */
+#define PNG_RGBA 0x0800U
+#define PNG_EXPAND 0x1000U
+#define PNG_GAMMA 0x2000U
+#define PNG_GRAY_TO_RGB 0x4000U
+#define PNG_FILLER 0x8000U
+#define PNG_PACKSWAP 0x10000U
+#define PNG_SWAP_ALPHA 0x20000U
+#define PNG_STRIP_ALPHA 0x40000U
+#define PNG_INVERT_ALPHA 0x80000U
+#define PNG_USER_TRANSFORM 0x100000U
+#define PNG_RGB_TO_GRAY_ERR 0x200000U
+#define PNG_RGB_TO_GRAY_WARN 0x400000U
+#define PNG_RGB_TO_GRAY 0x600000U /* two bits, RGB_TO_GRAY_ERR|WARN */
+#define PNG_ENCODE_ALPHA 0x800000U /* Added to libpng-1.5.4 */
+#define PNG_ADD_ALPHA 0x1000000U /* Added to libpng-1.2.7 */
+#define PNG_EXPAND_tRNS 0x2000000U /* Added to libpng-1.2.9 */
+#define PNG_SCALE_16_TO_8 0x4000000U /* Added to libpng-1.5.4 */
+ /* 0x8000000U unused */
+ /* 0x10000000U unused */
+ /* 0x20000000U unused */
+ /* 0x40000000U unused */
/* Flags for png_create_struct */
-#define PNG_STRUCT_PNG 0x0001
-#define PNG_STRUCT_INFO 0x0002
+#define PNG_STRUCT_PNG 0x0001U
+#define PNG_STRUCT_INFO 0x0002U
/* Flags for the png_ptr->flags rather than declaring a byte for each one */
-#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY 0x0001
-#define PNG_FLAG_ZSTREAM_INITIALIZED 0x0002 /* Added to libpng-1.6.0 */
- /* 0x0004 unused */
-#define PNG_FLAG_ZSTREAM_ENDED 0x0008 /* Added to libpng-1.6.0 */
- /* 0x0010 unused */
- /* 0x0020 unused */
-#define PNG_FLAG_ROW_INIT 0x0040
-#define PNG_FLAG_FILLER_AFTER 0x0080
-#define PNG_FLAG_CRC_ANCILLARY_USE 0x0100
-#define PNG_FLAG_CRC_ANCILLARY_NOWARN 0x0200
-#define PNG_FLAG_CRC_CRITICAL_USE 0x0400
-#define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800
-#define PNG_FLAG_ASSUME_sRGB 0x1000 /* Added to libpng-1.5.4 */
-#define PNG_FLAG_OPTIMIZE_ALPHA 0x2000 /* Added to libpng-1.5.4 */
-#define PNG_FLAG_DETECT_UNINITIALIZED 0x4000 /* Added to libpng-1.5.4 */
-/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS 0x8000 */
-/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS 0x10000 */
-#define PNG_FLAG_LIBRARY_MISMATCH 0x20000
-#define PNG_FLAG_STRIP_ERROR_NUMBERS 0x40000
-#define PNG_FLAG_STRIP_ERROR_TEXT 0x80000
-#define PNG_FLAG_BENIGN_ERRORS_WARN 0x100000 /* Added to libpng-1.4.0 */
-#define PNG_FLAG_APP_WARNINGS_WARN 0x200000 /* Added to libpng-1.6.0 */
-#define PNG_FLAG_APP_ERRORS_WARN 0x400000 /* Added to libpng-1.6.0 */
- /* 0x800000 unused */
- /* 0x1000000 unused */
- /* 0x2000000 unused */
- /* 0x4000000 unused */
- /* 0x8000000 unused */
- /* 0x10000000 unused */
- /* 0x20000000 unused */
- /* 0x40000000 unused */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY 0x0001U
+#define PNG_FLAG_ZSTREAM_INITIALIZED 0x0002U /* Added to libpng-1.6.0 */
+ /* 0x0004U unused */
+#define PNG_FLAG_ZSTREAM_ENDED 0x0008U /* Added to libpng-1.6.0 */
+ /* 0x0010U unused */
+ /* 0x0020U unused */
+#define PNG_FLAG_ROW_INIT 0x0040U
+#define PNG_FLAG_FILLER_AFTER 0x0080U
+#define PNG_FLAG_CRC_ANCILLARY_USE 0x0100U
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN 0x0200U
+#define PNG_FLAG_CRC_CRITICAL_USE 0x0400U
+#define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800U
+#define PNG_FLAG_ASSUME_sRGB 0x1000U /* Added to libpng-1.5.4 */
+#define PNG_FLAG_OPTIMIZE_ALPHA 0x2000U /* Added to libpng-1.5.4 */
+#define PNG_FLAG_DETECT_UNINITIALIZED 0x4000U /* Added to libpng-1.5.4 */
+/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS 0x8000U */
+/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS 0x10000U */
+#define PNG_FLAG_LIBRARY_MISMATCH 0x20000U
+#define PNG_FLAG_STRIP_ERROR_NUMBERS 0x40000U
+#define PNG_FLAG_STRIP_ERROR_TEXT 0x80000U
+#define PNG_FLAG_BENIGN_ERRORS_WARN 0x100000U /* Added to libpng-1.4.0 */
+#define PNG_FLAG_APP_WARNINGS_WARN 0x200000U /* Added to libpng-1.6.0 */
+#define PNG_FLAG_APP_ERRORS_WARN 0x400000U /* Added to libpng-1.6.0 */
+ /* 0x800000U unused */
+ /* 0x1000000U unused */
+ /* 0x2000000U unused */
+ /* 0x4000000U unused */
+ /* 0x8000000U unused */
+ /* 0x10000000U unused */
+ /* 0x20000000U unused */
+ /* 0x40000000U unused */
#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
PNG_FLAG_CRC_ANCILLARY_NOWARN)
@@ -640,6 +670,24 @@
((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \
(( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )
+/* This returns the number of trailing bits in the last byte of a row, 0 if the
+ * last byte is completely full of pixels. It is, in principle, (pixel_bits x
+ * width) % 8, but that would overflow for large 'width'. The second macro is
+ * the same except that it returns the number of unused bits in the last byte;
+ * (8-TRAILBITS), but 0 when TRAILBITS is 0.
+ *
+ * NOTE: these macros are intended to be self-evidently correct and never
+ * overflow on the assumption that pixel_bits is in the range 0..255. The
+ * arguments are evaluated only once and they can be signed (e.g. as a result of
+ * the integral promotions). The result of the expression always has type
+ * (png_uint_32), however the compiler always knows it is in the range 0..7.
+ */
+#define PNG_TRAILBITS(pixel_bits, width) \
+ (((pixel_bits) * ((width) % (png_uint_32)8)) % 8)
+
+#define PNG_PADBITS(pixel_bits, width) \
+ ((8 - PNG_TRAILBITS(pixel_bits, width)) % 8)
+
/* PNG_OUT_OF_RANGE returns true if value is outside the range
* ideal-delta..ideal+delta. Each argument is evaluated twice.
* "ideal" and "delta" should be constants, normally simple
@@ -1025,7 +1073,7 @@
#ifdef PNG_WRITE_cHRM_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
const png_xy *xy), PNG_EMPTY);
- /* The xy value must have been previously validated */
+ /* The xy value must have been previously validated */
#endif
#ifdef PNG_WRITE_sRGB_SUPPORTED
@@ -1174,6 +1222,7 @@
PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop
row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);
+#if PNG_ARM_NEON_OPT > 0
PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,
png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop
@@ -1188,7 +1237,25 @@
row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+#if PNG_MIPS_MSA_OPT > 0
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
+ png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
/* Choose the best filter to use and filter the row data */
PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
png_row_infop row_info),PNG_EMPTY);
@@ -1215,7 +1282,7 @@
/* Initialize the row buffers, etc. */
PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
-#if PNG_ZLIB_VERNUM >= 0x1240
+#if ZLIB_VERNUM >= 0x1240
PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
PNG_EMPTY);
# define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)
@@ -1413,7 +1480,7 @@
PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
png_inforp info_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,
- png_bytep row),PNG_EMPTY);
+ png_bytep row),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,
png_inforp info_ptr),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
@@ -1452,13 +1519,13 @@
PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
png_inforp info_ptr), PNG_EMPTY);
- /* Synchronize the info 'valid' flags with the colorspace */
+ /* Synchronize the info 'valid' flags with the colorspace */
PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
png_inforp info_ptr), PNG_EMPTY);
- /* Copy the png_struct colorspace to the info_struct and call the above to
- * synchronize the flags. Checks for NULL info_ptr and does nothing.
- */
+ /* Copy the png_struct colorspace to the info_struct and call the above to
+ * synchronize the flags. Checks for NULL info_ptr and does nothing.
+ */
#endif
/* Added at libpng version 1.4.0 */
@@ -1492,9 +1559,11 @@
/* The 'name' is used for information only */
/* Routines for checking parts of an ICC profile. */
+#ifdef PNG_READ_iCCP_SUPPORTED
PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
png_colorspacerp colorspace, png_const_charp name,
png_uint_32 profile_length), PNG_EMPTY);
+#endif /* READ_iCCP */
PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
png_colorspacerp colorspace, png_const_charp name,
png_uint_32 profile_length,
@@ -1913,10 +1982,17 @@
* the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
* CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
*/
+# if PNG_ARM_NEON_OPT > 0
PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
(png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
#endif
+#if PNG_MIPS_MSA_OPT > 0
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#endif
+#endif
+
PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
png_const_charp key, png_bytep new_key), PNG_EMPTY);
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.6.17 [March 26, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -28,10 +28,10 @@
{
#ifndef PNG_USER_MEM_SUPPORTED
png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
- error_fn, warn_fn, NULL, NULL, NULL);
+ error_fn, warn_fn, NULL, NULL, NULL);
#else
return png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
- warn_fn, NULL, NULL, NULL);
+ warn_fn, NULL, NULL, NULL);
}
/* Alternate create PNG structure for reading, and allocate any memory
@@ -43,7 +43,7 @@
png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
{
png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
- error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
+ error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
#endif /* USER_MEM */
if (png_ptr != NULL)
@@ -127,7 +127,10 @@
}
else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
+ {
+ png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
png_ptr->mode |= PNG_AFTER_IDAT;
+ }
/* This should be a binary subdivision search or a hash for
* matching the chunk name rather than a linear search.
@@ -249,7 +252,7 @@
else
png_handle_unknown(png_ptr, info_ptr, length,
- PNG_HANDLE_CHUNK_AS_DEFAULT);
+ PNG_HANDLE_CHUNK_AS_DEFAULT);
}
}
#endif /* SEQUENTIAL_READ */
@@ -276,7 +279,7 @@
/* New in 1.6.0 this avoids the bug of doing the initializations twice */
else
png_app_error(png_ptr,
- "png_read_update_info/png_start_read_image: duplicate call");
+ "png_read_update_info/png_start_read_image: duplicate call");
}
}
@@ -299,7 +302,7 @@
/* New in 1.6.0 this avoids the bug of doing the initializations twice */
else
png_app_error(png_ptr,
- "png_start_read_image/png_read_update_info: duplicate call");
+ "png_start_read_image/png_read_update_info: duplicate call");
}
}
#endif /* SEQUENTIAL_READ */
@@ -356,9 +359,9 @@
for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
{
- png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
- png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
- png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
+ png_uint_32 s0 = (png_uint_32)(*(rp ) << 8) | *(rp + 1);
+ png_uint_32 s1 = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);
+ png_uint_32 s2 = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);
png_uint_32 red = (s0 + s1 + 65536) & 0xffff;
png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
*(rp ) = (png_byte)((red >> 8) & 0xff);
@@ -537,7 +540,7 @@
{
if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
- png_ptr->prev_row + 1, png_ptr->row_buf[0]);
+ png_ptr->prev_row + 1, png_ptr->row_buf[0]);
else
png_error(png_ptr, "bad adaptive filter value");
}
@@ -581,7 +584,7 @@
{
if (png_ptr->pass < 6)
png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
- png_ptr->transformations);
+ png_ptr->transformations);
if (dsp_row != NULL)
png_combine_row(png_ptr, dsp_row, 1/*display*/);
@@ -716,7 +719,7 @@
* but the caller should do it!
*/
png_warning(png_ptr, "Interlace handling should be turned on when "
- "using png_read_image");
+ "using png_read_image");
/* Make sure this is set correctly */
png_ptr->num_rows = png_ptr->height;
}
@@ -776,8 +779,8 @@
#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* Report invalid palette index; added at libng-1.5.10 */
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
- png_ptr->num_palette_max > png_ptr->num_palette)
- png_benign_error(png_ptr, "Read palette index exceeding num_palette");
+ png_ptr->num_palette_max > png_ptr->num_palette)
+ png_benign_error(png_ptr, "Read palette index exceeding num_palette");
#endif
do
@@ -785,6 +788,9 @@
png_uint_32 length = png_read_chunk_header(png_ptr);
png_uint_32 chunk_name = png_ptr->chunk_name;
+ if (chunk_name != png_IDAT)
+ png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
if (chunk_name == png_IEND)
png_handle_IEND(png_ptr, info_ptr, length);
@@ -799,9 +805,9 @@
{
if (chunk_name == png_IDAT)
{
- if ((length > 0) ||
- (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
- png_benign_error(png_ptr, "Too many IDATs found");
+ if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+ || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
+ png_benign_error(png_ptr, ".Too many IDATs found");
}
png_handle_unknown(png_ptr, info_ptr, length, keep);
if (chunk_name == png_PLTE)
@@ -812,10 +818,14 @@
else if (chunk_name == png_IDAT)
{
/* Zero length IDATs are legal after the last IDAT has been
- * read, but not after other chunks have been read.
+ * read, but not after other chunks have been read. 1.6 does not
+ * always read all the deflate data; specifically it cannot be relied
+ * upon to read the Adler32 at the end. If it doesn't ignore IDAT
+ * chunks which are longer than zero as well:
*/
- if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
- png_benign_error(png_ptr, "Too many IDATs found");
+ if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+ || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
+ png_benign_error(png_ptr, "..Too many IDATs found");
png_crc_finish(png_ptr, length);
}
@@ -909,7 +919,7 @@
else
png_handle_unknown(png_ptr, info_ptr, length,
- PNG_HANDLE_CHUNK_AS_DEFAULT);
+ PNG_HANDLE_CHUNK_AS_DEFAULT);
} while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
}
#endif /* SEQUENTIAL_READ */
@@ -1020,8 +1030,7 @@
#ifdef PNG_INFO_IMAGE_SUPPORTED
void PNGAPI
png_read_png(png_structrp png_ptr, png_inforp info_ptr,
- int transforms,
- voidp params)
+ int transforms, voidp params)
{
if (png_ptr == NULL || info_ptr == NULL)
return;
@@ -1297,7 +1306,7 @@
if (info_ptr != NULL)
{
png_controlp control = png_voidcast(png_controlp,
- png_malloc_warn(png_ptr, (sizeof *control)));
+ png_malloc_warn(png_ptr, (sizeof *control)));
if (control != NULL)
{
@@ -1384,7 +1393,9 @@
png_structrp png_ptr = image->opaque->png_ptr;
png_inforp info_ptr = image->opaque->info_ptr;
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
png_set_benign_errors(png_ptr, 1/*warn*/);
+#endif
png_read_info(png_ptr, info_ptr);
/* Do this the fast way; just read directly out of png_struct. */
@@ -1422,7 +1433,7 @@
break;
case PNG_COLOR_TYPE_PALETTE:
- cmap_entries = png_ptr->num_palette;
+ cmap_entries = (png_uint_32)png_ptr->num_palette;
break;
default:
@@ -1460,12 +1471,12 @@
else
return png_image_error(image,
- "png_image_begin_read_from_stdio: invalid argument");
+ "png_image_begin_read_from_stdio: invalid argument");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");
+ "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");
return 0;
}
@@ -1498,12 +1509,12 @@
else
return png_image_error(image,
- "png_image_begin_read_from_file: invalid argument");
+ "png_image_begin_read_from_file: invalid argument");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");
+ "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");
return 0;
}
@@ -1540,7 +1551,7 @@
}
int PNGAPI png_image_begin_read_from_memory(png_imagep image,
- png_const_voidp memory, png_size_t size)
+ png_const_voidp memory, png_size_t size)
{
if (image != NULL && image->version == PNG_IMAGE_VERSION)
{
@@ -1563,12 +1574,12 @@
else
return png_image_error(image,
- "png_image_begin_read_from_memory: invalid argument");
+ "png_image_begin_read_from_memory: invalid argument");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");
+ "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");
return 0;
}
@@ -1614,12 +1625,12 @@
* IHDR, PLTE, tRNS, IDAT, and IEND chunks.
*/
png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_NEVER,
- NULL, -1);
+ NULL, -1);
/* But do not ignore image data handling chunks */
png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,
- chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
- }
+ chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
+ }
}
# define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)
@@ -1686,7 +1697,7 @@
#ifdef __GNUC__
default:
png_error(display->image->opaque->png_ptr,
- "unexpected encoding (internal error)");
+ "unexpected encoding (internal error)");
#endif
}
@@ -1695,8 +1706,8 @@
static png_uint_32
png_colormap_compose(png_image_read_control *display,
- png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,
- png_uint_32 background, int encoding)
+ png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,
+ png_uint_32 background, int encoding)
{
/* The file value is composed on the background, the background has the given
* encoding and so does the result, the file is encoded with P_FILE and the
@@ -1732,14 +1743,14 @@
*/
static void
png_create_colormap_entry(png_image_read_control *display,
- png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,
- png_uint_32 alpha, int encoding)
+ png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,
+ png_uint_32 alpha, int encoding)
{
png_imagep image = display->image;
const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
- P_LINEAR : P_sRGB;
+ P_LINEAR : P_sRGB;
const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
- (red != green || green != blue);
+ (red != green || green != blue);
if (ip > 255)
png_error(image->opaque->png_ptr, "color-map index out of range");
@@ -1957,7 +1968,7 @@
for (i=0; i<256; ++i)
png_create_colormap_entry(display, i, i, i, i, 255, P_FILE);
- return i;
+ return (int)i;
}
static int
@@ -1968,7 +1979,7 @@
for (i=0; i<256; ++i)
png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB);
- return i;
+ return (int)i;
}
#define PNG_GRAY_COLORMAP_ENTRIES 256
@@ -2019,10 +2030,10 @@
for (g=0; g<6; ++g)
png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51,
- P_sRGB);
+ P_sRGB);
}
- return i;
+ return (int)i;
}
#define PNG_GA_COLORMAP_ENTRIES 256
@@ -2043,11 +2054,11 @@
for (b=0; b<6; ++b)
png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255,
- P_sRGB);
+ P_sRGB);
}
}
- return i;
+ return (int)i;
}
#define PNG_RGB_COLORMAP_ENTRIES 216
@@ -2095,7 +2106,7 @@
else if (display->background == NULL /* no way to remove it */)
png_error(png_ptr,
- "a background color must be supplied to remove alpha/transparency");
+ "background color must be supplied to remove alpha/transparency");
/* Get a copy of the background color (this avoids repeating the checks
* below.) The encoding is 8-bit sRGB or 16-bit linear, depending on the
@@ -2190,7 +2201,7 @@
*/
if (i != trans)
png_create_colormap_entry(display, i, val, val, val, 255,
- P_FILE/*8-bit with file gamma*/);
+ P_FILE/*8-bit with file gamma*/);
/* Else this entry is transparent. The colors don't matter if
* there is an alpha channel (back_alpha == 0), but it does no
@@ -2202,7 +2213,7 @@
*/
else
png_create_colormap_entry(display, i, back_r, back_g, back_b,
- back_alpha, output_encoding);
+ back_alpha, output_encoding);
}
/* We need libpng to preserve the original encoding. */
@@ -2240,7 +2251,7 @@
if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "gray[16] color-map: too few entries");
- cmap_entries = make_gray_colormap(display);
+ cmap_entries = (unsigned int)make_gray_colormap(display);
if (png_ptr->num_trans > 0)
{
@@ -2267,7 +2278,7 @@
* matches.
*/
png_create_colormap_entry(display, gray, back_g, back_g,
- back_g, 65535, P_LINEAR);
+ back_g, 65535, P_LINEAR);
}
/* The background passed to libpng, however, must be the
@@ -2281,8 +2292,8 @@
* doesn't.
*/
png_set_background_fixed(png_ptr, &c,
- PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
- 0/*gamma: not used*/);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+ 0/*gamma: not used*/);
output_processing = PNG_CMAP_NONE;
break;
@@ -2312,7 +2323,7 @@
* background color at full precision.
*/
png_create_colormap_entry(display, 254, back_r, back_g, back_b,
- back_alpha, output_encoding);
+ back_alpha, output_encoding);
}
else
@@ -2338,7 +2349,7 @@
if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "gray+alpha color-map: too few entries");
- cmap_entries = make_ga_colormap(display);
+ cmap_entries = (unsigned int)make_ga_colormap(display);
background_index = PNG_CMAP_GA_BACKGROUND;
output_processing = PNG_CMAP_GA;
@@ -2372,7 +2383,7 @@
if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "gray-alpha color-map: too few entries");
- cmap_entries = make_gray_colormap(display);
+ cmap_entries = (unsigned int)make_gray_colormap(display);
if (output_encoding == P_LINEAR)
{
@@ -2380,7 +2391,7 @@
/* And make sure the corresponding palette entry matches. */
png_create_colormap_entry(display, gray, back_g, back_g,
- back_g, 65535, P_LINEAR);
+ back_g, 65535, P_LINEAR);
}
/* The background passed to libpng, however, must be the sRGB
@@ -2390,8 +2401,8 @@
c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
png_set_background_fixed(png_ptr, &c,
- PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
- 0/*gamma: not used*/);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+ 0/*gamma: not used*/);
output_processing = PNG_CMAP_NONE;
}
@@ -2411,7 +2422,7 @@
{
png_uint_32 gray = (i * 256 + 115) / 231;
png_create_colormap_entry(display, i++, gray, gray, gray,
- 255, P_sRGB);
+ 255, P_sRGB);
}
/* NOTE: this preserves the full precision of the application
@@ -2420,13 +2431,13 @@
background_index = i;
png_create_colormap_entry(display, i++, back_r, back_g, back_b,
#ifdef __COVERITY__
- /* Coverity claims that output_encoding cannot be 2 (P_LINEAR)
- * here.
- */ 255U,
+ /* Coverity claims that output_encoding
+ * cannot be 2 (P_LINEAR) here.
+ */ 255U,
#else
- output_encoding == P_LINEAR ? 65535U : 255U,
+ output_encoding == P_LINEAR ? 65535U : 255U,
#endif
- output_encoding);
+ output_encoding);
/* For non-opaque input composite on the sRGB background - this
* requires inverting the encoding for each component. The input
@@ -2464,9 +2475,9 @@
png_uint_32 gray = png_sRGB_table[g*51] * alpha;
png_create_colormap_entry(display, i++,
- PNG_sRGB_FROM_LINEAR(gray + back_rx),
- PNG_sRGB_FROM_LINEAR(gray + back_gx),
- PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);
+ PNG_sRGB_FROM_LINEAR(gray + back_rx),
+ PNG_sRGB_FROM_LINEAR(gray + back_gx),
+ PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);
}
}
@@ -2492,7 +2503,7 @@
* png_set_tRNS_to_alpha before png_set_background_fixed.
*/
png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1,
- -1);
+ -1);
data_encoding = P_sRGB;
/* The output will now be one or two 8-bit gray or gray+alpha
@@ -2511,7 +2522,7 @@
if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "rgb[ga] color-map: too few entries");
- cmap_entries = make_ga_colormap(display);
+ cmap_entries = (unsigned int)make_ga_colormap(display);
background_index = PNG_CMAP_GA_BACKGROUND;
output_processing = PNG_CMAP_GA;
}
@@ -2537,12 +2548,12 @@
png_ptr->num_trans > 0) &&
png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
{
- cmap_entries = make_gray_file_colormap(display);
+ cmap_entries = (unsigned int)make_gray_file_colormap(display);
data_encoding = P_FILE;
}
else
- cmap_entries = make_gray_colormap(display);
+ cmap_entries = (unsigned int)make_gray_colormap(display);
/* But if the input has alpha or transparency it must be removed
*/
@@ -2568,13 +2579,13 @@
gray = png_sRGB_table[gray]; /* now P_LINEAR */
gray = PNG_DIV257(png_gamma_16bit_correct(gray,
- png_ptr->colorspace.gamma)); /* now P_FILE */
+ png_ptr->colorspace.gamma)); /* now P_FILE */
/* And make sure the corresponding palette entry contains
* exactly the required sRGB value.
*/
png_create_colormap_entry(display, gray, back_g, back_g,
- back_g, 0/*unused*/, output_encoding);
+ back_g, 0/*unused*/, output_encoding);
}
else if (output_encoding == P_LINEAR)
@@ -2599,8 +2610,8 @@
*/
expand_tRNS = 1;
png_set_background_fixed(png_ptr, &c,
- PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
- 0/*gamma: not used*/);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+ 0/*gamma: not used*/);
}
output_processing = PNG_CMAP_NONE;
@@ -2630,11 +2641,11 @@
if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
png_error(png_ptr, "rgb+alpha color-map: too few entries");
- cmap_entries = make_rgb_colormap(display);
+ cmap_entries = (unsigned int)make_rgb_colormap(display);
/* Add a transparent entry. */
png_create_colormap_entry(display, cmap_entries, 255, 255,
- 255, 0, P_sRGB);
+ 255, 0, P_sRGB);
/* This is stored as the background index for the processing
* algorithm.
@@ -2655,7 +2666,7 @@
*/
for (b=0; b<256; b = (b << 1) | 0x7f)
png_create_colormap_entry(display, cmap_entries++,
- r, g, b, 128, P_sRGB);
+ r, g, b, 128, P_sRGB);
}
}
@@ -2679,10 +2690,10 @@
if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
png_error(png_ptr, "rgb-alpha color-map: too few entries");
- cmap_entries = make_rgb_colormap(display);
+ cmap_entries = (unsigned int)make_rgb_colormap(display);
png_create_colormap_entry(display, cmap_entries, back_r,
- back_g, back_b, 0/*unused*/, output_encoding);
+ back_g, back_b, 0/*unused*/, output_encoding);
if (output_encoding == P_LINEAR)
{
@@ -2704,9 +2715,9 @@
* index.
*/
if (memcmp((png_const_bytep)display->colormap +
- sample_size * cmap_entries,
- (png_const_bytep)display->colormap +
- sample_size * PNG_RGB_INDEX(r,g,b),
+ sample_size * cmap_entries,
+ (png_const_bytep)display->colormap +
+ sample_size * PNG_RGB_INDEX(r,g,b),
sample_size) != 0)
{
/* The background color must be added. */
@@ -2724,13 +2735,13 @@
*/
for (b=0; b<256; b = (b << 1) | 0x7f)
png_create_colormap_entry(display, cmap_entries++,
- png_colormap_compose(display, r, P_sRGB, 128,
- back_r, output_encoding),
- png_colormap_compose(display, g, P_sRGB, 128,
- back_g, output_encoding),
- png_colormap_compose(display, b, P_sRGB, 128,
- back_b, output_encoding),
- 0/*unused*/, output_encoding);
+ png_colormap_compose(display, r, P_sRGB, 128,
+ back_r, output_encoding),
+ png_colormap_compose(display, g, P_sRGB, 128,
+ back_g, output_encoding),
+ png_colormap_compose(display, b, P_sRGB, 128,
+ back_b, output_encoding),
+ 0/*unused*/, output_encoding);
}
}
@@ -2748,8 +2759,8 @@
c.blue = (png_uint_16)back_b;
png_set_background_fixed(png_ptr, &c,
- PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
- 0/*gamma: not used*/);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+ 0/*gamma: not used*/);
output_processing = PNG_CMAP_RGB;
}
@@ -2764,7 +2775,7 @@
if (PNG_RGB_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "rgb color-map: too few entries");
- cmap_entries = make_rgb_colormap(display);
+ cmap_entries = (unsigned int)make_rgb_colormap(display);
output_processing = PNG_CMAP_RGB;
}
}
@@ -2788,11 +2799,11 @@
output_processing = PNG_CMAP_NONE;
data_encoding = P_FILE; /* Don't change from color-map indices */
- cmap_entries = png_ptr->num_palette;
+ cmap_entries = (unsigned int)png_ptr->num_palette;
if (cmap_entries > 256)
cmap_entries = 256;
- if (cmap_entries > image->colormap_entries)
+ if (cmap_entries > (unsigned int)image->colormap_entries)
png_error(png_ptr, "palette color-map: too few entries");
for (i=0; i < cmap_entries; ++i)
@@ -2801,7 +2812,7 @@
{
if (trans[i] == 0)
png_create_colormap_entry(display, i, back_r, back_g,
- back_b, 0, output_encoding);
+ back_b, 0, output_encoding);
else
{
@@ -2809,22 +2820,22 @@
* on the sRGB color in 'back'.
*/
png_create_colormap_entry(display, i,
- png_colormap_compose(display, colormap[i].red, P_FILE,
- trans[i], back_r, output_encoding),
- png_colormap_compose(display, colormap[i].green, P_FILE,
- trans[i], back_g, output_encoding),
- png_colormap_compose(display, colormap[i].blue, P_FILE,
- trans[i], back_b, output_encoding),
- output_encoding == P_LINEAR ? trans[i] * 257U :
- trans[i],
- output_encoding);
+ png_colormap_compose(display, colormap[i].red,
+ P_FILE, trans[i], back_r, output_encoding),
+ png_colormap_compose(display, colormap[i].green,
+ P_FILE, trans[i], back_g, output_encoding),
+ png_colormap_compose(display, colormap[i].blue,
+ P_FILE, trans[i], back_b, output_encoding),
+ output_encoding == P_LINEAR ? trans[i] * 257U :
+ trans[i],
+ output_encoding);
}
}
else
png_create_colormap_entry(display, i, colormap[i].red,
- colormap[i].green, colormap[i].blue,
- i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);
+ colormap[i].green, colormap[i].blue,
+ i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);
}
/* The PNG data may have indices packed in fewer than 8 bits, it
@@ -2904,7 +2915,7 @@
png_error(png_ptr, "bad background index (internal error)");
}
- display->colormap_processing = output_processing;
+ display->colormap_processing = (int)output_processing;
return 1/*ok*/;
}
@@ -2914,7 +2925,7 @@
png_image_read_and_map(png_voidp argument)
{
png_image_read_control *display = png_voidcast(png_image_read_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_structrp png_ptr = image->opaque->png_ptr;
int passes;
@@ -3051,7 +3062,7 @@
if (alpha >= 196)
*outrow = PNG_RGB_INDEX(inrow[0], inrow[1],
- inrow[2]);
+ inrow[2]);
else if (alpha < 64)
*outrow = PNG_CMAP_RGB_ALPHA_BACKGROUND;
@@ -3103,7 +3114,7 @@
png_image_read_colormapped(png_voidp argument)
{
png_image_read_control *display = png_voidcast(png_image_read_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_controlp control = image->opaque;
png_structrp png_ptr = control->png_ptr;
@@ -3213,7 +3224,7 @@
else
{
- png_alloc_size_t row_bytes = display->row_bytes;
+ png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
while (--passes >= 0)
{
@@ -3220,7 +3231,7 @@
png_uint_32 y = image->height;
png_bytep row = png_voidcast(png_bytep, display->first_row);
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_read_row(png_ptr, row, NULL);
row += row_bytes;
@@ -3236,7 +3247,7 @@
png_image_read_composite(png_voidp argument)
{
png_image_read_control *display = png_voidcast(png_image_read_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_structrp png_ptr = image->opaque->png_ptr;
int passes;
@@ -3363,7 +3374,7 @@
png_image_read_background(png_voidp argument)
{
png_image_read_control *display = png_voidcast(png_image_read_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_structrp png_ptr = image->opaque->png_ptr;
png_inforp info_ptr = image->opaque->info_ptr;
@@ -3423,8 +3434,7 @@
for (pass = 0; pass < passes; ++pass)
{
- png_bytep row = png_voidcast(png_bytep,
- display->first_row);
+ png_bytep row = png_voidcast(png_bytep, display->first_row);
unsigned int startx, stepx, stepy;
png_uint_32 y;
@@ -3452,7 +3462,7 @@
for (; y<height; y += stepy)
{
png_bytep inrow = png_voidcast(png_bytep,
- display->local_row);
+ display->local_row);
png_bytep outrow = first_row + y * step_row;
png_const_bytep end_row = outrow + width;
@@ -3497,7 +3507,7 @@
for (; y<height; y += stepy)
{
png_bytep inrow = png_voidcast(png_bytep,
- display->local_row);
+ display->local_row);
png_bytep outrow = first_row + y * step_row;
png_const_bytep end_row = outrow + width;
@@ -3544,13 +3554,14 @@
*/
{
png_uint_16p first_row = png_voidcast(png_uint_16p,
- display->first_row);
+ display->first_row);
/* The division by two is safe because the caller passed in a
* stride which was multiplied by 2 (below) to get row_bytes.
*/
ptrdiff_t step_row = display->row_bytes / 2;
- int preserve_alpha = (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
- unsigned int outchannels = 1+preserve_alpha;
+ unsigned int preserve_alpha = (image->format &
+ PNG_FORMAT_FLAG_ALPHA) != 0;
+ unsigned int outchannels = 1U+preserve_alpha;
int swap_alpha = 0;
# ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
@@ -3594,7 +3605,7 @@
/* Read the row, which is packed: */
png_read_row(png_ptr, png_voidcast(png_bytep,
- display->local_row), NULL);
+ display->local_row), NULL);
inrow = png_voidcast(png_const_uint_16p, display->local_row);
/* Now do the pre-multiplication on each pixel in this row.
@@ -3643,7 +3654,7 @@
png_image_read_direct(png_voidp argument)
{
png_image_read_control *display = png_voidcast(png_image_read_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_structrp png_ptr = image->opaque->png_ptr;
png_inforp info_ptr = image->opaque->info_ptr;
@@ -3694,7 +3705,7 @@
do_local_background = 1/*maybe*/;
png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,
- PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);
+ PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);
}
change &= ~PNG_FORMAT_FLAG_COLOR;
@@ -3753,7 +3764,7 @@
* final value.
*/
if (png_muldiv(>est, output_gamma, png_ptr->colorspace.gamma,
- PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
+ PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
do_local_background = 0;
else if (mode == PNG_ALPHA_STANDARD)
@@ -3816,8 +3827,8 @@
* pixels.
*/
png_set_background_fixed(png_ptr, &c,
- PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
- 0/*gamma: not used*/);
+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+ 0/*gamma: not used*/);
}
else /* compose on row: implemented below. */
@@ -3848,16 +3859,16 @@
else
filler = 255;
-# ifdef PNG_FORMAT_AFIRST_SUPPORTED
- if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
- {
- where = PNG_FILLER_BEFORE;
- change &= ~PNG_FORMAT_FLAG_AFIRST;
- }
+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
+ {
+ where = PNG_FILLER_BEFORE;
+ change &= ~PNG_FORMAT_FLAG_AFIRST;
+ }
- else
-# endif
- where = PNG_FILLER_AFTER;
+ else
+#endif
+ where = PNG_FILLER_AFTER;
png_set_add_alpha(png_ptr, filler, where);
}
@@ -3965,12 +3976,12 @@
if (info_ptr->bit_depth == 16)
info_format |= PNG_FORMAT_FLAG_LINEAR;
-# ifdef PNG_FORMAT_BGR_SUPPORTED
- if ((png_ptr->transformations & PNG_BGR) != 0)
- info_format |= PNG_FORMAT_FLAG_BGR;
-# endif
+#ifdef PNG_FORMAT_BGR_SUPPORTED
+ if ((png_ptr->transformations & PNG_BGR) != 0)
+ info_format |= PNG_FORMAT_FLAG_BGR;
+#endif
-# ifdef PNG_FORMAT_AFIRST_SUPPORTED
+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
if (do_local_background == 2)
{
if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
@@ -4047,7 +4058,7 @@
else
{
- png_alloc_size_t row_bytes = display->row_bytes;
+ png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
while (--passes >= 0)
{
@@ -4054,7 +4065,7 @@
png_uint_32 y = image->height;
png_bytep row = png_voidcast(png_bytep, display->first_row);
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_read_row(png_ptr, row, NULL);
row += row_bytes;
@@ -4067,67 +4078,117 @@
int PNGAPI
png_image_finish_read(png_imagep image, png_const_colorp background,
- void *buffer, png_int_32 row_stride, void *colormap)
+ void *buffer, png_int_32 row_stride, void *colormap)
{
if (image != NULL && image->version == PNG_IMAGE_VERSION)
{
- png_uint_32 check;
+ /* Check for row_stride overflow. This check is not performed on the
+ * original PNG format because it may not occur in the output PNG format
+ * and libpng deals with the issues of reading the original.
+ */
+ const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
- if (row_stride == 0)
- row_stride = PNG_IMAGE_ROW_STRIDE(*image);
+ /* The following checks just the 'row_stride' calculation to ensure it
+ * fits in a signed 32-bit value. Because channels/components can be
+ * either 1 or 2 bytes in size the length of a row can still overflow 32
+ * bits; this is just to verify that the 'row_stride' argument can be
+ * represented.
+ */
+ if (image->width <= 0x7fffffffU/channels) /* no overflow */
+ {
+ png_uint_32 check;
+ const png_uint_32 png_row_stride = image->width * channels;
- if (row_stride < 0)
- check = -row_stride;
+ if (row_stride == 0)
+ row_stride = (png_int_32)/*SAFE*/png_row_stride;
- else
- check = row_stride;
+ if (row_stride < 0)
+ check = (png_uint_32)(-row_stride);
- if (image->opaque != NULL && buffer != NULL &&
- check >= PNG_IMAGE_ROW_STRIDE(*image))
- {
- if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||
- (image->colormap_entries > 0 && colormap != NULL))
+ else
+ check = (png_uint_32)row_stride;
+
+ /* This verifies 'check', the absolute value of the actual stride
+ * passed in and detects overflow in the application calculation (i.e.
+ * if the app did actually pass in a non-zero 'row_stride'.
+ */
+ if (image->opaque != NULL && buffer != NULL && check >= png_row_stride)
{
- int result;
- png_image_read_control display;
+ /* Now check for overflow of the image buffer calculation; this
+ * limits the whole image size to 32 bits for API compatibility with
+ * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
+ *
+ * The PNG_IMAGE_BUFFER_SIZE macro is:
+ *
+ * (PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)*height*(row_stride))
+ *
+ * And the component size is always 1 or 2, so make sure that the
+ * number of *bytes* that the application is saying are available
+ * does actually fit into a 32-bit number.
+ *
+ * NOTE: this will be changed in 1.7 because PNG_IMAGE_BUFFER_SIZE
+ * will be changed to use png_alloc_size_t; bigger images can be
+ * accomodated on 64-bit systems.
+ */
+ if (image->height <=
+ 0xffffffffU/PNG_IMAGE_PIXEL_COMPONENT_SIZE(image->format)/check)
+ {
+ if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||
+ (image->colormap_entries > 0 && colormap != NULL))
+ {
+ int result;
+ png_image_read_control display;
- memset(&display, 0, (sizeof display));
- display.image = image;
- display.buffer = buffer;
- display.row_stride = row_stride;
- display.colormap = colormap;
- display.background = background;
- display.local_row = NULL;
+ memset(&display, 0, (sizeof display));
+ display.image = image;
+ display.buffer = buffer;
+ display.row_stride = row_stride;
+ display.colormap = colormap;
+ display.background = background;
+ display.local_row = NULL;
- /* Choose the correct 'end' routine; for the color-map case all the
- * setup has already been done.
- */
- if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
- result =
- png_safe_execute(image, png_image_read_colormap, &display) &&
- png_safe_execute(image, png_image_read_colormapped, &display);
+ /* Choose the correct 'end' routine; for the color-map case
+ * all the setup has already been done.
+ */
+ if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
+ result =
+ png_safe_execute(image,
+ png_image_read_colormap, &display) &&
+ png_safe_execute(image,
+ png_image_read_colormapped, &display);
+ else
+ result =
+ png_safe_execute(image,
+ png_image_read_direct, &display);
+
+ png_image_free(image);
+ return result;
+ }
+
+ else
+ return png_image_error(image,
+ "png_image_finish_read[color-map]: no color-map");
+ }
+
else
- result =
- png_safe_execute(image, png_image_read_direct, &display);
-
- png_image_free(image);
- return result;
+ return png_image_error(image,
+ "png_image_finish_read: image too large");
}
else
return png_image_error(image,
- "png_image_finish_read[color-map]: no color-map");
+ "png_image_finish_read: invalid argument");
}
else
return png_image_error(image,
- "png_image_finish_read: invalid argument");
+ "png_image_finish_read: row_stride too large");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_finish_read: damaged PNG_IMAGE_VERSION");
+ "png_image_finish_read: damaged PNG_IMAGE_VERSION");
return 0;
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrio.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrio.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrio.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.6.17 [March 26, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -85,7 +85,7 @@
*/
void PNGAPI
png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
- png_rw_ptr read_data_fn)
+ png_rw_ptr read_data_fn)
{
if (png_ptr == NULL)
return;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.6.19 [November 12, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -48,7 +48,7 @@
case PNG_CRC_WARN_DISCARD: /* Not a valid action for critical data */
png_warning(png_ptr,
- "Can't discard critical data on CRC error");
+ "Can't discard critical data on CRC error");
case PNG_CRC_ERROR_QUIT: /* Error/quit */
case PNG_CRC_DEFAULT:
@@ -101,7 +101,7 @@
{
if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
png_app_error(png_ptr,
- "invalid after png_start_read_image or png_read_update_info");
+ "invalid after png_start_read_image or png_read_update_info");
else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_app_error(png_ptr, "invalid before the PNG header has been read");
@@ -159,7 +159,7 @@
png_set_background_fixed(png_ptr, background_color, background_gamma_code,
need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
}
-# endif /* FLOATING_POINT */
+# endif /* FLOATING_POINT */
#endif /* READ_BACKGROUND */
/* Scale 16-bit depth files to 8-bit depth. If both of these are set then the
@@ -209,7 +209,7 @@
#if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
static png_fixed_point
translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
- int is_screen)
+ int is_screen)
{
/* Check for flag values. The main reason for having the old Mac value as a
* flag is that it is pretty near impossible to work out what the correct
@@ -273,7 +273,7 @@
#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
void PNGFAPI
png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
- png_fixed_point output_gamma)
+ png_fixed_point output_gamma)
{
int compose = 0;
png_fixed_point file_gamma;
@@ -289,9 +289,12 @@
* is expected to be 1 or greater, but this range test allows for some
* viewing correction values. The intent is to weed out users of this API
* who use the inverse of the gamma value accidentally! Since some of these
- * values are reasonable this may have to be changed.
+ * values are reasonable this may have to be changed:
+ *
+ * 1.6.x: changed from 0.07..3 to 0.01..100 (to accomodate the optimal 16-bit
+ * gamma of 36, and its reciprocal.)
*/
- if (output_gamma < 70000 || output_gamma > 300000)
+ if (output_gamma < 1000 || output_gamma > 10000000)
png_error(png_ptr, "output gamma out of expected range");
/* The default file gamma is the inverse of the output gamma; the output
@@ -374,7 +377,7 @@
if ((png_ptr->transformations & PNG_COMPOSE) != 0)
png_error(png_ptr,
- "conflicting calls to set alpha mode and background");
+ "conflicting calls to set alpha mode and background");
png_ptr->transformations |= PNG_COMPOSE;
}
@@ -385,7 +388,7 @@
png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma)
{
png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,
- output_gamma));
+ output_gamma));
}
# endif
#endif
@@ -426,7 +429,7 @@
int i;
png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
- (png_uint_32)(num_palette * (sizeof (png_byte))));
+ (png_uint_32)((png_uint_32)num_palette * (sizeof (png_byte))));
for (i = 0; i < num_palette; i++)
png_ptr->quantize_index[i] = (png_byte)i;
}
@@ -443,7 +446,7 @@
/* Initialize an array to sort colors */
png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
- (png_uint_32)(num_palette * (sizeof (png_byte))));
+ (png_uint_32)((png_uint_32)num_palette * (sizeof (png_byte))));
/* Initialize the quantize_sort array */
for (i = 0; i < num_palette; i++)
@@ -577,9 +580,9 @@
/* Initialize palette index arrays */
png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
- (png_uint_32)(num_palette * (sizeof (png_byte))));
+ (png_uint_32)((png_uint_32)num_palette * (sizeof (png_byte))));
png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
- (png_uint_32)(num_palette * (sizeof (png_byte))));
+ (png_uint_32)((png_uint_32)num_palette * (sizeof (png_byte))));
/* Initialize the sort array */
for (i = 0; i < num_palette; i++)
@@ -799,7 +802,7 @@
#ifdef PNG_READ_GAMMA_SUPPORTED
void PNGFAPI
png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
- png_fixed_point file_gamma)
+ png_fixed_point file_gamma)
{
png_debug(1, "in png_set_gamma_fixed");
@@ -841,7 +844,7 @@
png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)
{
png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
- convert_gamma_value(png_ptr, file_gamma));
+ convert_gamma_value(png_ptr, file_gamma));
}
# endif /* FLOATING_POINT */
#endif /* READ_GAMMA */
@@ -987,7 +990,7 @@
* that it just worked and get a memory overwrite.
*/
png_error(png_ptr,
- "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
+ "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
/* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */
}
@@ -1014,7 +1017,7 @@
{
if (red >= 0 && green >= 0)
png_app_warning(png_ptr,
- "ignoring out of range rgb_to_gray coefficients");
+ "ignoring out of range rgb_to_gray coefficients");
/* Use the defaults, from the cHRM chunk if set, else the historical
* values which are close to the sRGB/HDTV/ITU-Rec 709 values. See
@@ -1023,7 +1026,7 @@
* something has already provided a default.
*/
if (png_ptr->rgb_to_gray_red_coeff == 0 &&
- png_ptr->rgb_to_gray_green_coeff == 0)
+ png_ptr->rgb_to_gray_green_coeff == 0)
{
png_ptr->rgb_to_gray_red_coeff = 6968;
png_ptr->rgb_to_gray_green_coeff = 23434;
@@ -1040,10 +1043,10 @@
void PNGAPI
png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,
- double green)
+ double green)
{
png_set_rgb_to_gray_fixed(png_ptr, error_action,
- png_fixed(png_ptr, red, "rgb to gray red coefficient"),
+ png_fixed(png_ptr, red, "rgb to gray red coefficient"),
png_fixed(png_ptr, green, "rgb to gray green coefficient"));
}
#endif /* FLOATING POINT */
@@ -1300,7 +1303,7 @@
{
if (png_ptr->screen_gamma != 0) /* screen set too */
gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma);
+ png_ptr->screen_gamma);
else
/* Assume the output matches the input; a long time default behavior
@@ -1581,7 +1584,7 @@
*/
if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
png_warning(png_ptr,
- "libpng does not support gamma+background+rgb_to_gray");
+ "libpng does not support gamma+background+rgb_to_gray");
if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)
{
@@ -1617,13 +1620,13 @@
case PNG_BACKGROUND_GAMMA_FILE:
g = png_reciprocal(png_ptr->colorspace.gamma);
gs = png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma);
+ png_ptr->screen_gamma);
break;
case PNG_BACKGROUND_GAMMA_UNIQUE:
g = png_reciprocal(png_ptr->background_gamma);
gs = png_reciprocal2(png_ptr->background_gamma,
- png_ptr->screen_gamma);
+ png_ptr->screen_gamma);
break;
default:
g = PNG_FP_1; /* back_1 */
@@ -1651,11 +1654,11 @@
if (png_gamma_significant(g) != 0)
{
back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
- g);
+ g);
back_1.green = png_gamma_8bit_correct(
- png_ptr->background.green, g);
+ png_ptr->background.green, g);
back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue,
- g);
+ g);
}
else
@@ -1726,7 +1729,7 @@
case PNG_BACKGROUND_GAMMA_FILE:
g = png_reciprocal(png_ptr->colorspace.gamma);
gs = png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma);
+ png_ptr->screen_gamma);
break;
case PNG_BACKGROUND_GAMMA_UNIQUE:
@@ -1912,7 +1915,7 @@
png_ptr->palette[i].blue = (png_byte)component;
}
}
-#endif /* READ_SHIFT */
+#endif /* READ_SHIFT */
}
/* Modify the info structure to reflect the transformations. The
@@ -2147,7 +2150,7 @@
{
png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
png_bytep dp = row + (png_size_t)row_width - 1;
- png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
+ png_uint_32 shift = 7U - ((row_width + 7U) & 0x07);
for (i = 0; i < row_width; i++)
{
*dp = (png_byte)((*sp >> shift) & 0x01);
@@ -2171,7 +2174,7 @@
png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
png_bytep dp = row + (png_size_t)row_width - 1;
- png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+ png_uint_32 shift = ((3U - ((row_width + 3U) & 0x03)) << 1);
for (i = 0; i < row_width; i++)
{
*dp = (png_byte)((*sp >> shift) & 0x03);
@@ -2194,7 +2197,7 @@
{
png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
png_bytep dp = row + (png_size_t)row_width - 1;
- png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+ png_uint_32 shift = ((1U - ((row_width + 1U) & 0x01)) << 2);
for (i = 0; i < row_width; i++)
{
*dp = (png_byte)((*sp >> shift) & 0x0f);
@@ -3220,7 +3223,8 @@
== png_ptr->trans_color.gray)
{
unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
- tmp |= png_ptr->background.gray << shift;
+ tmp |=
+ (unsigned int)(png_ptr->background.gray << shift);
*sp = (png_byte)(tmp & 0xff);
}
@@ -3249,7 +3253,8 @@
== png_ptr->trans_color.gray)
{
unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
- tmp |= png_ptr->background.gray << shift;
+ tmp |=
+ (unsigned int)png_ptr->background.gray << shift;
*sp = (png_byte)(tmp & 0xff);
}
@@ -3259,7 +3264,7 @@
unsigned int g = (gamma_table [p | (p << 2) |
(p << 4) | (p << 6)] >> 6) & 0x03;
unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
- tmp |= g << shift;
+ tmp |= (unsigned int)(g << shift);
*sp = (png_byte)(tmp & 0xff);
}
@@ -3285,7 +3290,8 @@
== png_ptr->trans_color.gray)
{
unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
- tmp |= png_ptr->background.gray << shift;
+ tmp |=
+ (unsigned int)png_ptr->background.gray << shift;
*sp = (png_byte)(tmp & 0xff);
}
@@ -3315,7 +3321,8 @@
== png_ptr->trans_color.gray)
{
unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
- tmp |= png_ptr->background.gray << shift;
+ tmp |=
+ (unsigned int)(png_ptr->background.gray << shift);
*sp = (png_byte)(tmp & 0xff);
}
@@ -3325,7 +3332,7 @@
unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
0x0f;
unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
- tmp |= g << shift;
+ tmp |= (unsigned int)(g << shift);
*sp = (png_byte)(tmp & 0xff);
}
@@ -3351,7 +3358,8 @@
== png_ptr->trans_color.gray)
{
unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
- tmp |= png_ptr->background.gray << shift;
+ tmp |=
+ (unsigned int)(png_ptr->background.gray << shift);
*sp = (png_byte)(tmp & 0xff);
}
@@ -4192,7 +4200,7 @@
*/
static void
png_do_expand_palette(png_row_infop row_info, png_bytep row,
- png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
+ png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
{
int shift, value;
png_bytep sp, dp;
@@ -4499,7 +4507,7 @@
row_info->channels = 2;
row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
- row_width);
+ row_width);
}
}
else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
@@ -4759,7 +4767,7 @@
(row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
png_do_strip_channel(row_info, png_ptr->row_buf + 1,
- 0 /* at_start == false, because SWAP_ALPHA happens later */);
+ 0 /* at_start == false, because SWAP_ALPHA happens later */);
#endif
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.6.20 [December 3, 2014]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.27 [January 5, 2017]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -86,11 +86,11 @@
{
png_uint_32 uval = png_get_uint_32(buf);
if ((uval & 0x80000000) == 0) /* non-negative */
- return uval;
+ return (png_int_32)uval;
uval = (uval ^ 0xffffffff) + 1; /* 2's complement: -x = ~x+1 */
if ((uval & 0x80000000) == 0) /* no overflow */
- return -(png_int_32)uval;
+ return -(png_int_32)uval;
/* The following has to be safe; this function only gets called on PNG data
* and if we get here that data is invalid. 0 is the most safe value and
* if not then an attacker would surely just generate a PNG with 0 instead.
@@ -370,11 +370,10 @@
*/
{
int ret; /* zlib return code */
-#if PNG_ZLIB_VERNUM >= 0x1240
+#if ZLIB_VERNUM >= 0x1240
+ int window_bits = 0;
# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
- int window_bits;
-
if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) ==
PNG_OPTION_ON)
{
@@ -384,14 +383,12 @@
else
{
- window_bits = 0;
png_ptr->zstream_start = 1;
}
-# else
-# define window_bits 0
# endif
-#endif
+#endif /* ZLIB_VERNUM >= 0x1240 */
+
/* Set this for safety, just in case the previous owner left pointers to
* memory allocations.
*/
@@ -402,19 +399,19 @@
if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
{
-#if PNG_ZLIB_VERNUM < 0x1240
+#if ZLIB_VERNUM >= 0x1240
+ ret = inflateReset2(&png_ptr->zstream, window_bits);
+#else
ret = inflateReset(&png_ptr->zstream);
-#else
- ret = inflateReset2(&png_ptr->zstream, window_bits);
#endif
}
else
{
-#if PNG_ZLIB_VERNUM < 0x1240
+#if ZLIB_VERNUM >= 0x1240
+ ret = inflateInit2(&png_ptr->zstream, window_bits);
+#else
ret = inflateInit(&png_ptr->zstream);
-#else
- ret = inflateInit2(&png_ptr->zstream, window_bits);
#endif
if (ret == Z_OK)
@@ -421,6 +418,13 @@
png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
}
+#if ZLIB_VERNUM >= 0x1281 && \
+ defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
+ if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
+ /* Turn off validation of the ADLER32 checksum in IDAT chunks */
+ ret = inflateValidate(&png_ptr->zstream, 0);
+#endif
+
if (ret == Z_OK)
png_ptr->zowner = owner;
@@ -435,7 +439,7 @@
#endif
}
-#if PNG_ZLIB_VERNUM >= 0x1240
+#if ZLIB_VERNUM >= 0x1240
/* Handle the start of the inflate stream if we called inflateInit2(strm,0);
* in this case some zlib versions skip validation of the CINFO field and, in
* certain circumstances, libpng may end up displaying an invalid image, in
@@ -461,6 +465,7 @@
#endif /* Zlib >= 1.2.4 */
#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
+#if defined(PNG_READ_zTXt_SUPPORTED) || defined (PNG_READ_iTXt_SUPPORTED)
/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to
* allow the caller to do multiple calls if required. If the 'finish' flag is
* set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must
@@ -599,9 +604,9 @@
*/
static int
png_decompress_chunk(png_structrp png_ptr,
- png_uint_32 chunklength, png_uint_32 prefix_size,
- png_alloc_size_t *newlength /* must be initialized to the maximum! */,
- int terminate /*add a '\0' to the end of the uncompressed data*/)
+ png_uint_32 chunklength, png_uint_32 prefix_size,
+ png_alloc_size_t *newlength /* must be initialized to the maximum! */,
+ int terminate /*add a '\0' to the end of the uncompressed data*/)
{
/* TODO: implement different limits for different types of chunk.
*
@@ -638,8 +643,8 @@
png_uint_32 lzsize = chunklength - prefix_size;
ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
- /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
- /* output: */ NULL, newlength);
+ /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
+ /* output: */ NULL, newlength);
if (ret == Z_STREAM_END)
{
@@ -659,15 +664,15 @@
*/
png_alloc_size_t new_size = *newlength;
png_alloc_size_t buffer_size = prefix_size + new_size +
- (terminate != 0);
+ (terminate != 0);
png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
- buffer_size));
+ buffer_size));
if (text != NULL)
{
ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
- png_ptr->read_buffer + prefix_size, &lzsize,
- text + prefix_size, newlength);
+ png_ptr->read_buffer + prefix_size, &lzsize,
+ text + prefix_size, newlength);
if (ret == Z_STREAM_END)
{
@@ -712,7 +717,7 @@
* the extra space may otherwise be used as a Trojan Horse.
*/
if (ret == Z_STREAM_END &&
- chunklength - prefix_size != lzsize)
+ chunklength - prefix_size != lzsize)
png_chunk_benign_error(png_ptr, "extra compressed data");
}
@@ -754,6 +759,7 @@
return Z_MEM_ERROR;
}
}
+#endif /* READ_zTXt || READ_iTXt */
#endif /* READ_COMPRESSED_TEXT */
#ifdef PNG_READ_iCCP_SUPPORTED
@@ -762,8 +768,8 @@
*/
static int
png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
- png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,
- int finish)
+ png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,
+ int finish)
{
if (png_ptr->zowner == png_ptr->chunk_name)
{
@@ -802,8 +808,8 @@
* the available output is produced; this allows reading of truncated
* streams.
*/
- ret = PNG_INFLATE(png_ptr,
- *chunk_bytes > 0 ? Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));
+ ret = PNG_INFLATE(png_ptr, *chunk_bytes > 0 ?
+ Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));
}
while (ret == Z_OK && (*out_size > 0 || png_ptr->zstream.avail_out > 0));
@@ -821,7 +827,7 @@
return Z_STREAM_ERROR;
}
}
-#endif
+#endif /* READ_iCCP */
/* Read and check the IDHR chunk */
@@ -1009,7 +1015,7 @@
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
#endif
{
- png_crc_finish(png_ptr, (int) length - num * 3);
+ png_crc_finish(png_ptr, (png_uint_32) (length - (unsigned int)num * 3));
}
#ifndef PNG_READ_OPT_PLTE_SUPPORTED
@@ -1292,7 +1298,7 @@
png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
(void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
- 1/*prefer cHRM values*/);
+ 1/*prefer cHRM values*/);
png_colorspace_sync(png_ptr, info_ptr);
}
#endif
@@ -1432,8 +1438,8 @@
png_ptr->zstream.next_in = (Bytef*)keyword + (keyword_length+2);
png_ptr->zstream.avail_in = read_length;
(void)png_inflate_read(png_ptr, local_buffer,
- (sizeof local_buffer), &length, profile_header, &size,
- 0/*finish: don't, because the output is too small*/);
+ (sizeof local_buffer), &length, profile_header, &size,
+ 0/*finish: don't, because the output is too small*/);
if (size == 0)
{
@@ -1443,14 +1449,14 @@
png_get_uint_32(profile_header);
if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
- keyword, profile_length) != 0)
+ keyword, profile_length) != 0)
{
/* The length is apparently ok, so we can check the 132
* byte header.
*/
if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
- keyword, profile_length, profile_header,
- png_ptr->color_type) != 0)
+ keyword, profile_length, profile_header,
+ png_ptr->color_type) != 0)
{
/* Now read the tag table; a variable size buffer is
* needed at this point, allocate one for the whole
@@ -1458,20 +1464,20 @@
* that none of these stuff will overflow.
*/
const png_uint_32 tag_count = png_get_uint_32(
- profile_header+128);
+ profile_header+128);
png_bytep profile = png_read_buffer(png_ptr,
- profile_length, 2/*silent*/);
+ profile_length, 2/*silent*/);
if (profile != NULL)
{
memcpy(profile, profile_header,
- (sizeof profile_header));
+ (sizeof profile_header));
size = 12 * tag_count;
(void)png_inflate_read(png_ptr, local_buffer,
- (sizeof local_buffer), &length,
- profile + (sizeof profile_header), &size, 0);
+ (sizeof local_buffer), &length,
+ profile + (sizeof profile_header), &size, 0);
/* Still expect a buffer error because we expect
* there to be some tag data!
@@ -1479,22 +1485,22 @@
if (size == 0)
{
if (png_icc_check_tag_table(png_ptr,
- &png_ptr->colorspace, keyword, profile_length,
- profile) != 0)
+ &png_ptr->colorspace, keyword, profile_length,
+ profile) != 0)
{
/* The profile has been validated for basic
* security issues, so read the whole thing in.
*/
size = profile_length - (sizeof profile_header)
- - 12 * tag_count;
+ - 12 * tag_count;
(void)png_inflate_read(png_ptr, local_buffer,
- (sizeof local_buffer), &length,
- profile + (sizeof profile_header) +
- 12 * tag_count, &size, 1/*finish*/);
+ (sizeof local_buffer), &length,
+ profile + (sizeof profile_header) +
+ 12 * tag_count, &size, 1/*finish*/);
if (length > 0 && !(png_ptr->flags &
- PNG_FLAG_BENIGN_ERRORS_WARN))
+ PNG_FLAG_BENIGN_ERRORS_WARN))
errmsg = "extra compressed data";
/* But otherwise allow extra data: */
@@ -1506,34 +1512,34 @@
* keep going.
*/
png_chunk_warning(png_ptr,
- "extra compressed data");
+ "extra compressed data");
}
png_crc_finish(png_ptr, length);
finished = 1;
-# ifdef PNG_sRGB_SUPPORTED
+# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
/* Check for a match against sRGB */
png_icc_set_sRGB(png_ptr,
- &png_ptr->colorspace, profile,
- png_ptr->zstream.adler);
-# endif
+ &png_ptr->colorspace, profile,
+ png_ptr->zstream.adler);
+# endif
/* Steal the profile for info_ptr. */
if (info_ptr != NULL)
{
png_free_data(png_ptr, info_ptr,
- PNG_FREE_ICCP, 0);
+ PNG_FREE_ICCP, 0);
info_ptr->iccp_name = png_voidcast(char*,
- png_malloc_base(png_ptr,
- keyword_length+1));
+ png_malloc_base(png_ptr,
+ keyword_length+1));
if (info_ptr->iccp_name != NULL)
{
memcpy(info_ptr->iccp_name, keyword,
- keyword_length+1);
+ keyword_length+1);
info_ptr->iccp_proflen =
- profile_length;
+ profile_length;
info_ptr->iccp_profile = profile;
png_ptr->read_buffer = NULL; /*steal*/
info_ptr->free_me |= PNG_FREE_ICCP;
@@ -1715,13 +1721,13 @@
data_length = length - (png_uint_32)(entry_start - buffer);
/* Integrity-check the data length */
- if ((data_length % entry_size) != 0)
+ if ((data_length % (unsigned int)entry_size) != 0)
{
png_warning(png_ptr, "sPLT chunk has bad length");
return;
}
- dl = (png_int_32)(data_length / entry_size);
+ dl = (png_uint_32)(data_length / (unsigned int)entry_size);
max_dl = PNG_SIZE_MAX / (sizeof (png_sPLT_entry));
if (dl > max_dl)
@@ -1730,10 +1736,10 @@
return;
}
- new_palette.nentries = (png_int_32)(data_length / entry_size);
+ new_palette.nentries = (png_int_32)(data_length / (unsigned int)entry_size);
- new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
- png_ptr, new_palette.nentries * (sizeof (png_sPLT_entry)));
+ new_palette.entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
+ (png_alloc_size_t) new_palette.nentries * (sizeof (png_sPLT_entry)));
if (new_palette.entries == NULL)
{
@@ -2270,7 +2276,7 @@
}
png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
- (png_charp)units, params);
+ (png_charp)units, params);
png_free(png_ptr, params);
}
@@ -2313,7 +2319,7 @@
}
png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
- length + 1);
+ length + 1);
buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
@@ -2365,7 +2371,7 @@
else
/* This is the (only) success case. */
png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
- (png_charp)buffer+1, (png_charp)buffer+heighti);
+ (png_charp)buffer+1, (png_charp)buffer+heighti);
}
}
#endif
@@ -2465,8 +2471,8 @@
if (buffer == NULL)
{
- png_chunk_benign_error(png_ptr, "out of memory");
- return;
+ png_chunk_benign_error(png_ptr, "out of memory");
+ return;
}
png_crc_read(png_ptr, buffer, length);
@@ -2573,7 +2579,7 @@
* and text chunks.
*/
if (png_decompress_chunk(png_ptr, length, keyword_length+2,
- &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
+ &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
{
png_text text;
@@ -2713,7 +2719,7 @@
* iCCP and text chunks.
*/
if (png_decompress_chunk(png_ptr, length, prefix_length,
- &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
+ &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
buffer = png_ptr->read_buffer;
else
@@ -2793,7 +2799,7 @@
{
/* Do a 'warn' here - it is handled below. */
png_ptr->unknown_chunk.data = png_voidcast(png_bytep,
- png_malloc_warn(png_ptr, length));
+ png_malloc_warn(png_ptr, length));
}
}
@@ -2818,7 +2824,7 @@
/* Handle an unknown, or known but disabled, chunk */
void /* PRIVATE */
png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
- png_uint_32 length, int keep)
+ png_uint_32 length, int keep)
{
int handled = 0; /* the chunk was handled */
@@ -2856,7 +2862,7 @@
{
/* Callback to user unknown chunk handler */
int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,
- &png_ptr->unknown_chunk);
+ &png_ptr->unknown_chunk);
/* ret is:
* negative: An error occurred; png_chunk_error will be called.
@@ -2890,9 +2896,9 @@
{
png_chunk_warning(png_ptr, "Saving unknown chunk:");
png_app_warning(png_ptr,
- "forcing save of an unhandled chunk;"
- " please call png_set_keep_unknown_chunks");
- /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */
+ "forcing save of an unhandled chunk;"
+ " please call png_set_keep_unknown_chunks");
+ /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */
}
# endif
keep = PNG_HANDLE_CHUNK_IF_SAFE;
@@ -2985,7 +2991,7 @@
* out; store the chunk.
*/
png_set_unknown_chunks(png_ptr, info_ptr,
- &png_ptr->unknown_chunk, 1);
+ &png_ptr->unknown_chunk, 1);
handled = 1;
# ifdef PNG_USER_LIMITS_SUPPORTED
break;
@@ -3097,7 +3103,7 @@
# ifdef PNG_READ_PACKSWAP_SUPPORTED
if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
/* little-endian byte */
- end_mask = 0xff << end_mask;
+ end_mask = (unsigned int)(0xff << end_mask);
else /* big-endian byte */
# endif
@@ -3418,8 +3424,8 @@
/* Everything is aligned for png_uint_16 copies, but try for
* png_uint_32 first.
*/
- if (png_isaligned(dp, png_uint_32) != 0 &&
- png_isaligned(sp, png_uint_32) != 0 &&
+ if (png_isaligned(dp, png_uint_32) &&
+ png_isaligned(sp, png_uint_32) &&
bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
bytes_to_jump % (sizeof (png_uint_32)) == 0)
{
@@ -3539,11 +3545,11 @@
#ifdef PNG_READ_INTERLACING_SUPPORTED
void /* PRIVATE */
png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
- png_uint_32 transformations /* Because these may affect the byte layout */)
+ png_uint_32 transformations /* Because these may affect the byte layout */)
{
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* Offset to next interlace block */
- static PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+ static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
png_debug(1, "in png_do_read_interlace");
if (row != NULL && row_info != NULL)
@@ -3558,9 +3564,10 @@
{
png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
- int sshift, dshift;
- int s_start, s_end, s_inc;
- int jstop = png_pass_inc[pass];
+ unsigned int sshift, dshift;
+ unsigned int s_start, s_end;
+ int s_inc;
+ int jstop = (int)png_pass_inc[pass];
png_byte v;
png_uint_32 i;
int j;
@@ -3568,8 +3575,8 @@
#ifdef PNG_READ_PACKSWAP_SUPPORTED
if ((transformations & PNG_PACKSWAP) != 0)
{
- sshift = (int)((row_info->width + 7) & 0x07);
- dshift = (int)((final_width + 7) & 0x07);
+ sshift = ((row_info->width + 7) & 0x07);
+ dshift = ((final_width + 7) & 0x07);
s_start = 7;
s_end = 0;
s_inc = -1;
@@ -3578,8 +3585,8 @@
else
#endif
{
- sshift = 7 - (int)((row_info->width + 7) & 0x07);
- dshift = 7 - (int)((final_width + 7) & 0x07);
+ sshift = 7 - ((row_info->width + 7) & 0x07);
+ dshift = 7 - ((final_width + 7) & 0x07);
s_start = 0;
s_end = 7;
s_inc = 1;
@@ -3591,7 +3598,7 @@
for (j = 0; j < jstop; j++)
{
unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));
- tmp |= v << dshift;
+ tmp |= (unsigned int)(v << dshift);
*dp = (png_byte)(tmp & 0xff);
if (dshift == s_end)
@@ -3601,7 +3608,7 @@
}
else
- dshift += s_inc;
+ dshift = (unsigned int)((int)dshift + s_inc);
}
if (sshift == s_end)
@@ -3611,7 +3618,7 @@
}
else
- sshift += s_inc;
+ sshift = (unsigned int)((int)sshift + s_inc);
}
break;
}
@@ -3620,16 +3627,17 @@
{
png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
- int sshift, dshift;
- int s_start, s_end, s_inc;
- int jstop = png_pass_inc[pass];
+ unsigned int sshift, dshift;
+ unsigned int s_start, s_end;
+ int s_inc;
+ int jstop = (int)png_pass_inc[pass];
png_uint_32 i;
#ifdef PNG_READ_PACKSWAP_SUPPORTED
if ((transformations & PNG_PACKSWAP) != 0)
{
- sshift = (int)(((row_info->width + 3) & 0x03) << 1);
- dshift = (int)(((final_width + 3) & 0x03) << 1);
+ sshift = (((row_info->width + 3) & 0x03) << 1);
+ dshift = (((final_width + 3) & 0x03) << 1);
s_start = 6;
s_end = 0;
s_inc = -2;
@@ -3638,8 +3646,8 @@
else
#endif
{
- sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
- dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
+ sshift = ((3 - ((row_info->width + 3) & 0x03)) << 1);
+ dshift = ((3 - ((final_width + 3) & 0x03)) << 1);
s_start = 0;
s_end = 6;
s_inc = 2;
@@ -3654,7 +3662,7 @@
for (j = 0; j < jstop; j++)
{
unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));
- tmp |= v << dshift;
+ tmp |= (unsigned int)(v << dshift);
*dp = (png_byte)(tmp & 0xff);
if (dshift == s_end)
@@ -3664,7 +3672,7 @@
}
else
- dshift += s_inc;
+ dshift = (unsigned int)((int)dshift + s_inc);
}
if (sshift == s_end)
@@ -3674,7 +3682,7 @@
}
else
- sshift += s_inc;
+ sshift = (unsigned int)((int)sshift + s_inc);
}
break;
}
@@ -3683,16 +3691,17 @@
{
png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
- int sshift, dshift;
- int s_start, s_end, s_inc;
+ unsigned int sshift, dshift;
+ unsigned int s_start, s_end;
+ int s_inc;
png_uint_32 i;
- int jstop = png_pass_inc[pass];
+ int jstop = (int)png_pass_inc[pass];
#ifdef PNG_READ_PACKSWAP_SUPPORTED
if ((transformations & PNG_PACKSWAP) != 0)
{
- sshift = (int)(((row_info->width + 1) & 0x01) << 2);
- dshift = (int)(((final_width + 1) & 0x01) << 2);
+ sshift = (((row_info->width + 1) & 0x01) << 2);
+ dshift = (((final_width + 1) & 0x01) << 2);
s_start = 4;
s_end = 0;
s_inc = -4;
@@ -3701,8 +3710,8 @@
else
#endif
{
- sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
- dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
+ sshift = ((1 - ((row_info->width + 1) & 0x01)) << 2);
+ dshift = ((1 - ((final_width + 1) & 0x01)) << 2);
s_start = 0;
s_end = 4;
s_inc = 4;
@@ -3716,7 +3725,7 @@
for (j = 0; j < jstop; j++)
{
unsigned int tmp = *dp & (0xf0f >> (4 - dshift));
- tmp |= v << dshift;
+ tmp |= (unsigned int)(v << dshift);
*dp = (png_byte)(tmp & 0xff);
if (dshift == s_end)
@@ -3726,7 +3735,7 @@
}
else
- dshift += s_inc;
+ dshift = (unsigned int)((int)dshift + s_inc);
}
if (sshift == s_end)
@@ -3736,7 +3745,7 @@
}
else
- sshift += s_inc;
+ sshift = (unsigned int)((int)sshift + s_inc);
}
break;
}
@@ -3750,7 +3759,7 @@
png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
- int jstop = png_pass_inc[pass];
+ int jstop = (int)png_pass_inc[pass];
png_uint_32 i;
for (i = 0; i < row_info->width; i++)
@@ -3783,7 +3792,7 @@
static void
png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row)
+ png_const_bytep prev_row)
{
png_size_t i;
png_size_t istop = row_info->rowbytes;
@@ -3801,7 +3810,7 @@
static void
png_read_filter_row_up(png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row)
+ png_const_bytep prev_row)
{
png_size_t i;
png_size_t istop = row_info->rowbytes;
@@ -3817,7 +3826,7 @@
static void
png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row)
+ png_const_bytep prev_row)
{
png_size_t i;
png_bytep rp = row;
@@ -3844,7 +3853,7 @@
static void
png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row)
+ png_const_bytep prev_row)
{
png_bytep rp_end = row + row_info->rowbytes;
int a, c;
@@ -3892,9 +3901,9 @@
static void
png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row)
+ png_const_bytep prev_row)
{
- int bpp = (row_info->pixel_depth + 7) >> 3;
+ unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
png_bytep rp_end = row + bpp;
/* Process the first pixel in the row completely (this is the same as 'up'
@@ -3907,7 +3916,7 @@
}
/* Remainder */
- rp_end += row_info->rowbytes - bpp;
+ rp_end = rp_end + (row_info->rowbytes - bpp);
while (row < rp_end)
{
@@ -3977,7 +3986,7 @@
void /* PRIVATE */
png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
- png_const_bytep prev_row, int filter)
+ png_const_bytep prev_row, int filter)
{
/* OPTIMIZATION: DO NOT MODIFY THIS FUNCTION, instead #define
* PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic
@@ -3995,7 +4004,7 @@
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
void /* PRIVATE */
png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
- png_alloc_size_t avail_out)
+ png_alloc_size_t avail_out)
{
/* Loop reading IDATs and decompressing the result into output[avail_out] */
png_ptr->zstream.next_out = output;
@@ -4252,7 +4261,7 @@
/* Offset to next interlace block in the y direction */
static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
- int max_pixel_depth;
+ unsigned int max_pixel_depth;
png_size_t row_bytes;
png_debug(1, "in png_read_start_row");
@@ -4281,7 +4290,7 @@
png_ptr->iwidth = png_ptr->width;
}
- max_pixel_depth = png_ptr->pixel_depth;
+ max_pixel_depth = (unsigned int)png_ptr->pixel_depth;
/* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of
* calculations to calculate the final pixel depth, then
@@ -4416,7 +4425,7 @@
defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
{
- int user_pixel_depth = png_ptr->user_transform_depth *
+ unsigned int user_pixel_depth = png_ptr->user_transform_depth *
png_ptr->user_transform_channels;
if (user_pixel_depth > max_pixel_depth)
@@ -4438,7 +4447,7 @@
* for safety's sake
*/
row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
- 1 + ((max_pixel_depth + 7) >> 3);
+ 1 + ((max_pixel_depth + 7) >> 3U);
#ifdef PNG_MAX_MALLOC_64K
if (row_bytes > (png_uint_32)65536L)
@@ -4447,42 +4456,42 @@
if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
{
- png_free(png_ptr, png_ptr->big_row_buf);
- png_free(png_ptr, png_ptr->big_prev_row);
+ png_free(png_ptr, png_ptr->big_row_buf);
+ png_free(png_ptr, png_ptr->big_prev_row);
- if (png_ptr->interlaced != 0)
- png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
- row_bytes + 48);
+ if (png_ptr->interlaced != 0)
+ png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
+ row_bytes + 48);
- else
- png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
+ else
+ png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
- png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
+ png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
- /* Use 16-byte aligned memory for row_buf with at least 16 bytes
- * of padding before and after row_buf; treat prev_row similarly.
- * NOTE: the alignment is to the start of the pixels, one beyond the start
- * of the buffer, because of the filter byte. Prior to libpng 1.5.6 this
- * was incorrect; the filter byte was aligned, which had the exact
- * opposite effect of that intended.
- */
- {
- png_bytep temp = png_ptr->big_row_buf + 32;
- int extra = (int)((temp - (png_bytep)0) & 0x0f);
- png_ptr->row_buf = temp - extra - 1/*filter byte*/;
+ /* Use 16-byte aligned memory for row_buf with at least 16 bytes
+ * of padding before and after row_buf; treat prev_row similarly.
+ * NOTE: the alignment is to the start of the pixels, one beyond the start
+ * of the buffer, because of the filter byte. Prior to libpng 1.5.6 this
+ * was incorrect; the filter byte was aligned, which had the exact
+ * opposite effect of that intended.
+ */
+ {
+ png_bytep temp = png_ptr->big_row_buf + 32;
+ int extra = (int)((temp - (png_bytep)0) & 0x0f);
+ png_ptr->row_buf = temp - extra - 1/*filter byte*/;
- temp = png_ptr->big_prev_row + 32;
- extra = (int)((temp - (png_bytep)0) & 0x0f);
- png_ptr->prev_row = temp - extra - 1/*filter byte*/;
- }
+ temp = png_ptr->big_prev_row + 32;
+ extra = (int)((temp - (png_bytep)0) & 0x0f);
+ png_ptr->prev_row = temp - extra - 1/*filter byte*/;
+ }
#else
- /* Use 31 bytes of padding before and 17 bytes after row_buf. */
- png_ptr->row_buf = png_ptr->big_row_buf + 31;
- png_ptr->prev_row = png_ptr->big_prev_row + 31;
+ /* Use 31 bytes of padding before and 17 bytes after row_buf. */
+ png_ptr->row_buf = png_ptr->big_row_buf + 31;
+ png_ptr->prev_row = png_ptr->big_prev_row + 31;
#endif
- png_ptr->old_big_row_buf_size = row_bytes + 48;
+ png_ptr->old_big_row_buf_size = row_bytes + 48;
}
#ifdef PNG_MAX_MALLOC_64K
@@ -4507,7 +4516,7 @@
* does not, so free the read buffer now regardless; the sequential reader
* reallocates it on demand.
*/
- if (png_ptr->read_buffer != 0)
+ if (png_ptr->read_buffer != NULL)
{
png_bytep buffer = png_ptr->read_buffer;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngset.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngset.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngset.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.6.21 [January 15, 2016]
- * Copyright (c) 1998-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -104,14 +104,14 @@
double green_x, double green_y, double blue_x, double blue_y)
{
png_set_cHRM_fixed(png_ptr, info_ptr,
- png_fixed(png_ptr, white_x, "cHRM White X"),
- png_fixed(png_ptr, white_y, "cHRM White Y"),
- png_fixed(png_ptr, red_x, "cHRM Red X"),
- png_fixed(png_ptr, red_y, "cHRM Red Y"),
- png_fixed(png_ptr, green_x, "cHRM Green X"),
- png_fixed(png_ptr, green_y, "cHRM Green Y"),
- png_fixed(png_ptr, blue_x, "cHRM Blue X"),
- png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
+ png_fixed(png_ptr, white_x, "cHRM White X"),
+ png_fixed(png_ptr, white_y, "cHRM White Y"),
+ png_fixed(png_ptr, red_x, "cHRM Red X"),
+ png_fixed(png_ptr, red_y, "cHRM Red Y"),
+ png_fixed(png_ptr, green_x, "cHRM Green X"),
+ png_fixed(png_ptr, green_y, "cHRM Green Y"),
+ png_fixed(png_ptr, blue_x, "cHRM Blue X"),
+ png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
}
void PNGAPI
@@ -120,15 +120,15 @@
double blue_X, double blue_Y, double blue_Z)
{
png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,
- png_fixed(png_ptr, red_X, "cHRM Red X"),
- png_fixed(png_ptr, red_Y, "cHRM Red Y"),
- png_fixed(png_ptr, red_Z, "cHRM Red Z"),
- png_fixed(png_ptr, green_X, "cHRM Green X"),
- png_fixed(png_ptr, green_Y, "cHRM Green Y"),
- png_fixed(png_ptr, green_Z, "cHRM Green Z"),
- png_fixed(png_ptr, blue_X, "cHRM Blue X"),
- png_fixed(png_ptr, blue_Y, "cHRM Blue Y"),
- png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));
+ png_fixed(png_ptr, red_X, "cHRM Red X"),
+ png_fixed(png_ptr, red_Y, "cHRM Red Y"),
+ png_fixed(png_ptr, red_Z, "cHRM Red Z"),
+ png_fixed(png_ptr, green_X, "cHRM Green X"),
+ png_fixed(png_ptr, green_Y, "cHRM Green Y"),
+ png_fixed(png_ptr, green_Z, "cHRM Green Z"),
+ png_fixed(png_ptr, blue_X, "cHRM Blue X"),
+ png_fixed(png_ptr, blue_Y, "cHRM Blue Y"),
+ png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));
}
# endif /* FLOATING_POINT */
@@ -283,10 +283,18 @@
/* Check that the type matches the specification. */
if (type < 0 || type > 3)
- png_error(png_ptr, "Invalid pCAL equation type");
+ {
+ png_chunk_report(png_ptr, "Invalid pCAL equation type",
+ PNG_CHUNK_WRITE_ERROR);
+ return;
+ }
if (nparams < 0 || nparams > 255)
- png_error(png_ptr, "Invalid pCAL parameter count");
+ {
+ png_chunk_report(png_ptr, "Invalid pCAL parameter count",
+ PNG_CHUNK_WRITE_ERROR);
+ return;
+ }
/* Validate params[nparams] */
for (i=0; i<nparams; ++i)
@@ -293,7 +301,11 @@
{
if (params[i] == NULL ||
!png_check_fp_string(params[i], strlen(params[i])))
- png_error(png_ptr, "Invalid format for pCAL parameter");
+ {
+ png_chunk_report(png_ptr, "Invalid format for pCAL parameter",
+ PNG_CHUNK_WRITE_ERROR);
+ return;
+ }
}
info_ptr->pcal_purpose = png_voidcast(png_charp,
@@ -301,8 +313,8 @@
if (info_ptr->pcal_purpose == NULL)
{
- png_warning(png_ptr, "Insufficient memory for pCAL purpose");
-
+ png_chunk_report(png_ptr, "Insufficient memory for pCAL purpose",
+ PNG_CHUNK_WRITE_ERROR);
return;
}
@@ -316,10 +328,10 @@
length = strlen(units) + 1;
png_debug1(3, "allocating units for info (%lu bytes)",
- (unsigned long)length);
+ (unsigned long)length);
info_ptr->pcal_units = png_voidcast(png_charp,
- png_malloc_warn(png_ptr, length));
+ png_malloc_warn(png_ptr, length));
if (info_ptr->pcal_units == NULL)
{
@@ -331,7 +343,7 @@
memcpy(info_ptr->pcal_units, units, length);
info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
- (png_size_t)((nparams + 1) * (sizeof (png_charp)))));
+ (png_size_t)(((unsigned int)nparams + 1) * (sizeof (png_charp)))));
if (info_ptr->pcal_params == NULL)
{
@@ -340,7 +352,8 @@
return;
}
- memset(info_ptr->pcal_params, 0, (nparams + 1) * (sizeof (png_charp)));
+ memset(info_ptr->pcal_params, 0, ((unsigned int)nparams + 1) *
+ (sizeof (png_charp)));
for (i = 0; i < nparams; i++)
{
@@ -398,7 +411,7 @@
png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
info_ptr->scal_s_width = png_voidcast(png_charp,
- png_malloc_warn(png_ptr, lengthw));
+ png_malloc_warn(png_ptr, lengthw));
if (info_ptr->scal_s_width == NULL)
{
@@ -414,7 +427,7 @@
png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
info_ptr->scal_s_height = png_voidcast(png_charp,
- png_malloc_warn(png_ptr, lengthh));
+ png_malloc_warn(png_ptr, lengthh));
if (info_ptr->scal_s_height == NULL)
{
@@ -453,9 +466,9 @@
char sheight[PNG_sCAL_MAX_DIGITS+1];
png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,
- PNG_sCAL_PRECISION);
+ PNG_sCAL_PRECISION);
png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,
- PNG_sCAL_PRECISION);
+ PNG_sCAL_PRECISION);
png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
}
@@ -563,7 +576,8 @@
PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));
if (num_palette > 0)
- memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color)));
+ memcpy(png_ptr->palette, palette, (unsigned int)num_palette *
+ (sizeof (png_color)));
info_ptr->palette = png_ptr->palette;
info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
@@ -648,7 +662,7 @@
*/
{
int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
- proflen, profile, info_ptr->color_type);
+ proflen, profile, info_ptr->color_type);
png_colorspace_sync_info(png_ptr, info_ptr);
@@ -673,7 +687,7 @@
memcpy(new_iccp_name, name, length);
new_iccp_profile = png_voidcast(png_bytep,
- png_malloc_warn(png_ptr, proflen));
+ png_malloc_warn(png_ptr, proflen));
if (new_iccp_profile == NULL)
{
@@ -748,14 +762,14 @@
* the overflow checks.
*/
new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,
- info_ptr->text, old_num_text, max_text-old_num_text,
- sizeof *new_text));
+ info_ptr->text, old_num_text, max_text-old_num_text,
+ sizeof *new_text));
}
if (new_text == NULL)
{
png_chunk_report(png_ptr, "too many text chunks",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
return 1;
}
@@ -783,7 +797,7 @@
text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
{
png_chunk_report(png_ptr, "text compression mode is out of range",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
continue;
}
@@ -815,7 +829,7 @@
# else /* iTXt */
{
png_chunk_report(png_ptr, "iTXt chunk not supported",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
continue;
}
# endif
@@ -844,7 +858,7 @@
if (textp->key == NULL)
{
png_chunk_report(png_ptr, "text chunk: out of memory",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
return 1;
}
@@ -952,12 +966,14 @@
png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
- /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
- png_ptr->trans_alpha = info_ptr->trans_alpha = png_voidcast(png_bytep,
- png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
-
if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
+ {
+ /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
+ info_ptr->trans_alpha = png_voidcast(png_bytep,
+ png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+ }
+ png_ptr->trans_alpha = info_ptr->trans_alpha;
}
if (trans_color != NULL)
@@ -974,7 +990,7 @@
trans_color->green > sample_max ||
trans_color->blue > sample_max)))
png_warning(png_ptr,
- "tRNS chunk has out-of-range samples for bit_depth");
+ "tRNS chunk has out-of-range samples for bit_depth");
}
#endif
@@ -1016,8 +1032,8 @@
* overflows. Notice that the parameters are (int) and (size_t)
*/
np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,
- info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
- sizeof *np));
+ info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
+ sizeof *np));
if (np == NULL)
{
@@ -1078,7 +1094,7 @@
* checked it when doing the allocation.
*/
memcpy(np->entries, entries->entries,
- entries->nentries * sizeof (png_sPLT_entry));
+ (unsigned int)entries->nentries * sizeof (png_sPLT_entry));
/* Note that 'continue' skips the advance of the out pointer and out
* count, so an invalid entry is not added.
@@ -1108,10 +1124,10 @@
{
/* Write struct, so unknown chunks come from the app */
png_app_warning(png_ptr,
- "png_set_unknown_chunks now expects a valid location");
+ "png_set_unknown_chunks now expects a valid location");
/* Use the old behavior */
location = (png_byte)(png_ptr->mode &
- (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
+ (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
}
/* This need not be an internal error - if the app calls
@@ -1134,7 +1150,7 @@
void PNGAPI
png_set_unknown_chunks(png_const_structrp png_ptr,
- png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
+ png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
{
png_unknown_chunkp np;
@@ -1173,13 +1189,13 @@
* appropriate to read or write.
*/
np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,
- info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,
- sizeof *np));
+ info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,
+ sizeof *np));
if (np == NULL)
{
png_chunk_report(png_ptr, "too many unknown chunks",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
return;
}
@@ -1208,12 +1224,12 @@
else
{
np->data = png_voidcast(png_bytep,
- png_malloc_base(png_ptr, unknowns->size));
+ png_malloc_base(png_ptr, unknowns->size));
if (np->data == NULL)
{
png_chunk_report(png_ptr, "unknown chunk: out of memory",
- PNG_CHUNK_WRITE_ERROR);
+ PNG_CHUNK_WRITE_ERROR);
/* But just skip storing the unknown chunk */
continue;
}
@@ -1247,7 +1263,7 @@
{
png_app_error(png_ptr, "invalid unknown chunk location");
/* Fake out the pre 1.6.0 behavior: */
- if ((location & PNG_HAVE_IDAT) != 0) /* undocumented! */
+ if (((unsigned int)location & PNG_HAVE_IDAT) != 0) /* undocumented! */
location = PNG_AFTER_IDAT;
else
@@ -1371,7 +1387,7 @@
return;
}
- num_chunks = num_chunks_in;
+ num_chunks = (unsigned int)num_chunks_in;
}
old_num_chunks = png_ptr->num_chunk_list;
@@ -1420,7 +1436,7 @@
for (i=0; i<num_chunks; ++i)
{
old_num_chunks = add_one_chunk(new_list, old_num_chunks,
- chunk_list+5*i, keep);
+ chunk_list+5*i, keep);
}
/* Now remove any spurious 'default' entries. */
@@ -1500,60 +1516,60 @@
void PNGAPI
png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
{
- if (png_ptr == NULL)
- return;
+ if (png_ptr == NULL)
+ return;
- if (size == 0 || size > PNG_UINT_31_MAX)
- png_error(png_ptr, "invalid compression buffer size");
+ if (size == 0 || size > PNG_UINT_31_MAX)
+ png_error(png_ptr, "invalid compression buffer size");
# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
- {
- png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
- return;
- }
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+ {
+ png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
+ return;
+ }
# endif
# ifdef PNG_WRITE_SUPPORTED
- if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+ {
+ if (png_ptr->zowner != 0)
{
- if (png_ptr->zowner != 0)
- {
- png_warning(png_ptr,
- "Compression buffer size cannot be changed because it is in use");
+ png_warning(png_ptr,
+ "Compression buffer size cannot be changed because it is in use");
- return;
- }
+ return;
+ }
#ifndef __COVERITY__
- /* Some compilers complain that this is always false. However, it
- * can be true when integer overflow happens.
- */
- if (size > ZLIB_IO_MAX)
- {
- png_warning(png_ptr,
- "Compression buffer size limited to system maximum");
- size = ZLIB_IO_MAX; /* must fit */
- }
+ /* Some compilers complain that this is always false. However, it
+ * can be true when integer overflow happens.
+ */
+ if (size > ZLIB_IO_MAX)
+ {
+ png_warning(png_ptr,
+ "Compression buffer size limited to system maximum");
+ size = ZLIB_IO_MAX; /* must fit */
+ }
#endif
- if (size < 6)
- {
- /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH
- * if this is permitted.
- */
- png_warning(png_ptr,
- "Compression buffer size cannot be reduced below 6");
+ if (size < 6)
+ {
+ /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH
+ * if this is permitted.
+ */
+ png_warning(png_ptr,
+ "Compression buffer size cannot be reduced below 6");
- return;
- }
+ return;
+ }
- if (png_ptr->zbuffer_size != size)
- {
- png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
- png_ptr->zbuffer_size = (uInt)size;
- }
+ if (png_ptr->zbuffer_size != size)
+ {
+ png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
+ png_ptr->zbuffer_size = (uInt)size;
}
+ }
# endif
}
@@ -1561,7 +1577,7 @@
png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
{
if (png_ptr != NULL && info_ptr != NULL)
- info_ptr->valid &= ~mask;
+ info_ptr->valid &= (unsigned int)(~mask);
}
@@ -1660,7 +1676,9 @@
png_uint_32 /* PRIVATE */
png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
{
+#ifdef PNG_WARNINGS_SUPPORTED
png_const_charp orig_key = key;
+#endif
png_uint_32 key_len = 0;
int bad_character = 0;
int space = 1;
@@ -1723,7 +1741,9 @@
png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x at 2'");
}
-#endif /* WARNINGS */
+#else /* !WARNINGS */
+ PNG_UNUSED(png_ptr)
+#endif /* !WARNINGS */
return key_len;
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngstruct.h - header file for PNG reference library
*
- * Last changed in libpng 1.6.18 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.28 [January 5, 2017]
+ * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -249,7 +249,7 @@
png_byte filter; /* file filter type (always 0) */
png_byte interlaced; /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
png_byte pass; /* current interlace pass (0 - 6) */
- png_byte do_filter; /* row filter flags (see PNG_FILTER_ below ) */
+ png_byte do_filter; /* row filter flags (see PNG_FILTER_ in png.h ) */
png_byte color_type; /* color type of file */
png_byte bit_depth; /* bit depth of file */
png_byte usr_bit_depth; /* bit depth of users row: write only */
@@ -263,7 +263,7 @@
/* pixel depth used for the row buffers */
png_byte transformed_pixel_depth;
/* pixel depth after read/write transforms */
-#if PNG_ZLIB_VERNUM >= 0x1240
+#if ZLIB_VERNUM >= 0x1240
png_byte zstream_start; /* at start of an input zlib stream */
#endif /* Zlib >= 1.2.4 */
#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
@@ -353,7 +353,7 @@
/* Options */
#ifdef PNG_SET_OPTION_SUPPORTED
- png_byte options; /* On/off state (up to 4 options) */
+ png_uint_32 options; /* On/off state (up to 16 options) */
#endif
#if PNG_LIBPNG_VER < 10700
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.5.25 [December 3, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -130,13 +130,13 @@
static int
tIME_to_str(png_structp png_ptr, png_charp ts, png_const_timep t)
{
- png_const_charp str = png_convert_to_rfc1123(png_ptr, t);
+ png_const_charp str = png_convert_to_rfc1123(png_ptr, t);
- if (str == NULL)
- return 0;
+ if (str == NULL)
+ return 0;
- strcpy(ts, str);
- return 1;
+ strcpy(ts, str);
+ return 1;
}
#endif /* older libpng */
#endif
@@ -240,95 +240,95 @@
* png_byte pixel_depth bits per pixel (depth*channels)
*/
- /* Counts the number of zero samples (or zero pixels if color_type is 3 */
+ /* Counts the number of zero samples (or zero pixels if color_type is 3 */
- if (row_info->color_type == 0 || row_info->color_type == 3)
- {
- int pos = 0;
- png_uint_32 n, nstop;
+ if (row_info->color_type == 0 || row_info->color_type == 3)
+ {
+ int pos = 0;
+ png_uint_32 n, nstop;
- for (n = 0, nstop=row_info->width; n<nstop; n++)
- {
- if (row_info->bit_depth == 1)
- {
- if (((*dp << pos++ ) & 0x80) == 0)
- zero_samples++;
+ for (n = 0, nstop=row_info->width; n<nstop; n++)
+ {
+ if (row_info->bit_depth == 1)
+ {
+ if (((*dp << pos++ ) & 0x80) == 0)
+ zero_samples++;
- if (pos == 8)
- {
- pos = 0;
- dp++;
- }
- }
+ if (pos == 8)
+ {
+ pos = 0;
+ dp++;
+ }
+ }
- if (row_info->bit_depth == 2)
- {
- if (((*dp << (pos+=2)) & 0xc0) == 0)
- zero_samples++;
+ if (row_info->bit_depth == 2)
+ {
+ if (((*dp << (pos+=2)) & 0xc0) == 0)
+ zero_samples++;
- if (pos == 8)
- {
- pos = 0;
- dp++;
- }
- }
+ if (pos == 8)
+ {
+ pos = 0;
+ dp++;
+ }
+ }
- if (row_info->bit_depth == 4)
- {
- if (((*dp << (pos+=4)) & 0xf0) == 0)
- zero_samples++;
+ if (row_info->bit_depth == 4)
+ {
+ if (((*dp << (pos+=4)) & 0xf0) == 0)
+ zero_samples++;
- if (pos == 8)
- {
- pos = 0;
- dp++;
- }
- }
+ if (pos == 8)
+ {
+ pos = 0;
+ dp++;
+ }
+ }
- if (row_info->bit_depth == 8)
- if (*dp++ == 0)
- zero_samples++;
+ if (row_info->bit_depth == 8)
+ if (*dp++ == 0)
+ zero_samples++;
- if (row_info->bit_depth == 16)
- {
- if ((*dp | *(dp+1)) == 0)
- zero_samples++;
- dp+=2;
- }
- }
- }
- else /* Other color types */
- {
- png_uint_32 n, nstop;
- int channel;
- int color_channels = row_info->channels;
- if (row_info->color_type > 3)
- color_channels--;
+ if (row_info->bit_depth == 16)
+ {
+ if ((*dp | *(dp+1)) == 0)
+ zero_samples++;
+ dp+=2;
+ }
+ }
+ }
+ else /* Other color types */
+ {
+ png_uint_32 n, nstop;
+ int channel;
+ int color_channels = row_info->channels;
+ if (row_info->color_type > 3)
+ color_channels--;
- for (n = 0, nstop=row_info->width; n<nstop; n++)
- {
- for (channel = 0; channel < color_channels; channel++)
- {
- if (row_info->bit_depth == 8)
- if (*dp++ == 0)
- zero_samples++;
+ for (n = 0, nstop=row_info->width; n<nstop; n++)
+ {
+ for (channel = 0; channel < color_channels; channel++)
+ {
+ if (row_info->bit_depth == 8)
+ if (*dp++ == 0)
+ zero_samples++;
- if (row_info->bit_depth == 16)
- {
- if ((*dp | *(dp+1)) == 0)
- zero_samples++;
+ if (row_info->bit_depth == 16)
+ {
+ if ((*dp | *(dp+1)) == 0)
+ zero_samples++;
- dp+=2;
- }
- }
- if (row_info->color_type > 3)
- {
- dp++;
- if (row_info->bit_depth == 16)
- dp++;
- }
- }
- }
+ dp+=2;
+ }
+ }
+ if (row_info->color_type > 3)
+ {
+ dp++;
+ if (row_info->bit_depth == 16)
+ dp++;
+ }
+ }
+ }
}
#endif /* WRITE_USER_TRANSFORM */
@@ -345,10 +345,10 @@
#ifdef PNG_IO_STATE_SUPPORTED
void
pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
- png_uint_32 io_op);
+ png_uint_32 io_op);
void
pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
- png_uint_32 io_op)
+ png_uint_32 io_op)
{
png_uint_32 io_state = png_get_io_state(png_ptr);
int err = 0;
@@ -532,7 +532,7 @@
memory_infop pinfo;
png_set_mem_fn(png_ptr, NULL, NULL, NULL);
pinfo = (memory_infop)png_malloc(png_ptr,
- (sizeof *pinfo));
+ (sizeof *pinfo));
pinfo->size = size;
current_allocation += size;
total_allocation += size;
@@ -562,7 +562,7 @@
if (verbose != 0)
printf("png_malloc %lu bytes at %p\n", (unsigned long)size,
- pinfo->pointer);
+ pinfo->pointer);
return (png_voidp)(pinfo->pointer);
}
@@ -769,9 +769,9 @@
if (verbose != 0)
fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n",
- (unsigned long)user_chunk_data.vpAg_width,
- (unsigned long)user_chunk_data.vpAg_height,
- user_chunk_data.vpAg_units);
+ (unsigned long)user_chunk_data.vpAg_width,
+ (unsigned long)user_chunk_data.vpAg_height,
+ user_chunk_data.vpAg_units);
png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width);
png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height);
@@ -812,7 +812,7 @@
#ifdef PNG_TEXT_SUPPORTED
static void
pngtest_check_text_support(png_structp png_ptr, png_textp text_ptr,
- int num_text)
+ int num_text)
{
while (num_text > 0)
{
@@ -894,26 +894,26 @@
pngtest_debug("Allocating read and write structures");
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
read_ptr =
- png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
- NULL, NULL, NULL, png_debug_malloc, png_debug_free);
+ png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL, NULL, png_debug_malloc, png_debug_free);
#else
read_ptr =
- png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif
png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
- pngtest_warning);
+ pngtest_warning);
#ifdef PNG_WRITE_SUPPORTED
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
write_ptr =
- png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
- NULL, NULL, NULL, png_debug_malloc, png_debug_free);
+ png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL, NULL, png_debug_malloc, png_debug_free);
#else
write_ptr =
- png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif
png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
- pngtest_warning);
+ pngtest_warning);
#endif
pngtest_debug("Allocating read_info, write_info and end_info structures");
read_info_ptr = png_create_info_struct(read_ptr);
@@ -926,7 +926,7 @@
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
init_callback_info(read_info_ptr);
png_set_read_user_chunk_fn(read_ptr, &user_chunk_data,
- read_user_chunk_callback);
+ read_user_chunk_callback);
#endif
#ifdef PNG_SETJMP_SUPPORTED
@@ -964,15 +964,16 @@
#endif
#endif
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
if (strict != 0)
{
/* Treat png_benign_error() as errors on read */
png_set_benign_errors(read_ptr, 0);
-#ifdef PNG_WRITE_SUPPORTED
+# ifdef PNG_WRITE_SUPPORTED
/* Treat them as errors on write */
png_set_benign_errors(write_ptr, 0);
-#endif
+# endif
/* if strict is not set, then app warnings and errors are treated as
* warnings in release builds, but not in unstable builds; this can be
@@ -985,10 +986,20 @@
/* Allow application (pngtest) errors and warnings to pass */
png_set_benign_errors(read_ptr, 1);
-#ifdef PNG_WRITE_SUPPORTED
+ /* Turn off CRC checking while reading */
+ png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
+
+#ifdef PNG_IGNORE_ADLER32
+ /* Turn off ADLER32 checking while reading */
+ png_set_option(read_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
+#endif
+
+# ifdef PNG_WRITE_SUPPORTED
png_set_benign_errors(write_ptr, 1);
-#endif
+# endif
+
}
+#endif /* BENIGN_ERRORS */
pngtest_debug("Initializing input and output streams");
#ifdef PNG_STDIO_SUPPORTED
@@ -1001,9 +1012,9 @@
# ifdef PNG_WRITE_SUPPORTED
png_set_write_fn(write_ptr, (png_voidp)fpout, pngtest_write_data,
# ifdef PNG_WRITE_FLUSH_SUPPORTED
- pngtest_flush);
+ pngtest_flush);
# else
- NULL);
+ NULL);
# endif
# endif
#endif
@@ -1043,11 +1054,11 @@
*/
#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
- NULL, 0);
+ NULL, 0);
#endif
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,
- NULL, 0);
+ NULL, 0);
#endif
#endif
@@ -1071,7 +1082,7 @@
&color_type, &interlace_type, &compression_type, &filter_type) != 0)
{
png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
- color_type, interlace_type, compression_type, filter_type);
+ color_type, interlace_type, compression_type, filter_type);
/* num_passes may not be available below if interlace support is not
* provided by libpng for both read and write.
*/
@@ -1098,13 +1109,13 @@
#ifdef PNG_cHRM_SUPPORTED
{
png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
- blue_y;
+ blue_y;
if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
- &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
+ &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
{
png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
- red_y, green_x, green_y, blue_x, blue_y);
+ red_y, green_x, green_y, blue_x, blue_y);
}
}
#endif
@@ -1121,13 +1132,13 @@
#ifdef PNG_cHRM_SUPPORTED
{
double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
- blue_y;
+ blue_y;
if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
- &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
+ &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
{
png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
- red_y, green_x, green_y, blue_x, blue_y);
+ red_y, green_x, green_y, blue_x, blue_y);
}
}
#endif
@@ -1149,10 +1160,10 @@
int compression_type;
if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
- &profile, &proflen) != 0)
+ &profile, &proflen) != 0)
{
png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
- profile, proflen);
+ profile, proflen);
}
}
#endif
@@ -1209,10 +1220,10 @@
int type, nparams;
if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
- &nparams, &units, ¶ms) != 0)
+ &nparams, &units, ¶ms) != 0)
{
png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
- nparams, units, params);
+ nparams, units, params);
}
}
#endif
@@ -1242,7 +1253,7 @@
double scal_width, scal_height;
if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
- &scal_height) != 0)
+ &scal_height) != 0)
{
png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
}
@@ -1254,7 +1265,7 @@
png_charp scal_width, scal_height;
if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
- &scal_height) != 0)
+ &scal_height) != 0)
{
png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
scal_height);
@@ -1295,7 +1306,7 @@
for (i=0; i<num_text; i++)
{
printf(" Text compression[%d]=%d\n",
- i, text_ptr[i].compression);
+ i, text_ptr[i].compression);
}
}
@@ -1332,7 +1343,7 @@
png_color_16p trans_color;
if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
- &trans_color) != 0)
+ &trans_color) != 0)
{
int sample_max = (1 << bit_depth);
/* libpng doesn't reject a tRNS chunk with out-of-range samples */
@@ -1351,12 +1362,12 @@
{
png_unknown_chunkp unknowns;
int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,
- &unknowns);
+ &unknowns);
if (num_unknowns != 0)
{
png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
- num_unknowns);
+ num_unknowns);
#if PNG_LIBPNG_VER < 10600
/* Copy the locations from the read_info_ptr. The automatically
* generated locations in write_end_info_ptr are wrong prior to 1.6.0
@@ -1366,7 +1377,7 @@
int i;
for (i = 0; i < num_unknowns; i++)
png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
- unknowns[i].location);
+ unknowns[i].location);
}
#endif
}
@@ -1386,12 +1397,17 @@
png_write_info(write_ptr, write_info_ptr);
write_chunks(write_ptr, before_IDAT); /* after PLTE */
+
+#ifdef PNG_COMPRESSION_COMPAT
+ /* Test the 'compatibility' setting here, if it is available. */
+ png_set_compression(write_ptr, PNG_COMPRESSION_COMPAT);
#endif
+#endif
#ifdef SINGLE_ROWBUF_ALLOC
pngtest_debug("Allocating row buffer...");
row_buf = (png_bytep)png_malloc(read_ptr,
- png_get_rowbytes(read_ptr, read_info_ptr));
+ png_get_rowbytes(read_ptr, read_info_ptr));
pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);
#endif /* SINGLE_ROWBUF_ALLOC */
@@ -1405,10 +1421,10 @@
*/
if (png_set_interlace_handling(read_ptr) != num_passes)
png_error(write_ptr,
- "png_set_interlace_handling(read): wrong pass count ");
+ "png_set_interlace_handling(read): wrong pass count ");
if (png_set_interlace_handling(write_ptr) != num_passes)
png_error(write_ptr,
- "png_set_interlace_handling(write): wrong pass count ");
+ "png_set_interlace_handling(write): wrong pass count ");
#else /* png_set_interlace_handling not called on either read or write */
# define calc_pass_height
#endif /* not using libpng interlace handling */
@@ -1445,10 +1461,10 @@
pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
row_buf = (png_bytep)png_malloc(read_ptr,
- png_get_rowbytes(read_ptr, read_info_ptr));
+ png_get_rowbytes(read_ptr, read_info_ptr));
pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
- (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
+ (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
#endif /* !SINGLE_ROWBUF_ALLOC */
png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
@@ -1506,7 +1522,7 @@
for (i=0; i<num_text; i++)
{
printf(" Text compression[%d]=%d\n",
- i, text_ptr[i].compression);
+ i, text_ptr[i].compression);
}
}
@@ -1540,12 +1556,12 @@
{
png_unknown_chunkp unknowns;
int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,
- &unknowns);
+ &unknowns);
if (num_unknowns != 0)
{
png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
- num_unknowns);
+ num_unknowns);
#if PNG_LIBPNG_VER < 10600
/* Copy the locations from the read_info_ptr. The automatically
* generated locations in write_end_info_ptr are wrong prior to 1.6.0
@@ -1555,7 +1571,7 @@
int i;
for (i = 0; i < num_unknowns; i++)
png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
- unknowns[i].location);
+ unknowns[i].location);
}
#endif
}
@@ -1589,7 +1605,7 @@
iwidth = png_get_image_width(write_ptr, write_info_ptr);
iheight = png_get_image_height(write_ptr, write_info_ptr);
fprintf(STDERR, "\n Image width = %lu, height = %lu\n",
- (unsigned long)iwidth, (unsigned long)iheight);
+ (unsigned long)iwidth, (unsigned long)iheight);
}
#endif
@@ -1622,7 +1638,7 @@
* above, but this is safe.
*/
fprintf(STDERR, "\n %s: %d libpng errors found (%d warnings)",
- inname, error_count, warning_count);
+ inname, error_count, warning_count);
if (strict != 0)
return (1);
@@ -1633,7 +1649,7 @@
else if (unsupported_chunks > 0)
{
fprintf(STDERR, "\n %s: unsupported chunks (%d)%s",
- inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");
+ inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");
}
# endif
@@ -1640,7 +1656,7 @@
else if (warning_count > 0)
{
fprintf(STDERR, "\n %s: %d libpng warnings found",
- inname, warning_count);
+ inname, warning_count);
if (strict != 0)
return (1);
@@ -1676,18 +1692,19 @@
if (num_in != num_out)
{
fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
- inname, outname);
+ inname, outname);
if (wrote_question == 0 && unsupported_chunks == 0)
{
fprintf(STDERR,
- " Was %s written with the same maximum IDAT chunk size (%d bytes),",
- inname, PNG_ZBUF_SIZE);
+ " Was %s written with the same maximum IDAT"
+ " chunk size (%d bytes),",
+ inname, PNG_ZBUF_SIZE);
fprintf(STDERR,
- "\n filtering heuristic (libpng default), compression");
+ "\n filtering heuristic (libpng default), compression");
fprintf(STDERR,
- " level (zlib default),\n and zlib version (%s)?\n\n",
- ZLIB_VERSION);
+ " level (zlib default),\n and zlib version (%s)?\n\n",
+ ZLIB_VERSION);
wrote_question = 1;
}
@@ -1707,17 +1724,18 @@
if (memcmp(inbuf, outbuf, num_in))
{
fprintf(STDERR, "\nFiles %s and %s are different\n", inname,
- outname);
+ outname);
if (wrote_question == 0 && unsupported_chunks == 0)
{
fprintf(STDERR,
- " Was %s written with the same maximum IDAT chunk size (%d bytes),",
+ " Was %s written with the same maximum"
+ " IDAT chunk size (%d bytes),",
inname, PNG_ZBUF_SIZE);
fprintf(STDERR,
- "\n filtering heuristic (libpng default), compression");
+ "\n filtering heuristic (libpng default), compression");
fprintf(STDERR,
- " level (zlib default),\n and zlib version (%s)?\n\n",
+ " level (zlib default),\n and zlib version (%s)?\n\n",
ZLIB_VERSION);
wrote_question = 1;
}
@@ -1768,12 +1786,12 @@
fprintf(STDERR, "%s", png_get_copyright(NULL));
/* Show the version of libpng used in building the library */
fprintf(STDERR, " library (%lu):%s",
- (unsigned long)png_access_version_number(),
- png_get_header_version(NULL));
+ (unsigned long)png_access_version_number(),
+ png_get_header_version(NULL));
/* Show the version of libpng used in building the application */
fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
- PNG_HEADER_VERSION_STRING);
+ PNG_HEADER_VERSION_STRING);
/* Do some consistency checking on the memory allocation settings, I'm
* not sure this matters, but it is nice to know, the first of these
@@ -1791,7 +1809,7 @@
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
{
fprintf(STDERR,
- "Warning: versions are different between png.h and png.c\n");
+ "Warning: versions are different between png.h and png.c\n");
fprintf(STDERR, " png.h version: %s\n", PNG_LIBPNG_VER_STRING);
fprintf(STDERR, " png.c version: %s\n\n", png_libpng_ver);
++ierror;
@@ -1846,19 +1864,19 @@
}
if (multiple == 0 && argc == 3 + verbose)
- outname = argv[2 + verbose];
+ outname = argv[2 + verbose];
if ((multiple == 0 && argc > 3 + verbose) ||
(multiple != 0 && argc < 2))
{
- fprintf(STDERR,
- "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
- argv[0], argv[0]);
- fprintf(STDERR,
- " reads/writes one PNG file (without -m) or multiple files (-m)\n");
- fprintf(STDERR,
- " with -m %s is used as a temporary file\n", outname);
- exit(1);
+ fprintf(STDERR,
+ "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
+ argv[0], argv[0]);
+ fprintf(STDERR,
+ " reads/writes one PNG file (without -m) or multiple files (-m)\n");
+ fprintf(STDERR,
+ " with -m %s is used as a temporary file\n", outname);
+ exit(1);
}
if (multiple != 0)
@@ -1879,7 +1897,7 @@
{
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
fprintf(STDERR, "\n PASS (%lu zero samples)\n",
- (unsigned long)zero_samples);
+ (unsigned long)zero_samples);
#else
fprintf(STDERR, " PASS\n");
#endif
@@ -1899,7 +1917,7 @@
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
if (allocation_now != current_allocation)
fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
- current_allocation - allocation_now);
+ current_allocation - allocation_now);
if (current_allocation != 0)
{
@@ -1906,13 +1924,13 @@
memory_infop pinfo = pinformation;
fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
- current_allocation);
+ current_allocation);
while (pinfo != NULL)
{
fprintf(STDERR, " %lu bytes at %p\n",
- (unsigned long)pinfo->size,
- pinfo->pointer);
+ (unsigned long)pinfo->size,
+ pinfo->pointer);
pinfo = pinfo->next;
}
}
@@ -1920,13 +1938,13 @@
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
fprintf(STDERR, " Current memory allocation: %10d bytes\n",
- current_allocation);
+ current_allocation);
fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
- maximum_allocation);
+ maximum_allocation);
fprintf(STDERR, " Total memory allocation: %10d bytes\n",
- total_allocation);
+ total_allocation);
fprintf(STDERR, " Number of allocations: %10d\n",
- num_allocations);
+ num_allocations);
#endif
}
@@ -1961,7 +1979,7 @@
{
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
fprintf(STDERR, "\n PASS (%lu zero samples)\n",
- (unsigned long)zero_samples);
+ (unsigned long)zero_samples);
#else
fprintf(STDERR, " PASS\n");
#endif
@@ -1988,7 +2006,7 @@
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
if (allocation_now != current_allocation)
fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
- current_allocation - allocation_now);
+ current_allocation - allocation_now);
if (current_allocation != 0)
{
@@ -1995,12 +2013,12 @@
memory_infop pinfo = pinformation;
fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
- current_allocation);
+ current_allocation);
while (pinfo != NULL)
{
fprintf(STDERR, " %lu bytes at %p\n",
- (unsigned long)pinfo->size, pinfo->pointer);
+ (unsigned long)pinfo->size, pinfo->pointer);
pinfo = pinfo->next;
}
}
@@ -2008,13 +2026,13 @@
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
fprintf(STDERR, " Current memory allocation: %10d bytes\n",
- current_allocation);
+ current_allocation);
fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
- maximum_allocation);
+ maximum_allocation);
fprintf(STDERR, " Total memory allocation: %10d bytes\n",
- total_allocation);
+ total_allocation);
fprintf(STDERR, " Number of allocations: %10d\n",
- num_allocations);
+ num_allocations);
#endif
}
@@ -2023,13 +2041,13 @@
t_misc += (t_stop - t_start);
t_start = t_stop;
fprintf(STDERR, " CPU time used = %.3f seconds",
- (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+ (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
fprintf(STDERR, " (decoding %.3f,\n",
- t_decode/(float)CLOCKS_PER_SEC);
+ t_decode/(float)CLOCKS_PER_SEC);
fprintf(STDERR, " encoding %.3f ,",
- t_encode/(float)CLOCKS_PER_SEC);
+ t_encode/(float)CLOCKS_PER_SEC);
fprintf(STDERR, " other %.3f seconds)\n\n",
- t_misc/(float)CLOCKS_PER_SEC);
+ t_misc/(float)CLOCKS_PER_SEC);
#endif
if (ierror == 0)
@@ -2041,19 +2059,19 @@
dummy_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
fprintf(STDERR, " Default limits:\n");
fprintf(STDERR, " width_max = %lu\n",
- (unsigned long) png_get_user_width_max(dummy_ptr));
+ (unsigned long) png_get_user_width_max(dummy_ptr));
fprintf(STDERR, " height_max = %lu\n",
- (unsigned long) png_get_user_height_max(dummy_ptr));
+ (unsigned long) png_get_user_height_max(dummy_ptr));
if (png_get_chunk_cache_max(dummy_ptr) == 0)
fprintf(STDERR, " cache_max = unlimited\n");
else
fprintf(STDERR, " cache_max = %lu\n",
- (unsigned long) png_get_chunk_cache_max(dummy_ptr));
+ (unsigned long) png_get_chunk_cache_max(dummy_ptr));
if (png_get_chunk_malloc_max(dummy_ptr) == 0)
fprintf(STDERR, " malloc_max = unlimited\n");
else
fprintf(STDERR, " malloc_max = %lu\n",
- (unsigned long) png_get_chunk_malloc_max(dummy_ptr));
+ (unsigned long) png_get_chunk_malloc_max(dummy_ptr));
png_destroy_read_struct(&dummy_ptr, NULL, NULL);
return (int)(ierror != 0);
@@ -2063,7 +2081,7 @@
main(void)
{
fprintf(STDERR,
- " test ignored because libpng was not built with read support\n");
+ " test ignored because libpng was not built with read support\n");
/* And skip this test */
return PNG_LIBPNG_VER < 10600 ? 0 : 77;
}
@@ -2070,4 +2088,4 @@
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_21 Your_png_h_is_not_version_1_6_21;
+typedef png_libpng_version_1_6_28 Your_png_h_is_not_version_1_6_28;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtrans.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.6.18 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -172,13 +172,14 @@
* size!
*/
png_app_error(png_ptr,
- "png_set_filler is invalid for low bit depth gray output");
+ "png_set_filler is invalid for"
+ " low bit depth gray output");
return;
}
default:
png_app_error(png_ptr,
- "png_set_filler: inappropriate color type");
+ "png_set_filler: inappropriate color type");
return;
}
# else
@@ -594,7 +595,7 @@
return; /* The filler channel has gone already */
/* Fix the rowbytes value. */
- row_info->rowbytes = dp-row;
+ row_info->rowbytes = (unsigned int)(dp-row);
}
#endif
@@ -692,7 +693,7 @@
* and this calculation is used because it avoids warnings that other
* forms produced on either GCC or MSVC.
*/
- int padding = (-row_info->pixel_depth * row_info->width) & 7;
+ int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
switch (row_info->bit_depth)
@@ -797,7 +798,7 @@
(png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
{
png_app_error(png_ptr,
- "info change after png_start_read_image or png_read_update_info");
+ "info change after png_start_read_image or png_read_update_info");
return;
}
#endif
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwio.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwio.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwio.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngwio.c - functions for data output
*
- * Last changed in libpng 1.6.15 [November 20, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -35,7 +35,7 @@
/* NOTE: write_data_fn must not change the buffer! */
if (png_ptr->write_data_fn != NULL )
(*(png_ptr->write_data_fn))(png_ptr, png_constcast(png_bytep,data),
- length);
+ length);
else
png_error(png_ptr, "Call to NULL write function");
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.6.19 [November 12, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -12,9 +12,9 @@
*/
#include "pngpriv.h"
-#if defined(PNG_SIMPLIFIED_WRITE_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
# include <errno.h>
-#endif
+#endif /* SIMPLIFIED_WRITE_STDIO */
#ifdef PNG_WRITE_SUPPORTED
@@ -22,7 +22,7 @@
/* Write out all the unknown chunks for the current given location */
static void
write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
- unsigned int where)
+ unsigned int where)
{
if (info_ptr->unknown_chunks_num != 0)
{
@@ -148,11 +148,11 @@
# ifdef PNG_WRITE_sRGB_SUPPORTED
if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
png_app_warning(png_ptr,
- "profile matches sRGB but writing iCCP instead");
+ "profile matches sRGB but writing iCCP instead");
# endif
png_write_iCCP(png_ptr, info_ptr->iccp_name,
- info_ptr->iccp_profile);
+ info_ptr->iccp_profile);
}
# ifdef PNG_WRITE_sRGB_SUPPORTED
else
@@ -383,7 +383,7 @@
for (i = 0; i < info_ptr->num_text; i++)
{
png_debug2(2, "Writing trailer text chunk %d, type %d", i,
- info_ptr->text[i].compression);
+ info_ptr->text[i].compression);
/* An internationalized chunk? */
if (info_ptr->text[i].compression > 0)
{
@@ -666,9 +666,9 @@
for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
{
- png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
- png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
- png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
+ png_uint_32 s0 = (png_uint_32)(*(rp ) << 8) | *(rp + 1);
+ png_uint_32 s1 = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);
+ png_uint_32 s2 = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);
png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL);
png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
*(rp ) = (png_byte)(red >> 8);
@@ -693,7 +693,7 @@
return;
png_debug2(1, "in png_write_row (row %u, pass %d)",
- png_ptr->row_number, png_ptr->pass);
+ png_ptr->row_number, png_ptr->pass);
/* Initialize transformations and other stuff if first time */
if (png_ptr->row_number == 0 && png_ptr->pass == 0)
@@ -901,7 +901,7 @@
if (png_ptr == NULL)
return;
- png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+ png_ptr->flush_dist = (nrows < 0 ? 0 : (png_uint_32)nrows);
}
/* Flush the current output buffers now */
@@ -1069,7 +1069,7 @@
* is not available so the filter can't be used. Just warn here.
*/
png_app_warning(png_ptr,
- "png_set_filter: UP/AVG/PAETH cannot be added after start");
+ "png_set_filter: UP/AVG/PAETH cannot be added after start");
filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
}
@@ -1095,13 +1095,13 @@
if (png_ptr->try_row == NULL)
png_ptr->try_row = png_voidcast(png_bytep,
- png_malloc(png_ptr, buf_size));
+ png_malloc(png_ptr, buf_size));
if (num_filters > 1)
{
if (png_ptr->tst_row == NULL)
png_ptr->tst_row = png_voidcast(png_bytep,
- png_malloc(png_ptr, buf_size));
+ png_malloc(png_ptr, buf_size));
}
}
png_ptr->do_filter = (png_byte)filters;
@@ -1452,7 +1452,6 @@
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-# ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
/* Initialize the write structure - general purpose utility. */
static int
png_image_write_init(png_imagep image)
@@ -1504,6 +1503,10 @@
png_const_voidp first_row;
ptrdiff_t row_bytes;
png_voidp local_row;
+ /* Byte count for memory writing */
+ png_bytep memory;
+ png_alloc_size_t memory_bytes; /* not used for STDIO */
+ png_alloc_size_t output_bytes; /* running total */
} png_image_write_control;
/* Write png_uint_16 input to a 16-bit PNG; the png_ptr has already been set to
@@ -1522,7 +1525,8 @@
display->first_row);
png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);
png_uint_16p row_end;
- const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+ const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?
+ 3 : 1;
int aindex = 0;
png_uint_32 y = image->height;
@@ -1536,9 +1540,9 @@
++output_row;
}
else
- aindex = channels;
+ aindex = (int)channels;
# else
- aindex = channels;
+ aindex = (int)channels;
# endif
}
@@ -1551,7 +1555,7 @@
*/
row_end = output_row + image->width * (channels+1);
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_const_uint_16p in_ptr = input_row;
png_uint_16p out_ptr = output_row;
@@ -1572,7 +1576,7 @@
if (alpha > 0 && alpha < 65535)
reciprocal = ((0xffff<<15)+(alpha>>1))/alpha;
- c = channels;
+ c = (int)channels;
do /* always at least one channel */
{
png_uint_16 component = *in_ptr++;
@@ -1607,7 +1611,7 @@
}
png_write_row(png_ptr, png_voidcast(png_const_bytep, display->local_row));
- input_row += display->row_bytes/(sizeof (png_uint_16));
+ input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
}
return 1;
@@ -1625,7 +1629,7 @@
static png_byte
png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
- png_uint_32 reciprocal/*from the above macro*/)
+ png_uint_32 reciprocal/*from the above macro*/)
{
/* The following gives 1.0 for an alpha of 0, which is fine, otherwise if 0/0
* is represented as some other value there is more likely to be a
@@ -1680,7 +1684,8 @@
display->first_row);
png_bytep output_row = png_voidcast(png_bytep, display->local_row);
png_uint_32 y = image->height;
- const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+ const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?
+ 3 : 1;
if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
@@ -1697,12 +1702,12 @@
else
# endif
- aindex = channels;
+ aindex = (int)channels;
/* Use row_end in place of a loop counter: */
row_end = output_row + image->width * (channels+1);
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_const_uint_16p in_ptr = input_row;
png_bytep out_ptr = output_row;
@@ -1720,7 +1725,7 @@
if (alphabyte > 0 && alphabyte < 255)
reciprocal = UNP_RECIPROCAL(alpha);
- c = channels;
+ c = (int)channels;
do /* always at least one channel */
*out_ptr++ = png_unpremultiply(*in_ptr++, alpha, reciprocal);
while (--c > 0);
@@ -1732,7 +1737,7 @@
png_write_row(png_ptr, png_voidcast(png_const_bytep,
display->local_row));
- input_row += display->row_bytes/(sizeof (png_uint_16));
+ input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
} /* while y */
}
@@ -1743,7 +1748,7 @@
*/
png_bytep row_end = output_row + image->width * channels;
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_const_uint_16p in_ptr = input_row;
png_bytep out_ptr = output_row;
@@ -1757,7 +1762,7 @@
}
png_write_row(png_ptr, output_row);
- input_row += display->row_bytes/(sizeof (png_uint_16));
+ input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
}
}
@@ -1774,7 +1779,7 @@
/* NOTE: the caller must check for cmap != NULL and entries != 0 */
const png_uint_32 format = image->format;
- const int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);
+ const unsigned int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);
# if defined(PNG_FORMAT_BGR_SUPPORTED) &&\
defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED)
@@ -1806,7 +1811,7 @@
{
png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);
- entry += i * channels;
+ entry += (unsigned int)i * channels;
if ((channels & 1) != 0) /* no alpha */
{
@@ -1845,16 +1850,16 @@
if (channels >= 3) /* RGB */
{
palette[i].blue = png_unpremultiply(entry[afirst + (2 ^ bgr)],
- alpha, reciprocal);
+ alpha, reciprocal);
palette[i].green = png_unpremultiply(entry[afirst + 1], alpha,
- reciprocal);
+ reciprocal);
palette[i].red = png_unpremultiply(entry[afirst + bgr], alpha,
- reciprocal);
+ reciprocal);
}
else /* gray */
palette[i].blue = palette[i].red = palette[i].green =
- png_unpremultiply(entry[afirst], alpha, reciprocal);
+ png_unpremultiply(entry[afirst], alpha, reciprocal);
}
}
@@ -1862,7 +1867,7 @@
{
png_const_bytep entry = png_voidcast(png_const_bytep, cmap);
- entry += i * channels;
+ entry += (unsigned int)i * channels;
switch (channels)
{
@@ -1901,13 +1906,13 @@
# endif
png_set_PLTE(image->opaque->png_ptr, image->opaque->info_ptr, palette,
- entries);
+ entries);
if (num_trans > 0)
png_set_tRNS(image->opaque->png_ptr, image->opaque->info_ptr, tRNS,
- num_trans, NULL);
+ num_trans, NULL);
- image->colormap_entries = entries;
+ image->colormap_entries = (png_uint_32)entries;
}
static int
@@ -1914,7 +1919,7 @@
png_image_write_main(png_voidp argument)
{
png_image_write_control *display = png_voidcast(png_image_write_control*,
- argument);
+ argument);
png_imagep image = display->image;
png_structrp png_ptr = image->opaque->png_ptr;
png_inforp info_ptr = image->opaque->info_ptr;
@@ -1931,10 +1936,44 @@
png_set_benign_errors(png_ptr, 0/*error*/);
# endif
- /* Default the 'row_stride' parameter if required. */
- if (display->row_stride == 0)
- display->row_stride = PNG_IMAGE_ROW_STRIDE(*image);
+ /* Default the 'row_stride' parameter if required, also check the row stride
+ * and total image size to ensure that they are within the system limits.
+ */
+ {
+ const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
+ if (image->width <= 0x7fffffffU/channels) /* no overflow */
+ {
+ png_uint_32 check;
+ const png_uint_32 png_row_stride = image->width * channels;
+
+ if (display->row_stride == 0)
+ display->row_stride = (png_int_32)/*SAFE*/png_row_stride;
+
+ if (display->row_stride < 0)
+ check = (png_uint_32)(-display->row_stride);
+
+ else
+ check = (png_uint_32)display->row_stride;
+
+ if (check >= png_row_stride)
+ {
+ /* Now check for overflow of the image buffer calculation; this
+ * limits the whole image size to 32 bits for API compatibility with
+ * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
+ */
+ if (image->height > 0xffffffffU/png_row_stride)
+ png_error(image->opaque->png_ptr, "memory image too large");
+ }
+
+ else
+ png_error(image->opaque->png_ptr, "supplied row stride too small");
+ }
+
+ else
+ png_error(image->opaque->png_ptr, "image row stride too large");
+ }
+
/* Set the required transforms then write the rows in the correct order. */
if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)
{
@@ -1943,9 +1982,9 @@
png_uint_32 entries = image->colormap_entries;
png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
- entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),
- PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
- PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),
+ PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
png_image_set_PLTE(display);
}
@@ -1952,15 +1991,15 @@
else
png_error(image->opaque->png_ptr,
- "no color-map for color-mapped image");
+ "no color-map for color-mapped image");
}
else
png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
- write_16bit ? 16 : 8,
- ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +
- ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ write_16bit ? 16 : 8,
+ ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +
+ ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
/* Counter-intuitively the data transformations must be called *after*
* png_write_info, not before as in the read code, but the 'set' functions
@@ -1975,11 +2014,11 @@
if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
png_set_cHRM_fixed(png_ptr, info_ptr,
- /* color x y */
- /* white */ 31270, 32900,
- /* red */ 64000, 33000,
- /* green */ 30000, 60000,
- /* blue */ 15000, 6000
+ /* color x y */
+ /* white */ 31270, 32900,
+ /* red */ 64000, 33000,
+ /* green */ 30000, 60000,
+ /* blue */ 15000, 6000
);
}
@@ -2073,7 +2112,7 @@
(colormap == 0 && display->convert_to_8bit != 0))
{
png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,
- png_get_rowbytes(png_ptr, info_ptr)));
+ png_get_rowbytes(png_ptr, info_ptr)));
int result;
display->local_row = row;
@@ -2099,7 +2138,7 @@
ptrdiff_t row_bytes = display->row_bytes;
png_uint_32 y = image->height;
- while (y-- > 0)
+ for (; y > 0; --y)
{
png_write_row(png_ptr, row);
row += row_bytes;
@@ -2110,14 +2149,130 @@
return 1;
}
+
+static void (PNGCBAPI
+image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,
+ png_size_t size)
+{
+ png_image_write_control *display = png_voidcast(png_image_write_control*,
+ png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);
+ const png_alloc_size_t ob = display->output_bytes;
+
+ /* Check for overflow; this should never happen: */
+ if (size <= ((png_alloc_size_t)-1) - ob)
+ {
+ /* I don't think libpng ever does this, but just in case: */
+ if (size > 0)
+ {
+ if (display->memory_bytes >= ob+size) /* writing */
+ memcpy(display->memory+ob, data, size);
+
+ /* Always update the size: */
+ display->output_bytes = ob+size;
+ }
+ }
+
+ else
+ png_error(png_ptr, "png_image_write_to_memory: PNG too big");
+}
+
+static void (PNGCBAPI
+image_memory_flush)(png_structp png_ptr)
+{
+ PNG_UNUSED(png_ptr)
+}
+
+static int
+png_image_write_memory(png_voidp argument)
+{
+ png_image_write_control *display = png_voidcast(png_image_write_control*,
+ argument);
+
+ /* The rest of the memory-specific init and write_main in an error protected
+ * environment. This case needs to use callbacks for the write operations
+ * since libpng has no built in support for writing to memory.
+ */
+ png_set_write_fn(display->image->opaque->png_ptr, display/*io_ptr*/,
+ image_memory_write, image_memory_flush);
+
+ return png_image_write_main(display);
+}
+
int PNGAPI
+png_image_write_to_memory(png_imagep image, void *memory,
+ png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8bit,
+ const void *buffer, png_int_32 row_stride, const void *colormap)
+{
+ /* Write the image to the given buffer, or count the bytes if it is NULL */
+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
+ {
+ if (memory_bytes != NULL && buffer != NULL)
+ {
+ /* This is to give the caller an easier error detection in the NULL
+ * case and guard against uninitialized variable problems:
+ */
+ if (memory == NULL)
+ *memory_bytes = 0;
+
+ if (png_image_write_init(image) != 0)
+ {
+ png_image_write_control display;
+ int result;
+
+ memset(&display, 0, (sizeof display));
+ display.image = image;
+ display.buffer = buffer;
+ display.row_stride = row_stride;
+ display.colormap = colormap;
+ display.convert_to_8bit = convert_to_8bit;
+ display.memory = png_voidcast(png_bytep, memory);
+ display.memory_bytes = *memory_bytes;
+ display.output_bytes = 0;
+
+ result = png_safe_execute(image, png_image_write_memory, &display);
+ png_image_free(image);
+
+ /* write_memory returns true even if we ran out of buffer. */
+ if (result)
+ {
+ /* On out-of-buffer this function returns '0' but still updates
+ * memory_bytes:
+ */
+ if (memory != NULL && display.output_bytes > *memory_bytes)
+ result = 0;
+
+ *memory_bytes = display.output_bytes;
+ }
+
+ return result;
+ }
+
+ else
+ return 0;
+ }
+
+ else
+ return png_image_error(image,
+ "png_image_write_to_memory: invalid argument");
+ }
+
+ else if (image != NULL)
+ return png_image_error(image,
+ "png_image_write_to_memory: incorrect PNG_IMAGE_VERSION");
+
+ else
+ return 0;
+}
+
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+int PNGAPI
png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
- const void *buffer, png_int_32 row_stride, const void *colormap)
+ const void *buffer, png_int_32 row_stride, const void *colormap)
{
/* Write the image to the given (FILE*). */
if (image != NULL && image->version == PNG_IMAGE_VERSION)
{
- if (file != NULL)
+ if (file != NULL && buffer != NULL)
{
if (png_image_write_init(image) != 0)
{
@@ -2148,12 +2303,12 @@
else
return png_image_error(image,
- "png_image_write_to_stdio: invalid argument");
+ "png_image_write_to_stdio: invalid argument");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");
+ "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");
else
return 0;
@@ -2161,13 +2316,13 @@
int PNGAPI
png_image_write_to_file(png_imagep image, const char *file_name,
- int convert_to_8bit, const void *buffer, png_int_32 row_stride,
- const void *colormap)
+ int convert_to_8bit, const void *buffer, png_int_32 row_stride,
+ const void *colormap)
{
/* Write the image to the named file. */
if (image != NULL && image->version == PNG_IMAGE_VERSION)
{
- if (file_name != NULL)
+ if (file_name != NULL && buffer != NULL)
{
FILE *fp = fopen(file_name, "wb");
@@ -2174,7 +2329,7 @@
if (fp != NULL)
{
if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,
- row_stride, colormap) != 0)
+ row_stride, colormap) != 0)
{
int error; /* from fflush/fclose */
@@ -2215,16 +2370,16 @@
else
return png_image_error(image,
- "png_image_write_to_file: invalid argument");
+ "png_image_write_to_file: invalid argument");
}
else if (image != NULL)
return png_image_error(image,
- "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");
+ "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");
else
return 0;
}
-# endif /* STDIO */
+#endif /* SIMPLIFIED_WRITE_STDIO */
#endif /* SIMPLIFIED_WRITE */
#endif /* WRITE */
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwtran.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
- * Last changed in libpng 1.6.18 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -177,7 +177,7 @@
if (row_info->color_type != PNG_COLOR_TYPE_PALETTE)
{
int shift_start[4], shift_dec[4];
- int channels = 0;
+ unsigned int channels = 0;
if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
@@ -525,7 +525,7 @@
#ifdef PNG_WRITE_FILLER_SUPPORTED
if ((png_ptr->transformations & PNG_FILLER) != 0)
png_do_strip_channel(row_info, png_ptr->row_buf + 1,
- !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
+ !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
#endif
#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
@@ -549,7 +549,7 @@
#ifdef PNG_WRITE_SHIFT_SUPPORTED
if ((png_ptr->transformations & PNG_SHIFT) != 0)
png_do_shift(row_info, png_ptr->row_buf + 1,
- &(png_ptr->shift));
+ &(png_ptr->shift));
#endif
#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.6.21 [January 15, 2016]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -23,10 +23,10 @@
void PNGAPI
png_save_uint_32(png_bytep buf, png_uint_32 i)
{
- buf[0] = (png_byte)(i >> 24);
- buf[1] = (png_byte)(i >> 16);
- buf[2] = (png_byte)(i >> 8);
- buf[3] = (png_byte)(i );
+ buf[0] = (png_byte)((i >> 24) & 0xffU);
+ buf[1] = (png_byte)((i >> 16) & 0xffU);
+ buf[2] = (png_byte)((i >> 8) & 0xffU);
+ buf[3] = (png_byte)( i & 0xffU);
}
/* Place a 16-bit number into a buffer in PNG byte order.
@@ -36,8 +36,8 @@
void PNGAPI
png_save_uint_16(png_bytep buf, unsigned int i)
{
- buf[0] = (png_byte)(i >> 8);
- buf[1] = (png_byte)(i );
+ buf[0] = (png_byte)((i >> 8) & 0xffU);
+ buf[1] = (png_byte)( i & 0xffU);
}
#endif
@@ -59,7 +59,7 @@
/* Write the rest of the 8 byte signature */
png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
- (png_size_t)(8 - png_ptr->sig_bytes));
+ (png_size_t)(8 - png_ptr->sig_bytes));
if (png_ptr->sig_bytes < 3)
png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
@@ -174,7 +174,7 @@
*/
static void
png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,
- png_const_bytep data, png_size_t length)
+ png_const_bytep data, png_size_t length)
{
if (png_ptr == NULL)
return;
@@ -191,10 +191,10 @@
/* This is the API that calls the internal function above. */
void PNGAPI
png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,
- png_const_bytep data, png_size_t length)
+ png_const_bytep data, png_size_t length)
{
png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
- length);
+ length);
}
/* This is used below to find the size of an image to pass to png_deflate_claim,
@@ -291,7 +291,7 @@
/* Initialize the compressor for the appropriate type of compression. */
static int
png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
- png_alloc_size_t data_size)
+ png_alloc_size_t data_size)
{
if (png_ptr->zowner != 0)
{
@@ -408,7 +408,7 @@
png_ptr->zstream.avail_out = 0;
/* Now initialize if required, setting the new parameters, otherwise just
- * to a simple reset to the previous parameters.
+ * do a simple reset to the previous parameters.
*/
if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
ret = deflateReset(&png_ptr->zstream);
@@ -416,7 +416,7 @@
else
{
ret = deflateInit2(&png_ptr->zstream, level, method, windowBits,
- memLevel, strategy);
+ memLevel, strategy);
if (ret == Z_OK)
png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
@@ -477,7 +477,7 @@
static void
png_text_compress_init(compression_state *comp, png_const_bytep input,
- png_alloc_size_t input_len)
+ png_alloc_size_t input_len)
{
comp->input = input;
comp->input_len = input_len;
@@ -487,7 +487,7 @@
/* Compress the data in the compression state input */
static int
png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,
- compression_state *comp, png_uint_32 prefix_len)
+ compression_state *comp, png_uint_32 prefix_len)
{
int ret;
@@ -579,7 +579,7 @@
/* Compress the data */
ret = deflate(&png_ptr->zstream,
- input_len > 0 ? Z_NO_FLUSH : Z_FINISH);
+ input_len > 0 ? Z_NO_FLUSH : Z_FINISH);
/* Claw back input data that was not consumed (because avail_in is
* reset above every time round the loop).
@@ -925,7 +925,7 @@
*/
void /* PRIVATE */
png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
- png_alloc_size_t input_len, int flush)
+ png_alloc_size_t input_len, int flush)
{
if (png_ptr->zowner != png_IDAT)
{
@@ -937,7 +937,7 @@
if (png_ptr->zbuffer_list == NULL)
{
png_ptr->zbuffer_list = png_voidcast(png_compression_bufferp,
- png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
+ png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
png_ptr->zbuffer_list->next = NULL;
}
@@ -1176,7 +1176,7 @@
png_byte new_name[80];
png_byte entrybuf[10];
png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
- png_size_t palette_size = entry_size * spalette->nentries;
+ png_size_t palette_size = entry_size * (png_size_t)spalette->nentries;
png_sPLT_entryp ep;
#ifndef PNG_POINTER_INDEXING_SUPPORTED
int i;
@@ -1358,7 +1358,7 @@
/* Write the chunk out as it is */
png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,
- (png_size_t)num_trans);
+ (png_size_t)num_trans);
}
else if (color_type == PNG_COLOR_TYPE_GRAY)
@@ -1389,7 +1389,7 @@
#endif
{
png_app_warning(png_ptr,
- "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
+ "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
return;
}
@@ -1441,7 +1441,8 @@
#endif
{
png_warning(png_ptr,
- "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
+ "Ignoring attempt to write 16-bit bKGD chunk "
+ "when bit_depth is 8");
return;
}
@@ -1571,7 +1572,7 @@
/* Compute the compressed data; do it now for the length */
png_text_compress_init(&comp, (png_const_bytep)text,
- text == NULL ? 0 : strlen(text));
+ text == NULL ? 0 : strlen(text));
if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK)
png_error(png_ptr, png_ptr->zstream.msg);
@@ -1742,7 +1743,7 @@
total_len = purpose_len + units_len + 10;
params_len = (png_size_tp)png_malloc(png_ptr,
- (png_alloc_size_t)(nparams * (sizeof (png_size_t))));
+ (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (png_size_t))));
/* Find the length of each parameter, making sure we don't count the
* null terminator for the last parameter.
@@ -1941,7 +1942,7 @@
*/
if ((filters & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)
png_ptr->prev_row = png_voidcast(png_bytep,
- png_calloc(png_ptr, buf_size));
+ png_calloc(png_ptr, buf_size));
#endif /* WRITE_FILTER */
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
@@ -2244,7 +2245,7 @@
*/
static void /* PRIVATE */
png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
- png_size_t row_bytes);
+ png_size_t row_bytes);
#ifdef PNG_WRITE_FILTER_SUPPORTED
static png_size_t /* PRIVATE */
@@ -2254,7 +2255,7 @@
png_bytep rp, dp, lp;
png_size_t i;
png_size_t sum = 0;
- int v;
+ unsigned int v;
png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
@@ -2262,7 +2263,11 @@
i++, rp++, dp++)
{
v = *dp = *rp;
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
}
for (lp = png_ptr->row_buf + 1; i < row_bytes;
@@ -2269,7 +2274,11 @@
i++, rp++, lp++, dp++)
{
v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
if (sum > lmins) /* We are already worse, don't continue. */
break;
@@ -2278,6 +2287,28 @@
return (sum);
}
+static void /* PRIVATE */
+png_setup_sub_row_only(png_structrp png_ptr, const png_uint_32 bpp,
+ const png_size_t row_bytes)
+{
+ png_bytep rp, dp, lp;
+ png_size_t i;
+
+ png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
+
+ for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;
+ i++, rp++, dp++)
+ {
+ *dp = *rp;
+ }
+
+ for (lp = png_ptr->row_buf + 1; i < row_bytes;
+ i++, rp++, lp++, dp++)
+ {
+ *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+ }
+}
+
static png_size_t /* PRIVATE */
png_setup_up_row(png_structrp png_ptr, const png_size_t row_bytes,
const png_size_t lmins)
@@ -2285,7 +2316,7 @@
png_bytep rp, dp, pp;
png_size_t i;
png_size_t sum = 0;
- int v;
+ unsigned int v;
png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
@@ -2294,7 +2325,11 @@
i++, rp++, pp++, dp++)
{
v = *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
if (sum > lmins) /* We are already worse, don't continue. */
break;
@@ -2302,24 +2337,43 @@
return (sum);
}
+static void /* PRIVATE */
+png_setup_up_row_only(png_structrp png_ptr, const png_size_t row_bytes)
+{
+ png_bytep rp, dp, pp;
+ png_size_t i;
+ png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
+
+ for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+ pp = png_ptr->prev_row + 1; i < row_bytes;
+ i++, rp++, pp++, dp++)
+ {
+ *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+ }
+}
+
static png_size_t /* PRIVATE */
png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp,
- const png_size_t row_bytes, const png_size_t lmins)
+ const png_size_t row_bytes, const png_size_t lmins)
{
png_bytep rp, dp, pp, lp;
png_uint_32 i;
png_size_t sum = 0;
- int v;
+ unsigned int v;
png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
- pp = png_ptr->prev_row + 1; i < bpp; i++)
+ pp = png_ptr->prev_row + 1; i < bpp; i++)
{
v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
}
for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)
@@ -2327,7 +2381,11 @@
v = *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
& 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
if (sum > lmins) /* We are already worse, don't continue. */
break;
@@ -2335,7 +2393,28 @@
return (sum);
}
+static void /* PRIVATE */
+png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp,
+ const png_size_t row_bytes)
+{
+ png_bytep rp, dp, pp, lp;
+ png_uint_32 i;
+ png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
+
+ for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+ pp = png_ptr->prev_row + 1; i < bpp; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+ }
+
+ for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+ & 0xff);
+ }
+}
+
static png_size_t /* PRIVATE */
png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp,
const png_size_t row_bytes, const png_size_t lmins)
@@ -2343,7 +2422,7 @@
png_bytep rp, dp, pp, cp, lp;
png_size_t i;
png_size_t sum = 0;
- int v;
+ unsigned int v;
png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
@@ -2352,7 +2431,11 @@
{
v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
}
for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;
@@ -2381,7 +2464,11 @@
v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
if (sum > lmins) /* We are already worse, don't continue. */
break;
@@ -2389,6 +2476,48 @@
return (sum);
}
+static void /* PRIVATE */
+png_setup_paeth_row_only(png_structrp png_ptr, const png_uint_32 bpp,
+ const png_size_t row_bytes)
+{
+ png_bytep rp, dp, pp, cp, lp;
+ png_size_t i;
+
+ png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
+
+ for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+ pp = png_ptr->prev_row + 1; i < bpp; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+ }
+
+ for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;
+ i++)
+ {
+ int a, b, c, pa, pb, pc, p;
+
+ b = *pp++;
+ c = *cp++;
+ a = *lp++;
+
+ p = b - c;
+ pc = a - c;
+
+#ifdef PNG_USE_ABS
+ pa = abs(p);
+ pb = abs(pc);
+ pc = abs(p + pc);
+#else
+ pa = p < 0 ? -p : p;
+ pb = pc < 0 ? -pc : pc;
+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+ p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+ *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+ }
+}
#endif /* WRITE_FILTER */
void /* PRIVATE */
@@ -2397,7 +2526,7 @@
#ifndef PNG_WRITE_FILTER_SUPPORTED
png_write_filtered_row(png_ptr, png_ptr->row_buf, row_info->rowbytes+1);
#else
- png_byte filter_to_do = png_ptr->do_filter;
+ unsigned int filter_to_do = png_ptr->do_filter;
png_bytep row_buf;
png_bytep best_row;
png_uint_32 bpp;
@@ -2443,34 +2572,35 @@
*/
best_row = png_ptr->row_buf;
-
- if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE)
+ if (PNG_SIZE_MAX/128 <= row_bytes)
{
+ /* Overflow can occur in the calculation, just select the lowest set
+ * filter.
+ */
+ filter_to_do &= 0U-filter_to_do;
+ }
+ else if ((filter_to_do & PNG_FILTER_NONE) != 0 &&
+ filter_to_do != PNG_FILTER_NONE)
+ {
+ /* Overflow not possible and multiple filters in the list, including the
+ * 'none' filter.
+ */
png_bytep rp;
png_size_t sum = 0;
png_size_t i;
- int v;
+ unsigned int v;
- if (PNG_SIZE_MAX/128 <= row_bytes)
{
for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
{
- /* Check for overflow */
- if (sum > PNG_SIZE_MAX/128 - 256)
- break;
-
v = *rp;
+#ifdef PNG_USE_ABS
+ sum += 128 - abs((int)v - 128);
+#else
sum += (v < 128) ? v : 256 - v;
+#endif
}
}
- else /* Overflow is not possible */
- {
- for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
- {
- v = *rp;
- sum += (v < 128) ? v : 256 - v;
- }
- }
mins = sum;
}
@@ -2479,7 +2609,7 @@
if (filter_to_do == PNG_FILTER_SUB)
/* It's the only filter so no testing is needed */
{
- (void) png_setup_sub_row(png_ptr, bpp, row_bytes, mins);
+ png_setup_sub_row_only(png_ptr, bpp, row_bytes);
best_row = png_ptr->try_row;
}
@@ -2505,7 +2635,7 @@
/* Up filter */
if (filter_to_do == PNG_FILTER_UP)
{
- (void) png_setup_up_row(png_ptr, row_bytes, mins);
+ png_setup_up_row_only(png_ptr, row_bytes);
best_row = png_ptr->try_row;
}
@@ -2531,7 +2661,7 @@
/* Avg filter */
if (filter_to_do == PNG_FILTER_AVG)
{
- (void) png_setup_avg_row(png_ptr, bpp, row_bytes, mins);
+ png_setup_avg_row_only(png_ptr, bpp, row_bytes);
best_row = png_ptr->try_row;
}
@@ -2555,9 +2685,9 @@
}
/* Paeth filter */
- if ((filter_to_do == PNG_FILTER_PAETH) != 0)
+ if (filter_to_do == PNG_FILTER_PAETH)
{
- (void) png_setup_paeth_row(png_ptr, bpp, row_bytes, mins);
+ png_setup_paeth_row_only(png_ptr, bpp, row_bytes);
best_row = png_ptr->try_row;
}
@@ -2589,7 +2719,7 @@
/* Do the actual writing of a previously filtered row. */
static void
png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
- png_size_t full_row_length/*includes filter byte*/)
+ png_size_t full_row_length/*includes filter byte*/)
{
png_debug(1, "in png_write_filtered_row");
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.21 - January 15, 2016
+libpng version 1.6.28 - January 5, 2017
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
@@ -93,3 +93,5 @@
DLL /MD /MDd
Static Library /MD /MDd
+Also, be sure to build libpng, zlib, and your project all for the same
+platform (e.g., 32-bit or 64-bit).
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -84,7 +84,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,9 +97,9 @@
<BrowseInformation>true</BrowseInformation>
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -114,7 +114,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -128,9 +128,9 @@
<BrowseInformation>true</BrowseInformation>
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
@@ -140,7 +140,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -153,9 +153,9 @@
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
@@ -170,7 +170,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -184,9 +184,9 @@
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Full</Optimization>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -30,7 +30,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -76,7 +76,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -83,9 +83,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -109,7 +109,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -117,9 +117,9 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -149,9 +149,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -176,7 +176,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -185,9 +185,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -76,7 +76,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -83,9 +83,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -109,7 +109,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -117,9 +117,9 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -149,9 +149,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -176,7 +176,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -185,9 +185,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -76,7 +76,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -83,9 +83,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -109,7 +109,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -117,9 +117,9 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -149,9 +149,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -176,7 +176,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -185,9 +185,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -76,7 +76,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -83,9 +83,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -109,7 +109,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -117,9 +117,9 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -149,9 +149,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -176,7 +176,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
@@ -185,9 +185,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
@@ -88,11 +88,13 @@
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>TurnOffAllWarnings</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -103,11 +105,13 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <WarningLevel>TurnOffAllWarnings</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -118,7 +122,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -126,7 +130,8 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@@ -141,7 +146,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -149,7 +154,8 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <TreatWarningAsError>true</TreatWarningAsError>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib.props 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.21 - January 15, 2016
+ * libpng version 1.6.28 - January 5, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
@@ -41,5 +41,18 @@
test it:
-->
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
+
+ <!-- The following lines provide a global (solution level) control of the
+ warnings issued by the compiler, these are used in the individual
+ project files (*/*.vcxproj) with, for zlib, some extra disables.
+
+ Different versions of Visual Studio may require different settings,
+ these settings work with Visual Studio 2013. Just set
+ TreatWarningAsError to false to check the build without failing on
+ errors.
+ -->
+ <WarningLevel>EnableAllWarnings</WarningLevel>
+ <TreatWarningAsError>true</TreatWarningAsError>
+ <DisableSpecificWarnings>4255;4668;4710;4711;4746;4820;4996</DisableSpecificWarnings>
</PropertyGroup>
</Project>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.6.21 - January 15, 2016
+Makefiles for libpng version 1.6.28 - January 5, 2017
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng16.so.16.1.6.21)
+ (gcc, creates libpng16.so.16.1.6.28)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -33,12 +33,12 @@
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng16.so.16.1.6.21)
+ creates libpng16.so.16.1.6.28)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng16.so.16.1.6.21)
+ creates libpng16.so.16.1.6.28)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng16.so.16.1.6.21)
+ creates libpng16.so.16.1.6.28)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/def.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,7 +21,7 @@
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN ""
PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.21"
+PNG_DFN ";Version 1.6.28"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,37 @@
+# genchk.cmake.in
+# Generate .chk from .out with awk (generic), based upon the automake logic.
+
+# Copyright (C) 2016 Glenn Randers-Pehrson
+# Written by Roger Leigh, 2016
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Variables substituted from CMakeLists.txt
+set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
+
+set(AWK "@AWK@")
+
+get_filename_component(INPUTEXT "${INPUT}" EXT)
+get_filename_component(OUTPUTEXT "${OUTPUT}" EXT)
+get_filename_component(INPUTBASE "${INPUT}" NAME_WE)
+get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE)
+get_filename_component(INPUTDIR "${INPUT}" PATH)
+get_filename_component(OUTPUTDIR "${OUTPUT}" PATH)
+
+if("${INPUTEXT}" STREQUAL ".out" AND "${OUTPUTEXT}" STREQUAL ".chk")
+ # Generate .chk from .out with awk (generic)
+ file(REMOVE "${OUTPUT}" "${OUTPUTDIR}/${OUTPUTBASE}.new")
+ execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/checksym.awk"
+ "${SRCDIR}/scripts/${INPUTBASE}.def"
+ "of=${OUTPUTDIR}/${OUTPUTBASE}.new"
+ "${INPUT}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate ${OUTPUTDIR}/${OUTPUTBASE}.new")
+ endif()
+ file(RENAME "${OUTPUTDIR}/${OUTPUTBASE}.new" "${OUTPUT}")
+else()
+ message(FATAL_ERROR "Unsupported conversion: ${INPUTEXT} to ${OUTPUTEXT}")
+endif()
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,93 @@
+# genout.cmake.in
+# Generate .out from .c with awk (generic), based upon the automake logic.
+
+# Copyright (C) 2016 Glenn Randers-Pehrson
+# Written by Roger Leigh, 2016
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Variables substituted from CMakeLists.txt
+set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(BINDIR "@CMAKE_CURRENT_BINARY_DIR@")
+
+set(AWK "@AWK@")
+set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
+set(CMAKE_C_FLAGS @CMAKE_C_FLAGS@)
+set(INCDIR "@CMAKE_CURRENT_BINARY_DIR@")
+set(PNG_PREFIX "@PNG_PREFIX@")
+set(PNGLIB_MAJOR "@PNGLIB_MAJOR@")
+set(PNGLIB_MINOR "@PNGLIB_MINOR@")
+set(PNGLIB_VERSION "@PNGLIB_VERSION@")
+set(ZLIBINCDIR "@ZLIB_INCLUDE_DIR@")
+
+set(PLATFORM_C_FLAGS)
+if(APPLE)
+ set(CMAKE_OSX_ARCHITECTURES "@CMAKE_OSX_ARCHITECTURES@")
+ set(CMAKE_OSX_SYSROOT "@CMAKE_OSX_SYSROOT@")
+ if(CMAKE_OSX_ARCHITECTURES)
+ set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -arch ${CMAKE_OSX_ARCHITECTURES})
+ endif()
+ if(CMAKE_OSX_SYSROOT)
+ set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT})
+ endif()
+endif()
+
+get_filename_component(INPUTEXT "${INPUT}" EXT)
+get_filename_component(OUTPUTEXT "${OUTPUT}" EXT)
+get_filename_component(INPUTBASE "${INPUT}" NAME_WE)
+get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE)
+get_filename_component(INPUTDIR "${INPUT}" PATH)
+get_filename_component(OUTPUTDIR "${OUTPUT}" PATH)
+
+if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out")
+ get_filename_component(GENDIR "${OUTPUT}" PATH)
+ file(MAKE_DIRECTORY "${GENDIR}")
+
+ file(REMOVE "${OUTPUT}.tf1" "${OUTPUT}.tf2")
+
+ set(INCLUDES "-I${INCDIR}")
+ if(ZLIBINCDIR)
+ foreach(dir ${ZLIBINCDIR})
+ list(APPEND INCLUDES "-I${dir}")
+ endforeach()
+ endif()
+
+ if(PNG_PREFIX)
+ set(PNG_PREFIX_DEF "-DPNG_PREFIX=${PNG_PREFIX}")
+ endif()
+
+ execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E"
+ ${CMAKE_C_FLAGS}
+ ${PLATFORM_C_FLAGS}
+ "-I${SRCDIR}"
+ "-I${BINDIR}"
+ ${INCLUDES}
+ "-DPNGLIB_LIBNAME=PNG${PNGLIB_MAJOR}${PNGLIB_MINOR}_0"
+ "-DPNGLIB_VERSION=${PNGLIB_VERSION}"
+ "-DSYMBOL_PREFIX=${SYMBOL_PREFIX}"
+ "-DPNG_NO_USE_READ_MACROS"
+ "-DPNG_BUILDING_SYMBOL_TABLE"
+ ${PNG_PREFIX_DEF}
+ "${INPUT}"
+ OUTPUT_FILE "${OUTPUT}.tf1"
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE CPP_FAIL)
+ if(CPP_FAIL)
+ message(FATAL_ERROR "Failed to generate ${OUTPUT}.tf1")
+ endif()
+
+ execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/dfn.awk"
+ "out=${OUTPUT}.tf2" "${OUTPUT}.tf1"
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate ${OUTPUT}.tf2")
+ endif()
+
+ file(REMOVE "${OUTPUT}.tf1")
+ file(RENAME "${OUTPUT}.tf2" "${OUTPUT}")
+else()
+ message(FATAL_ERROR "Unsupported conversion: ${INPUTEXT} to ${OUTPUTEXT}")
+endif()
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/gensrc.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/gensrc.cmake.in (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/gensrc.cmake.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,138 @@
+# gensrc.cmake.in
+# Generate source files with awk, based upon the automake logic.
+
+# Copyright (C) 2016 Glenn Randers-Pehrson
+# Written by Roger Leigh, 2016
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Variables substituted from CMakeLists.txt
+set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(BINDIR "@CMAKE_CURRENT_BINARY_DIR@")
+
+set(AWK "@AWK@")
+set(DFA_XTRA "@DFA_XTRA@")
+set(PNG_PREFIX "@PNG_PREFIX@")
+set(PNGLIB_VERSION "@PNGLIB_VERSION@")
+
+if("${OUTPUT}" STREQUAL "scripts/pnglibconf.c")
+ # Generate scripts/pnglibconf.c
+
+ file(REMOVE "${BINDIR}/pnglibconf.tf6" "${BINDIR}/pnglibconf.tf7")
+
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "com ${PNGLIB_VERSION} STANDARD API DEFINITION"
+ COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
+ "out=pnglibconf.tf6" "logunsupported=1" "version=search"
+ "${SRCDIR}/pngconf.h" "-"
+ "${SRCDIR}/scripts/pnglibconf.dfa"
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pnglibconf.tf6")
+ endif()
+
+ execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
+ "out=pnglibconf.tf7" "pnglibconf.tf6"
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pnglibconf.tf7")
+ endif()
+
+ file(REMOVE "pnglibconf.tf6")
+ file(MAKE_DIRECTORY "${BINDIR}/scripts")
+ file(RENAME "pnglibconf.tf7" "${BINDIR}/scripts/pnglibconf.c")
+
+elseif ("${OUTPUT}" STREQUAL "pnglibconf.c")
+ # Generate pnglibconf.c
+
+ file(REMOVE "${BINDIR}/pnglibconf.tf4" "${BINDIR}/pnglibconf.tf5")
+
+ execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
+ out=pnglibconf.tf4 version=search
+ ${SRCDIR}/pngconf.h ${SRCDIR}/scripts/pnglibconf.dfa
+ ${SRCDIR}/pngusr.dfa ${DFA_XTRA}
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pnglibconf.tf4")
+ endif()
+
+ execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
+ out=pnglibconf.tf5 pnglibconf.tf4
+ WORKING_DIRECTORY "${BINDIR}"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pnglibconf.tf5")
+ endif()
+
+ file(REMOVE "pnglibconf.tf4")
+ file(MAKE_DIRECTORY "${BINDIR}/scripts")
+ file(RENAME "pnglibconf.tf5" "${BINDIR}/pnglibconf.c")
+
+elseif ("${OUTPUT}" STREQUAL "pnglibconf.h")
+ # Generate pnglibconf.h
+
+ file(REMOVE "${BINDIR}/${OUTPUT}")
+ if(PNG_PREFIX)
+ file(REMOVE "pnglibconf.tf8")
+
+ execute_process(COMMAND "${AWK}" "s==0 && NR>1{print prev}
+ s==0{prev=\$0}
+ s==1{print \"#define\", \$1, \"${PNG_PREFIX}\" \$1}
+ s==2{print \"#define ${PNG_PREFIX}png_\" \$1, \"PNG_\" \$1}
+ END{print prev}" s=0 pnglibconf.out s=1 "${BINDIR}/scripts/prefix.out"
+ s=2 "${SRCDIR}/scripts/macro.lst"
+ OUTPUT_FILE pnglibconf.tf8
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pnglibconf.tf8")
+ endif()
+
+ file(RENAME "pnglibconf.tf8" "${BINDIR}/${OUTPUT}")
+ else()
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINDIR}/pnglibconf.out"
+ "${BINDIR}/${OUTPUT}"
+ RESULT_VARIABLE COPY_FAIL)
+ if(COPY_FAIL)
+ message(FATAL_ERROR "Failed to create pnglibconf.h")
+ endif()
+ endif()
+
+elseif ("${OUTPUT}" STREQUAL "pngprefix.h")
+ # Generate pngprefix.h
+
+ file(REMOVE "${BINDIR}/${OUTPUT}")
+
+ if(PNG_PREFIX)
+ file(REMOVE "pngprefix.tf1")
+
+ execute_process(COMMAND "${AWK}"
+ "{print \"#define\", \$1, \"${PNG_PREFIX}\" \$1}"
+ "${BINDIR}/scripts/intprefix.out"
+ OUTPUT_FILE "pngprefix.tf1"
+ RESULT_VARIABLE AWK_FAIL)
+ if(AWK_FAIL)
+ message(FATAL_ERROR "Failed to generate pngprefix.tf1")
+ endif()
+
+ file(RENAME "pngprefix.tf1" "${BINDIR}/${OUTPUT}")
+ else()
+ file(WRITE "${BINDIR}/${OUTPUT}" "/* No libpng symbol prefix configured. */")
+ endif()
+
+elseif("${OUTPUT}" STREQUAL "scripts/pnglibconf.h.prebuilt")
+ # Generate scripts/pnglibconf.h.prebuilt (fails build)
+
+ message(STATUS "Attempting to build scripts/pnglibconf.h.prebuilt")
+ message(STATUS "This is a machine generated file, but if you want to make")
+ message(STATUS "a new one simply build the 'genfiles' target, and copy")
+ message(STATUS "scripts/pnglibconf.out to scripts/pnglibconf.h.prebuilt")
+ message(STATUS "AND set PNG_ZLIB_VERNUM to 0 (you MUST do this)")
+ message(FATAL_ERROR "Stopping build")
+
+else()
+ message(FATAL_ERROR "Unsupported output: ${OUTPUT}")
+endif()
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/scripts/gensrc.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.21
+version=1.6.28
prefix=""
libdir=""
libs=""
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.6.21
+Version: 1.6.28
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc 2017-02-16 16:38:15 UTC (rev 766)
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 6
-VERMIC = 21
+VERMIC = 28
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2017-02-16 16:38:15 UTC (rev 766)
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 21
+RELEASE = 28
# Shared library names:
LIBSO=$(LIBNAME).so
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2017-02-16 16:38:15 UTC (rev 766)
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 21
+RELEASE = 28
# Shared library names:
LIBSO=$(LIBNAME).dll
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ne12bsd 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,7 +17,7 @@
LIB= png16
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.6.21
+SHLIB_MINOR= 1.6.28
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.21
+SHLIB_MINOR= 1.6.28
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.21
+SHLIB_MINOR= 1.6.28
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
# makefile for SCO OSr5 ELF and Unixware 7 with Native cc
-# Contributed by Mike Hopkirk (hops at sco.com) modified from Makefile.lnx
+# Contributed by Mike Hopkirk (hops at sco.com) modified from Makefile.lnx
# force ELF build dynamic linking, SONAME setting in lib and RPATH in app
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa 2017-02-16 16:38:15 UTC (rev 766)
@@ -552,6 +552,7 @@
# These options disable *all* the text chunks if turned off
+option TEXT disabled
option READ_TEXT requires READ_ANCILLARY_CHUNKS enables TEXT
option WRITE_TEXT requires WRITE_ANCILLARY_CHUNKS enables TEXT
@@ -873,9 +874,12 @@
# Write:
option SIMPLIFIED_WRITE,
- requires WRITE STDIO, SETJMP, WRITE_SWAP, WRITE_PACK,
+ requires WRITE, SETJMP, WRITE_SWAP, WRITE_PACK,
WRITE_tRNS, WRITE_gAMA, WRITE_sRGB, WRITE_cHRM
+# 1.6.22: allow simplified write without stdio support:
+option SIMPLIFIED_WRITE_STDIO requires SIMPLIFIED_WRITE STDIO
+
option SIMPLIFIED_WRITE_AFIRST enables FORMAT_AFIRST,
requires SIMPLIFIED_WRITE WRITE_SWAP_ALPHA
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
-/* libpng 1.6.21 STANDARD API DEFINITION */
+/* libpng 1.6.28 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.21 - January 15, 2016 */
+/* Libpng version 1.6.28 - January 5, 2017 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
@@ -109,6 +109,7 @@
#define PNG_SIMPLIFIED_READ_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_SUPPORTED
#define PNG_STDIO_SUPPORTED
#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-;Version 1.6.21
+;Version 1.6.28
;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng
@@ -249,3 +249,4 @@
png_set_check_for_invalid_index @242
png_get_palette_max @243
png_set_option @244
+ png_image_write_to_memory @245
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/test.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/test.cmake.in (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/test.cmake.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,31 @@
+# test.cmake.in
+
+# Copyright (C) 2016 Glenn Randers-Pehrson
+# Written by Roger Leigh, 2016
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+set(TEST_OPTIONS "@TEST_OPTIONS@")
+set(TEST_FILES "@TEST_FILES@")
+
+foreach(file ${TEST_FILES})
+ file(TO_NATIVE_PATH "${file}" native_file)
+ list(APPEND NATIVE_TEST_FILES "${native_file}")
+endforeach()
+
+# Add the directory containing libpng to the PATH (Windows only)
+if(WIN32)
+ get_filename_component(LIBPNG_DIR "${LIBPNG}" PATH)
+ file(TO_NATIVE_PATH "${LIBPNG_DIR}" LIBPNG_DIR)
+ set(ENV{PATH} "${LIBPNG_DIR};$ENV{PATH}")
+endif()
+
+execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "Running ${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES})
+
+execute_process(COMMAND "${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES}
+ RESULT_VARIABLE TEST_STATUS)
+if(TEST_STATUS)
+ message(FATAL_ERROR "Returned failed status ${TEST_STATUS}!")
+endif()
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/scripts/test.cmake.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/tests/badadler.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/tests/badcrc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,36 +17,38 @@
shift
alpha="$1"
shift
-exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} `
- for f in "${srcdir}/contrib/testpngs/"*.png
- do
- g=
- case "$f" in
- *-linear[.-]*)
- test "$gamma" = "linear" && g="$f";;
+args=
+LC_ALL="C" # fix glob sort order to ASCII:
+for f in "${srcdir}/contrib/testpngs/"*.png
+do
+ g=
+ case "$f" in
+ *-linear[.-]*)
+ test "$gamma" = "linear" && g="$f";;
- *-sRGB[.-]*)
- test "$gamma" = "sRGB" && g="$f";;
+ *-sRGB[.-]*)
+ test "$gamma" = "sRGB" && g="$f";;
- *-1.8[.-]*)
- test "$gamma" = "1.8" && g="$f";;
+ *-1.8[.-]*)
+ test "$gamma" = "1.8" && g="$f";;
- *)
- test "$gamma" = "none" && g="$f";;
- esac
+ *)
+ test "$gamma" = "none" && g="$f";;
+ esac
- case "$g" in
- "")
- :;;
+ case "$g" in
+ "")
+ :;;
- *-alpha[-.]*)
- test "$alpha" = "alpha" && echo "$g";;
+ *-alpha[-.]*)
+ test "$alpha" = "alpha" && args="$args $g";;
- *-tRNS[-.]*)
- test "$alpha" = "tRNS" -o "$alpha" = "none" && echo "$g";;
+ *-tRNS[-.]*)
+ test "$alpha" = "tRNS" -o "$alpha" = "none" && args="$args $g";;
- *)
- test "$alpha" = "opaque" -o "$alpha" = "none" && echo "$g";;
- esac
- done
-`
+ *)
+ test "$alpha" = "opaque" -o "$alpha" = "none" && args="$args $g";;
+ esac
+done
+# This only works if the arguments don't contain spaces; they don't.
+exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $args
Modified: branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,2 +1,4 @@
#!/bin/sh
+./pngtest --relaxed ${srcdir}/tests/badcrc.png
+./pngtest --relaxed ${srcdir}/tests/badadler.png
exec ./pngtest --strict ${srcdir}/pngtest.png
Modified: branches/stable/source/src/libs/libpng/version.ac
===================================================================
--- branches/stable/source/src/libs/libpng/version.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/libpng/version.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.6.21])
+m4_define([libpng_version], [1.6.28])
Modified: branches/stable/source/src/libs/poppler/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,15 +1,58 @@
+2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.51.0.
+ * version.ac: Adjust.
+
+2016-12-16 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.50.0.
+ * version.ac: Adjust.
+
+2016-11-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.49.0.
+ * version.ac: Adjust.
+
+2016-10-08 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.48.0.
+ * version.ac: Adjust.
+
+2016-08-19 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.47.0.
+ * version.ac: Adjust.
+
+2016-07-25 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.46.0.
+ * version.ac: Adjust.
+
+2016-06-18 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.45.0.
+ * version.ac, configure.ac, config.h.in, Makefile.am: Adjust.
+
+2016-05-22 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.44.0.
+ * version.ac: Adjust.
+
+2016-04-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.43.0.
+ * version.ac: Adjust.
+
2016-03-18 Luigi Scarso <luigi.scarso at gmail.com>
Import poppler-0.42.0.
* version.ac: Adjust.
-
2016-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import poppler-0.41.0.
* version.ac: Adjust.
-
2016-02-15 Karl Berry <karl at tug.org>
* poppler-PATCHES: rename from poppler-src-PATCHES.
Modified: branches/stable/source/src/libs/poppler/Makefile.am
===================================================================
--- branches/stable/source/src/libs/poppler/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -41,6 +41,7 @@
goo_libGoo_a_sources = \
@POPPLER_TREE@/goo/gfile.cc \
+ @POPPLER_TREE@/goo/glibc.cc \
@POPPLER_TREE@/goo/gmem.cc \
@POPPLER_TREE@/goo/gmempp.cc \
@POPPLER_TREE@/goo/grandom.cc \
Modified: branches/stable/source/src/libs/poppler/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/Makefile.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/Makefile.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -115,6 +115,7 @@
libpoppler_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = @POPPLER_TREE@/goo/gfile.$(OBJEXT) \
+ @POPPLER_TREE@/goo/glibc.$(OBJEXT) \
@POPPLER_TREE@/goo/gmem.$(OBJEXT) \
@POPPLER_TREE@/goo/gmempp.$(OBJEXT) \
@POPPLER_TREE@/goo/grandom.$(OBJEXT) \
@@ -451,6 +452,7 @@
goo_libGoo_a_sources = \
@POPPLER_TREE@/goo/gfile.cc \
+ @POPPLER_TREE@/goo/glibc.cc \
@POPPLER_TREE@/goo/gmem.cc \
@POPPLER_TREE@/goo/gmempp.cc \
@POPPLER_TREE@/goo/grandom.cc \
@@ -617,6 +619,9 @@
@POPPLER_TREE@/goo/gfile.$(OBJEXT): \
@POPPLER_TREE@/goo/$(am__dirstamp) \
@POPPLER_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
+ at POPPLER_TREE@/goo/glibc.$(OBJEXT): \
+ @POPPLER_TREE@/goo/$(am__dirstamp) \
+ @POPPLER_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
@POPPLER_TREE@/goo/gmem.$(OBJEXT): @POPPLER_TREE@/goo/$(am__dirstamp) \
@POPPLER_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
@POPPLER_TREE@/goo/gmempp.$(OBJEXT): \
@@ -889,6 +894,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po at am__quote@
Added: branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/ChangeLog (rev 0)
+++ branches/stable/source/src/libs/poppler/TLpatches/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,383 @@
+2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.51.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-12-16 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.50.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-11-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.49.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-10-08 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.48.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-08-19 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.47.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-07-25 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.46.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-06-18 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.45.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-05-22 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.44.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+ * patch-04-ULLONG-constants: Removed.
+
+2016-04-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.43.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions,
+ patch-04-ULLONG-constants: Adapted.
+
+2016-03-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * patch-04-ULLONG-constants: new patch.
+
+2016-03-18 Luigi Scarso <luigi.scarso at gmail.com>
+
+ Imported poppler-0.42.0 source tree from:
+ http://poppler.freedesktop.org/
+ Added @POPPLER_TREE@/poppler/SignatureInfo.cc to Makefile.am
+
+2016-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.41.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2016-01-14 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.40.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2015-12-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.39.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2015-10-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.37.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2015-09-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.36.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
+2015-09-01 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-03-Object-functions (new): Declare parameter of Object
+ member functions initCmd, isStream, and streamIs as const.
+
+2015-08-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.35.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-07-09 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.34.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-06-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.33.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-03-08 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.32.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-02-06 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.31.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2015-01-07 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.30.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-12-05 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.29.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-11-04 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.28.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+ * patch-10-UTF-16BE (removed): Included upstream.
+
+2014-10-08 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-10-UTF-16BE (new): Backport from poppler git
+ (submitted by Luigi Scarso <luigi.scarso at gmail.com>).
+
+2014-09-29 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.5 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-08-22 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.4 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-07-21 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.3 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-06-20 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.2 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-05-24 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.1 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2014-05-19 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.26.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+ * patch-03-NOMINMAX (removed): Now included upstream.
+
+2014-03-27 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.25.2 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+ * patch-03-NOMINMAX (new): Avoid to redefine NOMINMAX.
+
+2014-01-03 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.25.1 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-12-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.25.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-12-02 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.24.4 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-10-28 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.24.3 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-09-30 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.24.2 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-09-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.24.1 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-07-30 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.24.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-07-19 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.23.4 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-07-02 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.23.3 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-01-MINGW_PRINTF_FORMAT (removed): Now included upstream.
+ * patch-02-LLONG_MAX: Adapted.
+
+2013-06-18 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.23.2 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-01-disable-jpeg (removed): Now included upstream.
+ * patch-02-warnings (removed): Obsoleted by gcc-4.6.
+
+ * patch-01-MINGW_PRINTF_FORMAT (new): MinGW32 may not define
+ __MINGW_PRINTF_FORMAT (and __USE_MINGW_ANSI_STDIO could be 0).
+ * patch-02-LLONG_MAX (new): If necessary define LLONG_MAX etc.
+
+2013-03-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.22.2 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-warnings: Adapted.
+
+ * patch-01-disable-jpeg (new): We build without libjpeg.
+
+2012-12-31 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.22.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-warnings: Adapted.
+
+2012-10-15 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.21.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-warnings: Adapted.
+
+2012-07-11 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.20.2 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-warnings: Adapted.
+
+2012-05-11 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.20.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-01-missing-param (removed): Obsolete.
+ * patch-02-warnings: Adapted.
+
+2012-05-09 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.19.4 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-03-POPPLER_VERSION (removed): Obsolete.
+ * patch-01-missing-param (new): Bug fix, missing new func param.
+ * patch-02-warnings: Adapted.
+
+2012-02-23 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported poppler-0.18.4 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-01-PDF_PARSER_ONLY (removed): Obsolete.
+ * patch-0[23]-*: Adapted.
+
+2011-10-18 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-04-mingw (removed): Instead add `-lgdi32'.
+
+2011-10-11 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-04-mingw (new): Split off ...
+ * patch-01-PDF_PARSER_ONLY: ... from here.
+
+2011-10-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-03-POPPLER_VERSION: Reorg definition of POPPLER_VERSION.
+
+2011-10-08 Peter Breitenlohner <peb at 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 at mppmu.mpg.de>
+
+ * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for MinGW.
+
+ * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION.
+
+2011-04-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-02-warnings (new):
+ poppler/Movie.cc: Cast -1 to Gulong.
+ goo/PNGWriter.h: Add newline at end of file.
+
+2011-04-12 Taco Hoekwater <taco at luatex.org>
+
+ Imported poppler-0.12.4 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-01-PDF_PARSER_ONLY (new): Implement PDF_PARSER_ONLY.
+
Added: branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/TL-Changes (rev 0)
+++ branches/stable/source/src/libs/poppler/TLpatches/TL-Changes 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,29 @@
+Changes applied to the poppler-0.51.0 tree as obtained from:
+ http://poppler.freedesktop.org/
+
+Removed:
+ Makefile.in
+ aclocal.m4
+ compile
+ config.guess
+ config.sub
+ configure
+ depcomp
+ install-sh
+ ltmain.sh
+ missing
+ test-driver
+ fofi/Makefile.in
+ goo/Makefile.in
+ poppler/Makefile.in
+ splash/Makefile.in
+
+Removed unused dirs:
+ cmake
+ cpp
+ glib
+ m4
+ qt4
+ qt5
+ test
+ utils
Added: branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX (rev 0)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,25 @@
+diff -ur poppler-0.51.0.orig/goo/GooString.h poppler-0.51.0/goo/GooString.h
+--- poppler-0.51.0.orig/goo/GooString.h Fri Dec 16 04:08:06 2016
++++ poppler-0.51.0/goo/GooString.h Mon Jan 16 08:28:38 2017
+@@ -36,6 +36,21 @@
+ #endif
+
+ #include <limits.h> // for LLONG_MAX and ULLONG_MAX
++
++/* <limits.h> and/or the compiler may or may not define these. */
++/* Minimum and maximum values a `signed long long int' can hold. */
++#ifndef LLONG_MAX
++# define LLONG_MAX 9223372036854775807LL
++#endif
++#ifndef LLONG_MIN
++# define LLONG_MIN (-LLONG_MAX - 1LL)
++#endif
++
++/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */
++#ifndef ULLONG_MAX
++# define ULLONG_MAX 18446744073709551615ULL
++#endif
++
+ #include <stdarg.h>
+ #include <stdlib.h> // for NULL
+ #include "gtypes.h"
Added: branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions (rev 0)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,43 @@
+diff -ur poppler-0.51.0.orig/poppler/Object.h poppler-0.51.0/poppler/Object.h
+--- poppler-0.51.0.orig/poppler/Object.h Fri Dec 16 04:08:06 2016
++++ poppler-0.51.0/poppler/Object.h Mon Jan 16 08:31:27 2017
+@@ -148,7 +148,7 @@
+ Object *initStream(Stream *streamA);
+ Object *initRef(int numA, int genA)
+ { initObj(objRef); ref.num = numA; ref.gen = genA; return this; }
+- Object *initCmd(char *cmdA)
++ Object *initCmd(const char *cmdA)
+ { initObj(objCmd); cmd = copyString(cmdA); return this; }
+ Object *initError()
+ { initObj(objError); return this; }
+@@ -195,7 +195,7 @@
+ GBool isName(const char *nameA)
+ { return type == objName && !strcmp(name, nameA); }
+ GBool isDict(const char *dictType);
+- GBool isStream(char *dictType);
++ GBool isStream(const char *dictType);
+ GBool isCmd(const char *cmdA)
+ { return type == objCmd && !strcmp(cmd, cmdA); }
+
+@@ -245,7 +245,7 @@
+ Object *dictGetValNF(int i, Object *obj);
+
+ // Stream accessors.
+- GBool streamIs(char *dictType);
++ GBool streamIs(const char *dictType);
+ void streamReset();
+ void streamClose();
+ int streamGetChar();
+@@ -352,10 +352,10 @@
+
+ #include "Stream.h"
+
+-inline GBool Object::streamIs(char *dictType)
++inline GBool Object::streamIs(const char *dictType)
+ { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); }
+
+-inline GBool Object::isStream(char *dictType)
++inline GBool Object::isStream(const char *dictType)
+ { return type == objStream && streamIs(dictType); }
+
+ inline void Object::streamReset()
Modified: branches/stable/source/src/libs/poppler/config.h.in
===================================================================
--- branches/stable/source/src/libs/poppler/config.h.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/config.h.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -63,6 +63,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
Modified: branches/stable/source/src/libs/poppler/configure
===================================================================
--- branches/stable/source/src/libs/poppler/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.42.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.51.0.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.42.0'
-PACKAGE_STRING='poppler (TeX Live) 0.42.0'
+PACKAGE_VERSION='0.51.0'
+PACKAGE_STRING='poppler (TeX Live) 0.51.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1306,7 +1306,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.42.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.51.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.42.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.51.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.42.0
+poppler (TeX Live) configure 0.51.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.42.0, which was
+It was created by poppler (TeX Live) $as_me 0.51.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.42.0'
+ VERSION='0.51.0'
# Some tools Automake needs.
@@ -6203,7 +6203,7 @@
-for ac_func in gettimeofday gmtime_r mkstemp popen rand_r
+for ac_func in gettimeofday gmtime_r mkstemp popen rand_r timegm
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6578,7 +6578,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.42.0"
+#define POPPLER_VERSION "0.51.0"
_ACEOF
@@ -7272,7 +7272,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.42.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.51.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.42.0
+poppler (TeX Live) config.status 0.51.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/poppler/configure.ac
===================================================================
--- branches/stable/source/src/libs/poppler/configure.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/configure.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -70,7 +70,7 @@
dnl **** Checks for library functions ****
-AC_CHECK_FUNCS([gettimeofday gmtime_r mkstemp popen rand_r])
+AC_CHECK_FUNCS([gettimeofday gmtime_r mkstemp popen rand_r timegm])
AC_SYS_LARGEFILE
AC_FUNC_FSEEKO
AC_CHECK_FUNC([ftell64], [AC_CHECK_FUNCS([fseek64])])
Modified: branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -22,7 +22,7 @@
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "42")
+set(POPPLER_MINOR_VERSION "51")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -96,7 +96,7 @@
# setting the minimum required versions for some components
set(QT4_MIN_VERSION "4.7.0")
set(CAIRO_VERSION "1.10.0")
-set(GLIB_REQUIRED "2.18")
+set(GLIB_REQUIRED "2.41")
macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH)
find_package(Freetype REQUIRED)
@@ -168,13 +168,13 @@
set(USE_OPENJPEG2 FALSE)
set(WITH_OPENJPEG FALSE)
if(ENABLE_LIBOPENJPEG STREQUAL "auto")
- find_package(LIBOPENJPEG)
- set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
- set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
- if(NOT LIBOPENJPEG_FOUND)
- find_package(LIBOPENJPEG2)
- set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
- set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ find_package(LIBOPENJPEG2)
+ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ if(NOT LIBOPENJPEG2_FOUND)
+ find_package(LIBOPENJPEG)
+ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
endif()
elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg1")
find_package(LIBOPENJPEG)
@@ -325,6 +325,7 @@
goo/ImgWriter.cc
goo/gstrtod.cc
goo/grandom.cc
+ goo/glibc.cc
fofi/FoFiBase.cc
fofi/FoFiEncodings.cc
fofi/FoFiTrueType.cc
@@ -501,7 +502,7 @@
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 59.0.0 SOVERSION 59)
+set_target_properties(poppler PROPERTIES VERSION 66.0.0 SOVERSION 66)
target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
@@ -778,5 +779,5 @@
endif(ENABLE_ZLIB_UNCOMPRESS)
if(NOT WITH_OPENJPEG)
- message("Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained.")
+ message("Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained.")
endif(NOT WITH_OPENJPEG)
Modified: branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,2039 @@
+commit dc8edecc437f33305257b6cb208dc2da367b7868
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Jan 15 18:27:49 2017 +0100
+
+ Poppler 0.51
+
+ CMakeLists.txt | 2 +-
+ NEWS | 15 ++++++++++++++-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 8 files changed, 21 insertions(+), 8 deletions(-)
+
+commit c4de00a93c470020c6c96eb343854039bfc0a424
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat Jan 14 23:42:32 2017 +0100
+
+ Forgot to update the \since value
+
+ qt5/src/poppler-form.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 0eb28e216fc45fe5ceed1c093a541ceca0dc0397
+Author: Christoph Cullmann <cullmann at kde.org>
+Date: Fri Jan 13 00:03:27 2017 +0100
+
+ qt5: Fix segfault/assert if LinkDestination is constructed with
+ invalid input string.
+
+ Bug #99357
+
+ qt5/src/poppler-link.cc | 24 +++++++++++++-----------
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+commit 4db6507320b51e060f73f7fb0eab364e8a1fee77
+Author: Sebastian Rasmussen <sebras at gmail.com>
+Date: Wed Jan 11 23:37:54 2017 +0100
+
+ Check for error from NSS in SignatureHandler construct.
+
+ And cascading effects in other SignalHandler members.
+
+ Bug #99363
+
+ poppler/SignatureHandler.cc | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+commit 8bb90fc828a3400a2464a38f0ec9e592754197dd
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Jan 10 17:20:18 2017 +0100
+
+ Qt5: Minor api refinements to the new signature classes
+
+ qt5/src/poppler-form.cc | 32 +++++++++++++++++++++-----------
+ qt5/src/poppler-form.h | 22 +++++++++++-----------
+ qt5/tests/poppler-forms.cpp | 14 +++++++-------
+ 3 files changed, 39 insertions(+), 29 deletions(-)
+
+commit aa63debdaa6001ed68333b31cd06c2f9958fd8d2
+Author: Hanno Meyer-Thurow <h.mth at web.de>
+Date: Tue Jan 10 16:28:14 2017 +0100
+
+ Qt5: Implement digital signature support
+
+ Bug #94378
+
+ qt5/src/poppler-form.cc | 121
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt5/src/poppler-form.h | 106 ++++++++++++++++++++++++++++++++++++++
+ qt5/src/poppler-page.cc | 7 +++
+ qt5/tests/poppler-forms.cpp | 47 ++++++++++++++++-
+ 4 files changed, 280 insertions(+), 1 deletion(-)
+
+commit 2f831d5b9481e5ab06178409f7fccf74eda6e1a2
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Jan 9 00:30:42 2017 +0100
+
+ New year!
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b6c4d6d1312f63e5e6dcfa28ea48ff3e6935daa9
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Jan 9 00:28:37 2017 +0100
+
+ Fix memory leak in PDFDoc::markAnnotations
+
+ poppler/PDFDoc.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 3cae7773d2f8ad6506e2712689c56fa6975e01d3
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Mon Jan 9 00:25:53 2017 +0100
+
+ pdfunite: add fields to AcroForm dict
+
+ Bug #99141
+
+ utils/pdfunite.cc | 33 +++++++++++++++++++++++++++++++--
+ 1 file changed, 31 insertions(+), 2 deletions(-)
+
+commit c301f6c675784a65fb2ebdf99ded5d5d3f8defdd
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Dec 19 22:53:47 2016 +0100
+
+ qt5: Add Poppler::FormField::setName
+
+ qt5/src/poppler-form.cc | 9 ++++++++-
+ qt5/src/poppler-form.h | 10 ++++++++--
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+commit 86c99de95cd16199e0f9f1fb82999c27d54c5b76
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Dec 19 22:53:10 2016 +0100
+
+ Add Form[Field|Widget]::setPartialName
+
+ Useful to repair/tweak pdf files
+
+ poppler/Form.cc | 16 ++++++++++++++++
+ poppler/Form.h | 2 ++
+ 2 files changed, 18 insertions(+)
+
+commit 56dfa44960b9ab9fb4dcc01d8e3861a9293b0ee0
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Dec 15 23:32:41 2016 +0100
+
+ Poppler 0.50
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 25 +++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 3 ++-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 3 ++-
+ 11 files changed, 38 insertions(+), 11 deletions(-)
+
+commit 1511523450f40b539fb1d58950a907f3712fd5c7
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Dec 15 22:04:04 2016 +0100
+
+ Refine previous fix a bit
+
+ Call GfxColorSpace::setupColorProfiles only when we really need it
+
+ poppler/GfxState.cc | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 9b016440725de086fa87fcbf776e27acee2c01b7
+Author: Marek Kasik <mkasik at redhat.com>
+Date: Wed Sep 21 12:28:16 2016 +0200
+
+ Don't crash when calling cmsGetColorSpace()
+
+ Initialize RGBProfile and displayProfile before their use
+ if they were not initialized in GfxState's constructor.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=97870
+
+ poppler/GfxState.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 8321b400adf6c042cd630ceea7f54fcf6862211d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Dec 15 18:02:30 2016 +0100
+
+ Add one more const
+
+ Makes clang happier (i.e. gives one warning less)
+
+ fofi/FoFiEncodings.cc | 18 ++++++++++++++++--
+ fofi/FoFiEncodings.h | 18 ++++++++++++++++--
+ 2 files changed, 32 insertions(+), 4 deletions(-)
+
+commit 1a6e4b65197391b23c2163b939d4787f2058a2e1
+Author: Jason Crain <jason at inspiresomeone.us>
+Date: Wed Dec 7 09:28:58 2016 -0600
+
+ cairo: initialize CairoOutputDev::antialias
+
+ Initialize CairoOutputDev::antialias to CAIRO_ANTIALIAS_DEFAULT.
+
+ Bug #98983
+
+ poppler/CairoOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cf901c817fc99e1fa57745c11aa79cdfb4e8c99
+Author: William Bader <william at newspapersystems.com>
+Date: Thu Dec 8 21:45:18 2016 +0100
+
+ Fix PS conversion for some files
+
+ Bug #63963
+
+ fofi/FoFiTrueType.cc | 13 ++++++++++++-
+ fofi/FoFiTrueType.h | 2 ++
+ poppler/PSOutputDev.cc | 26 ++++++++++++++++++++++++++
+ poppler/PSOutputDev.h | 1 +
+ 4 files changed, 41 insertions(+), 1 deletion(-)
+
+commit 97b801b55b9bd33f20723c7139cf845a1cba5bd3
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Dec 7 22:52:24 2016 +0100
+
+ Remove useless include
+
+ utils/pdftohtml.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 7ac94c8f552f0db13334d4d014cfdb54de72c451
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Dec 7 22:38:48 2016 +0100
+
+ nSharedGroups doesn't need to be a class member
+
+ And also mark some variables as const to make it easier to see they
+ don't change
+
+ poppler/Hints.cc | 20 +++++++-------------
+ poppler/Hints.h | 1 -
+ 2 files changed, 7 insertions(+), 14 deletions(-)
+
+commit 4c4b913802c79eb8bf9c0ce72a08842851f1c5bc
+Author: Jeffrey Morlan <jmmorlan at sonic.net>
+Date: Wed Dec 7 22:36:26 2016 +0100
+
+ Bail out if nBitsNumObjects or nBitsDiffGroupLength are greater
+ than 32
+
+ Bug #94941
+
+ poppler/Hints.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 21cd08e34bd317b2ecc7c8b4e0d122d85bdf6714
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat Dec 3 02:18:58 2016 +0100
+
+ Default to libopenjpeg2 instead of libopenjpeg1
+
+ Tested 2.1.1 and it's better or equal than the old libopenjpeg1
+
+ I thought of doing a version check but i don't think it's common
+ someone will be building a new poppler with an old libopenjpeg2
+
+ CMakeLists.txt | 16 ++++++++--------
+ configure.ac | 31 ++++++++++++++++---------------
+ 2 files changed, 24 insertions(+), 23 deletions(-)
+
+commit b5f3e935c3a1f4824fcd681e291c35852966bb45
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Dec 2 00:09:38 2016 +0100
+
+ Revert "introduced hex string as a new Object type and used it for
+ file identifier"
+
+ This reverts commit debd1361f4a4cb7811677ab7a8f241b8b6fca5f9.
+
+ poppler/Lexer.cc | 3 +--
+ poppler/Object.cc | 15 ++-------------
+ poppler/Object.h | 16 +++-------------
+ poppler/PDFDoc.cc | 10 ----------
+ 4 files changed, 6 insertions(+), 38 deletions(-)
+
+commit 3a260ba8b3db99b4c0a956cc615704168db30e56
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Dec 2 00:09:31 2016 +0100
+
+ Revert "treat file identifier as a hex string, not a basic string"
+
+ This reverts commit 628299bc02ef825609e1ade539f967bbf052be0c.
+
+ poppler/PDFDoc.cc | 12 ++++++------
+ poppler/PSOutputDev.cc | 5 ++---
+ poppler/SecurityHandler.cc | 3 +--
+ poppler/StructElement.cc | 5 ++---
+ 4 files changed, 11 insertions(+), 14 deletions(-)
+
+commit 42ef2ac51543fabb5f5f5c3a19c79020d4fb1238
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Wed Nov 30 00:14:46 2016 +0100
+
+ Read softmask into memstrean in case of matte
+
+ In case of matte the softmask has to be read twice. This is not
+ possible when read from stdin. So this patch allocate a memstream
+ first and read the softmask into this memstream.
+
+ Bug #97803
+
+ poppler/SplashOutputDev.cc | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+commit c448e16dc4f2f3c55b06e3f1e098f45f8abacc18
+Author: William Bader <william at newspapersystems.com>
+Date: Wed Nov 30 00:00:15 2016 +0100
+
+ patch to add -passlevel1customcolor
+
+ Bug #97193
+
+ poppler/PSOutputDev.cc | 38 ++++++++++++++++----------------------
+ poppler/PSOutputDev.h | 5 +++++
+ utils/pdftops.cc | 6 +++++-
+ 3 files changed, 26 insertions(+), 23 deletions(-)
+
+commit 628299bc02ef825609e1ade539f967bbf052be0c
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Sun Jul 24 22:46:23 2016 +0200
+
+ treat file identifier as a hex string, not a basic string
+
+ poppler/PDFDoc.cc | 12 ++++++------
+ poppler/PSOutputDev.cc | 5 +++--
+ poppler/SecurityHandler.cc | 3 ++-
+ poppler/StructElement.cc | 5 +++--
+ 4 files changed, 14 insertions(+), 11 deletions(-)
+
+commit debd1361f4a4cb7811677ab7a8f241b8b6fca5f9
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Sun Jul 24 22:30:30 2016 +0200
+
+ introduced hex string as a new Object type and used it for file
+ identifier
+
+ File identifiers are usually written as hex strings (and this is
+ how the PDF
+ reference presents them in an example). Until now, poppler was
+ reading hex
+ strings properly, but was forgeting about the fact that a given
+ string is a hex
+ string, so e.g. file identifier was first read as a hex string and
+ then printed as
+ an ordinary string and thanks to that what was printed was actually
+ junk. This
+ commit fixes that.
+
+ poppler/Lexer.cc | 3 ++-
+ poppler/Object.cc | 15 +++++++++++++--
+ poppler/Object.h | 16 +++++++++++++---
+ poppler/PDFDoc.cc | 10 ++++++++++
+ 4 files changed, 38 insertions(+), 6 deletions(-)
+
+commit 484d9d46e8995f12ce941be1e080e98e2ff4b95d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Nov 25 20:05:19 2016 +0100
+
+ Spelling fixes spotted by William Bader
+
+ qt4/src/poppler-optcontent.h | 2 +-
+ qt5/src/poppler-optcontent.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bc11784e143d462d62d3f63fc61e58b4b9640da7
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Nov 25 17:42:27 2016 +0100
+
+ Qt: Support OCG state change links
+
+ qt4/src/poppler-link-private.h | 57 +++++++++++++++++++
+ qt4/src/poppler-link.cc | 33 +++++------
+ qt4/src/poppler-link.h | 34 +++++++++++-
+ qt4/src/poppler-optcontent-private.h | 3 +-
+ qt4/src/poppler-optcontent.cc | 103
+ +++++++++++++++++++++++------------
+ qt4/src/poppler-optcontent.h | 8 +++
+ qt4/src/poppler-page.cc | 11 +++-
+ qt5/src/poppler-link-private.h | 57 +++++++++++++++++++
+ qt5/src/poppler-link.cc | 33 +++++------
+ qt5/src/poppler-link.h | 34 +++++++++++-
+ qt5/src/poppler-optcontent-private.h | 3 +-
+ qt5/src/poppler-optcontent.cc | 103
+ +++++++++++++++++++++++------------
+ qt5/src/poppler-optcontent.h | 8 +++
+ qt5/src/poppler-page.cc | 11 +++-
+ 14 files changed, 382 insertions(+), 116 deletions(-)
+
+commit b4e93c374deaaf31121a666c987a35bc9554beb3
+Author: Kenji Uno <ku at digitaldolphins.jp>
+Date: Thu Nov 3 10:19:06 2016 +0900
+
+ Fix pdftoppm -tiff -gray/-mono incorrect output.
+
+ - SplashBitmap has imageWriterFormat that ImgWriter
+ should accept.
+
+ splash/SplashBitmap.cc | 93
+ +++++++++++++++++++++++++++++++++++++-------------
+ splash/SplashBitmap.h | 3 +-
+ 2 files changed, 71 insertions(+), 25 deletions(-)
+
+commit 5a04becc4940b926744e64d3b7d0355adcabf282
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Fri Jun 17 13:41:39 2016 +0200
+
+ Fix PDFDoc::saveIncrementalUpdate()'s detection of document being
+ modified
+
+ Bug 96561
+
+ poppler/PDFDoc.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 0c9c2089f52de5bb08717518c439fa8bbb99011f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Nov 23 20:22:17 2016 +0100
+
+ Fix Outline parsing on broken documents
+
+ Broken documents in which the parent "Last" pointer is earlier than
+ the siblings "Next" pointer
+
+ This mimics Adobe Reader behaviour.
+
+ Bug #98732
+
+ poppler/Outline.cc | 18 ++++--------------
+ poppler/Outline.h | 4 ++--
+ 2 files changed, 6 insertions(+), 16 deletions(-)
+
+commit e59cbaf9c1ab4a575633ee3263244e03c6d21713
+Author: Jason Crain <jason at inspiresomeone.us>
+Date: Fri Nov 18 15:44:29 2016 -0600
+
+ glib: Use g_slice_new0 for PopplerActionLayer
+
+ PDFs using PopplerActionLayer will sometimes crash because they are
+ allocated with g_new0 but freed with g_slice_free. Change the
+ allocation to use g_slice_new0.
+
+ Bug #98786
+
+ glib/poppler-action.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 02e2d8e2c3004c36d1f8f798e5a7a30166f48f37
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Nov 15 00:10:43 2016 +0100
+
+ 0.49
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 5 ++++-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 11 insertions(+), 8 deletions(-)
+
+commit f7f0f14e095425d171456a697804f2f34ed26426
+Author: Tor Lillqvist <tml at collabora.com>
+Date: Tue Nov 15 00:06:26 2016 +0100
+
+ VS 2013 has fmin() and fmax()
+
+ NEWS | 13 +++++++++++++
+ poppler/poppler-config.h.cmake | 3 ++-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+commit 07ac68603552b36a2a6b8ea5982f22f24f5835b1
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Nov 15 00:03:24 2016 +0100
+
+ Update (C)
+
+ poppler/PSOutputDev.cc | 1 +
+ poppler/poppler-config.h.in | 1 +
+ utils/pdfseparate.cc | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+commit b837ae3bc69c5c76f1a4e3abaeb22d0574d6b2c8
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Thu Nov 10 00:33:17 2016 +0100
+
+ Continue rendering in case of 'Singular matrix in shading pattern
+ fill'
+
+ Bug #98623
+
+ poppler/Gfx.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 6c01a48458a8b4896d606ef9bcc4af5e03393b72
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Wed Nov 2 23:10:01 2016 +0100
+
+ merge type3 glyph handling from xpdf 3.04
+
+ Fixes bug #96667
+
+ poppler/SplashOutputDev.cc | 28 +++++++++++++++++++++++-----
+ poppler/SplashOutputDev.h | 1 -
+ 2 files changed, 23 insertions(+), 6 deletions(-)
+
+commit f43cb73939f85952d83afc87a6dc638dc1ae311b
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Nov 2 00:13:26 2016 +0100
+
+ Avoid UBSan warning about undefined downcast
+
+ ...of this-ptr of in-construction FormFieldSignature while still in
+ the base
+ FormField ctor by simply casting the parent-class field member
+ when needed
+
+ poppler/Form.cc | 83
+ ++++++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h | 9 +++----
+ 2 files changed, 50 insertions(+), 42 deletions(-)
+
+commit 4539d0b002efbd19393fd55a6fb87b013acdb8f1
+Author: Caolán McNamara <caolanm at redhat.com>
+Date: Thu Oct 27 14:31:20 2016 +0200
+
+ PSOutputDev.cc: std::max requires <algorithm>
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4619957cbab81ab0b25f3fdd3ed872f0ad93f074
+Author: Tor Lillqvist <tml at collabora.com>
+Date: Thu Oct 27 14:27:32 2016 +0200
+
+ VS 2013 has fmin() and fmax()
+
+ poppler/poppler-config.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit be073d39f72f625bf3d8482ead76881150695bf4
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Oct 31 10:11:56 2016 +0100
+
+ Fix typo in disable nss help string
+
+ Bug #98514
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2a09ec47aef8870dba345f4045e691ffb5a59f4d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Oct 24 20:04:22 2016 +0200
+
+ Fix memory leak in parametrized gouraudTriangleShadedFill
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 169889b8e196cfcd288e6555fb048fbbf95ba3f6
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Oct 24 20:04:00 2016 +0200
+
+ Fix crash on broken files
+
+ splash/Splash.cc | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+commit 269a91e3b03a19acc06fd0f72356f2e48a6368a7
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Tue Aug 23 13:20:44 2016 +0200
+
+ PDFDoc::setDocInfoStringEntry(): treat value consisting of just the
+ unicode marker as an empty string
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 43cfdf9de45e6833a2815b173f8cc945f1c5f9d6
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Tue Aug 23 13:19:07 2016 +0200
+
+ goo: add GooString::hasJustUnicodeMarker(void)
+
+ goo/GooString.cc | 2 +-
+ goo/GooString.h | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit e3c5bdf4fcd29c5d180046d1c279d3f99c1027a7
+Author: Jakub Alba <jakubalba at gmail.com>
+Date: Fri Oct 21 23:06:23 2016 +0200
+
+ update copyrights
+
+ cpp/poppler-document.cpp | 2 +-
+ cpp/poppler-document.h | 2 +-
+ cpp/poppler-embedded-file.cpp | 2 +-
+ cpp/poppler-global.cpp | 2 +-
+ cpp/poppler-private.cpp | 2 +-
+ cpp/poppler-private.h | 2 +-
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-document.h | 2 +-
+ goo/GooString.cc | 2 +-
+ goo/GooString.h | 2 +-
+ poppler/Object.h | 2 +-
+ poppler/PDFDoc.cc | 2 +-
+ poppler/PDFDoc.h | 2 +-
+ poppler/XRef.cc | 2 +-
+ poppler/XRef.h | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-private.cc | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ qt5/src/poppler-document.cc | 2 +-
+ qt5/src/poppler-private.cc | 2 +-
+ qt5/src/poppler-private.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
+ 23 files changed, 23 insertions(+), 23 deletions(-)
+
+commit 5d15a52aade68c618c356fe403ca500e74917ef7
+Author: Pino Toscano <pino at kde.org>
+Date: Sun Oct 9 13:04:46 2016 +0200
+
+ pdfseparate: remove extra '%' in error message
+
+ utils/pdfseparate.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 036bcee237c814197af3324cd3697ea88d9ac6d3
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat Oct 8 17:55:31 2016 +0200
+
+ 0.48
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/Outline.cc | 1 +
+ poppler/UTF.cc | 1 +
+ poppler/UTF.h | 1 +
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 10 files changed, 22 insertions(+), 7 deletions(-)
+
+commit 3cfbc4efde1df6dcb9ef18a0fb26c7e199e6e8f5
+Author: Jason Crain <jason at inspiresomeone.us>
+Date: Wed Sep 28 14:56:02 2016 +0000
+
+ TextOutputDev: Break words on all whitespace characters
+
+ Some PDF creators like Chrome use no-break spaces or other whitespace
+ characters between words, causing pdftotext -bbox to not break
+ words as
+ expected. Fix this by breaking words on any character with the
+ Unicode
+ whitespace property.
+
+ Bug #97399
+
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/UTF.cc | 12 ++++++++++++
+ poppler/UTF.h | 2 ++
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+
+commit 27cf7fabad27648019b36b2d6352e6767bfc8689
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Sep 28 23:23:33 2016 +0200
+
+ Increase glib requirement
+
+ Seems we've been requiring it for a while at least.
+
+ See "Build fail on Ubuntu 14.04" thread on the mailing list
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 86e50e156952713f0ce3ecc7b6f03f06dc0902c1
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Wed Sep 28 06:10:20 2016 +0930
+
+ Revert "pdfinfo: add -dests option to print named destinations"
+
+ This reverts commit 183dbf3249e8db2398b63a749eb010bc0a89dc35.
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 1 -
+ utils/pdfinfo.1 | 4 --
+ utils/pdfinfo.cc | 140
+ +-------------------------------------
+ 4 files changed, 2 insertions(+), 145 deletions(-)
+
+commit 183dbf3249e8db2398b63a749eb010bc0a89dc35
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sat Sep 17 22:08:23 2016 +0930
+
+ pdfinfo: add -dests option to print named destinations
+
+ Bug 97262
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 1 +
+ utils/pdfinfo.1 | 4 ++
+ utils/pdfinfo.cc | 140
+ +++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 145 insertions(+), 2 deletions(-)
+
+commit 151715976509075e9b95e0ab86d1fcacb2c1580a
+Author: Masamichi Hosoda <trueroad at trueroad.jp>
+Date: Sat Aug 20 23:16:33 2016 +0900
+
+ Add functions for named destination name in name-dict
+
+ Get the number of named destinations in name-dict
+ int numDests();
+
+ Get the i'th named destination name in name-dict
+ char *getDestsName(int i);
+
+ Get the i'th named destination link destination in name-dict
+ LinkDest *getDestsDest(int i);
+
+ poppler/Catalog.cc | 38 ++++++++++++++++++++++++++++++++++++++
+ poppler/Catalog.h | 9 +++++++++
+ 2 files changed, 47 insertions(+)
+
+commit 99267c0b3f3aed520247dc0a5eb70df04b00df46
+Author: Masamichi Hosoda <trueroad at trueroad.jp>
+Date: Sat Aug 20 20:40:18 2016 +0900
+
+ Add functions for named destination name in name-tree
+
+ Get the number of named destinations in name-tree
+ int Catalog::numDestNameTree();
+
+ Get the i'th named destination name in name-tree
+ GooString *Catalog::getDestNameTreeName(int i);
+
+ Get the i'th named destination link destination in name-tree
+ LinkDest *Catalog::getDestNameTreeDest(int i);
+
+ poppler/Catalog.cc | 13 +++++++++++++
+ poppler/Catalog.h | 9 +++++++++
+ 2 files changed, 22 insertions(+)
+
+commit 09ab87a9faf552b28eb7fe3e8ffd137390be5535
+Author: Masamichi Hosoda <trueroad at trueroad.jp>
+Date: Sat Aug 20 19:35:27 2016 +0900
+
+ Divide Catalog::findDest()
+
+ In order to use constructing LinkDest from other functions,
+ this commit divides Catalog::findDest().
+
+ poppler/Catalog.cc | 24 +++++++++++++++++-------
+ poppler/Catalog.h | 2 ++
+ 2 files changed, 19 insertions(+), 7 deletions(-)
+
+commit 6c84188c3ff3120c3d13f26a889df51d5be6ed87
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Sep 7 23:58:42 2016 +0200
+
+ Refactor Hints to be less bad on broken files
+
+ If we reach the end of the stream don't try to continue reading bits
+ from it
+
+ Bug #97623
+
+ poppler/Hints.cc | 246
+ +++++++++++++++++++++++++++++++++---------------------
+ poppler/Hints.h | 16 ++--
+ poppler/PDFDoc.cc | 4 +
+ 3 files changed, 159 insertions(+), 107 deletions(-)
+
+commit 0d06c871df8065e72ae54a1821ca9e872a554352
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Sep 6 23:42:55 2016 +0200
+
+ Make some classes smaller in memory (amd64)
+
+ Thanks to elf-dissector
+
+ TextWord 176 -> 160
+ Annot 256 -> 240
+ GfxShading 200 -> 184
+
+ poppler/Annot.h | 6 +++---
+ poppler/GfxState.h | 6 +++---
+ poppler/TextOutputDev.h | 6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 3ccd1c34a19c81d92bff27a095cf912afecb5ef3
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Sep 6 23:42:03 2016 +0200
+
+ Compile++
+
+ splash/SplashScreen.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2ece00c84418fb8a92acc44d2bd0b001bfa10b27
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Sep 6 23:41:42 2016 +0200
+
+ Fix warning about new enum
+
+ utils/pdfinfo.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit f5c34c63a64ae3a6af9aee2d2710a966b7e2d95c
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sat Aug 27 06:13:55 2016 +0200
+
+ goo: check at compile time if GooString has the right size
+
+ static_assert is a C++ feature introduced in C++0x. GCC already
+ uses this
+ standard by default, so we can make use of it. In case it's compiled
+ without C++
+ >= 0x support, the #if macro will get rid of it.
+
+ goo/GooString.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 3a1a4baacf9672cd1e26a860303ba22f75c2b942
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sat Aug 27 06:09:04 2016 +0200
+
+ goo: fix GooString::STR_STATIC_SIZE calculation
+
+ Before this fix on 64-bit systems 4 bytes were left unsused (because
+ of memory
+ alignment). I've also removed unnecessary MemoryLayout class which
+ used to be
+ used to calculate GooString::STR_STATIC_SIZE, although it had only
+ made it
+ harder.
+
+ goo/GooString.h | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+commit 1de363eecfa50f6432c5ff87c920213186815416
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Sep 6 00:09:40 2016 +0200
+
+ Fix another ubsan warning
+
+ splash/SplashScreen.cc | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 90d0fae2b0bd713f36500f59f4bfee33ad9e13bb
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Sep 5 16:19:41 2016 +0200
+
+ Missing (C) from last commit
+
+ fofi/FoFiBase.cc | 1 +
+ fofi/FoFiTrueType.cc | 2 +-
+ goo/GooString.cc | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 67df1e16d7ae87e8b05c3186063cb925a799790a
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Sep 5 16:10:58 2016 +0200
+
+ Check we don't overflow in some calculations
+
+ Overflow is undefined behaviour
+
+ fofi/FoFiBase.cc | 2 ++
+ fofi/FoFiTrueType.cc | 7 +++++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 7024b3c97df1815a4f1c9f677dc05dcf5ee72c3d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Sep 5 16:09:34 2016 +0200
+
+ No need to do a memcpy of an empty string
+
+ Saves some warnings about memcpy of null strings on some broken
+ documents
+
+ goo/GooString.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a902f5983e6802c9346569fcc599cf5f5042bd8d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Sep 5 16:08:17 2016 +0200
+
+ initialize XRef::encryptAlgorithm to something
+
+ poppler/Decrypt.cc | 12 +++++++++++-
+ poppler/Stream.h | 5 +++--
+ poppler/XRef.cc | 3 ++-
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 7c7c35db46c0da51c09783a00484161721ea48ab
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Sep 4 15:40:32 2016 +0200
+
+ Fix memory leak in error handling
+
+ utils/HtmlOutputDev.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 4552af28684e18c6153ce5598b121a73477af4d6
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Sep 4 15:24:14 2016 +0200
+
+ Do not crash on invalid files where nStripes is 0
+
+ Bug #85276
+
+ poppler/PSOutputDev.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 364c15795a0508d421ca636bc7b71f93039a82b1
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Sep 4 15:23:25 2016 +0200
+
+ Always delete aaBuf if it is there
+
+ Doesn't matter if antialias is temporarily disabled
+
+ splash/Splash.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+commit 22c4701d5f7be0010ee4519daa546fba5ab7ac13
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Aug 26 15:18:22 2016 +0200
+
+ Fix crash in files with broken JBIG2Streams
+
+ poppler/JBIG2Stream.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit c46b8b99b3a2d51692d889df22136cb737d3a47f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Aug 26 14:53:19 2016 +0200
+
+ Fix memory leak when parsing broken Forms
+
+ poppler/Form.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 92175cb29450241fafc6d74170f97aee5b7a6d7a
+Author: Jason Crain <jason at inspiresomeone.us>
+Date: Sun Jul 31 00:53:24 2016 -0500
+
+ Fix UTF16 decoding of document outline title
+
+ Use TextStringToUCS4 function and don't ignore astral characters.
+
+ Bug #97156
+
+ poppler/Outline.cc | 18 ++----------------
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+commit fea7bfc3978cb962e2372df3c407114effd5f831
+Author: Jason Crain <jason at inspiresomeone.us>
+Date: Sat Jul 30 03:38:29 2016 -0500
+
+ TextOutputDev: Remove null characters from PDF text
+
+ Null characters in the PDF text cause problems with the glib
+ frontend's
+ handling of C strings. Filter them out.
+
+ Bug #97144
+
+ poppler/TextOutputDev.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit ead33cf26ab7416ae0b37f8eeb19dc231e9a31f0
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Aug 22 23:40:07 2016 +0200
+
+ Make sure GfxICCBasedColorSpace and its alt colorspace have the same
+ number of nComps
+
+ On files where this doesn't happen (only bad files i've found so far)
+ this is leading to crashes
+
+ poppler/GfxState.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 55e9f50deb68fb156335a5eb075b28e7b75d88ed
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Aug 18 23:54:15 2016 +0200
+
+ Poppler 0.47
+
+ CMakeLists.txt | 2 +-
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 6 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 0889366a5872316919dbb640b6cc5cda85295169
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Mon Aug 1 01:10:18 2016 +0200
+
+ XRef::createDocInfoIfNoneExists(): don't presume that DocInfo is
+ a dictionary
+
+ In case a PDF document doesn't comply with the PDF reference and
+ its DocInfo
+ object isn't a dictionary, remove it and create a dictionary in
+ its place.
+
+ poppler/XRef.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 7ba975630e12a3242d73372a685e016101c5e479
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Mon Aug 1 01:17:08 2016 +0200
+
+ PDFDoc::setDocInfoStringEntry(): free empty value string
+
+ Normally the ownership of value is passed on to the Object class. In
+ case value
+ is an empty string, it doesn't happen, so we have to free it in
+ order to have
+ a uniform behaviour managing memory and not to introduce memory leaks.
+
+ poppler/PDFDoc.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit f0feeed3513899558c59b65f798f294212309486
+Author: Matthias Kilian <kili at outback.escape.de>
+Date: Mon Aug 1 22:50:44 2016 +0200
+
+ Work with non gnu grep
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 3f5c84e17acfa71dfd44514384398f5a4c449630
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat Jul 30 17:50:42 2016 +0200
+
+ Check for XRefEntry existing before using it
+
+ Bug #97005
+
+ poppler/Hints.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+commit 7d3aea760a14a73962e429059f73d97391660367
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat Jul 30 17:32:59 2016 +0200
+
+ Fix abort on documents where the docinfo obj is not a dict
+
+ Bug #97134
+
+ poppler/PDFDoc.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5641644f485b402cd906d3db73a22a00eb00489b
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Jul 25 00:14:30 2016 +0200
+
+ Poppler 0.46
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 33 +++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Doxyfile | 2 +-
+ cpp/Makefile.am | 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 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 15 files changed, 48 insertions(+), 15 deletions(-)
+
+commit 97375143f458a9f12009d798ec43364d548051b9
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Jul 24 23:59:09 2016 +0200
+
+ update Copyrights
+
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Link.cc | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bc1e3df84adff679194c33ce2dc52caa70b24df8
+Author: Richard Palo <richard at netbsd.org>
+Date: Sun Jul 24 23:52:52 2016 +0200
+
+ Work with non gnu greps
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit df6904366d587133760adf0d43a128aa4d35a712
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 13:14:39 2016 +0200
+
+ qt5: fix memory leaks in Document::modificationDate() and
+ Document::creationDate()
+
+ qt5/src/poppler-document.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit d89ea6ae0ddd70916700a402649a9e0423ae9fbb
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 13:14:19 2016 +0200
+
+ qt4: fix memory leaks in Document::modificationDate() and
+ Document::creationDate()
+
+ qt4/src/poppler-document.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 844ede567f188997bb49ab1fc435797b4f31f5e9
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Jul 24 12:47:21 2016 +0200
+
+ qt5: Fix memory leak in new implementation of ::date
+
+ qt5/src/poppler-document.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit d34ac7cedf4213020f5a4c05e09aa8d781bc6e43
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 12:43:41 2016 +0200
+
+ qt5: Added document property setters & getters
+
+ Part of Bug #36653
+
+ qt5/src/poppler-document.cc | 234
+ ++++++++++++++++++++++++++++++++++++--------
+ qt5/src/poppler-private.cc | 9 ++
+ qt5/src/poppler-private.h | 3 +
+ qt5/src/poppler-qt5.h | 118 ++++++++++++++++++++++
+ 4 files changed, 321 insertions(+), 43 deletions(-)
+
+commit 720718739c8002304e8da33d9ca87bc0c1511425
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun Jul 24 12:40:04 2016 +0200
+
+ qt4: Fix memory leak in new implementation of ::date
+
+ qt4/src/poppler-document.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit e7cbc36467dfac9415d7d1cac70b77e04566e75d
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 12:39:34 2016 +0200
+
+ qt4: Added document property setters & getters
+
+ Part of Bug #36653
+
+ qt4/src/poppler-document.cc | 234
+ ++++++++++++++++++++++++++++++++++++--------
+ qt4/src/poppler-private.cc | 9 ++
+ qt4/src/poppler-private.h | 3 +
+ qt4/src/poppler-qt4.h | 118 ++++++++++++++++++++++
+ 4 files changed, 321 insertions(+), 43 deletions(-)
+
+commit 977669048b93e0561fc86e15b42ac69884e36fab
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 12:20:58 2016 +0200
+
+ cpp: Added document property setters & getters
+
+ Part of Bug #36653
+
+ cpp/poppler-document.cpp | 445
+ ++++++++++++++++++++++++++++++++++++++++++++---
+ cpp/poppler-document.h | 24 +++
+ 2 files changed, 447 insertions(+), 22 deletions(-)
+
+commit 7f4a201226bc1112a121c749eb73f2a78e5149e3
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 24 12:19:52 2016 +0200
+
+ cpp: Added functions to save a document
+
+ Part of Bug #36653
+
+ cpp/poppler-document.cpp | 30 ++++++++++++++++++++++++++++++
+ cpp/poppler-document.h | 4 ++++
+ 2 files changed, 34 insertions(+)
+
+commit 8d5778feeb3c6cd932ecd7abeba7d1e670d2af66
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Jul 19 22:58:39 2016 +0930
+
+ cairo: try finding glyphs in substitute fonts by unicode value
+
+ if the glyph name can not be found in the substitute font, try
+ converting the name to unicode value in see of the font cmap has a
+ mapping for the character.
+
+ Bug 96994
+
+ poppler/CairoFontEngine.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 954ee650047c185523f3e20e92f8fc4c67308196
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun Jul 17 21:38:54 2016 +0930
+
+ pdftocairo: Use fprintf for printing errors
+
+ utils/pdftocairo.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 92f283ba931b605935646e2c55007b75c7e82288
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Sun Jul 17 01:42:19 2016 +0200
+
+ glib: make document metatag gobject properties writeable
+
+ glib/poppler-document.cc | 56
+ +++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 48 insertions(+), 8 deletions(-)
+
+commit 13f0333a46e2a498700ee6bff9845ae0eceafe80
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Jul 5 06:54:54 2016 +0930
+
+ pdfinfo: update man page for listenc, meta, js, and struct* options
+
+ utils/pdfinfo.1 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit c91483aceb1b640771f572cb3df9ad707e5cad0d
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Mon Jul 4 21:55:53 2016 +0930
+
+ pdfinfo: Don't print pdf info when printing metadata, javascript,
+ or structure
+
+ Bug 96801
+
+ utils/pdfinfo.cc | 579
+ +++++++++++++++++++++++++++----------------------------
+ 1 file changed, 289 insertions(+), 290 deletions(-)
+
+commit 95d30fe3dd0cf265ccefd80d7deac00c7f430b14
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Tue Jul 12 23:02:35 2016 +0200
+
+ cpp: pass len to GooString constructor in
+ detail::ustring_to_unicode_GooString()
+
+ Bug #96426
+
+ cpp/poppler-private.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 8a0b8b2ea57e3b9ac60e17e82aa22994f26d6213
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Jul 5 23:35:57 2016 +0200
+
+ Be less strict when parsing FitH Link destinations
+
+ Would need the same for other kind of destinations too but since
+ don't have a file that needs it i'll refrain from changing it
+
+ Bug #96661
+
+ poppler/Link.cc | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+commit 7f893f546dd9753967b986d3a7a56becf9b8d02f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Jul 5 23:30:29 2016 +0200
+
+ Remove checks that are already at the beginning of the function
+
+ poppler/Link.cc | 8 --------
+ 1 file changed, 8 deletions(-)
+
+commit 82476b0d6967ce5e61dce4666fe556edd63c16e6
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Mon Jun 6 22:17:57 2016 +0200
+
+ glib: Added document property setters & simplified getters
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=36653
+
+ glib/poppler-document.cc | 347
+ +++++++++++++++++++++++++++---------
+ glib/poppler-document.h | 18 ++
+ glib/reference/poppler-docs.sgml | 4 +
+ glib/reference/poppler-sections.txt | 8 +
+ 4 files changed, 288 insertions(+), 89 deletions(-)
+
+commit 4f7c67b59b9c55b9b896378d3adbecbb73f6eb63
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Tue Feb 23 16:46:43 2016 +0100
+
+ Added DocInfo setters & getters
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=36653
+
+ poppler/Object.h | 7 +++++-
+ poppler/PDFDoc.cc | 67
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PDFDoc.h | 41 ++++++++++++++++++++++++++++++++++
+ poppler/XRef.cc | 34 ++++++++++++++++++++++++++++
+ poppler/XRef.h | 7 ++++++
+ 5 files changed, 155 insertions(+), 1 deletion(-)
+
+commit e2851dd8166fa5a1df0518959ad71c9d81bd9152
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Tue Feb 23 15:36:43 2016 +0100
+
+ Added XRef modification flag
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=36653
+
+ poppler/PDFDoc.cc | 12 +-----------
+ poppler/XRef.cc | 5 +++++
+ poppler/XRef.h | 7 +++++++
+ 3 files changed, 13 insertions(+), 11 deletions(-)
+
+commit 9faa9b05171e46815924b48d31a7c45a1285c403
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun Jun 5 22:44:56 2016 +0930
+
+ Fix tiling patterns with BBox with non-zero x,y
+
+ poppler/CairoOutputDev.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+commit 500fb06a23c95109547fded267a21647c8629502
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Jun 21 20:05:44 2016 +0930
+
+ Don't use -fPIC on cygwin
+
+ it emits a warning for every file stating that -fPIC is ignored
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5f939d683a8978cdfdb65a3471296bf9e5940055
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun Jun 19 11:07:09 2016 +0930
+
+ pdftocairo: revert the use of groups for blending into white page
+
+ This was added in 853e949 but has since been found to cause
+ regressions eg the test case in bug 63587.
+
+ utils/pdftocairo.cc | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+commit 5165c1a59332a0bc9da60a1a8d53dace039aae32
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun Jun 19 11:19:24 2016 +0930
+
+ cairo: fix bug in setAntialias()
+
+ Was setting the member cairo instead of cr parameter. Also rename the
+ function to avoid confusion with the public setAntialias() and make it
+ static to prevent this type of bug in future.
+
+ poppler/CairoOutputDev.cc | 16 ++++++++--------
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit dfbb98327cbbc173a63f5db36b6606a93e5166aa
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Jun 17 00:04:25 2016 +0200
+
+ Poppler 0.45
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 19 +++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 26 insertions(+), 7 deletions(-)
+
+commit 3829958339b332d7ddf005d5ab98dd0ad3c8b3c6
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Jun 16 23:58:07 2016 +0200
+
+ Add (C)
+
+ poppler/DateInfo.cc | 1 +
+ poppler/DateInfo.h | 1 +
+ poppler/Form.cc | 2 +-
+ utils/pdfinfo.cc | 2 +-
+ 4 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 4c7e057b0315ed37bd47e304ca191191244b2963
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Jun 17 00:11:50 2016 +0200
+
+ dist glibc.h
+
+ we don't install it, but we need it for building
+
+ goo/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 5ee67050c400daa7bc0b0a4f5dddf21be18be124
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Jun 14 07:32:35 2016 +0930
+
+ Fix windows compile
+
+ utils/pdfinfo.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit df0779031d6ae0180024f92602bc2a680cf73dd5
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Thu May 19 16:11:04 2016 +0200
+
+ cpp: switched from detail::convert_date() to core's dateStringToTime()
+
+ cpp/poppler-document.cpp | 4 +++-
+ cpp/poppler-embedded-file.cpp | 6 ++++--
+ cpp/poppler-global.cpp | 6 +++++-
+ cpp/poppler-private.cpp | 25 +------------------------
+ cpp/poppler-private.h | 3 +--
+ 5 files changed, 14 insertions(+), 30 deletions(-)
+
+commit ff24d677c6078c3dfb54c35541369d908314bcdb
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Wed Feb 24 20:57:37 2016 +1030
+
+ pdfinfo: add -isodates for printing dates in ISO-8601 format
+
+ utils/pdfinfo.1 | 3 +++
+ utils/pdfinfo.cc | 36 +++++++++++++++++++++++++++++++++++-
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+commit dd08f24f5e52c56546dfda70be483dc29e03c2e6
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Wed Feb 24 21:10:08 2016 +1030
+
+ pdfinfo: convert dates to local time zone
+
+ utils/pdfinfo.cc | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+commit e4690ee1be027dd7028e86ea6732a3f4f2680ef7
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Feb 23 21:01:49 2016 +1030
+
+ glib: return date in UTC instead of local time
+
+ Bug 94173
+
+ ConfigureChecks.cmake | 1 +
+ config.h.cmake | 3 +++
+ configure.ac | 1 +
+ glib/poppler-date.cc | 33 +++++++-------------------------
+ goo/glibc.cc | 24 ++++++++++++++++++++++++
+ goo/glibc.h | 4 ++++
+ poppler/DateInfo.cc | 52
+ +++++++++++++++++++++++++++++----------------------
+ poppler/DateInfo.h | 6 +++++-
+ poppler/Form.cc | 2 +-
+ 9 files changed, 76 insertions(+), 50 deletions(-)
+
+commit 7936af2eeb8f84993acabd1b306da50d49256b31
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Tue Feb 23 20:52:30 2016 +1030
+
+ Emulate some non portable glibc functions when not available
+
+ CMakeLists.txt | 1 +
+ cpp/tests/poppler-dump.cpp | 5 +----
+ glib/demo/utils.c | 6 ------
+ goo/Makefile.am | 3 ++-
+ goo/glibc.cc | 34 ++++++++++++++++++++++++++++++++++
+ goo/glibc.h | 33 +++++++++++++++++++++++++++++++++
+ poppler/DateInfo.cc | 7 ++-----
+ 7 files changed, 73 insertions(+), 16 deletions(-)
+
+commit 4d799cdf9b9039b003de7d3baf05d858bc507a5a
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Jun 2 00:22:05 2016 +0200
+
+ pdfinfo: Fix another leak
+
+ Again not crucial in pdfinfo itself but nice to be clean so that if it
+ the leak check fails is because the core is doing something bad
+
+ utils/JSInfo.cc | 13 ++++++++-----
+ utils/JSInfo.h | 3 ++-
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+commit 4daee8a8ce40aeb658964a5902ae104549f7af75
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Jun 1 18:37:57 2016 +0200
+
+ Fix memory leak when failing to parse thumbs or actions
+
+ poppler/Page.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit bc6eb28776feaa302ad93e315798cad02c1e2a54
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Jun 1 18:36:17 2016 +0200
+
+ pdfinto: Fix memory leak
+
+ It's not very critial that pdfinfo does not leak, but it's nice
+ to have no leaks so one can run ASAN over a file and see if something
+ is wrong or not
+
+ utils/pdfinfo.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 66617b256acfcd98f727bf11b7d7e92bcbd16de0
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Jun 1 18:35:50 2016 +0200
+
+ Point ucs4 to null when len is 0
+
+ Makes it easier for the caller than can always just free the passed
+ pointer
+
+ poppler/UTF.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 0d70a57c7ad8a53e2462560a47b6ea5eba73d6c5
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Jun 1 18:34:32 2016 +0200
+
+ Add docu to the get*Action methods
+
+ Since unfortunately their behaviour is different in what you have
+ to do with the pointer given
+
+ poppler/Annot.h | 12 ++++++------
+ poppler/Form.h | 6 +++---
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 3db727f9546779a8896fc30a6669751d726ab86c
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Jun 1 18:32:45 2016 +0200
+
+ Fix memory leak in RichMedia parsing
+
+ poppler/Annot.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 8ace48fb07b81cab6ae68dc23d173e7441ad6d2e
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sun May 29 11:45:55 2016 +0200
+
+ SplashOutputDev: Fix iccTransform + splashModeXBGR8
+
+ poppler/SplashOutputDev.cc | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 46039c2ef5b666d5ee85e7f6fc6a74a5a9e69526
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri May 27 11:06:01 2016 +0200
+
+ Add braces to make it more clear to which if the else applies
+
+ poppler/UnicodeTypeTable.cc | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+commit 2d72a8bfc87c9bdcea6b617ebd4b3a3684e174e8
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu May 26 17:59:21 2016 +0200
+
+ Initialize nConfigurations and nAssets
+
+ poppler/Annot.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 4e49b3af7d6f731b9da20a9d6e5aa54578f08d3f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu May 26 17:34:56 2016 +0200
+
+ Fix memory leak on error on JBIG2Stream::readHalftoneRegionSeg
+
+ poppler/JBIG2Stream.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 5f51939eea5b98dcef115d18baec3179701d0292
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue May 24 23:34:48 2016 +0200
+
+ Fix stack overflow
+
+ Bug #96027
+
+ poppler/Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c820826377d79438ecaf90e9b2106a8451585add
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue May 24 00:00:57 2016 +0200
+
+ Fix (C) year
+
+ utils/HtmlOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9ce8dd7fbd132b5f423dc3bf10fa87b973390d0b
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon May 23 23:59:40 2016 +0200
+
+ Fix stack overflow on broken file
+
+ Bug #95567
+
+ poppler/Stream.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 37fb37e368c659832fc1a1dfd499c42340b62f38
+Author: Vincent Le Garrec <legarrec.vincent at gmail.com>
+Date: Mon May 23 23:18:40 2016 +0200
+
+ pdftohtml: Fix crash on broken file
+
+ Bug #95563
+
+ utils/HtmlOutputDev.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit 1d0251c8ab48e2e1a4873d84b4bc573b3ae2a98d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat May 21 20:02:26 2016 +0200
+
+ Fix memory leak in Splash::gouraudTriangleShadedFill
+
+ splash/Splash.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit eb20f8cc2c0dea281ae44336a8fac8cc86a99895
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Sat May 21 19:19:43 2016 +0200
+
+ 0.44
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 23 insertions(+), 7 deletions(-)
+
+commit 58f56a7af99b477f39e57aed74443b6851afe15f
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Sat May 21 18:25:22 2016 +0200
+
+ Fix Compile in 32bit linux
+
+ Bug #95492
+
+ poppler/Decrypt.cc | 65
+ +++++++++++++++++++++++++++---------------------------
+ 1 file changed, 33 insertions(+), 32 deletions(-)
+
+commit 853e94995255591b35d9bdbeb0174476838097c0
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun Apr 17 16:02:57 2016 +0930
+
+ pdftocairo: add -antialias option
+
+ Bug 94977
+
+ poppler/CairoOutputDev.cc | 24 +++++++++++++++++
+ poppler/CairoOutputDev.h | 4 ++-
+ utils/pdftocairo.1 | 26 +++++++++++++++++++
+ utils/pdftocairo.cc | 66
+ ++++++++++++++++++++++++++++++++++++++++++-----
+ 4 files changed, 112 insertions(+), 8 deletions(-)
+
+commit 8453966178de8535cdabac090e78ec17857f8975
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Tue May 17 01:00:37 2016 +0200
+
+ Improve rendering of some dotted lines
+
+ Bug #84693
+
+ splash/Splash.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 182abe4ed5c0773073c6751a26a7c4e40e99e02e
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Fri May 13 00:07:24 2016 +0200
+
+ Splash: type 3 chars. restore the current position also in output
+ device
+
+ Bug #95344
+
+ poppler/Gfx.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 9c35dc79ec777d9495796124ac7a42bf2b4cf83f
+Author: Jakub Kucharski <jakubkucharski97 at gmail.com>
+Date: Wed May 11 23:34:53 2016 +0200
+
+ goo: refactor GooString::Set()
+
+ it is used only once to concatenate strings and it is in a GooString
+ constructor used specifically for that
+ so I think concatenation should take place in the constructor and
+ GooString::Set
+ should do exactly what it says which is setting the string.
+
+ Bug #94201
+
+ goo/GooString.cc | 40 ++++++++++++++--------------------------
+ goo/GooString.h | 10 +++++-----
+ 2 files changed, 19 insertions(+), 31 deletions(-)
+
+commit 0ecec576faf7e1ef644f5973f17e0b8244560912
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 23:23:04 2016 +0200
+
+ Fix typo in GfxPatchMeshShading::parse
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 890178f9c946931ec34b8b227493ec9f1c6109aa
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 01:32:47 2016 +0200
+
+ Fix potential crash in SplashOutputDev::doUpdateFont
+
+ If we delete fontLoc we need to set it to NULL since it's not set
+ to any value in all of the
+ branches of this code
+
+ poppler/SplashOutputDev.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 86572d7d2835fdd77e82eeb428e3a56c2d0f271d
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 01:27:54 2016 +0200
+
+ Fix memory leak in SignatureHandler::getDefaultFirefoxCertDB_Linux
+
+ poppler/SignatureHandler.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 3707f9d17c5f8a883ddb9614b11676ad49ade5b2
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 00:59:01 2016 +0200
+
+ Fix potential crash in TextPage::coalesce
+
+ When flows is not null flow was still pointing to an now deleted
+ flow that
+ may had made it crash in the for loop below
+
+ poppler/TextOutputDev.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 6d26d02c39de6546f57b20c46922f8c56aad78a0
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 00:58:12 2016 +0200
+
+ Remove call that does nothing
+
+ We don't use dict after this call and streamGetDict is a pure getter,
+ i.e. it doesn't change the stream at all
+
+ poppler/GfxState.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 56c71fcaae71c2b3cc91bb981715541518e05684
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed May 4 00:55:06 2016 +0200
+
+ Fix memory leak in PSOutputDev::filterPSLabel
+
+ poppler/PSOutputDev.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit a0c3fd3f18232c126815a129158e0c4cd3a819a9
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 29 00:14:24 2016 +0200
+
+ New version and soversion
+
+ CMakeLists.txt | 4 ++--
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+commit da91593e834d4e617213466331226347f1688a53
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 29 00:12:59 2016 +0200
+
+ News
+
+ NEWS | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+commit bdd25a2583552fe8e72dcf4bc17d9f488b7c1268
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 29 00:07:24 2016 +0200
+
+ Update Cs
+
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 1 +
+ poppler/GfxFont.cc | 2 +-
+ utils/pdftocairo.cc | 1 +
+ 5 files changed, 5 insertions(+), 3 deletions(-)
+
+commit dbbe1590d49e620ef0743cb1b99b0b5b9a1f36ec
+Author: Arseniy Lartsev <arseniy at alumni.chalmers.se>
+Date: Thu Apr 28 23:59:05 2016 +0200
+
+ qt: Fix crash on certain PDF form item activation actions
+
+ Bug #94873
+
+ qt4/src/poppler-page.cc | 3 ++-
+ qt5/src/poppler-page.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 1cc93886eee3204e2ccd8bcc8b90306e809255e0
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Thu Apr 28 23:53:06 2016 +0200
+
+ Allow newlines in '<num> <gen> obj' sequence
+
+ Bug #94756
+
+ poppler/XRef.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit a8e3399487258e53df0fd4a79c570c8d71188bed
+Author: Takahiro Hashimoto <kenya888.en at gmail.com>
+Date: Wed Apr 27 00:16:52 2016 +0200
+
+ Compile with C++11 compilers that don't define isinfinite
+
+ Bug #94761
+
+ poppler/SplashOutputDev.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit 6eafb6570765605108cf3525f78b10223439ee1d
+Author: Pino Toscano <pino at kde.org>
+Date: Thu Apr 21 08:30:25 2016 +0200
+
+ configure: remove unused check for gethostbyname
+
+ configure.ac | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit d9408c186f9b5c992a4e1492a58dda506d8453ac
+Author: Pino Toscano <pino at kde.org>
+Date: Sun Apr 10 10:29:05 2016 +0200
+
+ typo fixes
+
+ - "indentical" -> "identical"
+ - "numberals" -> "numerals"
+ - "paremeters" -> "parameters"
+
+ poppler/PageLabelInfo_p.h | 2 +-
+ qt4/src/poppler-media.cc | 8 ++++----
+ qt5/src/poppler-media.cc | 8 ++++----
+ utils/pdfimages.1 | 2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 5ac54db9150e949ed0e41eec1f19a7f5ec880646
+Author: Pino Toscano <pino at kde.org>
+Date: Sun Apr 10 10:16:36 2016 +0200
+
+ utils: ship pdfsig.1 if pdfsig is built
+
+ utils/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 92c6799a40b0755ff2d43f33241d442cc5d4e323
+Author: Pino Toscano <pino at kde.org>
+Date: Sun Apr 10 09:43:29 2016 +0200
+
+ remove +x modes
+
+ poppler/SecurityHandler.cc | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 9c39db64ba2eb20ca769a103d83a830f406486f0
+Author: Jason Crain <jason at aquaticape.us>
+Date: Mon Jan 18 20:56:18 2016 -0600
+
+ Add SymbolMT as an alias for the Symbol font
+
+ A document using the SymbolMT font will have the wrong glyphs drawn.
+ Add it as
+ an alias for the Symbol font so the correct font and encoding
+ are used.
+
+ Bug #93168
+
+ poppler/GfxFont.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit af332349d7a5e3737ea53608cda2f1cad6159108
+Author: Jason Crain <jason at aquaticape.us>
+Date: Mon Mar 28 21:36:52 2016 -0500
+
+ pdftocairo: Calculate rotation before scaling
+
+ Scaling calculation (-scale-to-x and -scale-to-y) is wrong if a
+ page is
+ rotated. Fix by moving scale calculation to after rotation
+ calculation.
+
+ bug #94655
+
+ utils/pdftocairo.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit db87dc7fa28537f7532328c278c05d8b60f90d6f
+Author: Jason Crain <jason at aquaticape.us>
+Date: Sun Feb 21 22:54:15 2016 -0600
+
+ cairo: save mask state and don't extend image mask
+
+ Don't extend an image mask pattern. Save and restore the mask in
+ tilingPatternFill.
+
+ bug #94234
+
+ poppler/CairoOutputDev.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit b68a4ee1dcd1da5b48b2c1f0bb2b6a789ca18ea5
+Author: Jason Crain <jason at aquaticape.us>
+Date: Thu Feb 18 01:59:42 2016 -0600
+
+ cairo: Check if PDF knows the width of 'm' in case of substituted font
+
+ Bug #94054
+
+ poppler/CairoFontEngine.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 7d8dfb09d2b9d69d4e80838ce58fdbd091bce7ec
+Author: Jason Crain <jason at aquaticape.us>
+Date: Sun Feb 28 16:18:05 2016 -0600
+
+ cairo: fix fillToStrokePathClip crash and rendering
+
+ The cairo backend can crash if the dash pattern changes between
+ calling
+ clipToStrokePathClip and fillToStrokePathClip because
+ fillToStrokePathClip
+ calls cairo_set_dash with the saved dash pattern but the current
+ dash count.
+
+ Fixes the crash by removing the call to cairo_get_dash_count in
+ fillToStrokePathClip. Makes strokePathClip reference counted
+ because when
+ drawing tiling patterns it may need to be kept around for more than
+ one drawing
+ operation. Uses fillToStrokePathClip in a few more places to fix
+ rendering.
+
+ bug #62905
+
+ poppler/CairoOutputDev.cc | 38 ++++++++++++++++++++++++++++++--------
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 31 insertions(+), 8 deletions(-)
+
+commit 67bc280c4068ae9501053c06ee05341b95a5e6db
+Author: Thomas Freitag <Thomas.Freitag at alfa.de>
+Date: Sun Mar 20 12:39:24 2016 +0100
+
+ Implement sanity check for linearization usage
+
+ Bug #92482
+
+ poppler/PDFDoc.cc | 42 +++++++++++++++++++++++++++++++++++++++++-
+ poppler/PDFDoc.h | 7 ++++++-
+ 2 files changed, 47 insertions(+), 2 deletions(-)
+
+commit a24ac96e9f5c914c1c979319ca1043dabd334763
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Thu Mar 17 00:08:37 2016 +0100
+
+ meh typo
+
+ NEWS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f8ff943650e7e2a4cb836be43bf04907a5e156fc
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Mar 16 23:40:00 2016 +0100
+
+ 0.42
+
+ CMakeLists.txt | 4 ++--
+ Makefile.am | 1 +
+ NEWS | 28 ++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 4 ++--
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 8 files changed, 37 insertions(+), 8 deletions(-)
+
commit ef21f651a4af801502d6b4b4f7258d54f14e7aea
Author: Albert Astals Cid <aacid at kde.org>
Date: Wed Mar 16 20:23:39 2016 +0100
@@ -1079,13 +3115,10 @@
rename pdfsigverify to pdfsig
- utils/CMakeLists.txt | 12 ++--
- utils/Makefile.am | 6 +-
- utils/pdfsig.cc | 173
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- utils/pdfsigverify.cc | 173
- --------------------------------------------------
- 4 files changed, 182 insertions(+), 182 deletions(-)
+ utils/CMakeLists.txt | 12 ++++++------
+ utils/Makefile.am | 6 +++---
+ utils/{pdfsigverify.cc => pdfsig.cc} | 6 +++---
+ 3 files changed, 12 insertions(+), 12 deletions(-)
commit 1d97f708ceb7cd34ccdb1a4f85192efe83d1853c
Author: Albert Astals Cid <aacid at kde.org>
@@ -2668,7 +4701,7 @@
sequence.
Bug #87215
- C# poppler-0.31.0.tar.xz
+ C# poppler-0.31.0.tar.xz
poppler/TextOutputDev.cc | 419
++++++++++++++++++++++++++++++++++-------------
@@ -2677,7 +4710,7 @@
commit 96c35dfde6722ff8c5ef7ff59e37be90d273acab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 27 22:42:34 2015 +0100
+Date: Fri Mar 27 22:42:34 2015 +0100
pdftohtml: Set exit status adecuately
@@ -2689,7 +4722,7 @@
commit 0969801c12a6ec0fbc079c8203cece9c70466955
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 26 16:08:20 2015 +0100
+Date: Thu Mar 26 16:08:20 2015 +0100
Fix previous commit about initializing on failure
@@ -2700,7 +4733,7 @@
commit ede6d00688fcf0e3c843b0a507304f5a98395d41
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 26 15:44:40 2015 +0100
+Date: Thu Mar 26 15:44:40 2015 +0100
memset on error to have reproducible outputs
@@ -2709,7 +4742,7 @@
commit 4bb2c9b98299f429752b4c60820cea31ef05f7e0
Author: Jason Crain <jason at aquaticape.us>
-Date: Wed Mar 25 21:04:19 2015 +0100
+Date: Wed Mar 25 21:04:19 2015 +0100
Use width from W array for WMode positioning
@@ -2721,7 +4754,7 @@
commit 033dbbd7fef8c04c7f4961455cc1cd8d6d1bd93b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 15 14:06:15 2015 +0100
+Date: Sun Mar 15 14:06:15 2015 +0100
Fix the previous pdfDocEncoding fix
@@ -2734,7 +4767,7 @@
commit bc8076d8f638ccb44f8e3b94aaae96850b025deb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 15 13:32:41 2015 +0100
+Date: Sun Mar 15 13:32:41 2015 +0100
Fix PDF Text String -> QString conversion
@@ -2748,22 +4781,22 @@
commit d7cc90a8b60d7e353db6e0acdd0b789485e32972
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 7 15:04:52 2015 +0100
+Date: Sat Mar 7 15:04:52 2015 +0100
0.32.0
- CMakeLists.txt | 4 ++--
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
7 files changed, 23 insertions(+), 7 deletions(-)
commit c13297d154ded11721fe7d3abdba459ca628cef8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 7 14:58:10 2015 +0100
+Date: Sat Mar 7 14:58:10 2015 +0100
Update (C)
@@ -2773,7 +4806,7 @@
commit c909964bff671d5ff0d8eee5f613ded4562f8afd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 7 14:54:43 2015 +0100
+Date: Sat Mar 7 14:54:43 2015 +0100
Do not assert on broken document
@@ -2784,7 +4817,7 @@
commit 3705fcee0309c50b5fecd563e8e466cbe2c5972b
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Mar 6 15:19:58 2015 +0100
+Date: Fri Mar 6 15:19:58 2015 +0100
Fix Wrong colour shown when GouraudTriangleShFill uses a DeviceN
colorspace
@@ -2796,7 +4829,7 @@
commit b7fde1ec83a5fff9bec73becc22e581583a30d43
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 25 21:51:34 2015 +0100
+Date: Wed Feb 25 21:51:34 2015 +0100
Fix last commit regression
@@ -2811,7 +4844,7 @@
commit 7980fe868a8ef2ee3315f0bcb606c448d6604039
Author: William Bader <williambader at hotmail.com>
-Date: Wed Feb 25 15:00:33 2015 +0100
+Date: Wed Feb 25 15:00:33 2015 +0100
Fix uninitialized variable in Splash::pipeRun
@@ -2822,7 +4855,7 @@
commit 57b6b78a0831fb31c06fd1bc6e9803de524f9d2d
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Feb 24 23:34:57 2015 +0100
+Date: Tue Feb 24 23:34:57 2015 +0100
pdfseparate: use always an unique instance for PDFDoc for savePageAs
@@ -2831,7 +4864,7 @@
commit 8a30d219df71ead323649ff0dfd4a724b5e7bd18
Author: William Bader <williambader at hotmail.com>
-Date: Sat Feb 21 23:55:10 2015 +0100
+Date: Sat Feb 21 23:55:10 2015 +0100
Fix memcpy introduced in ec956ab8552dbe10fac4e649951042bddc424b7d
@@ -2840,7 +4873,7 @@
commit ec956ab8552dbe10fac4e649951042bddc424b7d
Author: William Bader <williambader at hotmail.com>
-Date: Tue Feb 17 22:55:14 2015 +0100
+Date: Tue Feb 17 22:55:14 2015 +0100
Reduce use of gmalloc() in GooString::appendfv()
@@ -2851,7 +4884,7 @@
commit 132ef18324f62c1f2a08dcd794b379fadaa4daf5
Author: Petr Gajdos <pgajdos at suse.cz>
-Date: Wed Feb 11 19:37:21 2015 +0100
+Date: Wed Feb 11 19:37:21 2015 +0100
Annot BG/BC: Empty Array means no color
@@ -2860,7 +4893,7 @@
commit bf4aae25a244b1033a2479b9a8f633224f7d5de5
Author: William Bader <williambader at hotmail.com>
-Date: Wed Feb 11 17:35:40 2015 +0100
+Date: Wed Feb 11 17:35:40 2015 +0100
Off by one fix to the previous crash fix
@@ -2869,7 +4902,7 @@
commit 97dd46bae5424818ca808c20506d7d96f7b85fb5
Author: William Bader <williambader at hotmail.com>
-Date: Mon Feb 9 22:30:51 2015 +0100
+Date: Mon Feb 9 22:30:51 2015 +0100
pdftops: Add aaRaster and overprint to man file
@@ -2878,7 +4911,7 @@
commit c114a90063d755639d2b0dbf816690a66b54bee0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 8 00:24:11 2015 +0100
+Date: Sun Feb 8 00:24:11 2015 +0100
Fix crash in fuzzed file from Bug #84988
@@ -2887,7 +4920,7 @@
commit 22895623e6cd2a5923f552421d44cc80cab77dd8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 7 22:28:21 2015 +0100
+Date: Sat Feb 7 22:28:21 2015 +0100
Fix malformed file crash from bug #86854
@@ -2896,7 +4929,7 @@
commit cdb7ad95f7c8fbf63ade040d8a07ec96467042fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 7 22:21:16 2015 +0100
+Date: Sat Feb 7 22:21:16 2015 +0100
Fix malformed file crash in bug #85243
@@ -2905,7 +4938,7 @@
commit 6641b935e1fc0c4151a723b6b476d987b8324ed2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 7 21:58:23 2015 +0100
+Date: Sat Feb 7 21:58:23 2015 +0100
If ECM is around include the sanitizers module
@@ -2918,18 +4951,18 @@
commit 92e41685dcef538a7fc669ca357ce9f448a8078e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 7 21:54:39 2015 +0100
+Date: Sat Feb 7 21:54:39 2015 +0100
Fix crash in malformed file from bug #85275
poppler/SplashOutputDev.cc | 4 ++--
- splash/Splash.cc | 10 +++++++++-
+ splash/Splash.cc | 10 +++++++++-
splash/SplashBitmap.cc | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
commit 9842b3b00492eda21297d5d65f769f77a565f6ac
Author: Aleksei Volkov <Aleksei Volkov>
-Date: Sat Feb 7 20:46:26 2015 +0100
+Date: Sat Feb 7 20:46:26 2015 +0100
No need to check for hmtx, freetype does for us
@@ -2940,7 +4973,7 @@
commit 4849eb43892640062c485e48ba7a29b5a0cc9587
Author: William Bader <williambader at hotmail.com>
-Date: Sat Feb 7 16:41:53 2015 +0100
+Date: Sat Feb 7 16:41:53 2015 +0100
Make the colorpsace optimization and option and not the default
@@ -2947,40 +4980,40 @@
Bug #88971
poppler/PSOutputDev.cc | 25 ++++++++++++++++---------
- poppler/PSOutputDev.h | 4 ++++
- utils/pdftops.1 | 10 +++++++++-
- utils/pdftops.cc | 4 ++++
+ poppler/PSOutputDev.h | 4 ++++
+ utils/pdftops.1 | 10 +++++++++-
+ utils/pdftops.cc | 4 ++++
4 files changed, 33 insertions(+), 10 deletions(-)
commit 8e16e423a718b92514885e771e31048f1ae2a766
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 5 20:18:13 2015 +0100
+Date: Thu Feb 5 20:18:13 2015 +0100
0.31.0
And copyright updating
- CMakeLists.txt | 4 ++--
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/CairoOutputDev.cc | 1 +
poppler/CairoOutputDev.h | 1 +
poppler/JBIG2Stream.cc | 1 +
- poppler/JBIG2Stream.h | 1 +
- poppler/Makefile.am | 2 +-
- poppler/Stream.cc | 1 +
+ poppler/JBIG2Stream.h | 1 +
+ poppler/Makefile.am | 2 +-
+ poppler/Stream.cc | 1 +
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
16 files changed, 33 insertions(+), 11 deletions(-)
commit f932315e559a7857d9c5642eb04efc0d2b717789
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Tue Jan 20 22:05:29 2015 +1030
+Date: Tue Jan 20 22:05:29 2015 +1030
cairo: support embedding JBIG2 image data
@@ -2990,66 +5023,66 @@
++++++++++++++++++++++++++++++++++++++--------
poppler/CairoOutputDev.h | 3 ++
poppler/JBIG2Stream.cc | 9 +++-
- poppler/JBIG2Stream.h | 4 +-
- poppler/Stream.cc | 13 +++++-
+ poppler/JBIG2Stream.h | 4 +-
+ poppler/Stream.cc | 13 +++++-
5 files changed, 121 insertions(+), 25 deletions(-)
commit 78abf540057181b708c546aee421f81a1dd58331
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Wed Jan 21 22:30:45 2015 +0100
+Date: Wed Jan 21 22:30:45 2015 +0100
Worlds -> Words
qt4/src/poppler-page.cc | 4 ++--
- qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
qt4/tests/check_search.cpp | 4 ++--
qt5/src/poppler-page.cc | 4 ++--
- qt5/src/poppler-qt5.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
qt5/tests/check_search.cpp | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
commit 027eac4e565576ca2e7042e21426e28abd775d98
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Tue Jan 20 00:09:09 2015 +0100
+Date: Tue Jan 20 00:09:09 2015 +0100
Expose whole-words search option in Qt frontends
qt4/src/poppler-page-private.h | 5 +-
- qt4/src/poppler-page.cc | 114
+ qt4/src/poppler-page.cc | 114
+++++++++++++++++++++++++------------
- qt4/src/poppler-qt4.h | 44 +++++++++++++-
- qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++-----
+ qt4/src/poppler-qt4.h | 44 +++++++++++++-
+ qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++-----
qt5/src/poppler-page-private.h | 5 +-
- qt5/src/poppler-page.cc | 116
+ qt5/src/poppler-page.cc | 116
+++++++++++++++++++++++++------------
- qt5/src/poppler-qt5.h | 46 +++++++++++++--
- qt5/tests/check_search.cpp | 126
+ qt5/src/poppler-qt5.h | 46 +++++++++++++--
+ qt5/tests/check_search.cpp | 126
+++++++++++++++++++++++++++++++++--------
8 files changed, 447 insertions(+), 121 deletions(-)
commit 30a0baa353c374165e5f411efc4203746f14a74d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 18 15:39:53 2015 +0100
+Date: Sun Jan 18 15:39:53 2015 +0100
Move more variables from GlobalParams to PSOutputDev
- poppler/CairoFontEngine.cc | 4 +-
- poppler/GfxFont.cc | 15 ++---
- poppler/GfxFont.h | 7 ++-
+ poppler/CairoFontEngine.cc | 4 +-
+ poppler/GfxFont.cc | 15 ++---
+ poppler/GfxFont.h | 7 ++-
poppler/GlobalParams.cc | 144
---------------------------------------------
poppler/GlobalParams.h | 28 ---------
poppler/PSOutputDev.cc | 121 +++++++++++++++++++------------------
- poppler/PSOutputDev.h | 30 +++++++++-
- poppler/SplashOutputDev.cc | 2 +-
- qt4/src/ArthurOutputDev.cc | 4 +-
- qt5/src/ArthurOutputDev.cc | 4 +-
- utils/pdftops.cc | 36 ++++--------
+ poppler/PSOutputDev.h | 30 +++++++++-
+ poppler/SplashOutputDev.cc | 2 +-
+ qt4/src/ArthurOutputDev.cc | 4 +-
+ qt5/src/ArthurOutputDev.cc | 4 +-
+ utils/pdftops.cc | 36 ++++--------
11 files changed, 116 insertions(+), 279 deletions(-)
commit 8fed995c3457d64669ae12901450b7c811599dba
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 18 14:52:53 2015 +0100
+Date: Sun Jan 18 14:52:53 2015 +0100
Forgot to delete this in the previous commit
@@ -3058,7 +5091,7 @@
commit 4992ff7fa062462507733494827fdad7eaaa95b3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 18 13:57:36 2015 +0100
+Date: Sun Jan 18 13:57:36 2015 +0100
Move raster mono and resolution from GlobalParams to PSOutputDev
@@ -3065,13 +5098,13 @@
poppler/GlobalParams.cc | 32 --------------------------------
poppler/GlobalParams.h | 7 -------
poppler/PSOutputDev.cc | 18 +++++++-----------
- poppler/PSOutputDev.h | 6 ++++++
- utils/pdftops.cc | 7 ++++---
+ poppler/PSOutputDev.h | 6 ++++++
+ utils/pdftops.cc | 7 ++++---
5 files changed, 17 insertions(+), 53 deletions(-)
commit 54908f675eda96c363528198e8c530921df2f45a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 18 13:34:45 2015 +0100
+Date: Sun Jan 18 13:34:45 2015 +0100
Move psUncompressPreloadedImages from GlobalParams to PSOutputDev
@@ -3083,12 +5116,12 @@
poppler/GlobalParams.cc | 16 ----------------
poppler/GlobalParams.h | 3 ---
poppler/PSOutputDev.cc | 9 +++++----
- poppler/PSOutputDev.h | 2 ++
+ poppler/PSOutputDev.h | 2 ++
4 files changed, 7 insertions(+), 23 deletions(-)
commit 136d7aa5e79f153dfcb216c58598e33a8ff16630
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 18 13:28:26 2015 +0100
+Date: Sun Jan 18 13:28:26 2015 +0100
Remove declared but not defined function
@@ -3097,7 +5130,7 @@
commit fdba9154d9a176759c765180805e608d4959c34e
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Fri Jan 16 19:57:59 2015 +0100
+Date: Fri Jan 16 19:57:59 2015 +0100
pdftoppm: parse the flags earlier and only once
@@ -3106,7 +5139,7 @@
commit 6b072500b5ac936631be6b29b7d5a591848a18f3
Author: William Bader <williambader at hotmail.com>
-Date: Wed Jan 14 23:28:03 2015 +0100
+Date: Wed Jan 14 23:28:03 2015 +0100
Add rasterization option to pdftops
@@ -3121,19 +5154,19 @@
++-----------------------------------------
poppler/GlobalParams.h | 16 +++---------
poppler/PSOutputDev.cc | 14 +++++------
- poppler/PSOutputDev.h | 5 +++-
+ poppler/PSOutputDev.h | 5 +++-
poppler/SplashOutputDev.cc | 19 ++++++--------
poppler/SplashOutputDev.h | 11 +++++---
qt4/src/poppler-page.cc | 7 +++---
qt5/src/poppler-page.cc | 7 +++---
- utils/pdftohtml.cc | 9 +++----
- utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++----------
- utils/pdftops.cc | 14 ++++++++++-
+ utils/pdftohtml.cc | 9 +++----
+ utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++----------
+ utils/pdftops.cc | 14 ++++++++++-
12 files changed, 96 insertions(+), 118 deletions(-)
commit dc9751e6ac47a708ba6e7a68560bdce6a2e4a010
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 9 15:50:02 2015 +0100
+Date: Fri Jan 9 15:50:02 2015 +0100
Compile++
@@ -3142,7 +5175,7 @@
commit d91876a0c7a936b1f6f461d80131d7586a6c1a5e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 8 20:13:06 2015 +0100
+Date: Thu Jan 8 20:13:06 2015 +0100
Accept malformed documents whose root is a Page instead of a Pages
@@ -3155,7 +5188,7 @@
commit 7ce86b9be058408eb567d8d0b9747853a66c116f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 8 17:35:28 2015 +0100
+Date: Thu Jan 8 17:35:28 2015 +0100
Remove assert in gouraudFillTriangle
@@ -3170,7 +5203,7 @@
commit 9e9df4b20d17478996780008bc9802a857d173fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 8 17:01:52 2015 +0100
+Date: Thu Jan 8 17:01:52 2015 +0100
Fix crash on broken document
@@ -3181,7 +5214,7 @@
commit 636faafcb84b856580398f7883b6406d645c85d1
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Tue Jan 6 22:57:20 2015 +0100
+Date: Tue Jan 6 22:57:20 2015 +0100
JPEG2000Stream: Inline doGetChar and doLookChar
@@ -3192,28 +5225,28 @@
commit c13bffe92963c4969037695992f4c2776bbe973f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 4 23:17:42 2015 +0100
+Date: Sun Jan 4 23:17:42 2015 +0100
0.30
- CMakeLists.txt | 4 ++--
- NEWS | 18 ++++++++++++++++++
- configure.ac | 2 +-
- cpp/CMakeLists.txt | 2 +-
- cpp/Doxyfile | 2 +-
- cpp/Makefile.am | 2 +-
- poppler/Makefile.am | 2 +-
- poppler/PDFDoc.cc | 1 +
- poppler/TextOutputDev.cc | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Doxyfile | 2 +-
+ cpp/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/PDFDoc.cc | 1 +
+ poppler/TextOutputDev.cc | 2 +-
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
13 files changed, 31 insertions(+), 12 deletions(-)
commit e499fdab2e96cb3069db7ac8ffa0df20ccccddc9
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jan 4 20:23:39 2015 +0100
+Date: Sun Jan 4 20:23:39 2015 +0100
extended openjpeg2 support
@@ -3223,13 +5256,13 @@
commit 2841f3c34dd6366a70e4d6d307a08b3fbc3e9897
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 4 20:22:47 2015 +0100
+Date: Sun Jan 4 20:22:47 2015 +0100
Cmake support for openjpeg2
With some tweaks from Albert
- CMakeLists.txt | 56
+ CMakeLists.txt | 56
+++++++++++++++++++++++++++++-------
cmake/modules/FindLIBOPENJPEG2.cmake | 30 +++++++++++++++++++
2 files changed, 76 insertions(+), 10 deletions(-)
@@ -3236,7 +5269,7 @@
commit 117af9c6bbd923954ef7de63adec8c22d51da1e4
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 4 19:42:34 2015 +0100
+Date: Sun Jan 4 19:42:34 2015 +0100
Initial attempt at libopenjpeg2 support
@@ -3250,7 +5283,7 @@
to handle the the 2.1 change and any future changes.
- Move openjpeg.h into the .cc file
- configure.ac | 80 ++++++++----
+ configure.ac | 80 ++++++++----
poppler/JPEG2000Stream.cc | 313
+++++++++++++++++++++++++++++++++++++---------
poppler/JPEG2000Stream.h | 41 ++----
@@ -3258,7 +5291,7 @@
commit 9caf7525409d699c16896653528486451123b485
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 4 18:48:02 2015 +0100
+Date: Sun Jan 4 18:48:02 2015 +0100
Make PSOutputDev accept a list of pages indeces
@@ -3269,18 +5302,18 @@
Reviewed in the mailing list, see "Can anyone have a look at my
patch?"
- glib/poppler-page.cc | 10 ++++++---
- poppler/PSOutputDev.cc | 50
+ glib/poppler-page.cc | 10 ++++++---
+ poppler/PSOutputDev.cc | 50
++++++++++++++++++++++++-----------------
- poppler/PSOutputDev.h | 14 +++++++-----
+ poppler/PSOutputDev.h | 14 +++++++-----
qt4/src/poppler-ps-converter.cc | 11 ++++++---
qt5/src/poppler-ps-converter.cc | 11 ++++++---
- utils/pdftops.cc | 15 +++++++++----
+ utils/pdftops.cc | 15 +++++++++----
6 files changed, 71 insertions(+), 40 deletions(-)
commit 173f182fb568843f97e7d45d1b16bebbd2aa7413
Author: Li Junling <lijunling at sina.com>
-Date: Fri Jan 2 17:23:24 2015 +0100
+Date: Fri Jan 2 17:23:24 2015 +0100
Find last 'startxref' in the last 24K instead of the last 1K
@@ -3291,7 +5324,7 @@
commit 0b1cd9403b8a240e58ec4f1832588d25f8295278
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Dec 20 03:22:23 2014 -0600
+Date: Sat Dec 20 03:22:23 2014 -0600
Free BBox object on error
@@ -3300,7 +5333,7 @@
commit acc33a6950031ac4a5c759d043d24df0cfa7e8b6
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Dec 20 02:24:49 2014 -0600
+Date: Sat Dec 20 02:24:49 2014 -0600
Check for invalid matrix in annotation
@@ -3311,7 +5344,7 @@
commit 56aff7d78658f586e3c4cd41685f189dafb3098a
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Dec 23 15:49:15 2014 +0100
+Date: Tue Dec 23 15:49:15 2014 +0100
pdfunite: Support output intents, optional content and acroform
@@ -3321,7 +5354,7 @@
commit 9e734063e6a6a4b9743c9aa27d3d3127b5a960d7
Author: Jason Crain <jason at aquaticape.us>
-Date: Fri Dec 19 01:56:45 2014 -0600
+Date: Fri Dec 19 01:56:45 2014 -0600
Move array reallocation from visitLine to startLine
@@ -3335,7 +5368,7 @@
commit 0c47b769a77795bd866b6686b79fd20ad6f554bf
Author: Daniel Macks <dmacks at netspace.org>
-Date: Sun Dec 14 18:52:48 2014 +0100
+Date: Sun Dec 14 18:52:48 2014 +0100
Only consider adding -fno-check-new if compiler supports it
@@ -3348,7 +5381,7 @@
commit c9c90d50e3708f6fac313aa8b458aef6dba5dcfb
Author: Hans-Peter Deifel <hpdeifel at gmx.de>
-Date: Fri Dec 12 13:09:51 2014 +0100
+Date: Fri Dec 12 13:09:51 2014 +0100
cpp: New API to set debug output function
@@ -3356,41 +5389,41 @@
to install their own function to print internal poppler errors.
cpp/poppler-global.cpp | 29 +++++++++++++++++++++++++++++
- cpp/poppler-global.h | 5 +++++
+ cpp/poppler-global.h | 5 +++++
cpp/poppler-private.cpp | 15 ++++++++++++---
- cpp/poppler-private.h | 3 +++
+ cpp/poppler-private.h | 3 +++
4 files changed, 49 insertions(+), 3 deletions(-)
commit fa8f276a10911c97d2777fff3270771802bc3892
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 4 23:11:12 2014 +0100
+Date: Thu Dec 4 23:11:12 2014 +0100
0.29.0
- CMakeLists.txt | 4 ++--
- NEWS | 15 +++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 15 +++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
7 files changed, 23 insertions(+), 8 deletions(-)
commit fee700cfecb9d7d5fa938704a5f457f15aaa4676
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 1 20:52:42 2014 +0100
+Date: Mon Dec 1 20:52:42 2014 +0100
Run dos2unix as suggested by Volker Grabsch
- splash/SplashState.h | 278 ++++++++++----------
+ splash/SplashState.h | 278 ++++++++++----------
test/perf-test-preview-dummy.cc | 44 ++--
- test/perf-test-preview-win.cc | 544
+ test/perf-test-preview-win.cc | 544
++++++++++++++++++++--------------------
3 files changed, 433 insertions(+), 433 deletions(-)
commit d3fe0661c6dc6050e14cd5cb4afa089b7d7d66b0
Author: Richard PALO <richard at netbsd.org>
-Date: Sun Nov 30 22:46:22 2014 +0100
+Date: Sun Nov 30 22:46:22 2014 +0100
warning: "_FILE_OFFSET_BITS" redefined
@@ -3402,7 +5435,7 @@
commit 18884065e11fee82506915095619107a43172ecb
Author: Richard PALO <richard at netbsd.org>
-Date: Sun Nov 30 22:36:29 2014 +0100
+Date: Sun Nov 30 22:36:29 2014 +0100
The isfinite macro is defined on SunOS under c99
@@ -3413,7 +5446,7 @@
commit bcb470064dd9f75ab0b0a0d9b7319fe8f1e558ae
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Nov 25 05:53:38 2014 +1030
+Date: Tue Nov 25 05:53:38 2014 +1030
cofigure: print "no" instead of "auto" if lcms not found
@@ -3422,7 +5455,7 @@
commit 832046c57ab2909d329340f1c941b29e8246ff73
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Nov 28 11:08:34 2014 +0100
+Date: Fri Nov 28 11:08:34 2014 +0100
Use correct LAB byte array for lcms input
@@ -3430,12 +5463,12 @@
poppler/GfxState.cc | 51
++++++++++++++++++++++++++++++++++++++-------------
- poppler/GfxState.h | 4 +++-
+ poppler/GfxState.h | 4 +++-
2 files changed, 41 insertions(+), 14 deletions(-)
commit a604bc3a2ed9f9181aa3b12d795608fcf5e08220
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Nov 14 11:56:50 2014 +0100
+Date: Fri Nov 14 11:56:50 2014 +0100
Solve blend mode problem in CYMK and DeviceN for separable blend modes
@@ -3447,7 +5480,7 @@
commit b7802ff39db270dda2aa20f005fb87c22ed34137
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Nov 14 11:47:38 2014 +0100
+Date: Fri Nov 14 11:47:38 2014 +0100
Use Default colorspaces if present instead of Device colorspaces
@@ -3454,16 +5487,16 @@
Fixes part of #68986
poppler/CairoOutputDev.cc | 4 +-
- poppler/Gfx.cc | 40 +++++-----
- poppler/GfxState.cc | 197
+ poppler/Gfx.cc | 40 +++++-----
+ poppler/GfxState.cc | 197
++++++++++++++++++++++++++++++++++------------
- poppler/GfxState.h | 31 ++++----
- poppler/Page.cc | 4 +-
+ poppler/GfxState.h | 31 ++++----
+ poppler/Page.cc | 4 +-
5 files changed, 188 insertions(+), 88 deletions(-)
commit 07aa6f4030418883d8d45a8dfa3d80d2dadca4e7
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Nov 13 12:26:25 2014 +0100
+Date: Thu Nov 13 12:26:25 2014 +0100
write correct size in trailer dict
@@ -3474,7 +5507,7 @@
commit 51e7c29cabedc72e097023e6d8d6d68ed43fa20c
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Fri Nov 7 18:30:36 2014 +0100
+Date: Fri Nov 7 18:30:36 2014 +0100
regtest: Update references also for tests that no longer crash
@@ -3481,13 +5514,13 @@
We are currently updating the refs only when we have checksums to
compare, but if a test used to crash there's no md5 file in refs.
- regtest/TestRun.py | 2 ++
+ regtest/TestRun.py | 2 ++
regtest/backends/__init__.py | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
commit d205908930d5dc4ec3a1a1a2c2b93fbb92c2c867
Author: William Bader <williambader at hotmail.com>
-Date: Wed Nov 5 20:23:49 2014 +0100
+Date: Wed Nov 5 20:23:49 2014 +0100
Make it proper C
@@ -3496,12 +5529,12 @@
commit fa1d636b00210b9c52787ab3c833fe9aa2e293fa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 4 20:00:08 2014 +0100
+Date: Tue Nov 4 20:00:08 2014 +0100
0.28.1
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
@@ -3508,7 +5541,7 @@
commit 7debbb05df18afc86df8a4fd37980728ec2e5788
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 4 19:29:58 2014 +0100
+Date: Tue Nov 4 19:29:58 2014 +0100
Fix typo
@@ -3517,26 +5550,26 @@
commit d5489ef37742227176e800390a990f2b882d9710
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 4 01:27:05 2014 +0100
+Date: Tue Nov 4 01:27:05 2014 +0100
0.28.0
- CMakeLists.txt | 6 +++---
- NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 6 +++---
+ NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
11 files changed, 56 insertions(+), 13 deletions(-)
commit f87115a1129e4e03802769181a3392c8dce3192a
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Nov 4 01:25:18 2014 +0100
+Date: Tue Nov 4 01:25:18 2014 +0100
Don't ship the moc files
@@ -3546,31 +5579,31 @@
commit 0a9c38076f1555196029372b7e08714b43c7a58d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 3 21:43:28 2014 +0100
+Date: Mon Nov 3 21:43:28 2014 +0100
Update (C)
- fofi/FoFiType1.cc | 1 +
- poppler/PDFDoc.cc | 4 ++--
- poppler/PDFDoc.h | 2 +-
- poppler/XRef.cc | 2 +-
+ fofi/FoFiType1.cc | 1 +
+ poppler/PDFDoc.cc | 4 ++--
+ poppler/PDFDoc.h | 2 +-
+ poppler/XRef.cc | 2 +-
qt4/src/poppler-annotation-private.h | 2 +-
- qt4/src/poppler-annotation.cc | 2 +-
- qt4/src/poppler-page.cc | 2 +-
- qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
qt5/src/poppler-annotation-private.h | 2 +-
- qt5/src/poppler-annotation.cc | 2 +-
- qt5/src/poppler-page.cc | 2 +-
- qt5/src/poppler-qt5.h | 2 +-
- utils/pdfdetach.cc | 1 +
- utils/pdftocairo-win32.cc | 12 ++++++++++++
- utils/pdftocairo-win32.h | 12 ++++++++++++
- utils/pdftocairo.cc | 3 ++-
+ qt5/src/poppler-annotation.cc | 2 +-
+ qt5/src/poppler-page.cc | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
+ utils/pdfdetach.cc | 1 +
+ utils/pdftocairo-win32.cc | 12 ++++++++++++
+ utils/pdftocairo-win32.h | 12 ++++++++++++
+ utils/pdftocairo.cc | 3 ++-
16 files changed, 40 insertions(+), 13 deletions(-)
commit 73cf1e87c9803bbe4271be297b486d9932677d46
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 3 21:37:13 2014 +0100
+Date: Mon Nov 3 21:37:13 2014 +0100
Need to dist this file
@@ -3579,7 +5612,7 @@
commit 2fd0cd652cfc03c9af35a59192729e4ed26e8146
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 3 19:20:23 2014 +0100
+Date: Mon Nov 3 19:20:23 2014 +0100
Fix memory leaks when running pdfseparate
@@ -3594,7 +5627,7 @@
commit d6ea8acbb348fdb43601a963ba5407e933565003
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Nov 3 19:11:25 2014 +0100
+Date: Mon Nov 3 19:11:25 2014 +0100
fix crash in Xref::getEntry
@@ -3605,7 +5638,7 @@
commit bd142810b9f66b017a58b3e1840d4d72794f1ef4
Author: Jason Crain <jason at aquaticape.us>
-Date: Thu May 15 02:22:44 2014 -0500
+Date: Thu May 15 02:22:44 2014 -0500
cairo: Use matrix to determine pattern size
@@ -3616,7 +5649,7 @@
commit 06dd7dc337c7db6122329e98783a126d59035aff
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu May 29 12:45:33 2014 +0200
+Date: Thu May 29 12:45:33 2014 +0200
Include windows.h, not Windows.h
@@ -3631,7 +5664,7 @@
commit 76a350b11160ac203a41b27fbc85a3264bfe4735
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Thu Oct 30 18:25:06 2014 +0100
+Date: Thu Oct 30 18:25:06 2014 +0100
regtest: Try to fix again the paths of the resources in the generated
HTML report
@@ -3647,7 +5680,7 @@
commit c93d6b264dc77c46c72281d966bf826274a43d15
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Wed Oct 29 17:37:06 2014 +0100
+Date: Wed Oct 29 17:37:06 2014 +0100
regtest: respect --no-absolute-paths when creating the pretty
diff links
@@ -3657,7 +5690,7 @@
commit 9f953e47a6ea92d806aeea61e227af54c889c6be
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Mon Oct 27 19:53:28 2014 +0100
+Date: Mon Oct 27 19:53:28 2014 +0100
regtest: Add an option to create the HTML report without absolute
paths
@@ -3664,13 +5697,13 @@
It uses the paths as received from the command line attributes.
- regtest/HTMLReport.py | 15 +++++++++++----
+ regtest/HTMLReport.py | 15 +++++++++++----
regtest/commands/create-report.py | 4 ++++
2 files changed, 15 insertions(+), 4 deletions(-)
commit 3d840231bc6f0714da361493ef32913af2eb78d7
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Sun Oct 26 12:09:28 2014 +0100
+Date: Sun Oct 26 12:09:28 2014 +0100
regtest: Fix png diff generation with python-pil pillow fork
@@ -3682,7 +5715,7 @@
commit 68e58ec5465efc289d85ae104941db92450a3168
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Sun Oct 26 11:21:23 2014 +0100
+Date: Sun Oct 26 11:21:23 2014 +0100
regtest: Limit the number of worker threads to the number of documents
to test
@@ -3698,7 +5731,7 @@
commit 7c21b95852e891060cd2e276949acf0945306ab7
Author: Carlos Garcia Campos <cgarcia at igalia.com>
-Date: Sun Oct 26 11:08:45 2014 +0100
+Date: Sun Oct 26 11:08:45 2014 +0100
regtest: Allow to run groups of tests individually
@@ -3713,14 +5746,14 @@
directory.
This also allows us to update the refs for a group of tests.
- regtest/TestRun.py | 26 ++++++++++++++++++++++++--
- regtest/Utils.py | 7 +++++--
+ regtest/TestRun.py | 26 ++++++++++++++++++++++++--
+ regtest/Utils.py | 7 +++++--
regtest/commands/run-tests.py | 29 ++++++++++++++++++++---------
3 files changed, 49 insertions(+), 13 deletions(-)
commit 53be607edc18a861aeb0b6663bac3c05de46c84c
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Oct 24 11:35:17 2014 +0200
+Date: Fri Oct 24 11:35:17 2014 +0200
Fix warning on unused variable in pdftocairo.cc
@@ -3730,7 +5763,7 @@
pdftocairo.cc:130:14: warning: ‘setupdlg’ defined but not used
[-Wunused-variable]
static GBool setupdlg = gFalse;
- ^
+ ^
https://bugs.freedesktop.org/show_bug.cgi?id=85400
@@ -3739,7 +5772,7 @@
commit f966b8766d40b2c912e69a1e17ef8cc4bd52be95
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Oct 21 16:42:27 2014 +0200
+Date: Tue Oct 21 16:42:27 2014 +0200
fofi: Fix a crash when parsing an invalid font due to a integer
overflow
@@ -3751,23 +5784,23 @@
commit 4963332ca4db13d8a9186b06d2aa0d59abbc10ee
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Oct 5 21:58:37 2014 +1030
+Date: Sun Oct 5 21:58:37 2014 +1030
pdftocairo: add -printdlg output option for win32
when set the win32 print dialog is displayed before printing
- configure.ac | 2 +-
+ configure.ac | 2 +-
utils/pdftocairo-win32.cc | 303
++++++++++++++++++++++++++++++++++++++++++++--
utils/pdftocairo-win32.h | 14 +--
- utils/pdftocairo.1 | 14 ++-
- utils/pdftocairo.cc | 31 ++++-
+ utils/pdftocairo.1 | 14 ++-
+ utils/pdftocairo.cc | 31 ++++-
5 files changed, 337 insertions(+), 27 deletions(-)
commit d8fe025c36f555a5438677e20df803eee216bb13
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Oct 5 18:11:09 2014 +1030
+Date: Sun Oct 5 18:11:09 2014 +1030
pdftocairo: add a -setupdlg option that will the show printer
properties
@@ -3776,13 +5809,13 @@
utils/pdftocairo-win32.cc | 22 +++++++++++++++++++---
utils/pdftocairo-win32.h | 3 ++-
- utils/pdftocairo.1 | 5 +++++
- utils/pdftocairo.cc | 24 ++++++++++++++++--------
+ utils/pdftocairo.1 | 5 +++++
+ utils/pdftocairo.cc | 24 ++++++++++++++++--------
4 files changed, 42 insertions(+), 12 deletions(-)
commit c091aa14513859ab76223f5e4e6055d92082433c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Sep 14 20:43:47 2014 +0930
+Date: Sun Sep 14 20:43:47 2014 +0930
pdftocairo: fix a number of bugs in win32 printing
@@ -3799,29 +5832,29 @@
utils/pdftocairo-win32.cc | 181
++++++++++++++++++++++++++--------------------
utils/pdftocairo-win32.h | 2 +-
- utils/pdftocairo.1 | 5 +-
- utils/pdftocairo.cc | 49 ++++++-------
+ utils/pdftocairo.1 | 5 +-
+ utils/pdftocairo.cc | 49 ++++++-------
4 files changed, 132 insertions(+), 105 deletions(-)
commit cc3b39d49c656e912a7461212f3bb4e58c6444e7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Sep 12 18:17:49 2014 +0930
+Date: Fri Sep 12 18:17:49 2014 +0930
make pdftocairo-win32.cc a standalone .cc file
instead of #including it in pdftocairo.cc
- utils/CMakeLists.txt | 1 +
- utils/Makefile.am | 3 +-
+ utils/CMakeLists.txt | 1 +
+ utils/Makefile.am | 3 +-
utils/pdftocairo-win32.cc | 74
+++++++++++++++++++++++------------------------
utils/pdftocairo-win32.h | 22 ++++++++++++++
- utils/pdftocairo.cc | 24 +++++++++------
+ utils/pdftocairo.cc | 24 +++++++++------
5 files changed, 77 insertions(+), 47 deletions(-)
commit 700205af19ef1ae5f2c713d118ebd5dd4a0afba3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Sep 7 20:18:36 2014 +0930
+Date: Sun Sep 7 20:18:36 2014 +0930
pdftocairo: Allow an output file for win32 printing to be specified
@@ -3828,28 +5861,28 @@
Can be used for testing win32 print output without wasting paper.
utils/pdftocairo-win32.cc | 12 ++++++++----
- utils/pdftocairo.1 | 4 ++++
- utils/pdftocairo.cc | 13 +++++++------
+ utils/pdftocairo.1 | 4 ++++
+ utils/pdftocairo.cc | 13 +++++++------
3 files changed, 19 insertions(+), 10 deletions(-)
commit 40d3ae87befad489fd8c0b38ff2561a0782cae0b
Author: Rodrigo Rivas Costa <rodrigorivascosta at gmail.com>
-Date: Sat Sep 6 21:04:10 2014 +0930
+Date: Sat Sep 6 21:04:10 2014 +0930
Add support for printing to a Windows printer from pdftocairo
Bug 79936
- configure.ac | 2 +-
+ configure.ac | 2 +-
utils/pdftocairo-win32.cc | 219
++++++++++++++++++++++++++++++++++++++++++++++
- utils/pdftocairo.1 | 23 ++++-
- utils/pdftocairo.cc | 61 ++++++++++---
+ utils/pdftocairo.1 | 23 ++++-
+ utils/pdftocairo.cc | 61 ++++++++++---
4 files changed, 292 insertions(+), 13 deletions(-)
commit ee4a389872d86b619c677888da8f13f1f6c54472
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Oct 20 22:32:30 2014 +1030
+Date: Mon Oct 20 22:32:30 2014 +1030
PDFDoc: fix crash when getPage() returns NULL
@@ -3860,7 +5893,7 @@
commit 0c3f53e34ec287dab2784e1f3411ad06b62dffc7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Oct 20 22:17:20 2014 +1030
+Date: Mon Oct 20 22:17:20 2014 +1030
PDFDOC: Check for EOF when reading raw stream
@@ -3871,7 +5904,7 @@
commit 88dbd4df0998233939b4a51cedbfc65c58a315f9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Oct 19 22:47:15 2014 +1030
+Date: Sun Oct 19 22:47:15 2014 +1030
pdfdetach: fix crash when getPage() returns null
@@ -3882,7 +5915,7 @@
commit e0179304cdef615fcf639046410d214fd5b5f276
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Oct 19 21:36:39 2014 +1030
+Date: Sun Oct 19 21:36:39 2014 +1030
cairo: fix crash when no group color space
@@ -3893,7 +5926,7 @@
commit 745f1241bf903969e50f0e1139641e389a9c331f
Author: Scott West <scott.gregory.west at gmail.com>
-Date: Tue Oct 7 23:54:52 2014 +0200
+Date: Tue Oct 7 23:54:52 2014 +0200
Fix memory leak in Dict.remove.
@@ -3908,7 +5941,7 @@
commit b8810703ca76f0bbc8185ab87679cf18eb006d52
Author: Luigi Scarso <luigi.scarso at gmail.com>
-Date: Tue Oct 7 22:45:05 2014 +0200
+Date: Tue Oct 7 22:45:05 2014 +0200
Make Attribute::getName() work when UTF-16BE is used
@@ -3915,7 +5948,7 @@
Contains some ideas by me
Bug #84722
- goo/GooString.h | 9 +++++----
+ goo/GooString.h | 9 +++++----
poppler/StructElement.cc | 17 +++++++++++------
poppler/StructElement.h | 7 +++++--
3 files changed, 21 insertions(+), 12 deletions(-)
@@ -3922,7 +5955,7 @@
commit 96a04336c7a6331727724125686a0d6f42f19f46
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Oct 6 10:21:51 2014 +1030
+Date: Mon Oct 6 10:21:51 2014 +1030
cairo: only embed mime data if image decode map is identity
@@ -3934,7 +5967,7 @@
commit 18541054bebce3f9d4729629785bf140d67d2da0
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Sep 24 21:20:42 2014 +0930
+Date: Wed Sep 24 21:20:42 2014 +0930
cairo: Only embed mime data for gray/rgb/cmyk colorspaces
@@ -3946,7 +5979,7 @@
commit cbf2652c483d7010fc36191c8b209a57eeec93d8
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Jan 26 00:37:17 2012 +1030
+Date: Thu Jan 26 00:37:17 2012 +1030
cairo: don't render text when text matrix is not invertable
@@ -3960,7 +5993,7 @@
commit 4fe17e97a4bd7873caad771c446199b282039697
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 5 11:30:43 2014 +0200
+Date: Sun Oct 5 11:30:43 2014 +0200
glib: Build introspection linking to the uninstalled libraries
@@ -3971,7 +6004,7 @@
commit a2477da56a4d1c534175940d7c01a9d3db6c72d4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 1 22:33:11 2014 +0200
+Date: Wed Oct 1 22:33:11 2014 +0200
Fix 303287ebdad0de9fb2655c4d7eab627c0045ea04
@@ -3983,7 +6016,7 @@
commit ce95ecda450361496aedd5d5cd0bf47fd2c66703
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 30 19:50:20 2014 +0200
+Date: Tue Sep 30 19:50:20 2014 +0200
Fix assert in 5068.asan.0.6052.pdf
@@ -3992,7 +6025,7 @@
commit 01723aa17e836e818158dbdc56df642a290be300
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Sep 30 18:48:47 2014 +0200
+Date: Tue Sep 30 18:48:47 2014 +0200
Map Standard/Expert encoding ligatures to AGLFN names
@@ -4002,14 +6035,14 @@
Bug 80093
poppler/CairoFontEngine.cc | 12 +++++++++---
- poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++-
- poppler/GfxFont.h | 7 ++++++-
+ poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++-
+ poppler/GfxFont.h | 7 ++++++-
splash/SplashFTFontFile.cc | 8 ++++++++
4 files changed, 51 insertions(+), 5 deletions(-)
commit 529db4a94607c1ad909764d26f740c601bbe896f
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Sep 29 22:59:15 2014 +0200
+Date: Mon Sep 29 22:59:15 2014 +0200
Fix build with --disable-utils
@@ -4019,13 +6052,13 @@
Bug #84448
- Makefile.am | 6 +-----
+ Makefile.am | 6 +-----
utils/Makefile.am | 4 ++++
2 files changed, 5 insertions(+), 5 deletions(-)
commit c54f6aceed983a221d88ce5c21becbf8aab2931b
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Sep 29 21:42:46 2014 +0200
+Date: Mon Sep 29 21:42:46 2014 +0200
use alt colorspace to get CMYK values for an ICC based CMYK colorspace
@@ -4041,7 +6074,7 @@
commit 21b5fd655ce45b90668d1416d21c526ab7eb3ad6
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Sep 14 11:20:23 2014 +0200
+Date: Sun Sep 14 11:20:23 2014 +0200
Refactor Makefiles to build a noinst library for parsing args
@@ -4089,7 +6122,7 @@
commit 70a851b0cc58241d1f2f6bc48af2614595326c8f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Sep 6 21:16:04 2014 +0930
+Date: Sat Sep 6 21:16:04 2014 +0930
Update .gitignore
@@ -4098,7 +6131,7 @@
commit d44e7e3560bdc79253df98db05385dce3e8ccbb4
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Sep 6 21:53:21 2014 +0930
+Date: Sat Sep 6 21:53:21 2014 +0930
Don't use -fPIC on mingw
@@ -4109,7 +6142,7 @@
commit 2723371b2e2f7684301ea1c5272ab49851f28c03
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Sep 6 21:19:46 2014 +0930
+Date: Sat Sep 6 21:19:46 2014 +0930
make autogen.sh work with variables with spaces
@@ -4120,7 +6153,7 @@
commit ebc814a7e31511308bbcd8856d0356f4d7cc74be
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Sep 14 11:45:12 2014 +0200
+Date: Sun Sep 14 11:45:12 2014 +0200
Add compile to .gitignore
@@ -4138,13 +6171,13 @@
commit 8ce31485faa26994c52f4d032cc5a8355aba23d1
Merge: 4589ce1 303287e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 26 00:40:43 2014 +0200
+Date: Fri Sep 26 00:40:43 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 303287ebdad0de9fb2655c4d7eab627c0045ea04
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Sep 26 00:25:38 2014 +0200
+Date: Fri Sep 26 00:25:38 2014 +0200
Fix rendering of file with a wrong embedded font
@@ -4155,7 +6188,7 @@
commit f94ba85a736b4c90c05e7782939f32506472658e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 12 19:22:20 2014 +0200
+Date: Fri Sep 12 19:22:20 2014 +0200
glib: Fix use of uninitialized members in PopplerInputStream
@@ -4166,7 +6199,7 @@
commit 4589ce17caf94e7c5fa856906d3a8cc08e999d73
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 12 19:22:20 2014 +0200
+Date: Fri Sep 12 19:22:20 2014 +0200
glib: Fix use of uninitialized members in PopplerInputStream
@@ -4178,20 +6211,20 @@
commit fe67324d450c356b7c876cf50da705156112513a
Merge: e62e18e f74a596
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 21 21:39:52 2014 +0200
+Date: Thu Aug 21 21:39:52 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit f74a5964078224c01bd5642aabc928d185bb0b69
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 21 20:07:54 2014 +0200
+Date: Thu Aug 21 20:07:54 2014 +0200
0.26.4
CMakeLists.txt | 2 +-
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 17 insertions(+), 5 deletions(-)
@@ -4198,17 +6231,17 @@
commit ce92e4ccefc7dad79db7f0af7a792ffa47824849
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 21 20:03:42 2014 +0200
+Date: Thu Aug 21 20:03:42 2014 +0200
Update (C) years
- poppler/Annot.cc | 1 +
+ poppler/Annot.cc | 1 +
poppler/CairoOutputDev.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 42315c28809e62da7872add917e82853cf8c7e33
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 21 19:58:35 2014 +0200
+Date: Thu Aug 21 19:58:35 2014 +0200
Make sure e is always initialized
@@ -4217,7 +6250,7 @@
commit e62e18e1b318d6fa664d236723de3c06ae43e86b
Author: Jehan Pagès <jehan at zemarmot.net>
-Date: Tue Aug 12 21:05:03 2014 +0200
+Date: Tue Aug 12 21:05:03 2014 +0200
poppler: use poppler-data pkg-config for both cmake and autotools
builds
@@ -4224,56 +6257,56 @@
CMakeLists.txt | 16 ++++++++++++++++
config.h.cmake | 2 +-
- configure.ac | 7 ++++++-
+ configure.ac | 7 ++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
commit 572c60764bbbd2080bfd7a926c646ad20b467aea
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Aug 12 18:12:45 2014 +0200
+Date: Tue Aug 12 18:12:45 2014 +0200
Makefile.am cleanups
Bug #79411
- configure.ac | 13 +++--
- cpp/Makefile.am | 66 +++++++++++++------------
- cpp/tests/Makefile.am | 13 ++---
- fofi/Makefile.am | 6 +--
- glib/Makefile.am | 29 ++++++-----
- glib/demo/Makefile.am | 18 +++----
- glib/reference/Makefile.am | 3 +-
- goo/Makefile.am | 38 +++++++--------
- poppler/Makefile.am | 118
+ configure.ac | 13 +++--
+ cpp/Makefile.am | 66 +++++++++++++------------
+ cpp/tests/Makefile.am | 13 ++---
+ fofi/Makefile.am | 6 +--
+ glib/Makefile.am | 29 ++++++-----
+ glib/demo/Makefile.am | 18 +++----
+ glib/reference/Makefile.am | 3 +-
+ goo/Makefile.am | 38 +++++++--------
+ poppler/Makefile.am | 118
++++++++++++++++++++++-----------------------
- qt4/demos/Makefile.am | 59 +++++++++++------------
- qt4/src/Makefile.am | 31 ++++++------
- qt4/tests/Makefile.am | 97 +++++++++++++------------------------
- qt5/demos/Makefile.am | 59 +++++++++++------------
- qt5/src/Makefile.am | 27 ++++++-----
- qt5/tests/Makefile.am | 98 ++++++++++++++-----------------------
- splash/Makefile.am | 42 ++++++++--------
- test/Makefile.am | 68 +++++++++-----------------
- utils/Makefile.am | 97 ++++++++++++++++++-------------------
+ qt4/demos/Makefile.am | 59 +++++++++++------------
+ qt4/src/Makefile.am | 31 ++++++------
+ qt4/tests/Makefile.am | 97 +++++++++++++------------------------
+ qt5/demos/Makefile.am | 59 +++++++++++------------
+ qt5/src/Makefile.am | 27 ++++++-----
+ qt5/tests/Makefile.am | 98 ++++++++++++++-----------------------
+ splash/Makefile.am | 42 ++++++++--------
+ test/Makefile.am | 68 +++++++++-----------------
+ utils/Makefile.am | 97 ++++++++++++++++++-------------------
18 files changed, 405 insertions(+), 477 deletions(-)
commit 4a4fe80d85a31b10822c7cd8eb5a0698bf306a52
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Aug 1 07:16:36 2014 +0200
+Date: Fri Aug 1 07:16:36 2014 +0200
glib-demo: Replace use of deprecated gtk stock items
https://bugs.freedesktop.org/show_bug.cgi?id=82384
- glib/demo/annots.c | 8 ++++----
+ glib/demo/annots.c | 8 ++++----
glib/demo/attachments.c | 4 ++--
- glib/demo/main.c | 6 +++---
- glib/demo/page.c | 6 +++---
- glib/demo/utils.c | 4 ++--
+ glib/demo/main.c | 6 +++---
+ glib/demo/page.c | 6 +++---
+ glib/demo/utils.c | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
commit ec6bad36cf5e9521f35285a3295976c05a69f76a
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Aug 1 07:51:10 2014 +0200
+Date: Fri Aug 1 07:51:10 2014 +0200
glib-demo: Remove use of deprecated gtk_dialog_get_action_area()
@@ -4285,13 +6318,13 @@
commit b72a534d6c7d8bc026812b68f9d9ac6bf9a2200a
Merge: f2e4154 ef3f758
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 3 01:06:57 2014 +0200
+Date: Sun Aug 3 01:06:57 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit ef3f7585fac086de0919aa0bb0ef91a5070ac23e
Author: Jiri Slaby <jirislaby at gmail.com>
-Date: Sun Aug 3 01:05:00 2014 +0200
+Date: Sun Aug 3 01:05:00 2014 +0200
Improve non-latin characters in inline notes
@@ -4300,19 +6333,19 @@
Bug #65956
- poppler/Annot.cc | 1 +
+ poppler/Annot.cc | 1 +
poppler/CharCodeToUnicode.cc | 1 +
2 files changed, 2 insertions(+)
commit 1b9c54286a4cdfaa284795933c20acf3c7e13bfc
Author: Ed Porras <ed at moto-research.com>
-Date: Sun Aug 3 01:01:35 2014 +0200
+Date: Sun Aug 3 01:01:35 2014 +0200
Don't check for inlineImg twice
Bug #82059
- poppler/Annot.cc | 2 +-
+ poppler/Annot.cc | 2 +-
poppler/CharCodeToUnicode.cc | 2 +-
poppler/SplashOutputDev.cc | 9 ++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
@@ -4319,7 +6352,7 @@
commit f2e4154eff52b86e62490a3ccba470824c9cf436
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Jul 26 00:12:37 2014 +0200
+Date: Sat Jul 26 00:12:37 2014 +0200
pdfseparate: additonal handling for annotations
@@ -4332,7 +6365,7 @@
commit e7825f7cbbe7cc9c324fcb34c2e0dcae75f4172a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 25 15:45:55 2014 +0200
+Date: Fri Jul 25 15:45:55 2014 +0200
glib: Fix a memory leak when getting text layout and attributes
@@ -4341,7 +6374,7 @@
commit b729bf92ea1522a1eed9579e53e7580215cb9555
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 25 15:45:55 2014 +0200
+Date: Fri Jul 25 15:45:55 2014 +0200
glib: Fix a memory leak when getting text layout and attributes
@@ -4350,7 +6383,7 @@
commit a1ecff0f0ab81fe76f63244250d96e7ef275f402
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 25 11:25:42 2014 +0200
+Date: Fri Jul 25 11:25:42 2014 +0200
glib: Return NULL in poppler_annot_get_contents also for empty strings
@@ -4359,7 +6392,7 @@
commit ab1113d10ef712c7c44cd4b4bb6bc79f9ca3702c
Author: Anuj Khare <khareanuj18 at gmail.com>
-Date: Thu Jul 24 19:47:22 2014 +0200
+Date: Thu Jul 24 19:47:22 2014 +0200
annots: Fix a crash when adding annot without contents
@@ -4372,7 +6405,7 @@
commit f302864ed354b313ec39433f65ca3b107b55789d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 25 11:25:42 2014 +0200
+Date: Fri Jul 25 11:25:42 2014 +0200
glib: Return NULL in poppler_annot_get_contents also for empty strings
@@ -4381,7 +6414,7 @@
commit 13a5c5f4b61d05f2d18f94ad15e210a47021a576
Author: Anuj Khare <khareanuj18 at gmail.com>
-Date: Thu Jul 24 19:47:22 2014 +0200
+Date: Thu Jul 24 19:47:22 2014 +0200
annots: Fix a crash when adding annot without contents
@@ -4394,7 +6427,7 @@
commit 94ea9d8e1631abfbb8cc078100942d46b1356970
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 24 10:46:17 2014 +0200
+Date: Thu Jul 24 10:46:17 2014 +0200
cairo: Make sure we always push a transparency group in
setSoftMaskFromImageMask()
@@ -4409,7 +6442,7 @@
commit 02c127b355bb8a98684a5d0af063c60b8bfd09dd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 24 10:46:17 2014 +0200
+Date: Thu Jul 24 10:46:17 2014 +0200
cairo: Make sure we always push a transparency group in
setSoftMaskFromImageMask()
@@ -4424,7 +6457,7 @@
commit c841a703c4c1750fd7ac0d04c6c3e7d4af80b8fa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 21 00:29:28 2014 +0200
+Date: Mon Jul 21 00:29:28 2014 +0200
Improve Overprintmode and shadings
@@ -4432,7 +6465,7 @@
poppler/SplashOutputDev.cc | 6 ++++--
poppler/SplashOutputDev.h | 8 +++++++-
- splash/Splash.cc | 24 ++++++++++++++++++++++--
+ splash/Splash.cc | 24 ++++++++++++++++++++++--
splash/SplashPattern.h | 6 +++++-
4 files changed, 38 insertions(+), 6 deletions(-)
@@ -4439,13 +6472,13 @@
commit ce782112746f629a8e7be6f2daf6ece6ab19917d
Merge: 2c0cb68 26372cf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 20 20:35:13 2014 +0200
+Date: Sun Jul 20 20:35:13 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 26372cfae029a1124e042855c58bf5b70f281c76
Author: Ed Porras <ed at moto-research.com>
-Date: Sun Jul 20 20:33:48 2014 +0200
+Date: Sun Jul 20 20:33:48 2014 +0200
printf -> error
@@ -4456,13 +6489,13 @@
commit 87d12c09281e3d12cda0fadcd65ab78928dff283
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 20 18:20:57 2014 +0200
+Date: Sun Jul 20 18:20:57 2014 +0200
0.26.3
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
@@ -4469,7 +6502,7 @@
commit 69e5b81640c9bb31f0876fa8eb7ba28dbf38923f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 20 18:18:29 2014 +0200
+Date: Sun Jul 20 18:18:29 2014 +0200
News for 0.26.3
@@ -4478,7 +6511,7 @@
commit c368c0714d57c089057d974908295d850a1b5108
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 20 18:15:22 2014 +0200
+Date: Sun Jul 20 18:15:22 2014 +0200
Update Thomas' (C)
@@ -4488,7 +6521,7 @@
commit 639179318c43a907a27e86778b720d33d481a9f9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jul 17 07:33:10 2014 +0200
+Date: Thu Jul 17 07:33:10 2014 +0200
glib: use C90-style comments in public headers
@@ -4498,13 +6531,13 @@
commit 2c0cb689910e8579bf428b3999bcac0cb27b0e51
Merge: 0b639cd 1161e72
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jul 12 17:21:07 2014 +0200
+Date: Sat Jul 12 17:21:07 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 1161e728de9ca7c9a5fb0e24c4a5e4a79c65a849
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Jul 12 17:04:42 2014 +0200
+Date: Sat Jul 12 17:04:42 2014 +0200
Error out instead of exiting if allInter grows too much
@@ -4516,7 +6549,7 @@
commit e82a24a585d251f767725f61700dc1f8fe169a52
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 12 08:35:45 2014 +0200
+Date: Sat Jul 12 08:35:45 2014 +0200
cmake: sync poppler-config.h.cmake with poppler-config.h.in
@@ -4526,13 +6559,13 @@
commit 0b639cd2ac1071f5b741031a78d8e2bc18d2b7d7
Merge: bb16c71 a5ad55b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 11 00:32:46 2014 +0200
+Date: Fri Jul 11 00:32:46 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 11 00:32:07 2014 +0200
+Date: Fri Jul 11 00:32:07 2014 +0200
Add Hib's (C)
@@ -4541,7 +6574,7 @@
commit 4f4ee736075d5b1d1bf4911a26c2f80a7122fe04
Author: Aki Koskinen <freedesktop at akikoskinen.info>
-Date: Fri Jul 11 00:30:52 2014 +0200
+Date: Fri Jul 11 00:30:52 2014 +0200
Fix compilation of Qt5 frontend with MinGW
@@ -4550,7 +6583,7 @@
commit ddd91675792d9d496b06223867e05d2a190b878b
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu May 29 16:58:55 2014 +0200
+Date: Thu May 29 16:58:55 2014 +0200
Include stdio.h from poppler-config.h
@@ -4563,8 +6596,8 @@
XRef::XRefTableWriter::writeEntry(Goffset, int, XRefEntryType)':
XRef.cc:1460:94: warning: unknown conversion type character 'l'
in format [-Wformat=]
- outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen,
- (type==xrefEntryFree)?'f':'n');
+ outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen,
+ (type==xrefEntryFree)?'f':'n');
^
XRef.cc:1460:94: warning: format '%i' expects argument of type 'int',
but argument 3 has type 'Goffset {aka long long int}' [-Wformat=]
@@ -4578,7 +6611,7 @@
commit bb16c7162c73b871e26f508823c0ee259b7e5420
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 7 12:00:52 2014 +0200
+Date: Sat Jun 7 12:00:52 2014 +0200
Move automake version check from autogen.sh to configure.ac
@@ -4591,13 +6624,13 @@
commit 74c72223cf609e7c24594f95cab6f9865ad562ac
Merge: f8f7b3a 47a947f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 11 00:23:04 2014 +0200
+Date: Fri Jul 11 00:23:04 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 47a947f1dc664793a7037888a46a297a46c79d6c
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Jun 19 10:11:21 2014 +0200
+Date: Thu Jun 19 10:11:21 2014 +0200
Fix moc-qt5 detection
@@ -4609,13 +6642,13 @@
commit f8f7b3a61bc7eb1e569c25a630b5e127b5dcae62
Merge: 805ff76 aa6205d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 9 00:23:22 2014 +0200
+Date: Wed Jul 9 00:23:22 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit aa6205d195c56a77e897bad125bf213aba138422
Author: Jason Crain <jason at aquaticape.us>
-Date: Mon Jul 7 23:52:39 2014 -0500
+Date: Mon Jul 7 23:52:39 2014 -0500
Increase required Qt4 version to 4.7.0
@@ -4624,12 +6657,12 @@
bug #81005
CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
+ configure.ac | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
commit 805ff76112ebfd57276ea78f1f0891abc61a6c03
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
-Date: Mon Apr 11 16:26:11 2011 -0500
+Date: Mon Apr 11 16:26:11 2011 -0500
Do not dist gir_DATA
@@ -4640,7 +6673,7 @@
commit e5862155b1c549b6774bb4f25c09c45857ff1734
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 20:58:56 2014 +0200
+Date: Wed Jun 4 20:58:56 2014 +0200
Add Changelog to .gitignore
@@ -4651,7 +6684,7 @@
commit 5f22649694d64c4170db82847b599576d5377176
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 20:56:23 2014 +0200
+Date: Wed Jun 4 20:56:23 2014 +0200
Add *.gir, *.typelib to glib/.gitignore
@@ -4662,7 +6695,7 @@
commit b63f57985719c7884b67f46fc4afd4954c44c5ab
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 20:54:30 2014 +0200
+Date: Wed Jun 4 20:54:30 2014 +0200
Add poppler-undeclared.txt to .gitignore
@@ -4673,7 +6706,7 @@
commit 5e0f4e2516d5a3997ea9c9a9927e24d4f3abe136
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 20:52:15 2014 +0200
+Date: Wed Jun 4 20:52:15 2014 +0200
Add poppler-forms, stress-threads-qt, test-render-to-file to
.gitignore
@@ -4686,7 +6719,7 @@
commit 4d2400e7bb8ae9208030b9615dda7c53e571be8b
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 10:09:16 2014 +0200
+Date: Wed Jun 4 10:09:16 2014 +0200
Add test-driver to .gitignore
@@ -4697,7 +6730,7 @@
commit 4c35e0213be26f21b628ff8d9f170252bb0106c9
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 4 10:06:20 2014 +0200
+Date: Wed Jun 4 10:06:20 2014 +0200
Add poppler-qt5.pc to .gitignore
@@ -4708,7 +6741,7 @@
commit 2b455b85168d5c9d8641d9a91bfde81ccab18e54
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jul 6 11:13:54 2014 +0200
+Date: Sun Jul 6 11:13:54 2014 +0200
glib: fix typo in apidox
@@ -4717,14 +6750,14 @@
commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 19 20:16:19 2014 +0200
+Date: Thu Jun 19 20:16:19 2014 +0200
0.26.2
CMakeLists.txt | 2 +-
- NEWS | 10 ++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 15 insertions(+), 5 deletions(-)
@@ -4731,7 +6764,7 @@
commit 3381ee20efca2ce27733182d0d6720c1e6936a7f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 19 19:57:31 2014 +0200
+Date: Thu Jun 19 19:57:31 2014 +0200
Update (C)
@@ -4742,13 +6775,13 @@
commit 8a5e59c6ea7ccd0ecbdb4b37bf3fe4e74e1c0e8e
Merge: 1b70533 310fbee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 18 00:37:03 2014 +0200
+Date: Wed Jun 18 00:37:03 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 310fbeec692b02d555e3e8dd6c851be11b25e26a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 18 00:31:48 2014 +0200
+Date: Wed Jun 18 00:31:48 2014 +0200
Make sure we have an xref before using
@@ -4789,7 +6822,7 @@
commit 1b705331019b155f2138d4b9f5a5bd03ec59193d
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 17:07:15 2014 +0200
+Date: Sun Jun 8 17:07:15 2014 +0200
[glib] doc: Move poppler_date_parse to utility functions section
@@ -4801,7 +6834,7 @@
commit d661553b0a13855aa5a1240e9c04a0e49dafd910
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 16:11:26 2014 +0200
+Date: Sun Jun 8 16:11:26 2014 +0200
[glib] doc: Document PopplerFindFlags:POPPLER_FIND_DEFAULT
@@ -4819,7 +6852,7 @@
commit 237a1402ab836d10eb5fdc1aa6ceccabea10a316
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 16:07:14 2014 +0200
+Date: Sun Jun 8 16:07:14 2014 +0200
[glib] doc: Use <emphasis> instead of <em>
@@ -4835,7 +6868,7 @@
commit 66abf3992228be2559542e9d2753f45f06ae7728
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 16:02:01 2014 +0200
+Date: Sun Jun 8 16:02:01 2014 +0200
[glib] doc: Add PopplerBackend documentation
@@ -4846,7 +6879,7 @@
commit a30ec8e4abe3875aad068c83265b47f9beea33d1
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 15:05:52 2014 +0200
+Date: Sun Jun 8 15:05:52 2014 +0200
[glib] doc: Add missing POPPLER_TYPE_POINT
@@ -4860,7 +6893,7 @@
commit 6eb0537ac5163356c8e8f689d2408fa695e99423
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 14:59:15 2014 +0200
+Date: Sun Jun 8 14:59:15 2014 +0200
[glib] doc: Fix typo
@@ -4871,7 +6904,7 @@
commit 96adcad85d76409cb8ed4266a08ae776b42661e4
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 14:53:42 2014 +0200
+Date: Sun Jun 8 14:53:42 2014 +0200
[glib] doc: Add poppler_annot_set_flags() to documentation
@@ -4882,7 +6915,7 @@
commit f3519352c70537009cc6bd660c0bd3e727db8b8a
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 14:38:13 2014 +0200
+Date: Sun Jun 8 14:38:13 2014 +0200
[glib] doc: Move PopplerFindFlags to PopplerPage section
@@ -4896,7 +6929,7 @@
commit 45b0d49330d9d089b2480b91e418924a490c82ce
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 14:22:28 2014 +0200
+Date: Sun Jun 8 14:22:28 2014 +0200
[glib] doc: Move PopplerPrintFlags to PopplerPage section
@@ -4907,7 +6940,7 @@
commit ce357147d17004a2772ca3b32d106da511bba360
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 13:22:51 2014 +0200
+Date: Sun Jun 8 13:22:51 2014 +0200
[glib] doc: Move poppler_get_{version, backend} documentation to
features section
@@ -4919,14 +6952,14 @@
commit 1bfd6b69e7e98d4b3e6e891a46b58c9109b8c14c
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 8 12:57:25 2014 +0200
+Date: Sun Jun 8 12:57:25 2014 +0200
[glib] doc: Move PopplerColor documentation to it's own section
https://bugs.freedesktop.org/show_bug.cgi?id=79798
- glib/poppler-page.cc | 6 ++++++
- glib/reference/poppler-docs.sgml | 1 +
+ glib/poppler-page.cc | 6 ++++++
+ glib/reference/poppler-docs.sgml | 1 +
glib/reference/poppler-sections.txt | 21 +++++++++++++++------
3 files changed, 22 insertions(+), 6 deletions(-)
@@ -4933,13 +6966,13 @@
commit 2dd9b95fd910023a7d9d23f2c2e41dcab91d3c31
Merge: fed71eb b36d27b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 6 21:43:49 2014 +0200
+Date: Fri Jun 6 21:43:49 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit b36d27b42417d15866a5729409e39d6f7c2b0289
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jun 6 21:42:10 2014 +0200
+Date: Fri Jun 6 21:42:10 2014 +0200
Fix typo in configure.ac
@@ -4950,7 +6983,7 @@
commit fed71ebd8e43e24eace9dcebe24bd318ff3d04a6
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu May 29 13:22:05 2014 +0200
+Date: Thu May 29 13:22:05 2014 +0200
Change pagenum arguments in PDFDoc::markAnnotations from Guint to int
@@ -4962,11 +6995,11 @@
XRef*, XRef*, Guint, Guint, Guint)':
PDFDoc.cc:1607:40: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
- if (obj2.getRef().num == oldPageNum) {
- ^
+ if (obj2.getRef().num == oldPageNum) {
+ ^
PDFDoc.cc:1617:47: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
- } else if (obj2.getRef().num == newPageNum) {
+ } else if (obj2.getRef().num == newPageNum) {
https://bugs.freedesktop.org/show_bug.cgi?id=79410
@@ -4976,7 +7009,7 @@
commit f5e702060a84362bfdf75260531920d4ba8b7333
Author: Pino Toscano <pino at kde.org>
-Date: Sat May 24 15:59:42 2014 +0200
+Date: Sat May 24 15:59:42 2014 +0200
pdftohtml: exit with 0 with -v and -h
@@ -4985,14 +7018,14 @@
commit 700bf398ef7b20306f5035e423becfaa3d28fb10
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 23 20:05:41 2014 +0200
+Date: Fri May 23 20:05:41 2014 +0200
0.26.1
CMakeLists.txt | 2 +-
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 17 insertions(+), 5 deletions(-)
@@ -4999,7 +7032,7 @@
commit 93373cd113d046b65538fe983b46842d689a2112
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 11 18:31:10 2014 +0200
+Date: Sun May 11 18:31:10 2014 +0200
Qt: Add a new page->annotations() call that let's you specify subtypes
@@ -5006,27 +7039,27 @@
This way we don't return annotations you may not be interested in
qt4/src/poppler-annotation-private.h | 4 +--
- qt4/src/poppler-annotation.cc | 48
+ qt4/src/poppler-annotation.cc | 48
++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-page.cc | 7 +++++-
- qt4/src/poppler-qt4.h | 14 +++++++++++
+ qt4/src/poppler-page.cc | 7 +++++-
+ qt4/src/poppler-qt4.h | 14 +++++++++++
qt5/src/poppler-annotation-private.h | 4 +--
- qt5/src/poppler-annotation.cc | 48
+ qt5/src/poppler-annotation.cc | 48
++++++++++++++++++++++++++++++++++--
- qt5/src/poppler-page.cc | 7 +++++-
- qt5/src/poppler-qt5.h | 15 +++++++++++
+ qt5/src/poppler-page.cc | 7 +++++-
+ qt5/src/poppler-qt5.h | 15 +++++++++++
8 files changed, 137 insertions(+), 10 deletions(-)
commit d2892cd893e4379914a08e66682ed5c423743a41
Merge: 0844220 7e9fc61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 7 22:27:41 2014 +0200
+Date: Wed May 7 22:27:41 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 7 22:25:59 2014 +0200
+Date: Wed May 7 22:25:59 2014 +0200
Fix libopenjpeg 1.5 detection on some systems
@@ -5041,13 +7074,13 @@
commit 0844220347f984c3d9b04fe53e690ee0e8c74afe
Merge: 84278d8 0a6c1ff
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 7 21:56:07 2014 +0200
+Date: Wed May 7 21:56:07 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 0a6c1ff777aa23c7a5654b313b639e66600883b9
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed May 7 21:54:46 2014 +0200
+Date: Wed May 7 21:54:46 2014 +0200
Only add annotations of the current page when splitting
@@ -5062,13 +7095,13 @@
commit 84278d8adbb1f6e9a28588fcb4db30c9ef70adde
Merge: 7b94b11 5b2cdef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 4 22:21:25 2014 +0200
+Date: Sun May 4 22:21:25 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 5b2cdef49a8a0a92fd323fbe45841a5098a42ece
Author: Olly Betts <olly at survex.com>
-Date: Sun May 4 22:20:30 2014 +0200
+Date: Sun May 4 22:20:30 2014 +0200
Fix extraction of text in some files
@@ -5080,13 +7113,13 @@
commit 7b94b119f07713af7b8b9f1ac3ea3f1d35c1e240
Merge: c859d2b bae836c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 4 16:21:24 2014 +0200
+Date: Sun May 4 16:21:24 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit bae836cd3dd3511ca9cf4745626142334bafd1a6
Author: Marek Kasik <mkasik at redhat.com>
-Date: Sun May 4 16:20:33 2014 +0200
+Date: Sun May 4 16:20:33 2014 +0200
Use field value V for radio buttons
@@ -5101,7 +7134,7 @@
commit a748b3a059938e6ae98b51eb82bab7c33a5e23c7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Apr 30 09:25:31 2014 +0200
+Date: Wed Apr 30 09:25:31 2014 +0200
glib: Fix multiple definition of PopplerTextSpan
@@ -5112,7 +7145,7 @@
commit c859d2b891a115c79d04db14463791dfb1c46a20
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Apr 30 09:25:31 2014 +0200
+Date: Wed Apr 30 09:25:31 2014 +0200
glib: Fix multiple definition of PopplerTextSpan
@@ -5123,14 +7156,14 @@
commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 25 01:01:08 2014 +0200
+Date: Fri Apr 25 01:01:08 2014 +0200
0.26.0
CMakeLists.txt | 4 ++--
- NEWS | 13 +++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ NEWS | 13 +++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 20 insertions(+), 7 deletions(-)
@@ -5137,7 +7170,7 @@
commit 8073852c84b71257d487aa8a46e441aa82f4b42c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Apr 14 23:35:50 2014 +0200
+Date: Mon Apr 14 23:35:50 2014 +0200
qt: Fix missing ! in TextAnnotation::setInplaceIntent
@@ -5149,7 +7182,7 @@
commit 1fbf98664c0879ac035a63602242a910c0c1d316
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 14 11:53:59 2014 +0200
+Date: Mon Apr 14 11:53:59 2014 +0200
Initialize tmpBufLen
@@ -5165,7 +7198,7 @@
commit b3e5c582a279b1b8d8309322ac3f4d0e51831f77
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 10 23:38:09 2014 +0200
+Date: Thu Apr 10 23:38:09 2014 +0200
Remove unused member
@@ -5174,19 +7207,19 @@
commit b86f471c43e387cf873358cf3cbcd27470646713
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 10 22:50:56 2014 +0200
+Date: Thu Apr 10 22:50:56 2014 +0200
0.25.3
- CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ CMakeLists.txt | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/CairoOutputDev.cc | 2 +-
- poppler/GfxFont.cc | 2 +-
- qt4/src/Doxyfile | 2 +-
+ poppler/GfxFont.cc | 2 +-
+ qt4/src/Doxyfile | 2 +-
qt4/src/poppler-optcontent.cc | 2 +-
- qt5/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
qt5/src/poppler-optcontent.cc | 2 +-
qt5/src/poppler-private.cc | 2 +-
qt5/src/poppler-private.h | 2 +-
@@ -5194,7 +7227,7 @@
commit 80107c72ac03bf4d00b2d71d6f947c139ea84ab5
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 6 20:17:31 2014 +0200
+Date: Sun Apr 6 20:17:31 2014 +0200
qt5: remove m_fontInfoIterator from Document
@@ -5207,7 +7240,7 @@
commit b8325316e41fb03eb5fac5c80d6a550fe9ce9695
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 16:05:51 2014 +0200
+Date: Sun Apr 6 16:05:51 2014 +0200
Fix memory leak
@@ -5218,7 +7251,7 @@
commit ca9713118d6ce3fdd245f9ca4f595229a5be19c3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:59:43 2014 +0200
+Date: Sun Apr 6 15:59:43 2014 +0200
Don't check twice for the same variable ^_^
@@ -5229,7 +7262,7 @@
commit 0ef290a7c5a8fa54d3fe0f646abdf098443a7a67
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:57:38 2014 +0200
+Date: Sun Apr 6 15:57:38 2014 +0200
Fix memory leak
@@ -5240,7 +7273,7 @@
commit 8810b8917fded340b784873a91ca025b0bb49f3d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:49:18 2014 +0200
+Date: Sun Apr 6 15:49:18 2014 +0200
Fix Out-of-bounds read
@@ -5251,7 +7284,7 @@
commit 9309907673e8557a25021dce79d9b4354640e2d0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:35:00 2014 +0200
+Date: Sun Apr 6 15:35:00 2014 +0200
Fix memory leak
@@ -5264,7 +7297,7 @@
commit a511005584a38217fed582ced6ce2c937526cf96
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:28:50 2014 +0200
+Date: Sun Apr 6 15:28:50 2014 +0200
Fix Uninitialized pointer read when nFucnsA is 0
@@ -5275,7 +7308,7 @@
commit 26b961a64030d91c5db2769dcd0ab8dff7b9b6a6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:23:35 2014 +0200
+Date: Sun Apr 6 15:23:35 2014 +0200
gfree -> delete since it was new'ed
@@ -5286,7 +7319,7 @@
commit 814ac2230b594cce3b871588804dd92f4a187e7e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:22:13 2014 +0200
+Date: Sun Apr 6 15:22:13 2014 +0200
delete -> gfree since it was gmaloced
@@ -5297,7 +7330,7 @@
commit b496b6665803247b10b018ae939a2a452fa4a48f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:17:50 2014 +0200
+Date: Sun Apr 6 15:17:50 2014 +0200
Fix memory leak
@@ -5308,7 +7341,7 @@
commit 1b612f355e9f29fa93c15a9de1188049a8e086b6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 6 15:14:50 2014 +0200
+Date: Sun Apr 6 15:14:50 2014 +0200
Fix memory leak
@@ -5320,13 +7353,13 @@
commit 07621ebbda8ab85cf4cd76a6092efc67aa14454d
Merge: 8d3a2c9 9fcd46a
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 15:49:31 2014 +0200
+Date: Sat Apr 5 15:49:31 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 9fcd46ac4a94f138981ec5afaab3875918c6a175
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 15:48:27 2014 +0200
+Date: Sat Apr 5 15:48:27 2014 +0200
qt4/qt5: remove extra qDebug
@@ -5336,7 +7369,7 @@
commit 37286ee2923de060ae463ac6b178ffd0e6096b90
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 15:46:44 2014 +0200
+Date: Sat Apr 5 15:46:44 2014 +0200
qt4/qt5: fix some kinds of OCG models
@@ -5348,19 +7381,19 @@
commit 8d3a2c9d007052bcb8719200760a1abb6314f804
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Sun Mar 30 23:34:23 2014 +0200
+Date: Sun Mar 30 23:34:23 2014 +0200
Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
- goo/GooMutex.h | 3 +++
- goo/GooTimer.h | 5 ++++-
- goo/gfile.h | 5 ++++-
+ goo/GooMutex.h | 3 +++
+ goo/GooTimer.h | 5 ++++-
+ goo/gfile.h | 5 ++++-
poppler/XpdfPluginAPI.h | 3 +++
4 files changed, 14 insertions(+), 2 deletions(-)
commit 38dcaf96f308265ff6958e4683bcec2be0c254b9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 28 20:49:17 2014 +1030
+Date: Fri Mar 28 20:49:17 2014 +1030
cairo: fix segv cause by bad image stream
@@ -5371,7 +7404,7 @@
commit 07b0a038b194eb0392a1e9a4236064d37247d687
Author: Jakub Wilk <jwilk at jwilk.net>
-Date: Sun Mar 30 16:12:28 2014 +0200
+Date: Sun Mar 30 16:12:28 2014 +0200
pdftohtml: Fix typo in manpage
@@ -5380,7 +7413,7 @@
commit ac3c8303396a0b8de5e4ad32f480b8da5f3b396e
Author: Thomas Liebetraut <thomas at tommie-lie.de>
-Date: Sun Mar 30 12:25:26 2014 +0200
+Date: Sun Mar 30 12:25:26 2014 +0200
glib: Fix the first coord of the qudrilateral in
create_poppler_quads_from_annot_quads()
@@ -5392,7 +7425,7 @@
commit 82d69da7c2f67e774c51fb7b146fdf639a6b9616
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 28 15:53:22 2014 +0100
+Date: Fri Mar 28 15:53:22 2014 +0100
Fix error reported by ASAN in 3628.asan.0.3910.pdf
@@ -5400,51 +7433,51 @@
address 0x60040005c6ef at pc 0x7f8912ca0c90 bp 0x7fff8509ee20 sp
0x7fff8509ee18
READ of size 1 at 0x60040005c6ef thread T0
- #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*,
- int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855
- #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, int, bool, int, int, int, int, SplashBitmap*)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:4897
- #2 0x7f8912c9d2b7 in Splash::scaleImage(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, int, bool, int, int, int, int, bool, bool)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:4127
- #3 0x7f8912c98101 in Splash::drawImage(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, bool, int, int, double*, bool, bool)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:3726
- #4 0x7f8912c7056a in
- SplashOutputDev::drawSoftMaskedImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*,
- bool, Stream*, int, int, GfxImageColorMap*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630
- #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646
- #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7f8912a9e50f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7f8912a9e163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*,
+ int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855
+ #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, int, bool, int, int, int, int, SplashBitmap*)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:4897
+ #2 0x7f8912c9d2b7 in Splash::scaleImage(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, int, bool, int, int, int, int, bool, bool)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:4127
+ #3 0x7f8912c98101 in Splash::drawImage(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, bool, int, int, double*, bool, bool)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:3726
+ #4 0x7f8912c7056a in
+ SplashOutputDev::drawSoftMaskedImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*,
+ bool, Stream*, int, int, GfxImageColorMap*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630
+ #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646
+ #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7f8912a9e50f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7f8912a9e163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/Splash.cc | 3 +++
1 file changed, 3 insertions(+)
@@ -5451,7 +7484,7 @@
commit 38ec8cbeeaf69d96b9d7bcd662187c8916cf7903
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 28 11:18:02 2014 +0100
+Date: Fri Mar 28 11:18:02 2014 +0100
Fix error reported by ASAN in 5782.asan.0.7113.pdf
@@ -5459,38 +7492,38 @@
address 0x6008000e3bcf at pc 0x7f66bae0e117 bp 0x7fffcb54ea70 sp
0x7fffcb54ea68
READ of size 1 at 0x6008000e3bcf thread T0
- #0 0x7f66bae0e116 in GooString::getChar(int)
- /home/tsdgeos/devel/poppler/goo/GooString.h:119
- #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*)
- /home/tsdgeos/devel/poppler/poppler/Link.cc:562
- #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*)
- /home/tsdgeos/devel/poppler/poppler/Link.cc:98
- #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621
- #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596
- #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737
- #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683
- #7 0x7f66bafc750d in Page::getAnnots(XRef*)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:402
- #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:595
- #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int,
- double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #11 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #13 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f66bae0e116 in GooString::getChar(int)
+ /home/tsdgeos/devel/poppler/goo/GooString.h:119
+ #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Link.cc:562
+ #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Link.cc:98
+ #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621
+ #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596
+ #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737
+ #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683
+ #7 0x7f66bafc750d in Page::getAnnots(XRef*)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:402
+ #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:595
+ #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int,
+ double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #11 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #13 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/Link.cc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
@@ -5497,7 +7530,7 @@
commit 49b4eb68ee646aefe49b70f9e2831ebf93576053
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 28 11:08:18 2014 +0100
+Date: Fri Mar 28 11:08:18 2014 +0100
Fix error reported by ASAN in 590.asan.0.7288.pdf
@@ -5505,38 +7538,38 @@
address 0x60ae0007432c at pc 0x7f03483026aa bp 0x7fff6ec0c820 sp
0x7fff6ec0c818
READ of size 4 at 0x60ae0007432c thread T0
- #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414
- #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239
- #2 0x7f0348100599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #5 0x7f03480db50f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #6 0x7f03480db163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int,
- double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #10 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #12 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414
+ #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239
+ #2 0x7f0348100599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #5 0x7f03480db50f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #6 0x7f03480db163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int,
+ double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #10 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #12 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFTFont.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -5543,7 +7576,7 @@
commit 89a64b508e5f8445798c95fcec6c87180f6c9b73
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 28 00:35:17 2014 +0100
+Date: Fri Mar 28 00:35:17 2014 +0100
Fix error reported by ASAN in 2279.asan.0.1904.pdf
@@ -5551,47 +7584,47 @@
address 0x60420000ff04 at pc 0x7fa1492e8012 bp 0x7fff8406d900 sp
0x7fff8406d8f8
READ of size 4 at 0x60420000ff04 thread T0
- #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284
- #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168
- #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
- #3 0x7fa1492b3368 in Splash::fillChar(double, double, int,
- SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
- #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
- #5 0x7fa1490e7599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7fa1490c250f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7fa1490c2163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284
+ #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168
+ #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+ #3 0x7fa1492b3368 in Splash::fillChar(double, double, int,
+ SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+ #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+ #5 0x7fa1490e7599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7fa1490c250f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7fa1490c2163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFTFont.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -5598,7 +7631,7 @@
commit 5055479634dc8d0cd5afb3373de600fb121357fe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 27 23:54:20 2014 +0100
+Date: Thu Mar 27 23:54:20 2014 +0100
Fix error reported by ASAN in 2010.asan.0.1506.pdf
@@ -5606,45 +7639,45 @@
0x7f1e4a6beb50 at pc 0x7f1e5557444d bp 0x7fff6af3c340 sp
0x7fff6af3bb00
WRITE of size 442216446 at 0x7f1e4a6beb50 thread T0
- #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c)
- #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206
- #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
- #3 0x7f1e550a5368 in Splash::fillChar(double, double, int,
- SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
- #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
- #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7f1e54eb450f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7f1e54eb4163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c)
+ #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206
+ #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+ #3 0x7f1e550a5368 in Splash::fillChar(double, double, int,
+ SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+ #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+ #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7f1e54eb450f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7f1e54eb4163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFont.cc | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
@@ -5651,7 +7684,7 @@
commit 3e7779935ec2610410bc4a42e9b0174e41ca9672
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 27 16:49:57 2014 +0100
+Date: Thu Mar 27 16:49:57 2014 +0100
Fix error reported by ASAN in 139.asan.0.581.pdf
@@ -5659,35 +7692,35 @@
0x605df000f3ee (pc 0x7f1087b3a22e sp 0x7fffec30ff20 bp 0x7fffec30ff80
T0)
AddressSanitizer can not provide additional info.
- #0 0x7f1087b3a22d
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d)
- #1 0x7f1087b19d92
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92)
- #2 0x7f1087ae570b
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b)
- #3 0x7f1087ae4061
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061)
- #4 0x7f1087ab9b38
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38)
- #5 0x7f1087900989
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989)
- #6 0x7f10878f733a
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a)
- #7 0x7f10878f650f
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f)
- #8 0x7f10878f6163
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163)
- #9 0x7f10879d8dd1
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1)
- #10 0x7f10879e02fd
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd)
- #11 0x40311e
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e)
- #12 0x404416
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416)
- #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4)
- #14 0x401d58
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f1087b3a22d
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d)
+ #1 0x7f1087b19d92
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92)
+ #2 0x7f1087ae570b
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b)
+ #3 0x7f1087ae4061
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061)
+ #4 0x7f1087ab9b38
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38)
+ #5 0x7f1087900989
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989)
+ #6 0x7f10878f733a
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a)
+ #7 0x7f10878f650f
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f)
+ #8 0x7f10878f6163
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163)
+ #9 0x7f10879d8dd1
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1)
+ #10 0x7f10879e02fd
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd)
+ #11 0x40311e
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e)
+ #12 0x404416
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416)
+ #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4)
+ #14 0x401d58
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashXPathScanner.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@@ -5694,42 +7727,42 @@
commit 23ad7fa5253a4fec6543d1435827aa1b59b62ced
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 27 01:14:05 2014 +0100
+Date: Thu Mar 27 01:14:05 2014 +0100
0.25.2
- CMakeLists.txt | 4 ++--
- NEWS | 48
+ CMakeLists.txt | 4 ++--
+ NEWS | 48
+++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- gtk-doc.make | 33 +++++++++++++++++++---------
- m4/gtk-doc.m4 | 47
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 33 +++++++++++++++++++---------
+ m4/gtk-doc.m4 | 47
+++++++++++++++++++++++++++-------------
- poppler/CairoOutputDev.h | 2 +-
- poppler/Hints.cc | 2 +-
- poppler/Makefile.am | 2 +-
- poppler/PSOutputDev.cc | 3 ++-
- poppler/PSOutputDev.h | 2 +-
- poppler/StructElement.cc | 2 +-
- poppler/StructElement.h | 2 +-
- poppler/StructTreeRoot.cc | 2 +-
- poppler/StructTreeRoot.h | 2 +-
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Hints.cc | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/PSOutputDev.cc | 3 ++-
+ poppler/PSOutputDev.h | 2 +-
+ poppler/StructElement.cc | 2 +-
+ poppler/StructElement.h | 2 +-
+ poppler/StructTreeRoot.cc | 2 +-
+ poppler/StructTreeRoot.h | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt4/src/poppler-ps-converter.cc | 1 +
- qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
qt5/src/poppler-ps-converter.cc | 1 +
- utils/pdftocairo.cc | 2 +-
- utils/pdftops.cc | 1 +
+ utils/pdftocairo.cc | 2 +-
+ utils/pdftops.cc | 1 +
25 files changed, 127 insertions(+), 45 deletions(-)
commit ec2f8bca9f48935d3180dab65ef2ca455a893afd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 18:38:13 2014 +0100
+Date: Wed Mar 26 18:38:13 2014 +0100
Fix overflow malloc
@@ -5738,7 +7771,7 @@
commit 322e416451b7b33cba8fb3d4702207693c3c7921
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 17:58:48 2014 +0100
+Date: Wed Mar 26 17:58:48 2014 +0100
Fix error reported by ASAN in 1195.asan.0.293.pdf
@@ -5746,47 +7779,47 @@
address 0x60040002a215 at pc 0x7f5614cd96c4 bp 0x7fff54a44050 sp
0x7fff54a44048
READ of size 1 at 0x60040002a215 thread T0
- #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389
- #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned
- int, unsigned int, unsigned int*, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
- #2 0x7f5614ccb8fe in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
- #3 0x7f5614cca72e in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7f5614d1648b in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7f5614c1850f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7f5614c18163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389
+ #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7f5614ccb8fe in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7f5614cca72e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f5614d1648b in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f5614c1850f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f5614c18163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
@@ -5793,7 +7826,7 @@
commit 225232f6f070d17d8570108ffe39ffd4350fc6e8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 15:00:09 2014 +0100
+Date: Wed Mar 26 15:00:09 2014 +0100
Fix error reported by ASAN in 6609.asan.0.8343.pdf
@@ -5801,47 +7834,47 @@
address 0x7f3b12f7b5e1 at pc 0x7f3b0f915f5e bp 0x7fff47842de0 sp
0x7fff47842dd8
READ of size 1 at 0x7f3b12f7b5e1 thread T0
- #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628
- #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned
- int, bool, bool, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849
- #2 0x7f3b0f906b33 in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443
- #3 0x7f3b0f90572e in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7f3b0f951459 in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7f3b0f85350f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7f3b0f853163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628
+ #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned
+ int, bool, bool, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849
+ #2 0x7f3b0f906b33 in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443
+ #3 0x7f3b0f90572e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f3b0f951459 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f3b0f85350f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f3b0f853163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
@@ -5848,7 +7881,7 @@
commit 216890f1f147b25643e0d6e18e361d4d34b6c332
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 12:19:42 2014 +0100
+Date: Wed Mar 26 12:19:42 2014 +0100
Fix error reported by ASAN in 6760.asan.0.8568.pdf
@@ -5856,52 +7889,52 @@
0x7fffbc3e5ea8 (pc 0x7fe1fa858db1 sp 0x7fffc788eb30 bp 0x7fffc788eb40
T0)
AddressSanitizer can not provide additional info.
- #0 0x7fe1fa858db0 in PSStack::index(int)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1067
- #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1621
- #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*,
- double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266
- #3 0x7fe1fa854097 in
- PostScriptFunction::PostScriptFunction(Object*, Dict*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1216
- #4 0x7fe1fa84a0c2 in Function::parse(Object*,
- std::set<int, std::less<int>, std::allocator<int> >*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:98
- #5 0x7fe1fa849e3c in Function::parse(Object*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:63
- #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*,
- OutputDev*, GfxState*, int)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978
- #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*,
- OutputDev*, GfxState*, int)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328
- #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403
- #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #11 0x7fe1fa85c49b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #16 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #18 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fe1fa858db0 in PSStack::index(int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1067
+ #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1621
+ #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*,
+ double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266
+ #3 0x7fe1fa854097 in
+ PostScriptFunction::PostScriptFunction(Object*, Dict*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1216
+ #4 0x7fe1fa84a0c2 in Function::parse(Object*,
+ std::set<int, std::less<int>, std::allocator<int> >*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:98
+ #5 0x7fe1fa849e3c in Function::parse(Object*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:63
+ #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978
+ #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328
+ #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403
+ #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #11 0x7fe1fa85c49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #16 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #18 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/Function.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
@@ -5908,7 +7941,7 @@
commit fb7d91435c71603697b652c70cfa76dd595ee200
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 12:08:52 2014 +0100
+Date: Wed Mar 26 12:08:52 2014 +0100
Fix ASAN in 750.asan.0.9621.pdf
@@ -5916,47 +7949,47 @@
address 0x60040002a10f at pc 0x7fc396c3c23e bp 0x7ffff1123d20 sp
0x7ffff1123d18
READ of size 1 at 0x60040002a10f thread T0
- #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504
- #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned
- int, unsigned int, unsigned int*, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
- #2 0x7fc396c2d88a in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
- #3 0x7fc396c2c6ba in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7fc396c783f7 in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7fc396b7a49b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7fc396b7a0ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504
+ #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7fc396c2d88a in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7fc396c2c6ba in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7fc396c783f7 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7fc396b7a49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7fc396b7a0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
@@ -5963,7 +7996,7 @@
commit 9002b3b7cbbbc5802abfa8383ded2093a29d1746
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 00:48:15 2014 +0100
+Date: Wed Mar 26 00:48:15 2014 +0100
Fix ASAN in 784.asan.0.9671.pdf
@@ -5972,57 +8005,57 @@
0x603bfffe5804 (pc 0x7f7aa3310c6b sp 0x7fff0e656bd0 bp 0x7fff0e656e90
T0)
AddressSanitizer can not provide additional info.
- #0 0x7f7aa3310c6a in
- GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
- #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*,
- GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529
- #2 0x7f7aa3466712 in convertGfxColor(unsigned
- char*, SplashColorMode, GfxColorSpace*, GfxColor*)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117
- #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int,
- int, unsigned char*)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215
- #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:363
- #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*,
- int, int, int, bool, unsigned char)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:1537
- #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool,
- SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388
- #7 0x7f7aa348b65c in
- SplashOutputDev::univariateShadedFill(GfxState*,
- SplashUnivariatePattern*, double, double)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408
- #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*,
- GfxRadialShading*, double, double)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427
- #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058
- #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476
- #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #12 0x7f7aa32b049b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #13 0x7f7aa32b00ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #17 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #19 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f7aa3310c6a in
+ GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
+ #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*,
+ GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529
+ #2 0x7f7aa3466712 in convertGfxColor(unsigned
+ char*, SplashColorMode, GfxColorSpace*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117
+ #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int,
+ int, unsigned char*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215
+ #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:363
+ #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*,
+ int, int, int, bool, unsigned char)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:1537
+ #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool,
+ SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388
+ #7 0x7f7aa348b65c in
+ SplashOutputDev::univariateShadedFill(GfxState*,
+ SplashUnivariatePattern*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408
+ #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*,
+ GfxRadialShading*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427
+ #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058
+ #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476
+ #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #12 0x7f7aa32b049b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #13 0x7f7aa32b00ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #17 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #19 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
SUMMARY: AddressSanitizer: SEGV
/home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
@@ -6032,7 +8065,7 @@
commit 8947c6bc1dcb768b9d9c03a7a5db1573abdc2e87
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 00:47:59 2014 +0100
+Date: Wed Mar 26 00:47:59 2014 +0100
Forgot my (C) in the last commit
@@ -6041,7 +8074,7 @@
commit 1d7095ab7bdf0f14c3bfe99d6d5985bce98abe16
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 25 22:29:07 2014 +0100
+Date: Tue Mar 25 22:29:07 2014 +0100
Fix Heap-buffer-overflow in TextPage::updateFont
@@ -6052,7 +8085,7 @@
commit 37ad83d69bd1d10da6ea1eb559c4bd320917ae25
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 17:33:55 2014 +0100
+Date: Sat Mar 22 17:33:55 2014 +0100
Reorder the if check condition
@@ -6067,7 +8100,7 @@
commit 3535d658095ffa49ef8615d69843afa9c5ada061
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 17:29:46 2014 +0100
+Date: Sat Mar 22 17:29:46 2014 +0100
Make the test rect go to xMax, yMax not xMax-1,yMax-1
@@ -6079,7 +8112,7 @@
commit 1e93c3f2d1c86edd40ca283ed422089f64886d04
Author: William Bader <williambader at hotmail.com>
-Date: Sat Mar 15 17:14:21 2014 +0100
+Date: Sat Mar 15 17:14:21 2014 +0100
Fix regression when creating level1 PS
@@ -6086,18 +8119,18 @@
Bug #75241
poppler/PreScanOutputDev.cc | 16 ++++++++++++++--
- poppler/PreScanOutputDev.h | 3 ++-
+ poppler/PreScanOutputDev.h | 3 ++-
2 files changed, 16 insertions(+), 3 deletions(-)
commit 1ea2eb412d12d97eaf49d1e51d7fda7abd8fbf9d
Author: Jason Crain <jason at aquaticape.us>
-Date: Wed Mar 12 00:34:13 2014 +0100
+Date: Wed Mar 12 00:34:13 2014 +0100
Limit numeric parsing of character names
Bug #38456
- poppler/GfxFont.cc | 139
+ poppler/GfxFont.cc | 139
++++++++++++++++++++++++++++++++++--------------
poppler/GlobalParams.cc | 4 +-
2 files changed, 102 insertions(+), 41 deletions(-)
@@ -6104,7 +8137,7 @@
commit e24cbeae22d6c8630e292897bd982a87e6290ca6
Author: Steven Lee <roc.sky at gmail.com>
-Date: Tue Mar 11 21:24:59 2014 +0100
+Date: Tue Mar 11 21:24:59 2014 +0100
Fix TIFF writting in Windows
@@ -6115,7 +8148,7 @@
commit b984a3b5946ebcd736e0583a10eb614cede3388a
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Wed Mar 5 11:19:48 2014 +0200
+Date: Wed Mar 5 11:19:48 2014 +0200
glib: Use flags argument in poppler_structure_element_get_text()
@@ -6132,12 +8165,12 @@
glib/poppler-structure-element.cc | 12 +++++++-----
glib/poppler-structure-element.h | 14 +++++++++++++-
- glib/reference/poppler-sections.txt | 3 +++
+ glib/reference/poppler-sections.txt | 3 +++
3 files changed, 23 insertions(+), 6 deletions(-)
commit 94df09de1e07d442895ec1fb5cc23cacd9826552
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Mar 6 10:44:51 2014 +0200
+Date: Thu Mar 6 10:44:51 2014 +0200
glib: Add missing underscore in method name
@@ -6150,7 +8183,7 @@
commit 7ddd03f9a00dcf505921821c55bebe6817aa3605
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 5 17:48:39 2014 +0100
+Date: Wed Mar 5 17:48:39 2014 +0100
Rename getNumElements, getElement and appendElement as getNumChildren,
getChild and appendChild
@@ -6158,15 +8191,15 @@
It's more consistent with other internal API and less confusing.
glib/poppler-structure-element.cc | 16 ++++++++--------
- poppler/StructElement.cc | 6 +++---
- poppler/StructElement.h | 8 ++++----
- poppler/StructTreeRoot.cc | 4 ++--
- poppler/StructTreeRoot.h | 8 ++++----
+ poppler/StructElement.cc | 6 +++---
+ poppler/StructElement.h | 8 ++++----
+ poppler/StructTreeRoot.cc | 4 ++--
+ poppler/StructTreeRoot.h | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
commit 7d6a5b65f8497537248d405177ae141f3765a419
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 5 17:40:14 2014 +0100
+Date: Wed Mar 5 17:40:14 2014 +0100
glib: Update the documentation symbols after the PopplerStructureScope
rename
@@ -6176,7 +8209,7 @@
commit 9282b5a26e9ce81d81d42c0cbe449543c8366b7c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 5 17:37:38 2014 +0100
+Date: Wed Mar 5 17:37:38 2014 +0100
glib: Rename PopplerStructureScope as PopplerStructureTableScope
@@ -6188,7 +8221,7 @@
commit 9888eb65c6fad0eabcf525a7e88941dec2a27e92
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Sep 26 19:36:12 2013 +0300
+Date: Thu Sep 26 19:36:12 2013 +0300
glib: Implement accessors for element attributes
@@ -6200,25 +8233,25 @@
glib/poppler-structure-element.cc | 1279
++++++++++++++++++++++++++++++++++-
- glib/poppler-structure-element.h | 252 ++++++-
- glib/reference/poppler-sections.txt | 84 +++
+ glib/poppler-structure-element.h | 252 ++++++-
+ glib/reference/poppler-sections.txt | 84 +++
3 files changed, 1597 insertions(+), 18 deletions(-)
commit b346df59ef0775f5bd74a9f7379b5f430ccd7b79
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Tue Mar 4 23:40:59 2014 +0100
+Date: Tue Mar 4 23:40:59 2014 +0100
Qt: Expose document-supplied text direction
qt4/src/poppler-document.cc | 17 +++++++++++++++++
- qt4/src/poppler-qt4.h | 10 +++++++++-
+ qt4/src/poppler-qt4.h | 10 +++++++++-
qt5/src/poppler-document.cc | 17 +++++++++++++++++
- qt5/src/poppler-qt5.h | 10 +++++++++-
+ qt5/src/poppler-qt5.h | 10 +++++++++-
4 files changed, 52 insertions(+), 2 deletions(-)
commit 2fc38c1866243598e22be07f0177e7d9385542d5
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Fri Feb 28 19:14:36 2014 +0200
+Date: Fri Feb 28 19:14:36 2014 +0200
glib: Fixes in the API reference documentation
@@ -6238,7 +8271,7 @@
commit cfe47a655ec5e280168e000da85bbf13f5f5f8b8
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Fri Feb 28 19:17:45 2014 +0200
+Date: Fri Feb 28 19:17:45 2014 +0200
glib: Remove poppler_text_span_is_link() in header
@@ -6252,7 +8285,7 @@
commit 7a2db63b5f7cae4bc215baa0859c4d4f8a660951
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Wed Feb 26 20:16:29 2014 +0200
+Date: Wed Feb 26 20:16:29 2014 +0200
glib: Remove unneeded POPPLER_STRUCTURE_ELEMENT_UNKNOWN
@@ -6270,7 +8303,7 @@
commit db909c2a14f962234a813ba9853535b9692cfd5a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 26 22:09:44 2014 +0100
+Date: Wed Feb 26 22:09:44 2014 +0100
Try harder to open broken files
@@ -6282,7 +8315,7 @@
commit b2394eee5384edf4128d598030989e66d64714ef
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Mon Feb 10 20:29:35 2014 +0200
+Date: Mon Feb 10 20:29:35 2014 +0200
Tagged-PDF: Fix parsing of attached element attributes
@@ -6301,7 +8334,7 @@
commit c549b5e9ce2dcc8beb2511ee315bfff2fdfdf6e8
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Sun Feb 9 18:31:22 2014 +0200
+Date: Sun Feb 9 18:31:22 2014 +0200
glib: Add poppler_structure_element_is_grouping()
@@ -6311,13 +8344,13 @@
https://bugs.freedesktop.org/show_bug.cgi?id=74753
glib/poppler-structure-element.cc | 20 ++++++++++++++++++++
- glib/poppler-structure-element.h | 1 +
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-structure-element.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 22 insertions(+)
commit 6fbd6cb85bdd32dc5a3d4c3c719556269a4488ac
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Fri Feb 21 15:02:44 2014 +0200
+Date: Fri Feb 21 15:02:44 2014 +0200
glib: Handle missing structure element types
@@ -6335,11 +8368,11 @@
commit 63e9c0b67fa2e64ca20258d873a849386c7eb295
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Feb 17 23:58:09 2014 +0100
+Date: Mon Feb 17 23:58:09 2014 +0100
Some error() usage fixes
- poppler/Hints.cc | 3 ++-
+ poppler/Hints.cc | 3 ++-
poppler/JBIG2Stream.cc | 4 ++--
poppler/PSOutputDev.cc | 4 ++--
poppler/SecurityHandler.cc | 3 ++-
@@ -6351,21 +8384,21 @@
commit 8f2d847f1d0224a297e642944f8da9c1409732b6
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Feb 17 23:56:49 2014 +0100
+Date: Mon Feb 17 23:56:49 2014 +0100
Clang++ plugin that checks for usage errors in GooString::format-style
calls
- goo/GooString.h | 12 +-
- poppler/Error.h | 4 +-
- test/goostring-format-checker/README | 16 +
- .../goostring-format-checker.cc | 369
+ goo/GooString.h | 12 +-
+ poppler/Error.h | 4 +-
+ test/goostring-format-checker/README | 16 +
+ .../goostring-format-checker.cc | 369
+++++++++++++++++++++
4 files changed, 397 insertions(+), 4 deletions(-)
commit d7d61dcda91910f7eb2548b19e8380d7c3232dd3
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Feb 12 21:50:38 2014 +0100
+Date: Wed Feb 12 21:50:38 2014 +0100
blend usage in PDF with spot colors casue random output
@@ -6382,7 +8415,7 @@
commit b2905a0d299cc09fcd219afe49cb370f6db61c5a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 10 20:19:07 2014 +0100
+Date: Mon Feb 10 20:19:07 2014 +0100
increase gtk3 dependency
@@ -6389,12 +8422,12 @@
gtk_tree_view_set_activate_on_single_click was introduced in 3.8
cmake/modules/FindGTK.cmake | 2 +-
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 71d4041b061c109a965e72230640cf8ee616dac3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 10 20:16:46 2014 +0100
+Date: Mon Feb 10 20:16:46 2014 +0100
Make sure number of least objects in hints table is valid
@@ -6405,17 +8438,17 @@
commit a865f13def88153fdbe8a0a054d2005e3e2bb737
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 9 23:22:07 2014 +0100
+Date: Sun Feb 9 23:22:07 2014 +0100
Fix cmake build
- glib/CMakeLists.txt | 2 ++
+ glib/CMakeLists.txt | 2 ++
glib/demo/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+)
commit d6fde0fac0120b1622942d8344d5153d9abf3e1e
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Wed May 29 23:44:03 2013 +0300
+Date: Wed May 29 23:44:03 2013 +0300
glib-demo: Pane showing the document structure
@@ -6424,8 +8457,8 @@
documents. It also serves as an example on how to to use the API for
PopplerStructure and PopplerStructureElement.
- glib/demo/Makefile.am | 2 +
- glib/demo/main.c | 2 +
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 2 +
glib/demo/taggedstruct.c | 232
+++++++++++++++++++++++++++++++++++++++++++++++
glib/demo/taggedstruct.h | 31 +++++++
@@ -6433,7 +8466,7 @@
commit 0f9fa775c469c03d1613b955ee7b06b823e6e080
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Sep 26 17:50:51 2013 +0300
+Date: Thu Sep 26 17:50:51 2013 +0300
glib: Expose inline attributes of structure elements
@@ -6452,14 +8485,14 @@
glib/poppler-structure-element.cc | 269
++++++++++++++++++++++++++++++++++++
- glib/poppler-structure-element.h | 16 ++-
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 12 ++
+ glib/poppler-structure-element.h | 16 ++-
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 12 ++
4 files changed, 297 insertions(+), 1 deletion(-)
commit 8072d4b0e3ea10b4308f8172891f769f30466133
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu May 9 12:01:59 2013 +0300
+Date: Thu May 9 12:01:59 2013 +0300
glib: Expose the document structure tree
@@ -6473,20 +8506,20 @@
https://bugs.freedesktop.org/show_bug.cgi?id=64821
- glib/Makefile.am | 2 +
- glib/poppler-private.h | 10 +
+ glib/Makefile.am | 2 +
+ glib/poppler-private.h | 10 +
glib/poppler-structure-element.cc | 663
++++++++++++++++++++++++++++++++++++
glib/poppler-structure-element.h | 112 ++++++
- glib/poppler.h | 3 +
- glib/reference/poppler-docs.sgml | 2 +
- glib/reference/poppler-sections.txt | 37 ++
- glib/reference/poppler.types | 2 +
+ glib/poppler.h | 3 +
+ glib/reference/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 37 ++
+ glib/reference/poppler.types | 2 +
8 files changed, 831 insertions(+)
commit 46b7470ae9846d7e6dbb72bbb3ff831acd954168
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Thu Jan 30 14:42:51 2014 -0800
+Date: Thu Jan 30 14:42:51 2014 -0800
glib-demo: Fix performance in text markup annotations
@@ -6497,7 +8530,7 @@
commit 8a84b45674aed8c27a1d172b07eb0531c0ec14f1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 8 09:17:02 2014 +0100
+Date: Sat Feb 8 09:17:02 2014 +0100
glib: Fix gobject-introspection warnings
@@ -6506,7 +8539,7 @@
commit 899799df78c00fc2ca6d2d0e612536b87a871817
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Tue Feb 4 19:26:53 2014 +0200
+Date: Tue Feb 4 19:26:53 2014 +0200
Allow properly identifying grouping elements
@@ -6527,7 +8560,7 @@
commit 27cd9a00bfebf0602e7ed29a8ee8e16ffff67bde
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Tue Feb 4 19:35:58 2014 +0200
+Date: Tue Feb 4 19:35:58 2014 +0200
Report LBody elements in Tagged-PDF structure as block elements
@@ -6544,7 +8577,7 @@
commit 4cda839cb489fe5cd4726109cb9ab8b0ba2fa563
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Jan 28 06:06:09 2014 +1030
+Date: Tue Jan 28 06:06:09 2014 +1030
pdftops: ensure there is always a page size in the output
@@ -6555,7 +8588,7 @@
commit 45a87afdf1372911aa1ba840557e61627cdc7b4f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Dec 29 15:16:37 2013 +1030
+Date: Sun Dec 29 15:16:37 2013 +1030
cairo: clip to crop box
@@ -6568,7 +8601,7 @@
commit 6d39a1d7b348329dd057a8e7c77bfd47921fc495
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Dec 30 17:59:09 2013 +1030
+Date: Mon Dec 30 17:59:09 2013 +1030
pdftocairo: ensure page size and crop box works the same as pdftops
@@ -6580,7 +8613,7 @@
commit b1da7e20dcef78ef6036418b37a47ba3f8818453
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Dec 19 22:18:26 2013 +1030
+Date: Thu Dec 19 22:18:26 2013 +1030
pdftops: Only change paper size when different to previous size
@@ -6596,7 +8629,7 @@
commit 7ac7d3bad4b868950ee96fd9c5ece88632f8827c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Dec 20 07:19:21 2013 +1030
+Date: Fri Dec 20 07:19:21 2013 +1030
pdftops: Remove origpagesizes mode and make -origpagesizes an alias
for -paper match
@@ -6604,14 +8637,14 @@
Bug 72312
poppler/PSOutputDev.cc | 9 ++-------
- poppler/PSOutputDev.h | 4 ++--
- utils/pdftops.1 | 30 ++++++++++--------------------
- utils/pdftops.cc | 23 ++++++++++++++---------
+ poppler/PSOutputDev.h | 4 ++--
+ utils/pdftops.1 | 30 ++++++++++--------------------
+ utils/pdftops.cc | 23 ++++++++++++++---------
4 files changed, 28 insertions(+), 38 deletions(-)
commit 31fc5181bc491ff2e4aee0ae05c0f611a36e585c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Dec 20 07:16:37 2013 +1030
+Date: Fri Dec 20 07:16:37 2013 +1030
pdftops: Use crop box as page size
@@ -6626,23 +8659,23 @@
commit bf2049b17ac4706f472c59e50266f4eaf0ffaa32
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Dec 15 18:00:41 2013 +1030
+Date: Sun Dec 15 18:00:41 2013 +1030
pdftps: fix DocumentMedia/Page/Media/PageBBox DSC comments
Bug 72312
- poppler/PSOutputDev.cc | 167
+ poppler/PSOutputDev.cc | 167
++++++++++++++++++++++++++--------------
- poppler/PSOutputDev.h | 6 +-
+ poppler/PSOutputDev.h | 6 +-
qt4/src/poppler-ps-converter.cc | 1 +
qt5/src/poppler-ps-converter.cc | 1 +
- utils/pdftops.cc | 1 +
+ utils/pdftops.cc | 1 +
5 files changed, 119 insertions(+), 57 deletions(-)
commit fe49033c9bd2103c13d4eb59983e06fdcdd33a8d
Author: Till Kamppeter <till.kamppeter at gmail.com>
-Date: Sat Dec 14 16:05:09 2013 +1030
+Date: Sat Dec 14 16:05:09 2013 +1030
pdftops: ensure paper size takes into account rotation
@@ -6654,28 +8687,28 @@
commit 31edf585e62f4e91b7b64295cc8b978ac466ce58
Author: Bogdan Cristea <cristeab at gmail.com>
-Date: Mon Jan 27 20:06:11 2014 +0100
+Date: Mon Jan 27 20:06:11 2014 +0100
[qt] Improve compilation under Win 8 with Visual Studio 2012
Bug #73111
- goo/GooMutex.h | 3 ++-
- goo/GooTimer.h | 2 ++
- goo/gfile.h | 2 ++
- poppler/PDFDoc.cc | 4 +---
- poppler/XpdfPluginAPI.h | 2 ++
+ goo/GooMutex.h | 3 ++-
+ goo/GooTimer.h | 2 ++
+ goo/gfile.h | 2 ++
+ poppler/PDFDoc.cc | 4 +---
+ poppler/XpdfPluginAPI.h | 2 ++
poppler/poppler-config.h.cmake | 18 ++++++++++++++++--
- poppler/poppler-config.h.in | 18 ++++++++++++++++--
+ poppler/poppler-config.h.in | 18 ++++++++++++++++--
qt4/tests/stress-threads-qt4.cpp | 5 +++++
- qt5/src/poppler-private.h | 6 ++++--
+ qt5/src/poppler-private.h | 6 ++++--
qt5/tests/stress-threads-qt5.cpp | 5 +++++
- test/perf-test.cc | 1 -
+ test/perf-test.cc | 1 -
11 files changed, 55 insertions(+), 11 deletions(-)
commit 834cd18e3ddfda44a11316290f7eee98cd871305
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 26 16:10:20 2014 +0100
+Date: Sun Jan 26 16:10:20 2014 +0100
Use c99 for the c compiler
@@ -6684,7 +8717,7 @@
commit 03674a141a96806e5e1a134dc3dec2ee61b68713
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 26 12:43:13 2014 +0100
+Date: Sun Jan 26 12:43:13 2014 +0100
qt4/qt5: add GCC visibility export attributes
@@ -6698,7 +8731,7 @@
commit 52b46d05219cf9898ee4adae7c8c2702adb1ba23
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 26 12:38:03 2014 +0100
+Date: Sun Jan 26 12:38:03 2014 +0100
qt4/qt5: improve naming of internal export/import macros
@@ -6710,7 +8743,7 @@
commit 7a8bcea11ad71fccbbba2787fc442f6ba4bf7100
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 23 22:34:07 2014 +0100
+Date: Thu Jan 23 22:34:07 2014 +0100
cmake: install JpegWriter.h depending on libjpeg
@@ -6721,7 +8754,7 @@
commit 57f34f525fa2c2e62ebc7383ceba48ebc80ebba6
Author: Andres Gomez <agomez at igalia.com>
-Date: Wed Jan 8 12:26:14 2014 +0200
+Date: Wed Jan 8 12:26:14 2014 +0200
glib-demo: Fix conding style issue in render.c
@@ -6730,7 +8763,7 @@
commit 3fac919eeb1ca1abfdbb4f9923a454e532256f5c
Author: Andres Gomez <agomez at igalia.com>
-Date: Wed Jan 8 12:25:52 2014 +0200
+Date: Wed Jan 8 12:25:52 2014 +0200
glib-demo: Fix trailing whitespaces in render.c
@@ -6739,7 +8772,7 @@
commit 92ea15642a6d3fe65d66d5c59fb6bed54e060e5d
Author: Christian Persch <chpe at gnome.org>
-Date: Fri Jan 3 23:31:56 2014 +0100
+Date: Fri Jan 3 23:31:56 2014 +0100
glib: Install error callback
@@ -6754,7 +8787,7 @@
commit f99128e38bbff43623d5cd1c1bc27fd789d0bc0c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 19 16:03:35 2014 +0100
+Date: Sun Jan 19 16:03:35 2014 +0100
glib: Make vertices a constructor parameter of line annotations
@@ -6767,7 +8800,7 @@
commit 587a40f90e4ac5a1b6ab9044495a1ae403bc8c58
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 19 15:58:43 2014 +0100
+Date: Sun Jan 19 15:58:43 2014 +0100
annots: Fix memory leak when setting AnnotTextMarkup quads twice
@@ -6776,7 +8809,7 @@
commit 69e73da1fbab9bf3365b40dced1008b0283ac931
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Wed Nov 20 11:53:30 2013 -0800
+Date: Wed Nov 20 11:53:30 2013 -0800
glib-demo: Add support for PopplerTextAnnotMarkup
@@ -6792,7 +8825,7 @@
commit 9a7699ebe3e644ba845ef75d9295c88d321cb934
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Nov 18 16:42:08 2013 -0800
+Date: Mon Nov 18 16:42:08 2013 -0800
glib: Add PopplerAnnotTextMarkup class and subtypes
@@ -6802,33 +8835,33 @@
https://bugs.freedesktop.org/show_bug.cgi?id=51487
- glib/poppler-annot.cc | 264
+ glib/poppler-annot.cc | 264
++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 23 ++++
- glib/poppler-page.cc | 6 +
- glib/poppler-private.h | 1 +
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 11 ++
+ glib/poppler-annot.h | 23 ++++
+ glib/poppler-page.cc | 6 +
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 11 ++
6 files changed, 306 insertions(+)
commit 40040b41216a3dcc833fc224f1c6f15517a88aed
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Nov 18 16:26:27 2013 -0800
+Date: Mon Nov 18 16:26:27 2013 -0800
glib: Add PopplerQuadrilateral boxed type
https://bugs.freedesktop.org/show_bug.cgi?id=51487
- glib/poppler-page.cc | 53
+ glib/poppler-page.cc | 53
+++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 33 +++++++++++++++++++++++
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 6 +++++
+ glib/poppler-page.h | 33 +++++++++++++++++++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 6 +++++
4 files changed, 93 insertions(+)
commit c8a845cf7c7752d3b7dad06013d3154812c66c92
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 14 20:26:59 2014 +0100
+Date: Tue Jan 14 20:26:59 2014 +0100
Do not define -ansi
@@ -6837,12 +8870,12 @@
not make any sense. Bug #72499
cmake/modules/PopplerMacros.cmake | 5 -----
- configure.ac | 15 ---------------
+ configure.ac | 15 ---------------
2 files changed, 20 deletions(-)
commit f0c13ee72e8a7df17bdf847f5e922c01acee1f0d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 6 21:55:07 2014 +0100
+Date: Mon Jan 6 21:55:07 2014 +0100
C for last commit
@@ -6851,7 +8884,7 @@
commit 1e1b9991a911fb610e74119979b20b179f3f2a67
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 6 21:51:25 2014 +0100
+Date: Mon Jan 6 21:51:25 2014 +0100
Fix rendering of pdf file from KDE bug 329600
@@ -6866,17 +8899,17 @@
commit 4cd5c349cfbc745688c0c38fc50d364092bc3718
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 6 21:48:25 2014 +0100
+Date: Mon Jan 6 21:48:25 2014 +0100
Update popplers (C)
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 7ca2f42b06757587dfd9521fb1c6c7d657545553
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 6 15:48:22 2014 +0100
+Date: Mon Jan 6 15:48:22 2014 +0100
Learn about automake 1.14
@@ -6885,13 +8918,13 @@
commit de9643b6f76774ebe131c4787df82dd213181c71
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 3 00:53:37 2014 +0100
+Date: Fri Jan 3 00:53:37 2014 +0100
0.25.1
CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- cpp/Doxyfile | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
5 files changed, 23 insertions(+), 4 deletions(-)
@@ -6898,7 +8931,7 @@
commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 3 00:29:28 2014 +0100
+Date: Fri Jan 3 00:29:28 2014 +0100
Fix qt5 moc detection fix
@@ -6908,28 +8941,28 @@
commit 381ae2877acace4e8908b07ee5fb442bc19bf814
Merge: 64100e7 a2f0e4b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 3 00:04:29 2014 +0100
+Date: Fri Jan 3 00:04:29 2014 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
- CMakeLists.txt
- NEWS
- configure.ac
- cpp/Doxyfile
- qt4/src/Doxyfile
- qt5/src/Doxyfile
+ CMakeLists.txt
+ NEWS
+ configure.ac
+ cpp/Doxyfile
+ qt4/src/Doxyfile
+ qt5/src/Doxyfile
commit a2f0e4b1fd8b3d9675cc00a561094bd78a63d048
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 2 23:48:29 2014 +0100
+Date: Thu Jan 2 23:48:29 2014 +0100
0.24.5
CMakeLists.txt | 2 +-
- NEWS | 4 ++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 4 ++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
@@ -6936,7 +8969,7 @@
commit 523b2731e0489bab58e66b21016bd6f010e616ea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 2 22:54:42 2014 +0100
+Date: Thu Jan 2 22:54:42 2014 +0100
Update copyrights
@@ -6945,7 +8978,7 @@
commit 64100e7f1f6b550e952838fce38615ec3788e17c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Dec 28 12:11:47 2013 +0100
+Date: Sat Dec 28 12:11:47 2013 +0100
Simplify some calls to GooString::format-family functions
@@ -6955,18 +8988,18 @@
commit 0abde34d0f7ba0fc04a30dbfd78373ec9d9d0695
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Dec 28 12:11:05 2013 +0100
+Date: Sat Dec 28 12:11:05 2013 +0100
Fixed some GooString format markers
- poppler/CMap.cc | 3 ++-
- poppler/Function.cc | 3 ++-
+ poppler/CMap.cc | 3 ++-
+ poppler/Function.cc | 3 ++-
poppler/StructElement.cc | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
commit a7da4c6ac2b13308803806009c3437332b140586
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Dec 27 17:09:39 2013 +0100
+Date: Fri Dec 27 17:09:39 2013 +0100
GooString format: fixed bug with printing LLONG_MIN
@@ -6977,11 +9010,11 @@
commit fe88f20cc565b4cf4765fed56c821989148ef454
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Dec 27 17:08:50 2013 +0100
+Date: Fri Dec 27 17:08:50 2013 +0100
GooString format: Added some tests + improved documentation
- goo/GooString.h | 10 +++++--
+ goo/GooString.h | 10 +++++--
qt4/tests/check_goostring.cpp | 66
+++++++++++++++++++++++++++++++++++++++++++
qt5/tests/check_goostring.cpp | 66
@@ -6990,7 +9023,7 @@
commit 5234a349adb678d267a3d8ca13176ac8abb7afd2
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Dec 20 20:25:26 2013 +0100
+Date: Fri Dec 20 20:25:26 2013 +0100
pdfunite: do not lose fonts when merging some files
@@ -7000,16 +9033,16 @@
commit 8e24fcc0d296e07327e9cbe297f627bfc6471ee3
Merge: 85efba3 b02f873
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 18 21:51:57 2013 +0100
+Date: Wed Dec 18 21:51:57 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
- poppler/GfxState.cc
+ poppler/GfxState.cc
commit b02f873174865837fed3a9544b70b8b21747a3dd
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Dec 18 21:46:12 2013 +0100
+Date: Wed Dec 18 21:46:12 2013 +0100
Fixed some GooString format markers
@@ -7018,7 +9051,7 @@
commit 85efba38c02b5daf7d3fc46bc85850e6842a085d
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Dec 18 00:46:00 2013 +0100
+Date: Wed Dec 18 00:46:00 2013 +0100
Make pdfunite work even if there's a single file given
@@ -7029,7 +9062,7 @@
commit a766c55f68db38feed91cf003a0d5710e2f925a8
Author: Tuomas Jormola <tj at solitudo.net>
-Date: Mon Dec 16 20:43:28 2013 +0100
+Date: Mon Dec 16 20:43:28 2013 +0100
Fix detection of moc for Qt5
@@ -7058,35 +9091,35 @@
commit a43b4bf84fe4bde6649049685bf4ed6a682e8286
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 15 11:59:57 2013 +0100
+Date: Sun Dec 15 11:59:57 2013 +0100
regtest: Add a command line option to create-report command to not
launch the browser
- regtest/HTMLReport.py | 5 +++--
+ regtest/HTMLReport.py | 5 +++--
regtest/commands/create-report.py | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
commit 113958276b96d7f1aab7042e1807a9970425d234
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 15 11:48:51 2013 +0100
+Date: Sun Dec 15 11:48:51 2013 +0100
regtest: Return an exist status code depending on whether the
command succeeded
- regtest/TestRun.py | 2 ++
- regtest/commands/__init__.py | 4 ++--
+ regtest/TestRun.py | 2 ++
+ regtest/commands/__init__.py | 4 ++--
regtest/commands/create-refs.py | 2 ++
regtest/commands/create-report.py | 2 ++
regtest/commands/find-regression.py | 4 +++-
- regtest/commands/run-tests.py | 6 ++++--
- regtest/main.py | 8 ++++----
- regtest/poppler-regtest | 2 +-
+ regtest/commands/run-tests.py | 6 ++++--
+ regtest/main.py | 8 ++++----
+ regtest/poppler-regtest | 2 +-
8 files changed, 20 insertions(+), 10 deletions(-)
commit 44cf2de0df351d5948893f6a4e2bca1168d16b70
Author: Dominik Haumann <dhaumann at kde.org>
-Date: Thu Dec 12 23:12:35 2013 +0100
+Date: Thu Dec 12 23:12:35 2013 +0100
Arthur font rendering improvements
@@ -7104,18 +9137,18 @@
commit 02863f683be4543a2af6c26d53be93785d2b836a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 12 23:09:43 2013 +0100
+Date: Thu Dec 12 23:09:43 2013 +0100
qt: Simple silly test program to save to file
Allows us to do some quick arthur testing
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 8 ++++-
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 8 ++++-
qt4/tests/test-render-to-file.cpp | 69
+++++++++++++++++++++++++++++++++++++++
- qt5/tests/CMakeLists.txt | 1 +
- qt5/tests/Makefile.am | 8 ++++-
+ qt5/tests/CMakeLists.txt | 1 +
+ qt5/tests/Makefile.am | 8 ++++-
qt5/tests/test-render-to-file.cpp | 69
+++++++++++++++++++++++++++++++++++++++
6 files changed, 154 insertions(+), 2 deletions(-)
@@ -7122,13 +9155,13 @@
commit 018892d4ceccd5e2994cdb74cd2d401293fc929d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 11 23:05:53 2013 +0100
+Date: Wed Dec 11 23:05:53 2013 +0100
0.25.0
CMakeLists.txt | 6 +++---
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
@@ -7136,7 +9169,7 @@
commit a1b99b26da9124fa55f773af55ae7382bd911d47
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 11 23:00:00 2013 +0100
+Date: Wed Dec 11 23:00:00 2013 +0100
NEWS
@@ -7145,22 +9178,22 @@
commit 10a0c45676ef56bee5924e889a7e7c21244b4339
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 10 20:48:36 2013 +0100
+Date: Tue Dec 10 20:48:36 2013 +0100
Update copyrights
- cpp/poppler-image.cpp | 1 +
- goo/PNGWriter.cc | 2 +-
+ cpp/poppler-image.cpp | 1 +
+ goo/PNGWriter.cc | 2 +-
poppler/MarkedContentOutputDev.cc | 2 ++
poppler/MarkedContentOutputDev.h | 2 ++
- poppler/Object.h | 1 +
- poppler/PDFDoc.h | 1 +
- utils/ImageOutputDev.h | 2 +-
+ poppler/Object.h | 1 +
+ poppler/PDFDoc.h | 1 +
+ utils/ImageOutputDev.h | 2 +-
7 files changed, 9 insertions(+), 2 deletions(-)
commit 6c0e7d35f273583acc2aa818860e3120b0cab64f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Dec 10 20:14:39 2013 +0100
+Date: Tue Dec 10 20:14:39 2013 +0100
correction for knockout transparency groups
@@ -7167,28 +9200,28 @@
Fixes test "G" in eci_altona-test-suite-v2_technical2_x4.pdf
poppler/SplashOutputDev.cc | 18 ++++++++++---
- splash/Splash.cc | 63
+ splash/Splash.cc | 63
+++++++++++++++++++++++++++++++++------------
- splash/SplashFTFontEngine.h | 3 +++
+ splash/SplashFTFontEngine.h | 3 +++
splash/SplashFontEngine.cc | 13 ++++++++++
- splash/SplashFontEngine.h | 5 ++++
+ splash/SplashFontEngine.h | 5 ++++
5 files changed, 82 insertions(+), 20 deletions(-)
commit f77bc21813ae7234ec4ce94ce4e92230fe5c174a
Merge: 06e9dc9 58e04a0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 7 16:56:11 2013 +0000
+Date: Sat Dec 7 16:56:11 2013 +0000
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
- utils/pdfimages.cc
- utils/pdfinfo.cc
- utils/pdfseparate.cc
+ utils/pdfimages.cc
+ utils/pdfinfo.cc
+ utils/pdfseparate.cc
commit 06e9dc917650f562cd6f6666190a8c25756514a3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 7 16:39:02 2013 +0000
+Date: Sat Dec 7 16:39:02 2013 +0000
Compile++
@@ -7197,7 +9230,7 @@
commit 58e04a08afee39370283c494ee2e4e392fd3b684
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Dec 7 16:33:09 2013 +0000
+Date: Sat Dec 7 16:33:09 2013 +0000
segExtraBytes is a goffset not an int so use lld
@@ -7208,7 +9241,7 @@
commit 3335d5e52fd7527bba7368ad6e87f1188808582f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 6 17:28:13 2013 +0100
+Date: Fri Dec 6 17:28:13 2013 +0100
regtest: Limit the stderr files to ~1MB
@@ -7226,7 +9259,7 @@
commit 24107ac47625438837d7c29053bff795f986a6bb
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 6 13:24:47 2013 +0100
+Date: Fri Dec 6 13:24:47 2013 +0100
regtest: Save checksum results sorted in md5 files
@@ -7238,7 +9271,7 @@
commit f1c9993d58fb9d191a7b3e26bfcaf7b5eec5323d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 6 13:03:24 2013 +0100
+Date: Fri Dec 6 13:03:24 2013 +0100
regtest: Show also the tests expected to crash/fail to run but
don't fail
@@ -7248,7 +9281,7 @@
commit 64d1e79c863d12b12b87ed0e3139d364f503e026
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 6 12:51:48 2013 +0100
+Date: Fri Dec 6 12:51:48 2013 +0100
regtest: Improve readability of test results
@@ -7264,7 +9297,7 @@
commit c35bc1da9402896c88999f9cffed6962a265f32e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 6 10:04:48 2013 +0100
+Date: Fri Dec 6 10:04:48 2013 +0100
glib-demo: Increase the default size of the main window
@@ -7276,7 +9309,7 @@
commit ab7da0bf62bb5032c4683d9cd841075d26045aae
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Oct 28 22:52:22 2013 -0700
+Date: Mon Oct 28 22:52:22 2013 -0700
glib-demo: Add Square and Circle annotations demo
@@ -7287,7 +9320,7 @@
commit 2ec450567f27bba3ee4a08b5e69b7c9605bea4bb
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Oct 28 22:48:39 2013 -0700
+Date: Mon Oct 28 22:48:39 2013 -0700
glib: Add implementation of Square and Circle annotations
@@ -7297,18 +9330,18 @@
https://bugs.freedesktop.org/show_bug.cgi?id=70983
- glib/poppler-annot.cc | 263
+ glib/poppler-annot.cc | 263
++++++++++++++++++++++++++++++++----
- glib/poppler-annot.h | 23 ++++
- glib/poppler-page.cc | 6 +
- glib/poppler-private.h | 2 +
- glib/poppler.h | 2 +
- glib/reference/poppler-sections.txt | 16 +++
+ glib/poppler-annot.h | 23 ++++
+ glib/poppler-page.cc | 6 +
+ glib/poppler-private.h | 2 +
+ glib/poppler.h | 2 +
+ glib/reference/poppler-sections.txt | 16 +++
6 files changed, 286 insertions(+), 26 deletions(-)
commit e109cf2461d5be93d004593123d875a28fd79b61
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 26 20:12:22 2013 +0100
+Date: Tue Nov 26 20:12:22 2013 +0100
annots: Make Annot::setBorder receive an AnnotBorder object
@@ -7322,7 +9355,7 @@
commit 3979b82982e84107d93fbbe95350bf25ce47398d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 26 14:44:57 2013 +0100
+Date: Tue Nov 26 14:44:57 2013 +0100
annots: Use a default border for annots that can have a BS entry
@@ -7339,7 +9372,7 @@
commit 36c07c82bdff010695c5d615b67506922522d0e8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 26 14:07:21 2013 +0100
+Date: Tue Nov 26 14:07:21 2013 +0100
annots: Add helper function Annot::setLineStyleForBorder
@@ -7356,7 +9389,7 @@
commit e7b1ff97318fd6c3a8fed3a33d45f1cb55208b28
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 26 11:40:57 2013 +0100
+Date: Tue Nov 26 11:40:57 2013 +0100
annots: Remove unused typeUnknown AnnotBorderType from AnnotBorder
@@ -7369,7 +9402,7 @@
commit 17b2623360ed8917e94a8e5b880e92e6db70335e
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Tue Jun 18 00:35:51 2013 +0300
+Date: Tue Jun 18 00:35:51 2013 +0300
Tagged-PDF: Text content extraction from structure elements
@@ -7381,17 +9414,17 @@
https://bugs.freedesktop.org/show_bug.cgi?id=64815
- poppler/Makefile.am | 2 +
+ poppler/Makefile.am | 2 +
poppler/MarkedContentOutputDev.cc | 210
++++++++++++++++++++++++++++++++++++++
poppler/MarkedContentOutputDev.h | 128 +++++++++++++++++++++++
- poppler/StructElement.cc | 50 +++++++++
- poppler/StructElement.h | 28 +++++
+ poppler/StructElement.cc | 50 +++++++++
+ poppler/StructElement.h | 28 +++++
5 files changed, 418 insertions(+)
commit 2c4320c26744ea28be10eac7cc54980c9eb4fc27
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Dec 3 19:07:09 2013 +0100
+Date: Tue Dec 3 19:07:09 2013 +0100
glib-demo: Show number of charcters and text layout units in text demo
@@ -7402,7 +9435,7 @@
commit 98d75dcdb9b73feb6f35d8ad76f5d0c428289f91
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Nov 30 17:29:50 2013 +0100
+Date: Sat Nov 30 17:29:50 2013 +0100
Limit use of ZapfDingbats character names
@@ -7412,9 +9445,9 @@
Bug #60243
- goo/GooString.cc | 10 ++
- goo/GooString.h | 4 +
- poppler/GfxFont.cc | 15 +-
+ goo/GooString.cc | 10 ++
+ goo/GooString.h | 4 +
+ poppler/GfxFont.cc | 15 +-
poppler/GlobalParams.cc | 33 +++-
poppler/GlobalParams.h | 16 +-
poppler/NameToUnicodeTable.h | 415
@@ -7423,7 +9456,7 @@
commit 817cc333ca8009998f2099583fd0a2fc703f3db3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 29 10:07:16 2013 +0100
+Date: Fri Nov 29 10:07:16 2013 +0100
regtest: Do not buffer stderr output
@@ -7446,7 +9479,7 @@
commit f8f82f1cc3a948239a05d7762210a3f244299db6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 29 10:03:24 2013 +0100
+Date: Fri Nov 29 10:03:24 2013 +0100
regtest: Read test results in chunks to get the md5 digest
@@ -7464,7 +9497,7 @@
commit 3444a44397a890dbeb1bd10357dbc8246fd21ad0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 29 10:01:20 2013 +0100
+Date: Fri Nov 29 10:01:20 2013 +0100
regtest: Remove unused method _check_exit_status2
@@ -7476,7 +9509,7 @@
commit 5f825df417947c51943f1db327e1aa6c3faa15b0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 29 09:57:57 2013 +0100
+Date: Fri Nov 29 09:57:57 2013 +0100
regtest: Do not store the current line in Printer but only its length
@@ -7487,7 +9520,7 @@
commit 1486d93f0f6418b37ccc57568717d9349a79935b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Nov 27 18:29:36 2013 +0100
+Date: Wed Nov 27 18:29:36 2013 +0100
regtest: Do not consider docs with no refs as skipped
@@ -7500,7 +9533,7 @@
commit 5241c0cc730c380dc44c3a081e1de675e1915861
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Nov 27 17:18:37 2013 +0100
+Date: Wed Nov 27 17:18:37 2013 +0100
regtest: Use number of tests run to show the progress
@@ -7512,30 +9545,30 @@
correct order. It also simplifies the code a bit.
Also improved the output formatting to make it easier to read.
- regtest/Printer.py | 44 ++++-----------
+ regtest/Printer.py | 44 ++++-----------
regtest/TestReferences.py | 50 +++++++++++------
- regtest/TestRun.py | 136
+ regtest/TestRun.py | 136
+++++++++++++++++++++++++---------------------
3 files changed, 118 insertions(+), 112 deletions(-)
commit 0af3e009a702d0c6ca716565ab87b386baa0a1ed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 27 00:53:16 2013 +0100
+Date: Wed Nov 27 00:53:16 2013 +0100
0.24.4
- CMakeLists.txt | 4 ++--
- NEWS | 18 ++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
7 files changed, 25 insertions(+), 7 deletions(-)
commit a42a13be0a0cda71dc230a73f7b16eb4eb066251
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Nov 27 00:05:57 2013 +0100
+Date: Wed Nov 27 00:05:57 2013 +0100
Warn the user if he provides a wrong range
@@ -7552,7 +9585,7 @@
commit 45552cafaeef6b883078db269437586add1dc32c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 26 23:36:12 2013 +0100
+Date: Tue Nov 26 23:36:12 2013 +0100
Update copyrights
@@ -7561,7 +9594,7 @@
commit f20fe89d4f5a8f768e2019f25cecf40cd0e4f5f8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Nov 25 09:05:41 2013 +0100
+Date: Mon Nov 25 09:05:41 2013 +0100
glib-demo: Add an area selector to text demo
@@ -7574,20 +9607,20 @@
commit bb2b7fb491fb72f0ea024d80df89680ede3457b4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Nov 25 09:04:30 2013 +0100
+Date: Mon Nov 25 09:04:30 2013 +0100
glib: Add API to get text, text layout and text attributes for a
given area
- glib/poppler-page.cc | 107
+ glib/poppler-page.cc | 107
++++++++++++++++++++++++++++++++++--
- glib/poppler-page.h | 8 +++
- glib/reference/poppler-sections.txt | 3 +
+ glib/poppler-page.h | 8 +++
+ glib/reference/poppler-sections.txt | 3 +
3 files changed, 113 insertions(+), 5 deletions(-)
commit f662973b0da52da84acc3668a0e037ee72498193
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Nov 2 14:07:07 2013 +0100
+Date: Sat Nov 2 14:07:07 2013 +0100
TextOutputDev: Honor the selection rectangle passed to
TextPage::getSelectionWords()
@@ -7603,7 +9636,7 @@
https://bugs.freedesktop.org/show_bug.cgi?id=71160
- glib/poppler-page.cc | 22 ++++++++++++++--------
+ glib/poppler-page.cc | 22 ++++++++++++++--------
poppler/TextOutputDev.cc | 40 ++++++++--------------------------------
poppler/TextOutputDev.h | 20 ++++++++++++++++++++
3 files changed, 42 insertions(+), 40 deletions(-)
@@ -7610,7 +9643,7 @@
commit 18fab454c59b1c77c691617aaef99245eacd83b5
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Oct 28 22:41:41 2013 -0700
+Date: Mon Oct 28 22:41:41 2013 -0700
glib-demo: Simplify annotations list and its properties
@@ -7628,13 +9661,13 @@
commit 770a7ac9833a3c4f4f0399093272d4d0bdc7923b
Merge: e7a0f2b 9ae29c7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 21 23:58:29 2013 +0100
+Date: Thu Nov 21 23:58:29 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
commit 9ae29c7a07d0f372dbfc4aca17bbb646126aedb5
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Nov 21 23:53:53 2013 +0100
+Date: Thu Nov 21 23:53:53 2013 +0100
Don't end loop if reading from GooFile fails
@@ -7645,7 +9678,7 @@
commit e7a0f2b942fe621304275175324f7809d1c83d80
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Nov 20 00:43:27 2013 +0100
+Date: Wed Nov 20 00:43:27 2013 +0100
Fix warning on signed/unsigned comparison in GfxState.cc
@@ -7656,7 +9689,7 @@
commit c784c4c3a582aaa4e10c223665cb876e12b7c16f
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Nov 18 00:57:53 2013 -0800
+Date: Mon Nov 18 00:57:53 2013 -0800
glib-demo: Add support for simple line annotations
@@ -7668,7 +9701,7 @@
commit 2d164e06b8a84ade6689d85bba2d606c66bf62a9
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Mon Nov 18 00:48:13 2013 -0800
+Date: Mon Nov 18 00:48:13 2013 -0800
glib-demo: add color selection for new annotations
@@ -7679,50 +9712,50 @@
commit 7127a2c705787f6f44b0852efeabe9fdeae7e2c0
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sun Nov 17 23:38:32 2013 -0800
+Date: Sun Nov 17 23:38:32 2013 -0800
glib: Add support for simple line annotations
https://bugs.freedesktop.org/show_bug.cgi?id=70981
- glib/poppler-annot.cc | 79
+ glib/poppler-annot.cc | 79
+++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 12 ++++++
- glib/poppler-page.cc | 3 ++
- glib/poppler-private.h | 1 +
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 7 ++++
+ glib/poppler-annot.h | 12 ++++++
+ glib/poppler-page.cc | 3 ++
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 7 ++++
6 files changed, 103 insertions(+)
commit 451bac9f05bab18f3aa0392ddf6eb6b569004cb8
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sun Nov 17 23:30:14 2013 -0800
+Date: Sun Nov 17 23:30:14 2013 -0800
glib: Add PopplerPoint boxed type
https://bugs.freedesktop.org/show_bug.cgi?id=70981
- glib/poppler-page.cc | 54
+ glib/poppler-page.cc | 54
+++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 20 ++++++++++++++
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 5 ++++
+ glib/poppler-page.h | 20 ++++++++++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 5 ++++
4 files changed, 80 insertions(+)
commit c01cee165392ba8297e4168111a66d2acb272a99
Merge: 07c2554 47605a8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 18 22:58:28 2013 +0100
+Date: Mon Nov 18 22:58:28 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
- poppler/Catalog.cc
- poppler/Catalog.h
+ poppler/Catalog.cc
+ poppler/Catalog.h
commit 47605a8aaf85bee21601219b04c0c8e6cf982507
Author: José Aliste <jaliste at src.gnome.org>
-Date: Mon Nov 18 22:52:08 2013 +0100
+Date: Mon Nov 18 22:52:08 2013 +0100
Catalog: sort entries of NameTrees to make sure lookup works
@@ -7734,7 +9767,7 @@
commit 07c255482f7ec8a8cfd4eaeaf7b07de317bbcc7a
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sun Oct 27 13:30:22 2013 -0700
+Date: Sun Oct 27 13:30:22 2013 -0700
glib-demo: Add annotations interactively
@@ -7749,7 +9782,7 @@
commit 4b7c91ea697359751f9abe9ec5e63021c90a60ed
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sat Sep 28 23:18:07 2013 -0700
+Date: Sat Sep 28 23:18:07 2013 -0700
glib: Add getter and setter for annotation's rectangle
@@ -7760,15 +9793,15 @@
https://bugs.freedesktop.org/show_bug.cgi?id=70901
- glib/poppler-annot.cc | 48
+ glib/poppler-annot.cc | 48
+++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 4 ++++
- glib/reference/poppler-sections.txt | 2 ++
+ glib/poppler-annot.h | 4 ++++
+ glib/reference/poppler-sections.txt | 2 ++
3 files changed, 54 insertions(+)
commit 491f0a170c72271a7a9ce049fbcfe81f08cff162
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Fri Nov 15 20:35:12 2013 +0100
+Date: Fri Nov 15 20:35:12 2013 +0100
pdftotext: Escape the text of the xml headers
@@ -7778,13 +9811,13 @@
commit 4da94680d4d2d6b1bd3351d476a20f9c7ae565bc
Merge: 3ea3d7c 78c407a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 15 20:27:00 2013 +0100
+Date: Fri Nov 15 20:27:00 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
commit 3ea3d7c6c7a0ede76428204ec11aec3a844117fc
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 15 19:59:52 2013 +0100
+Date: Fri Nov 15 19:59:52 2013 +0100
pdftotext: Silence warning for may be used uninitialized variable
@@ -7795,7 +9828,7 @@
commit 97910b9eb92df49757915bde02e0d54de04552d4
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 15 19:55:19 2013 +0100
+Date: Fri Nov 15 19:55:19 2013 +0100
Do not close stdout in pdftotext
@@ -7806,7 +9839,7 @@
commit 78c407ac7e8f48ae2d2c75ad0f5960390190d2e3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 15 20:25:52 2013 +0100
+Date: Fri Nov 15 20:25:52 2013 +0100
destionation -> destination
@@ -7821,7 +9854,7 @@
commit a23c9ad4c0536d680bedc563444ce3adf6e1ee9e
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 15 11:38:45 2013 +0100
+Date: Fri Nov 15 11:38:45 2013 +0100
Silence warning for may be used uninitialized variable in
ImageOutputDec.cc
@@ -7843,7 +9876,7 @@
commit c43a80e65fc570a8017892ba111a8c48ac33d9ad
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 15 19:59:52 2013 +0100
+Date: Fri Nov 15 19:59:52 2013 +0100
pdftotext: Silence warning for may be used uninitialized variable
@@ -7854,7 +9887,7 @@
commit f905d804c0d1c715d8423938f41b5a002c0ef15d
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 15 19:55:19 2013 +0100
+Date: Fri Nov 15 19:55:19 2013 +0100
Do not close stdout in pdftotext
@@ -7866,13 +9899,13 @@
commit 33e703ac9bb6cf69664d6c6fddd3bebd56336074
Merge: 8294d18 7c74bcc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 15 19:50:10 2013 +0100
+Date: Fri Nov 15 19:50:10 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
commit 7c74bccdf514cce05987dde7fb1cce4ac65ff025
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 15 19:48:07 2013 +0100
+Date: Fri Nov 15 19:48:07 2013 +0100
Forgot to update the copyrights
@@ -7884,7 +9917,7 @@
commit ebe49d597a62aa94601c2e4595dbad1895ea7ef0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 15 19:33:00 2013 +0100
+Date: Fri Nov 15 19:33:00 2013 +0100
Fix regression in broken endstream detection
@@ -7899,7 +9932,7 @@
commit 8294d18ea96bd18be076bccbdbdaa015fc48aa12
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Sep 26 20:46:34 2013 +0300
+Date: Thu Sep 26 20:46:34 2013 +0300
Tagged-PDF: Parsing of StructElem standard types and attributes
@@ -7919,7 +9952,7 @@
commit 4e0cbd37b964107c0fb531d48876a33ae843bf27
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Mon Nov 11 22:46:07 2013 +0100
+Date: Mon Nov 11 22:46:07 2013 +0100
pdftohtml: Add -? and --help
@@ -7928,7 +9961,7 @@
commit 4dbd36f5b35dd0964e59d942242aecdc6b474c89
Author: Andres Gomez <agomez at igalia.com>
-Date: Tue Nov 5 09:52:23 2013 +0200
+Date: Tue Nov 5 09:52:23 2013 +0200
glib-demo: Fix conding style issue in main.c
@@ -7939,7 +9972,7 @@
commit 02f3c235eaf60350c98e88dbe266378fccef59d7
Author: Andres Gomez <agomez at igalia.com>
-Date: Tue Nov 5 09:52:23 2013 +0200
+Date: Tue Nov 5 09:52:23 2013 +0200
glib-demo: Fix a typo in function name
@@ -7950,7 +9983,7 @@
commit 5620b82e69335b7f12d877a24f1a463604f0e515
Author: Andres Gomez <agomez at igalia.com>
-Date: Tue Nov 5 09:52:23 2013 +0200
+Date: Tue Nov 5 09:52:23 2013 +0200
glib-demo: Fix trailing whitespaces in main.c
@@ -7961,7 +9994,7 @@
commit 43309d92d327b4ae8e89edb15482247045d726a4
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sat Sep 28 20:45:32 2013 -0700
+Date: Sat Sep 28 20:45:32 2013 -0700
glib-demo: Make the Remove annotation button prominent in demo
@@ -7977,14 +10010,14 @@
commit f4a72fd3c61091d6b455af9a881c2390da19b506
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 26 19:06:34 2013 +0200
+Date: Sat Oct 26 19:06:34 2013 +0200
0.24.3
CMakeLists.txt | 2 +-
- NEWS | 14 ++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 14 ++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 19 insertions(+), 5 deletions(-)
@@ -7991,24 +10024,24 @@
commit 33a5af32cd5769cf1b6c6344077ac4a3f407ba21
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 26 18:48:50 2013 +0200
+Date: Sat Oct 26 18:48:50 2013 +0200
Update copyrights
qt4/src/poppler-document.cc | 2 +-
- utils/pdfseparate.cc | 2 +-
+ utils/pdfseparate.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 9f09b9596f1fc52481914019d68c8f9b85b5c438
Merge: bd893d4 61f79b8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 24 01:03:02 2013 +0200
+Date: Thu Oct 24 01:03:02 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 61f79b8447c3ac8ab5a26e79e0c28053ffdccf75
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 24 00:54:56 2013 +0200
+Date: Thu Oct 24 00:54:56 2013 +0200
Allow only one %d in the filename
@@ -8024,13 +10057,13 @@
commit bd893d4a543a6cc3a525655f37def38440944f28
Merge: 93e8b05 daa0990
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 10 02:19:34 2013 +0200
+Date: Thu Oct 10 02:19:34 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit daa0990a7baf17d00d12574a4de815e070727a86
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 10 02:16:25 2013 +0200
+Date: Thu Oct 10 02:16:25 2013 +0200
Return empty if getXRef()->copy() fails
@@ -8043,7 +10076,7 @@
commit f4bfa940aa40a82a1080cdaf765da1d1615ccfb1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Oct 5 11:20:04 2013 +0200
+Date: Sat Oct 5 11:20:04 2013 +0200
cairo: Do not set an invalid matrix in drawImage()
@@ -8054,7 +10087,7 @@
commit 93e8b05fb2a6d225f048db6a3a735717433a5a13
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Oct 5 11:20:04 2013 +0200
+Date: Sat Oct 5 11:20:04 2013 +0200
cairo: Do not set an invalid matrix in drawImage()
@@ -8065,7 +10098,7 @@
commit 3084f8f4a5ad55937094b14e30169dccf1fa4ec9
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sat Sep 21 11:59:32 2013 -0700
+Date: Sat Sep 21 11:59:32 2013 -0700
glib-demo: Expand short names for annotations used in demo
@@ -8077,7 +10110,7 @@
commit ff674f57a3587142165fd56aec089d9840ceda36
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Fri Sep 27 22:33:42 2013 -0700
+Date: Fri Sep 27 22:33:42 2013 -0700
glib-demo: Merge columns Type and Color in annotations demo
@@ -8092,7 +10125,7 @@
commit 76d6e2d385e2cbad7f44bc8aee05147efd3970a4
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Fri Sep 20 23:27:20 2013 -0700
+Date: Fri Sep 20 23:27:20 2013 -0700
glib-demo: Rearrange layout for annotations in demo
@@ -8106,7 +10139,7 @@
commit a6b1fc1a2ca83b3e4c52bcaa95b99d0289354f4b
Author: Germán Poo-Caamaño <gpoo at gnome.org>
-Date: Sun Sep 29 22:50:42 2013 -0700
+Date: Sun Sep 29 22:50:42 2013 -0700
glib-demo: Fix rectangle calculation for new annotations in demo
@@ -8117,7 +10150,7 @@
commit bd49b3c0c6f2adccc5bda561edbaf9f00ed2917a
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Oct 2 23:32:09 2013 +0200
+Date: Wed Oct 2 23:32:09 2013 +0200
Use icc profile in OutputIntents
@@ -8124,16 +10157,16 @@
Bug #34053
poppler/Gfx.cc | 114 +++++++++++---
- poppler/Gfx.h | 8 +-
+ poppler/Gfx.h | 8 +-
poppler/GfxState.cc | 429
+++++++++++++++++++++++++++++++++++++++++-----------
- poppler/GfxState.h | 72 ++++++---
- poppler/Page.cc | 2 +-
+ poppler/GfxState.h | 72 ++++++---
+ poppler/Page.cc | 2 +-
5 files changed, 490 insertions(+), 135 deletions(-)
commit df947a0641082f530200880d46e20cd3e1fd962f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 2 20:53:32 2013 +0200
+Date: Wed Oct 2 20:53:32 2013 +0200
Compile++
@@ -8142,7 +10175,7 @@
commit fa83d7e4f36cfc11c7b4f81f5f5e8ed69eb6dbbe
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Wed Oct 2 20:35:58 2013 +0200
+Date: Wed Oct 2 20:35:58 2013 +0200
pdfseparate: allow zero-padded pagespecs
@@ -8153,7 +10186,7 @@
commit e04cabd878a0fd84faa5178f423fd828d010b664
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Mon Jun 17 17:00:27 2013 +0300
+Date: Mon Jun 17 17:00:27 2013 +0300
Tagged-PDF: Implement parsing of StructTreeRoot
@@ -8178,10 +10211,10 @@
https://bugs.freedesktop.org/show_bug.cgi?id=64815
- poppler/Catalog.cc | 36 +++---
- poppler/Catalog.h | 5 +-
- poppler/Makefile.am | 4 +
- poppler/PDFDoc.h | 3 +-
+ poppler/Catalog.cc | 36 +++---
+ poppler/Catalog.h | 5 +-
+ poppler/Makefile.am | 4 +
+ poppler/PDFDoc.h | 3 +-
poppler/StructElement.cc | 322
++++++++++++++++++++++++++++++++++++++++++++++
poppler/StructElement.h | 167 ++++++++++++++++++++++++
@@ -8191,7 +10224,7 @@
commit 45e0fe56985f34e695c99a2f6ec1ffe14e239b9e
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Sep 26 20:56:52 2013 +0300
+Date: Thu Sep 26 20:56:52 2013 +0300
Implement Object::takeString() method
@@ -8207,7 +10240,7 @@
commit d80eb4a34c218de34633ee2f1b9dfd65504a0ad9
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Oct 1 22:57:55 2013 +0200
+Date: Tue Oct 1 22:57:55 2013 +0200
cache cms values in getGray(), getRGB() and getCMYK()
@@ -8215,19 +10248,19 @@
poppler/GfxState.cc | 111
++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/GfxState.h | 2 +
+ poppler/GfxState.h | 2 +
2 files changed, 113 insertions(+)
commit 9bc8f3240698d5a8ae4c0129e768840664d28c22
Merge: a2742c8 e2fe851
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 1 19:19:32 2013 +0200
+Date: Tue Oct 1 19:19:32 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit e2fe85137ecb59eb0d177682c552febc64cda643
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Oct 1 19:15:08 2013 +0200
+Date: Tue Oct 1 19:15:08 2013 +0200
Fix PFB font embedding
@@ -8240,20 +10273,20 @@
commit a2742c8fce0594ccbdb036dd0c29c6e15d2229f3
Merge: 6b30a52 06dabe1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 30 19:32:41 2013 +0200
+Date: Mon Sep 30 19:32:41 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 06dabe1eed912e5f5c96fe9f371ab459516e5a99
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 27 12:41:23 2013 +0200
+Date: Fri Sep 27 12:41:23 2013 +0200
0.24.2
CMakeLists.txt | 2 +-
- NEWS | 8 ++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 8 ++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 13 insertions(+), 5 deletions(-)
@@ -8260,7 +10293,7 @@
commit 78141da189c42a04b6a303767284de755a4a2d4d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 27 12:39:00 2013 +0200
+Date: Fri Sep 27 12:39:00 2013 +0200
Update copyrights
@@ -8270,13 +10303,13 @@
commit 6b30a5214e39993025cf2fb9f221e1360de7fa9c
Merge: 4966b6f dc344b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 21 10:38:45 2013 +0200
+Date: Sat Sep 21 10:38:45 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit dc344b410f49410174ee902b7649ebd8c2cb0fa2
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Sat Sep 21 10:37:30 2013 +0200
+Date: Sat Sep 21 10:37:30 2013 +0200
pdftocairo: check file opening failure in beginDocument()
@@ -8286,13 +10319,13 @@
commit 4966b6f4193cc9d13f63e92bdc2aac0c8b78298d
Merge: 0f074b1 1e612d3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 21 10:15:28 2013 +0200
+Date: Sat Sep 21 10:15:28 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 1e612d331b79dabec66ad241d7ffe66674a10bc4
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Sep 21 10:10:16 2013 +0200
+Date: Sat Sep 21 10:10:16 2013 +0200
Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION
@@ -8304,16 +10337,16 @@
commit 0f074b16317d874fe58d7042f8434282786ca757
Merge: d277432 b8682d8
Author: Pino Toscano <pino at kde.org>
-Date: Mon Sep 16 19:53:10 2013 +0200
+Date: Mon Sep 16 19:53:10 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
- utils/pdfimages.1
+ utils/pdfimages.1
commit b8682d868ddf7f741e93b791588af0932893f95c
Author: Pino Toscano <pino at kde.org>
-Date: Mon Sep 16 19:46:55 2013 +0200
+Date: Mon Sep 16 19:46:55 2013 +0200
pdfseparate: improve the path building
@@ -8327,7 +10360,7 @@
commit d2774325f5248018977d3ab8f8dd7155ed972668
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Sep 14 14:08:11 2013 +0930
+Date: Sat Sep 14 14:08:11 2013 +0930
pdfimages.1: fix typo
@@ -8336,7 +10369,7 @@
commit 9b5957278c7f249fa1010e61a0ed79f0eb20e26d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 31 17:33:25 2013 +0930
+Date: Sat Aug 31 17:33:25 2013 +0930
pdfimages: ensure dump* variables are intialized
@@ -8345,7 +10378,7 @@
commit e116ef32504b589001814f0f579309ecf7ec89d9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Aug 28 08:05:23 2013 +0930
+Date: Wed Aug 28 08:05:23 2013 +0930
Make cpp/poppler-image.cc use goo/NetPBMWriter
@@ -8359,7 +10392,7 @@
commit a87a11ee6bbd0f5707a3ac34ac2b9cc79f4e92d0
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Aug 29 22:42:34 2013 +0930
+Date: Thu Aug 29 22:42:34 2013 +0930
pdfimages: support cmyk tiff output
@@ -8370,13 +10403,13 @@
utils/ImageOutputDev.cc | 32 +++++++++++++++++++++++++++++++-
utils/ImageOutputDev.h | 3 ++-
- utils/pdfimages.1 | 13 ++++++++-----
- utils/pdfimages.cc | 3 ++-
+ utils/pdfimages.1 | 13 ++++++++-----
+ utils/pdfimages.cc | 3 ++-
4 files changed, 43 insertions(+), 8 deletions(-)
commit 63da26f8fb0b2b5ffaa127762d4e36d995c482ee
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Aug 27 20:40:29 2013 +0200
+Date: Tue Aug 27 20:40:29 2013 +0200
resolve copy&paste error
@@ -8385,14 +10418,14 @@
commit 563da2d375c003478d398897796ecbf45ce03482
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 26 22:33:10 2013 +0200
+Date: Mon Aug 26 22:33:10 2013 +0200
0.24.1
CMakeLists.txt | 2 +-
- NEWS | 23 +++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 23 +++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 28 insertions(+), 5 deletions(-)
@@ -8399,7 +10432,7 @@
commit 2c73f1ea9116172692d8350cb7adf1b5376f795c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 26 21:50:51 2013 +0200
+Date: Mon Aug 26 21:50:51 2013 +0200
Fix typo
@@ -8408,18 +10441,18 @@
commit f58e9b64d5cf62906876c5c0f8da0f3c2c6c2bac
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 26 00:27:59 2013 +0200
+Date: Mon Aug 26 00:27:59 2013 +0200
Some more files Adrian has changed
- goo/PNGWriter.h | 2 +-
+ goo/PNGWriter.h | 2 +-
utils/HtmlOutputDev.cc | 2 +-
- utils/pdftocairo.cc | 2 +-
+ utils/pdftocairo.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 16da389c61c495111a5a49f62539a423a0655c28
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Aug 26 07:50:51 2013 +0930
+Date: Mon Aug 26 07:50:51 2013 +0930
fix typo in pdfimages.1
@@ -8428,7 +10461,7 @@
commit 56c0d4f3a231dca141c06493b50ab25959b5b15c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Aug 26 07:47:46 2013 +0930
+Date: Mon Aug 26 07:47:46 2013 +0930
fix typo in pdfimages.1
@@ -8437,7 +10470,7 @@
commit af4f2b775946815b572622bf4c4d42ad3aea1141
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 24 21:25:51 2013 +0930
+Date: Sat Aug 24 21:25:51 2013 +0930
pdfimages: Add -all option to write all image in their native format
@@ -8447,45 +10480,45 @@
commit 25e96b6ddbbe54a75ddb97d2e235c1bd6033fe79
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Aug 21 22:22:28 2013 +0930
+Date: Wed Aug 21 22:22:28 2013 +0930
pdfimages: support ccitt output
- poppler/Stream.h | 5 +++++
+ poppler/Stream.h | 5 +++++
utils/ImageOutputDev.cc | 35 +++++++++++++++++++++++++++++++++++
utils/ImageOutputDev.h | 4 ++++
- utils/pdfimages.1 | 39 ++++++++++++++++++++++++++++++++++++++-
- utils/pdfimages.cc | 4 ++++
+ utils/pdfimages.1 | 39 ++++++++++++++++++++++++++++++++++++++-
+ utils/pdfimages.cc | 4 ++++
5 files changed, 86 insertions(+), 1 deletion(-)
commit 086413263cb63a24d9492fbe534fdcc34b45951a
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 18 20:37:01 2013 +0930
+Date: Sun Aug 18 20:37:01 2013 +0930
pdfimages: support JBIG2 output
- poppler/JBIG2Stream.h | 1 +
+ poppler/JBIG2Stream.h | 1 +
utils/ImageOutputDev.cc | 25 +++++++++++++++++++++++++
utils/ImageOutputDev.h | 4 ++++
- utils/pdfimages.1 | 13 ++++++++-----
- utils/pdfimages.cc | 4 ++++
+ utils/pdfimages.1 | 13 ++++++++-----
+ utils/pdfimages.cc | 4 ++++
5 files changed, 42 insertions(+), 5 deletions(-)
commit 2845ebabd00a2755549b8db436e78a3e0e0c0713
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 18 20:07:31 2013 +0930
+Date: Sun Aug 18 20:07:31 2013 +0930
pdfimages: add support for writing JPEG2000 files
utils/ImageOutputDev.cc | 4 ++++
utils/ImageOutputDev.h | 4 ++++
- utils/pdfimages.1 | 12 ++++++++----
- utils/pdfimages.cc | 4 ++++
+ utils/pdfimages.1 | 12 ++++++++----
+ utils/pdfimages.cc | 4 ++++
4 files changed, 20 insertions(+), 4 deletions(-)
commit 2021c8ffcb36432049c4305e85ced2ae139086f3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 18 17:29:00 2013 +0930
+Date: Sun Aug 18 17:29:00 2013 +0930
pdfimages: add support for png and tiff output
@@ -8492,28 +10525,28 @@
utils/ImageOutputDev.cc | 67
++++++++++++++++++++++++++++++++++++++++++++++---
utils/ImageOutputDev.h | 17 +++++++++++--
- utils/pdfimages.1 | 22 ++++++++++------
- utils/pdfimages.cc | 19 +++++++++++---
+ utils/pdfimages.1 | 22 ++++++++++------
+ utils/pdfimages.cc | 19 +++++++++++---
4 files changed, 110 insertions(+), 15 deletions(-)
commit 8f466775c77b09a7114c688004317e6db05bcd3f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 18 16:08:02 2013 +0930
+Date: Sun Aug 18 16:08:02 2013 +0930
Change PNGWriter monochrome format to be 8 pixels/byte
to be consistent with TiffWriter and NetPBMWriter
- goo/PNGWriter.cc | 4 ----
- goo/PNGWriter.h | 2 +-
+ goo/PNGWriter.cc | 4 ----
+ goo/PNGWriter.h | 2 +-
utils/HtmlOutputDev.cc | 31 +++++++++++++++++++------------
utils/ImageOutputDev.cc | 9 ++++++---
- utils/pdftocairo.cc | 2 +-
+ utils/pdftocairo.cc | 2 +-
5 files changed, 27 insertions(+), 21 deletions(-)
commit e53aec2c61ba42cf0635dc05f8e27e3503c1eaac
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 18 15:50:39 2013 +0930
+Date: Sun Aug 18 15:50:39 2013 +0930
Refactor ImageOutputDev to facilitate adding more output formats
@@ -8523,10 +10556,10 @@
- Create generic WriteRawIMage function for writing jpeg files so
support for jpeg2000/jbig2 can be added.
- CMakeLists.txt | 1 +
- goo/Makefile.am | 2 +
- goo/NetPBMWriter.cc | 84 ++++++++++++++++
- goo/NetPBMWriter.h | 52 ++++++++++
+ CMakeLists.txt | 1 +
+ goo/Makefile.am | 2 +
+ goo/NetPBMWriter.cc | 84 ++++++++++++++++
+ goo/NetPBMWriter.h | 52 ++++++++++
utils/ImageOutputDev.cc | 261
+++++++++++++++++++++---------------------------
utils/ImageOutputDev.h | 15 +--
@@ -8534,7 +10567,7 @@
commit 0ca0fcc9f536a57365048914cd8a8cc3eb5ed4fd
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 17 15:24:43 2013 +0930
+Date: Sat Aug 17 15:24:43 2013 +0930
pdfimages: fix bug in -list output
@@ -8545,47 +10578,47 @@
commit f8ee5a931c795013d17f73f083b6e6f9a683d061
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 17 15:17:11 2013 +0930
+Date: Sat Aug 17 15:17:11 2013 +0930
pdfimages: print size, ratio, and ppi
utils/ImageOutputDev.cc | 100
++++++++++++++++++++++++++++++++++++++++++++----
- utils/pdfimages.1 | 12 ++++++
- utils/pdfimages.cc | 2 +-
+ utils/pdfimages.1 | 12 ++++++
+ utils/pdfimages.cc | 2 +-
3 files changed, 106 insertions(+), 8 deletions(-)
commit b5321c4f40fb56b10f75c14c5c955c5775cf2ef9
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Aug 25 20:13:12 2013 +0200
+Date: Sun Aug 25 20:13:12 2013 +0200
use getCMYK/DeviceNLine in CMYK mode if available
Second part of bug 66928
- poppler/GfxState.cc | 310
+ poppler/GfxState.cc | 310
++++++++++++++++++++++++++++++++++++++++++++-
- poppler/GfxState.h | 32 ++++-
+ poppler/GfxState.h | 32 ++++-
poppler/SplashOutputDev.cc | 28 ++--
- splash/SplashTypes.h | 2 -
+ splash/SplashTypes.h | 2 -
4 files changed, 355 insertions(+), 17 deletions(-)
commit d006ac567e59e82c4c6cb42c5e429a4aa516ac0b
Merge: d391af7 ed3585e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 25 19:36:33 2013 +0200
+Date: Sun Aug 25 19:36:33 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit ed3585efc8b259cb065eac361a6a499f9f26851f
Author: William Bader <williambader at hotmail.com>
-Date: Sun Aug 25 19:31:11 2013 +0200
+Date: Sun Aug 25 19:31:11 2013 +0200
Fix pdftops -eps -level1sep rendering of a file
Since 8fb243bf11a979af8bfa36427436940706c9f71d we have
- case splashModeXBGR8:
- + cSrcNonIso[3] = 255;
+ case splashModeXBGR8:
+ + cSrcNonIso[3] = 255;
and that means splashModeDeviceN8 and splashModeCMYK8 can't
skip their breaks anymore otherwise the cSrcNonIso[3] gets
overwritten
@@ -8597,7 +10630,7 @@
commit d391af7ea63c4bc884bb81895aea0cdd8f8b282a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 24 14:03:49 2013 +0200
+Date: Sat Aug 24 14:03:49 2013 +0200
Update copyrights
@@ -8614,7 +10647,7 @@
commit a47b7f853174d6101f2b882a2db1a7dc95b33293
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 3 10:28:20 2013 +0930
+Date: Sat Aug 3 10:28:20 2013 +0930
Add pdfinfo option to print out javascript
@@ -8628,7 +10661,7 @@
commit 8f7155e7e3180bb1966a5e7df6af6acdd479939b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 3 09:05:21 2013 +0930
+Date: Sat Aug 3 09:05:21 2013 +0930
pdfinfo: indicate if pdf contains javascript
@@ -8652,13 +10685,13 @@
commit c2453fc1307ebb222747f976e1311ecc5e99abfa
Merge: 3bb8c2e 70298a0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 20 19:53:17 2013 +0200
+Date: Tue Aug 20 19:53:17 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 70298a021657a72ae80389687a86247144e6d6b6
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Aug 20 19:46:01 2013 +0200
+Date: Tue Aug 20 19:46:01 2013 +0200
Don't copy not needed bitmap
@@ -8671,13 +10704,13 @@
commit 3bb8c2e34039cf473bf72ed9dab55664deab3ab7
Merge: 71c1d16 fc78330
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 20 00:41:13 2013 +0200
+Date: Tue Aug 20 00:41:13 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit fc78330072b9771fa39d21896703adb4836e5398
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 20 00:37:56 2013 +0200
+Date: Tue Aug 20 00:37:56 2013 +0200
use getRGBLine images if available
@@ -8691,7 +10724,7 @@
commit 71c1d162477a243db07b62ef3c056a2946f8986e
Merge: 7d1de78 678c767
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 18 16:41:20 2013 +0200
+Date: Sun Aug 18 16:41:20 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
@@ -8698,7 +10731,7 @@
commit 7d1de78ad79162217ee0ca6c2e99ce51017a327d
Merge: 7e0d969 fbea224
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 18 16:40:34 2013 +0200
+Date: Sun Aug 18 16:40:34 2013 +0200
Merge commit 'origin/poppler-0.24~1'
@@ -8709,7 +10742,7 @@
commit 678c767584fa80620cc58a1d8a913cb3473209d4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 18 16:19:27 2013 +0200
+Date: Sun Aug 18 16:19:27 2013 +0200
Fix crash in 1026.asan.0.42.pdf
@@ -8720,7 +10753,7 @@
commit fbea2241cccdde0106d2c34592b6ddda28a8d848
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 17 01:32:51 2013 +0200
+Date: Sat Aug 17 01:32:51 2013 +0200
Revert "Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary"
@@ -8734,7 +10767,7 @@
commit 6d2771b8a8c0cb0f2288d0900fea3c9edc3dd172
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 17 01:32:38 2013 +0200
+Date: Sat Aug 17 01:32:38 2013 +0200
Revert "pdfinfo: Use Catalog::getMarkInfo() to show mark info
properties"
@@ -8749,13 +10782,13 @@
commit 7e0d969dc2439637ab16e609df8223504316f87d
Merge: 6efc0c7 ef64206
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 17 01:13:30 2013 +0200
+Date: Sat Aug 17 01:13:30 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit ef6420656c7b88eb22a63ec2cb3e504e0bda0384
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 17 01:11:37 2013 +0200
+Date: Sat Aug 17 01:11:37 2013 +0200
Fix jpeg image export
@@ -8767,7 +10800,7 @@
commit 681f52a572b08c068cb376e5b2dc8a31676aad07
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 16 23:58:44 2013 +0200
+Date: Fri Aug 16 23:58:44 2013 +0200
Fix exit(1) in 1026.asan.0.42.pdf
@@ -8778,7 +10811,7 @@
commit 9f4d7796589e4c9c1645fbbcf0cfabd79a71bde9
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Aug 8 20:33:54 2013 +0200
+Date: Thu Aug 8 20:33:54 2013 +0200
use copyString where memory is freed with gfree
@@ -8790,7 +10823,7 @@
commit 73cca518c479594e26605196d54b429fbf42dcdc
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Apr 25 09:52:56 2013 +0300
+Date: Thu Apr 25 09:52:56 2013 +0300
pdfinfo: Use Catalog::getMarkInfo() to show mark info properties
@@ -8799,7 +10832,7 @@
commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Apr 25 09:52:56 2013 +0300
+Date: Thu Apr 25 09:52:56 2013 +0300
Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary
@@ -8809,7 +10842,7 @@
commit 6efc0c7ad97a82064a1e2c47e0b063b606e56bb7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 16 23:31:54 2013 +0200
+Date: Fri Aug 16 23:31:54 2013 +0200
Remove unused xref member
@@ -8818,7 +10851,7 @@
commit cb5160aa74f64b78a20aaed4b89fead850b42e9b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 16 23:31:17 2013 +0200
+Date: Fri Aug 16 23:31:17 2013 +0200
Remove usnused objectNumberFirst member
@@ -8827,7 +10860,7 @@
commit a642aad68733c25f4055c268d691eedcf4e14a22
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 16 23:30:50 2013 +0200
+Date: Fri Aug 16 23:30:50 2013 +0200
PNGWriterPrivate is actually a struct not a class
@@ -8836,7 +10869,7 @@
commit 31947d413eae115acc147c33fc55b8ab4adccd91
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Aug 13 19:39:30 2013 +0200
+Date: Tue Aug 13 19:39:30 2013 +0200
pdftoppm: Add thinlinemode option setting
@@ -8847,13 +10880,13 @@
commit 8a1740b0b6ee4b217ecbe9d0046e4afa491e9f17
Merge: b27588c c3f953d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 12 22:47:44 2013 +0200
+Date: Mon Aug 12 22:47:44 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit c3f953dc87f83ac726f99cb8f1f959c486098391
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Sat Aug 10 21:43:57 2013 +0300
+Date: Sat Aug 10 21:43:57 2013 +0300
Fix a typo
@@ -8862,7 +10895,7 @@
commit b27588c4c946ef4f9a62248fbead4dffcb60b4d1
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Mon Aug 12 22:42:13 2013 +0200
+Date: Mon Aug 12 22:42:13 2013 +0200
Fix indentation
@@ -8872,13 +10905,13 @@
commit b8b5773386ee4f57e72c2b867421cdff8a2eab5a
Merge: 5f9d385 62d079b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 8 20:47:05 2013 +0200
+Date: Thu Aug 8 20:47:05 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 62d079b40a2f816f59cc533b1624ea57458331f3
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Thu Aug 8 20:45:08 2013 +0200
+Date: Thu Aug 8 20:45:08 2013 +0200
Fix `pdftotext -bbox in.pdf -`
@@ -8892,13 +10925,13 @@
commit 5f9d385dbec3148614b84ae24cae47177e18dbfc
Merge: af450a8 86dbc5f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 8 20:41:25 2013 +0200
+Date: Thu Aug 8 20:41:25 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 86dbc5f6f850ba3919bed9979386e5a4d0e7dba3
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Thu Aug 8 20:39:30 2013 +0200
+Date: Thu Aug 8 20:39:30 2013 +0200
pdfdetach: don't mention xpdfrc
@@ -8913,7 +10946,7 @@
commit af450a885ede5a3eac1a12734310722963764d83
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Aug 8 20:33:54 2013 +0200
+Date: Thu Aug 8 20:33:54 2013 +0200
use copyString where memory is freed with gfree
@@ -8925,7 +10958,7 @@
commit 030ee12875a562f5976c5569d5c76783aadf89bd
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Apr 25 09:52:56 2013 +0300
+Date: Thu Apr 25 09:52:56 2013 +0300
pdfinfo: Use Catalog::getMarkInfo() to show mark info properties
@@ -8934,7 +10967,7 @@
commit 9a232273988c0d2fd752dc2016e5111227ae6646
Author: Adrian Perez de Castro <aperez at igalia.com>
-Date: Thu Apr 25 09:52:56 2013 +0300
+Date: Thu Apr 25 09:52:56 2013 +0300
Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary
@@ -8944,7 +10977,7 @@
commit 2724a7b9f723789491b4991ce7fe0cfa3e5488c3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 30 09:36:44 2013 +0200
+Date: Tue Jul 30 09:36:44 2013 +0200
glib-demo: Remove GTK_DISABLE_DEPRECATED compilation flag
@@ -8956,7 +10989,7 @@
commit ef9d861486d54fb3dcf7b8bca01bd44c3b3361a9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 30 09:36:44 2013 +0200
+Date: Tue Jul 30 09:36:44 2013 +0200
glib-demo: Remove GTK_DISABLE_DEPRECATED compilation flag
@@ -8968,14 +11001,14 @@
commit eac752dc25942439de3e1c7a4ff815500a41dd2a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 29 19:11:55 2013 +0200
+Date: Mon Jul 29 19:11:55 2013 +0200
0.24.0
CMakeLists.txt | 6 +++---
- NEWS | 7 +++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ NEWS | 7 +++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
@@ -8983,7 +11016,7 @@
commit 892433a068a8a11c09a7c4f57c5fc941747c4453
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 29 19:08:10 2013 +0200
+Date: Mon Jul 29 19:08:10 2013 +0200
Update Ed's copyright
@@ -8992,7 +11025,7 @@
commit 4637b1581286381c3d1c6963828d9cd8afc5b9e0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 29 01:08:06 2013 +0200
+Date: Mon Jul 29 01:08:06 2013 +0200
Make some pdftops conversions *much* faster
@@ -9010,12 +11043,12 @@
This has passed the pdf->ps regression test without a single issue
poppler/PSOutputDev.cc | 42 ++++++++++--------------------------------
- poppler/PSOutputDev.h | 6 +++---
+ poppler/PSOutputDev.h | 6 +++---
2 files changed, 13 insertions(+), 35 deletions(-)
commit e04287f2682e46831c04e0ef8d60411f521a2572
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 29 00:55:43 2013 +0200
+Date: Mon Jul 29 00:55:43 2013 +0200
Fallback to 1x1 bitmap If we fail to create the corrent one
@@ -9024,7 +11057,7 @@
commit fe5ff20cb93a70fa1650ef5e00b67e35de20f0ca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 29 00:54:07 2013 +0200
+Date: Mon Jul 29 00:54:07 2013 +0200
Initialize t3FillColorOnly
@@ -9033,7 +11066,7 @@
commit 19930d9f104b63070dcd7636758eb8b90a86fc0d
Author: Ed Catmur <ed at catmur.co.uk>
-Date: Sun Jul 21 11:07:00 2013 +0200
+Date: Sun Jul 21 11:07:00 2013 +0200
TextOutputDev: Do not draw ligatures more than once when selected
@@ -9049,27 +11082,27 @@
commit 6b451b2d3f785c28d98907ae338d58380db518d2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 19 02:55:29 2013 +0200
+Date: Fri Jul 19 02:55:29 2013 +0200
0.23.4
- CMakeLists.txt | 4 +--
- NEWS | 8 ++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- gtk-doc.make | 70
+ CMakeLists.txt | 4 +--
+ NEWS | 8 ++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 70
+++++++++++++++++++++++++++++++-----------------
- m4/gtk-doc.m4 | 6 ++++-
+ m4/gtk-doc.m4 | 6 ++++-
poppler/CairoOutputDev.h | 2 +-
- poppler/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
poppler/TextOutputDev.cc | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
11 files changed, 67 insertions(+), 35 deletions(-)
commit 6cf43442e38c501b49293a28f38e06ab143852c6
Author: Ed Catmur <ed at catmur.co.uk>
-Date: Thu Jul 18 10:34:29 2013 +0200
+Date: Thu Jul 18 10:34:29 2013 +0200
TextOutputDev: clip the selected text rendering to the selection box
@@ -9085,7 +11118,7 @@
commit 269b3f3d572a15f1007f8cc84f758b1a293ef8af
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 8 20:19:30 2013 +0200
+Date: Mon Jul 8 20:19:30 2013 +0200
build: Make -lpthread take preference over -pthread
@@ -9099,11 +11132,11 @@
commit 40f857d27930aa002a99c96f3892c5e240e7ecb5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 8 19:55:10 2013 +0200
+Date: Mon Jul 8 19:55:10 2013 +0200
m4: Replace old acx_pthread.m4 with new one ax_pthread.m4
- configure.ac | 2 +-
+ configure.ac | 2 +-
m4/acx_pthread.m4 | 280 -----------------------------------------------
m4/ax_pthread.m4 | 317
++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -9111,7 +11144,7 @@
commit 44b7070aa713b2e20eb97b868000d432e2f8504e
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jul 8 19:42:15 2013 +0200
+Date: Mon Jul 8 19:42:15 2013 +0200
cmake: improve linking with pthreads
@@ -9123,7 +11156,7 @@
commit 69c281fdcf23520151c0eb5471a4259c73fa1273
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 7 11:51:27 2013 +0200
+Date: Sun Jul 7 11:51:27 2013 +0200
cairo: Fix the bounding box of images saved in CairoImageOutputDev
@@ -9137,7 +11170,7 @@
commit 759e0266b36c4ea9f66912f1e53ed6392dbfd6da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 2 00:47:13 2013 +0200
+Date: Tue Jul 2 00:47:13 2013 +0200
News for 0.23.3
@@ -9148,14 +11181,14 @@
commit df1fe9dc7ade5228e37c16c6f0c9a2d4890fdc90
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 2 00:33:04 2013 +0200
+Date: Tue Jul 2 00:33:04 2013 +0200
0.23.3
CMakeLists.txt | 4 ++--
- Makefile.am | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ Makefile.am | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
@@ -9163,13 +11196,13 @@
commit df9d4fee17adfe003c822175b6921a3cd93675f6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 1 21:04:10 2013 +0200
+Date: Mon Jul 1 21:04:10 2013 +0200
Update copyrights
- poppler/Annot.cc | 2 +-
- poppler/Annot.h | 2 +-
- poppler/Page.cc | 2 +-
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h | 2 +-
+ poppler/Page.cc | 2 +-
poppler/TextOutputDev.cc | 2 +-
poppler/TextOutputDev.h | 2 +-
qt5/src/poppler-annotation.cc | 2 +-
@@ -9176,12 +11209,12 @@
qt5/src/poppler-annotation.h | 2 +-
qt5/src/poppler-document.cc | 2 +-
qt5/src/poppler-link.cc | 2 +-
- qt5/src/poppler-qt5.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
commit 67129e9db88e8332907407f14d3e09ee5c49e274
Author: Jason Crain <jason at aquaticape.us>
-Date: Mon Jul 1 02:24:47 2013 -0500
+Date: Mon Jul 1 02:24:47 2013 -0500
Check for NULL in Page::getResourceDictCopy
@@ -9190,7 +11223,7 @@
commit c376559bc412e90204162bb4b2d20cd586db70c1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jun 30 13:14:07 2013 +0200
+Date: Sun Jun 30 13:14:07 2013 +0200
annots: Invalidate the appearance stream when annot properties change
@@ -9200,8 +11233,8 @@
the core
and fixes the appearance stream regeneration in the glib frontend too.
- poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 10 ++++++----
+ poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 10 ++++++----
qt4/src/poppler-annotation.cc | 34 ----------------------------------
qt5/src/poppler-annotation.cc | 34 ----------------------------------
4 files changed, 42 insertions(+), 72 deletions(-)
@@ -9208,7 +11241,7 @@
commit c746e8b38e821d1ebeaf52c4c816515bc3ddaaf6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jun 30 11:44:59 2013 +0200
+Date: Sun Jun 30 11:44:59 2013 +0200
annots: Remove unused variable
@@ -9217,7 +11250,7 @@
commit 7d9d5d2518f7760e6a4317a358040ddd9164fdef
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jun 30 11:40:15 2013 +0200
+Date: Sun Jun 30 11:40:15 2013 +0200
annots: Do not update AP and AS entries if they are not present when
invaliding the appaearance stream
@@ -9227,7 +11260,7 @@
commit 347b53f7fca644564724c230fe6c0dcbffa0d6f9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jun 30 11:23:54 2013 +0200
+Date: Sun Jun 30 11:23:54 2013 +0200
annots: do not set the default appearance state when invalidating
appearances
@@ -9243,7 +11276,7 @@
commit b5e9941c145fc99e03a28d92a50840638895908d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 1 00:32:51 2013 +0200
+Date: Mon Jul 1 00:32:51 2013 +0200
Fix crash on malformed doc
@@ -9255,7 +11288,7 @@
commit 19f8a88bba6022b8172477e6f52dfd36b2fc5e92
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 7 00:20:15 2013 +0100
+Date: Thu Mar 7 00:20:15 2013 +0100
qt5: Free some temporary memory in
TextAnnotationPrivate::createNativeAnnot
@@ -9267,7 +11300,7 @@
commit 8bac4d1e43ce9a4c66fddc8430d7bed2d9aabba1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Jun 25 20:09:00 2013 +0200
+Date: Tue Jun 25 20:09:00 2013 +0200
qt5: Some documentation about annotations
@@ -9290,7 +11323,7 @@
commit 1d5fe3f20189fd3928121e954bcc8fa7278b39fb
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 2 19:06:49 2013 +0100
+Date: Sat Mar 2 19:06:49 2013 +0100
qt5: FixedRotation annotations' coordinate conversion
@@ -9302,21 +11335,21 @@
clients will need to set geometry-related annotation properties in
the following order:
1) flags (because we need to know if this is a FixedRotation
- annotation or not)
+ annotation or not)
2) boundary (because we need to know what the topleft corner is,
- so that we can construct the conversion matrix)
+ so that we can construct the conversion matrix)
3) anything else
This requirement will be documented in the next patch
qt5/src/poppler-annotation-private.h | 7 ++-
- qt5/src/poppler-annotation.cc | 111
+ qt5/src/poppler-annotation.cc | 111
+++++++++++++++++++++++++++--------
2 files changed, 92 insertions(+), 26 deletions(-)
commit ab130c91492765f8be29ed112dd2e2e6f665641b
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 2 00:55:58 2013 +0100
+Date: Sat Mar 2 00:55:58 2013 +0100
core: Remove geometry-related arguments from annotation constructors
@@ -9343,20 +11376,20 @@
commit 35cfb6914e1be4c5eda2f355900b1a0a1fa69d19
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Feb 15 12:24:18 2013 +0100
+Date: Fri Feb 15 12:24:18 2013 +0100
poppler_qt5viewer: Add combobox to select rotation
qt5/demos/navigationtoolbar.cpp | 15 +++++++++++++++
- qt5/demos/navigationtoolbar.h | 4 ++++
- qt5/demos/pageview.cpp | 24 +++++++++++++++++++++++-
- qt5/demos/pageview.h | 3 +++
- qt5/demos/viewer.cpp | 2 ++
+ qt5/demos/navigationtoolbar.h | 4 ++++
+ qt5/demos/pageview.cpp | 24 +++++++++++++++++++++++-
+ qt5/demos/pageview.h | 3 +++
+ qt5/demos/viewer.cpp | 2 ++
5 files changed, 47 insertions(+), 1 deletion(-)
commit de2a93c0bc6e92a95c687796f59780c998b90ca4
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 7 00:20:15 2013 +0100
+Date: Thu Mar 7 00:20:15 2013 +0100
qt4: Free some temporary memory in
TextAnnotationPrivate::createNativeAnnot
@@ -9368,7 +11401,7 @@
commit 738b0b4fedaa2b2b28ea1c11622dfd880180d1c9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 7 20:50:52 2013 +0100
+Date: Thu Mar 7 20:50:52 2013 +0100
qt4: Some documentation about annotations
@@ -9391,7 +11424,7 @@
commit cf950a2b7e8278e70719c67b441b0d324ffd0399
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 2 19:06:49 2013 +0100
+Date: Sat Mar 2 19:06:49 2013 +0100
qt4: FixedRotation annotations' coordinate conversion
@@ -9403,23 +11436,23 @@
clients will need to set geometry-related annotation properties in
the following order:
1) flags (because we need to know if this is a FixedRotation
- annotation or not)
+ annotation or not)
2) boundary (because we need to know what the topleft corner is,
- so that we can construct the conversion matrix)
+ so that we can construct the conversion matrix)
3) anything else
This requirement will be documented in the next patch
- poppler/Annot.cc | 8 +++
- poppler/Annot.h | 2 +
+ poppler/Annot.cc | 8 +++
+ poppler/Annot.h | 2 +
qt4/src/poppler-annotation-private.h | 7 ++-
- qt4/src/poppler-annotation.cc | 111
+ qt4/src/poppler-annotation.cc | 111
+++++++++++++++++++++++++++--------
4 files changed, 102 insertions(+), 26 deletions(-)
commit 4b13085568df09d8b75099f6a5438f025a028fd5
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 2 00:55:58 2013 +0100
+Date: Sat Mar 2 00:55:58 2013 +0100
core: Remove geometry-related arguments from annotation constructors
@@ -9441,28 +11474,28 @@
- AnnotPolygon
- AnnotInk
- poppler/Annot.cc | 56
+ poppler/Annot.cc | 56
+++++++++++++------------------------------
- poppler/Annot.h | 9 ++++---
+ poppler/Annot.h | 9 ++++---
qt4/src/poppler-annotation.cc | 34 +++++++++++++-------------
3 files changed, 39 insertions(+), 60 deletions(-)
commit 5923cfb5f7e3a0703de17e21f4952f92a44f3c14
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Feb 15 12:24:18 2013 +0100
+Date: Fri Feb 15 12:24:18 2013 +0100
poppler_qt4viewer: Add combobox to select rotation
qt4/demos/navigationtoolbar.cpp | 15 +++++++++++++++
- qt4/demos/navigationtoolbar.h | 4 ++++
- qt4/demos/pageview.cpp | 24 +++++++++++++++++++++++-
- qt4/demos/pageview.h | 3 +++
- qt4/demos/viewer.cpp | 2 ++
+ qt4/demos/navigationtoolbar.h | 4 ++++
+ qt4/demos/pageview.cpp | 24 +++++++++++++++++++++++-
+ qt4/demos/pageview.h | 3 +++
+ qt4/demos/viewer.cpp | 2 ++
5 files changed, 47 insertions(+), 1 deletion(-)
commit 74ea15cc454f31b772e71b3525b71045dbfa5527
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Jun 25 19:56:20 2013 +0200
+Date: Tue Jun 25 19:56:20 2013 +0200
core: Support for rendering annotations with flagNoRotate
@@ -9472,12 +11505,12 @@
++++++++++++++++++++++++++++++++++++-------------------
poppler/Annot.h | 3 ++-
poppler/Gfx.cc | 41 +++++++++++++++++++++++++++++++++++++----
- poppler/Gfx.h | 3 ++-
+ poppler/Gfx.h | 3 ++-
4 files changed, 77 insertions(+), 25 deletions(-)
commit 2639957ba78defd2ab6282679375fb7969bad21f
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Jun 26 23:12:40 2013 +0200
+Date: Wed Jun 26 23:12:40 2013 +0200
Do not crash in page::removeAnnot if there are non-Ref entries
in /Annots
@@ -9487,7 +11520,7 @@
commit ae016aa263c218fbfbd607cc92feac1013348c7e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 26 11:33:55 2013 +0200
+Date: Wed Jun 26 11:33:55 2013 +0200
Fix qt5 found/not found logic
@@ -9497,13 +11530,13 @@
commit e27c1057caf4d878a0dc43c92c9e0b565db8fe40
Merge: c55b577 ee8cfbc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 25 19:17:13 2013 +0200
+Date: Tue Jun 25 19:17:13 2013 +0200
Merge remote-tracking branch 'origin/qt5'
commit c55b577ce69ad4bb69f5261b3e120e92c9fdb3d0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 25 10:01:38 2013 +0200
+Date: Tue Jun 25 10:01:38 2013 +0200
glib: Use TextPage::getSelectionWords to build text layout and
attributes
@@ -9523,7 +11556,7 @@
commit fc534f571315c064005515c19d7d70ad3af1563e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 25 10:05:01 2013 +0200
+Date: Tue Jun 25 10:05:01 2013 +0200
TextOutputDev: add a method to TextPage to get the selection as a
list of words
@@ -9536,7 +11569,7 @@
commit a924246b7534e86165f8e9ab6c60d56b73a17b94
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 25 09:57:48 2013 +0200
+Date: Tue Jun 25 09:57:48 2013 +0200
TextOutputDev: simplify the text selection dumper
@@ -9549,7 +11582,7 @@
commit c849094a2daf896d085937adff1f7659a09da062
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 24 18:29:11 2013 +0200
+Date: Mon Jun 24 18:29:11 2013 +0200
TextOutputDev: Move TextSelection class from TextSelectionPainter
to TextSelectionVisitor
@@ -9563,7 +11596,7 @@
commit b3ff3f2c3e131556d2b27cbe52f0ddbbb4820c19
Author: Jason Crain <jason at aquaticape.us>
-Date: Thu Jun 20 21:47:13 2013 -0500
+Date: Thu Jun 20 21:47:13 2013 -0500
Draw glyphs after selection background
@@ -9581,7 +11614,7 @@
commit ee8cfbc78fe9de109abbe0727a738870f6027a73
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 18 23:20:01 2013 +0200
+Date: Tue Jun 18 23:20:01 2013 +0200
Fix indent
@@ -9590,14 +11623,14 @@
commit 9d0a5b6afb25a1273504383e108bdb95ca82f099
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 18 23:19:30 2013 +0200
+Date: Tue Jun 18 23:19:30 2013 +0200
Bring changes from the qt4 dir
- qt5/src/Doxyfile | 2 +-
- qt5/src/poppler-private.h | 2 +-
- qt5/tests/CMakeLists.txt | 1 +
- qt5/tests/Makefile.am | 13 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/poppler-private.h | 2 +-
+ qt5/tests/CMakeLists.txt | 1 +
+ qt5/tests/Makefile.am | 13 +-
qt5/tests/stress-threads-qt5.cpp | 304
+++++++++++++++++++++++++++++++++++++++
qt5/tests/test-poppler-qt5.cpp | 2 +-
@@ -9605,30 +11638,26 @@
commit 1adb1ab7aee026e227d25716a4b7be22b19b5b84
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 18 20:50:49 2013 +0200
+Date: Tue Jun 18 20:50:49 2013 +0200
Make it build with autotools
- poppler/ArthurOutputDev.cc | 816
- ------------------------------------------
- poppler/ArthurOutputDev.h | 170 ---------
- poppler/Makefile.am | 23 +-
- qt4/src/ArthurOutputDev.cc | 816
- ++++++++++++++++++++++++++++++++++++++++++
- qt4/src/ArthurOutputDev.h | 170 +++++++++
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Makefile.am | 5 +-
- qt5/src/ArthurOutputDev.cc | 816
- ++++++++++++++++++++++++++++++++++++++++++
- qt5/src/ArthurOutputDev.h | 170 +++++++++
- qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Makefile.am | 5 +-
- qt5/src/poppler-optcontent.cc | 2 +
- 12 files changed, 1983 insertions(+), 1014 deletions(-)
+ poppler/Makefile.am | 23 +-
+ {poppler => qt4/src}/ArthurOutputDev.cc | 0
+ {poppler => qt4/src}/ArthurOutputDev.h | 0
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 5 +-
+ qt5/src/ArthurOutputDev.cc | 816
+ ++++++++++++++++++++++++++++++++
+ qt5/src/ArthurOutputDev.h | 170 +++++++
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Makefile.am | 5 +-
+ qt5/src/poppler-optcontent.cc | 2 +
+ 10 files changed, 997 insertions(+), 28 deletions(-)
commit 93a1c2b768cc419c5bf9b3033bf85fb21326a65a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 18 00:33:38 2013 +0200
+Date: Tue Jun 18 00:33:38 2013 +0200
If qmake gives us a Qt5 qmake try with qmake4 and qmake-qt4
@@ -9638,7 +11667,7 @@
commit 7cc33a752ef864b595748ce7724ba553a8e3ba8e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 22:57:56 2013 +0200
+Date: Mon Jun 17 22:57:56 2013 +0200
We are not compiling an executable
@@ -9647,17 +11676,17 @@
commit 87cfcd41e8e970186c6ce753aa660ef86aca8878
Author: Granger Anthony <grangeranthony at gmail.com>
-Date: Mon Jun 17 09:17:51 2013 +0200
+Date: Mon Jun 17 09:17:51 2013 +0200
Allow to enable Qt5 support only with CMake >= 2.8.8
- CMakeLists.txt | 26 ++++++++++++++++----------
+ CMakeLists.txt | 26 ++++++++++++++++----------
qt5/tests/CMakeLists.txt | 1 -
2 files changed, 16 insertions(+), 11 deletions(-)
commit b44c70f04758000cf0e049b06cc7864287570f7b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 22:10:05 2013 +0200
+Date: Mon Jun 17 22:10:05 2013 +0200
Bring PIC back to the toplevel, still have linking errors tohugh :-/
@@ -9666,7 +11695,7 @@
commit be49073f5ce79f56b38197758a5cf1253b972306
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 21:50:31 2013 +0200
+Date: Mon Jun 17 21:50:31 2013 +0200
Use qtchooser if available
@@ -9675,7 +11704,7 @@
commit b1958228d4bc6793a3606b5e31c61a57b9fac9f5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 20:21:08 2013 +0200
+Date: Mon Jun 17 20:21:08 2013 +0200
No distro ships moc-qt5 but make it work in case someone would
@@ -9684,7 +11713,7 @@
commit 06f45c7177afc67e02985be1a97cd976c530c4ae
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 20:04:49 2013 +0200
+Date: Mon Jun 17 20:04:49 2013 +0200
Build fixes
@@ -9691,34 +11720,34 @@
Fix moc when moc-qt4 is qt4 moc but moc is qt5 one
Do not add -fPIE everywhere, just -fPIC to qt5
- configure.ac | 10 ++++++----
- qt5/src/Makefile.am | 2 +-
+ configure.ac | 10 ++++++----
+ qt5/src/Makefile.am | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
commit cb617c21fba727781f46278f5475b91d528a488b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 18:12:18 2013 +0200
+Date: Mon Jun 17 18:12:18 2013 +0200
Files i forgot
poppler-qt5-uninstalled.pc.in | 7 +++++++
- poppler-qt5.pc.cmake | 13 +++++++++++++
- poppler-qt5.pc.in | 13 +++++++++++++
+ poppler-qt5.pc.cmake | 13 +++++++++++++
+ poppler-qt5.pc.in | 13 +++++++++++++
3 files changed, 33 insertions(+)
commit 5c521bba427eb163e4b77d936865fbdd0e07faf3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 18:12:07 2013 +0200
+Date: Mon Jun 17 18:12:07 2013 +0200
soversion 1
qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 43786964946b4f4c005a0526e16fead3ffa6ba4a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 00:23:31 2013 +0200
+Date: Mon Jun 17 00:23:31 2013 +0200
harmonize spaces
@@ -9727,23 +11756,23 @@
commit 2e2ea27fe3dc688c87003d170b82451a6a872b0d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 00:22:18 2013 +0200
+Date: Mon Jun 17 00:22:18 2013 +0200
Remove qt4 mentions
- qt5/src/poppler-converter-private.h | 6 +++---
+ qt5/src/poppler-converter-private.h | 6 +++---
qt5/src/poppler-embeddedfile-private.h | 2 +-
- qt5/src/poppler-form.cc | 2 +-
- qt5/src/poppler-form.h | 6 +++---
- qt5/src/poppler-pdf-converter.cc | 2 +-
- qt5/src/poppler-private.cc | 4 ++--
- qt5/src/poppler-private.h | 2 +-
- qt5/src/poppler-qt5.h | 2 +-
+ qt5/src/poppler-form.cc | 2 +-
+ qt5/src/poppler-form.h | 6 +++---
+ qt5/src/poppler-pdf-converter.cc | 2 +-
+ qt5/src/poppler-private.cc | 4 ++--
+ qt5/src/poppler-private.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
commit e2264ce82af3e971e34930f5307b7c9b43a1e346
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 00:19:27 2013 +0200
+Date: Mon Jun 17 00:19:27 2013 +0200
remove deprecated stuff
@@ -9753,7 +11782,7 @@
qt5/src/poppler-link.cc | 5 --
qt5/src/poppler-link.h | 10 ----
qt5/src/poppler-page.cc | 18 -------
- qt5/src/poppler-qt5.h | 41 ----------------
+ qt5/src/poppler-qt5.h | 41 ----------------
qt5/tests/check_fonts.cpp | 21 ++-------
qt5/tests/check_metadata.cpp | 1 -
qt5/tests/check_search.cpp | 107
@@ -9762,7 +11791,7 @@
commit 21808e203eed46e379954b58b7014998b3836573
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 00:03:45 2013 +0200
+Date: Mon Jun 17 00:03:45 2013 +0200
remove commented stuff
@@ -9771,122 +11800,122 @@
commit 16e7033f18a8da8e27aaed6f63cce156abf8837a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 17 00:01:27 2013 +0200
+Date: Mon Jun 17 00:01:27 2013 +0200
Initial Qt5 port
- CMakeLists.txt | 20 +
- Makefile.am | 18 +-
- configure.ac | 66 +-
- qt5/.gitignore | 4 +
- qt5/CMakeLists.txt | 3 +
- qt5/Makefile.am | 1 +
- qt5/demos/.gitignore | 4 +
- qt5/demos/CMakeLists.txt | 38 +
- qt5/demos/Makefile.am | 67 +
- qt5/demos/abstractinfodock.cpp | 57 +
- qt5/demos/abstractinfodock.h | 48 +
- qt5/demos/documentobserver.cpp | 50 +
- qt5/demos/documentobserver.h | 50 +
- qt5/demos/embeddedfiles.cpp | 82 +
- qt5/demos/embeddedfiles.h | 44 +
- qt5/demos/fonts.cpp | 72 +
- qt5/demos/fonts.h | 43 +
- qt5/demos/info.cpp | 72 +
- qt5/demos/info.h | 43 +
- qt5/demos/main_viewer.cpp | 33 +
- qt5/demos/metadata.cpp | 50 +
- qt5/demos/metadata.h | 43 +
- qt5/demos/navigationtoolbar.cpp | 129 +
- qt5/demos/navigationtoolbar.h | 61 +
- qt5/demos/optcontent.cpp | 69 +
- qt5/demos/optcontent.h | 47 +
- qt5/demos/pageview.cpp | 79 +
- qt5/demos/pageview.h | 50 +
- qt5/demos/permissions.cpp | 66 +
- qt5/demos/permissions.h | 43 +
- qt5/demos/thumbnails.cpp | 84 +
- qt5/demos/thumbnails.h | 48 +
- qt5/demos/toc.cpp | 88 +
- qt5/demos/toc.h | 43 +
- qt5/demos/viewer.cpp | 317 ++
- qt5/demos/viewer.h | 73 +
- qt5/src/.gitignore | 9 +
- qt5/src/CMakeLists.txt | 54 +
- qt5/src/Doxyfile | 1637 ++++++++++
- qt5/src/Mainpage.dox | 85 +
- qt5/src/Makefile.am | 73 +
- qt5/src/poppler-annotation-helper.h | 198 ++
- qt5/src/poppler-annotation-private.h | 111 +
- qt5/src/poppler-annotation.cc | 4394
+ CMakeLists.txt | 20 +
+ Makefile.am | 18 +-
+ configure.ac | 66 +-
+ qt5/.gitignore | 4 +
+ qt5/CMakeLists.txt | 3 +
+ qt5/Makefile.am | 1 +
+ qt5/demos/.gitignore | 4 +
+ qt5/demos/CMakeLists.txt | 38 +
+ qt5/demos/Makefile.am | 67 +
+ qt5/demos/abstractinfodock.cpp | 57 +
+ qt5/demos/abstractinfodock.h | 48 +
+ qt5/demos/documentobserver.cpp | 50 +
+ qt5/demos/documentobserver.h | 50 +
+ qt5/demos/embeddedfiles.cpp | 82 +
+ qt5/demos/embeddedfiles.h | 44 +
+ qt5/demos/fonts.cpp | 72 +
+ qt5/demos/fonts.h | 43 +
+ qt5/demos/info.cpp | 72 +
+ qt5/demos/info.h | 43 +
+ qt5/demos/main_viewer.cpp | 33 +
+ qt5/demos/metadata.cpp | 50 +
+ qt5/demos/metadata.h | 43 +
+ qt5/demos/navigationtoolbar.cpp | 129 +
+ qt5/demos/navigationtoolbar.h | 61 +
+ qt5/demos/optcontent.cpp | 69 +
+ qt5/demos/optcontent.h | 47 +
+ qt5/demos/pageview.cpp | 79 +
+ qt5/demos/pageview.h | 50 +
+ qt5/demos/permissions.cpp | 66 +
+ qt5/demos/permissions.h | 43 +
+ qt5/demos/thumbnails.cpp | 84 +
+ qt5/demos/thumbnails.h | 48 +
+ qt5/demos/toc.cpp | 88 +
+ qt5/demos/toc.h | 43 +
+ qt5/demos/viewer.cpp | 317 ++
+ qt5/demos/viewer.h | 73 +
+ qt5/src/.gitignore | 9 +
+ qt5/src/CMakeLists.txt | 54 +
+ qt5/src/Doxyfile | 1637 ++++++++++
+ qt5/src/Mainpage.dox | 85 +
+ qt5/src/Makefile.am | 73 +
+ qt5/src/poppler-annotation-helper.h | 198 ++
+ qt5/src/poppler-annotation-private.h | 111 +
+ qt5/src/poppler-annotation.cc | 4394
++++++++++++++++++++++++++
- qt5/src/poppler-annotation.h | 921 ++++++
- qt5/src/poppler-base-converter.cc | 105 +
- qt5/src/poppler-converter-private.h | 49 +
- qt5/src/poppler-document.cc | 679 ++++
+ qt5/src/poppler-annotation.h | 921 ++++++
+ qt5/src/poppler-base-converter.cc | 105 +
+ qt5/src/poppler-converter-private.h | 49 +
+ qt5/src/poppler-document.cc | 679 ++++
qt5/src/poppler-embeddedfile-private.h | 42 +
- qt5/src/poppler-embeddedfile.cc | 135 +
- qt5/src/poppler-export.h | 17 +
- qt5/src/poppler-fontinfo.cc | 149 +
- qt5/src/poppler-form.cc | 416 +++
- qt5/src/poppler-form.h | 343 ++
+ qt5/src/poppler-embeddedfile.cc | 135 +
+ qt5/src/poppler-export.h | 17 +
+ qt5/src/poppler-fontinfo.cc | 149 +
+ qt5/src/poppler-form.cc | 416 +++
+ qt5/src/poppler-form.h | 343 ++
qt5/src/poppler-link-extractor-private.h | 57 +
- qt5/src/poppler-link-extractor.cc | 84 +
- qt5/src/poppler-link.cc | 711 +++++
- qt5/src/poppler-link.h | 612 ++++
- qt5/src/poppler-media.cc | 168 +
- qt5/src/poppler-media.h | 100 +
- qt5/src/poppler-movie.cc | 110 +
- qt5/src/poppler-optcontent-private.h | 121 +
- qt5/src/poppler-optcontent.cc | 427 +++
- qt5/src/poppler-optcontent.h | 77 +
- qt5/src/poppler-page-private.h | 54 +
+ qt5/src/poppler-link-extractor.cc | 84 +
+ qt5/src/poppler-link.cc | 711 +++++
+ qt5/src/poppler-link.h | 612 ++++
+ qt5/src/poppler-media.cc | 168 +
+ qt5/src/poppler-media.h | 100 +
+ qt5/src/poppler-movie.cc | 110 +
+ qt5/src/poppler-optcontent-private.h | 121 +
+ qt5/src/poppler-optcontent.cc | 427 +++
+ qt5/src/poppler-optcontent.h | 77 +
+ qt5/src/poppler-page-private.h | 54 +
qt5/src/poppler-page-transition-private.h | 28 +
- qt5/src/poppler-page-transition.cc | 95 +
- qt5/src/poppler-page-transition.h | 148 +
- qt5/src/poppler-page.cc | 744 +++++
- qt5/src/poppler-pdf-converter.cc | 115 +
- qt5/src/poppler-private.cc | 292 ++
- qt5/src/poppler-private.h | 240 ++
- qt5/src/poppler-ps-converter.cc | 273 ++
+ qt5/src/poppler-page-transition.cc | 95 +
+ qt5/src/poppler-page-transition.h | 148 +
+ qt5/src/poppler-page.cc | 744 +++++
+ qt5/src/poppler-pdf-converter.cc | 115 +
+ qt5/src/poppler-private.cc | 292 ++
+ qt5/src/poppler-private.h | 240 ++
+ qt5/src/poppler-ps-converter.cc | 273 ++
qt5/src/poppler-qiodeviceoutstream-private.h | 47 +
- qt5/src/poppler-qiodeviceoutstream.cc | 64 +
- qt5/src/poppler-qt5.h | 1812 +++++++++++
- qt5/src/poppler-sound.cc | 132 +
- qt5/src/poppler-textbox.cc | 63 +
- qt5/tests/.gitignore | 30 +
- qt5/tests/CMakeLists.txt | 75 +
- qt5/tests/Makefile.am | 152 +
- qt5/tests/README.unittest | 23 +
- qt5/tests/check_actualtext.cpp | 33 +
- qt5/tests/check_attachments.cpp | 157 +
- qt5/tests/check_dateConversion.cpp | 142 +
- qt5/tests/check_fonts.cpp | 248 ++
- qt5/tests/check_goostring.cpp | 61 +
- qt5/tests/check_lexer.cpp | 128 +
- qt5/tests/check_links.cpp | 96 +
- qt5/tests/check_metadata.cpp | 275 ++
- qt5/tests/check_optcontent.cpp | 484 +++
- qt5/tests/check_pagelabelinfo.cpp | 43 +
- qt5/tests/check_pagelayout.cpp | 49 +
- qt5/tests/check_pagemode.cpp | 73 +
- qt5/tests/check_password.cpp | 88 +
- qt5/tests/check_permissions.cpp | 44 +
- qt5/tests/check_search.cpp | 91 +
- qt5/tests/check_strings.cpp | 250 ++
- qt5/tests/poppler-attachments.cpp | 39 +
- qt5/tests/poppler-fonts.cpp | 89 +
- qt5/tests/poppler-forms.cpp | 166 +
- qt5/tests/poppler-texts.cpp | 40 +
- qt5/tests/stress-poppler-dir.cpp | 67 +
- qt5/tests/stress-poppler-qt5.cpp | 74 +
- qt5/tests/test-password-qt5.cpp | 136 +
- qt5/tests/test-poppler-qt5.cpp | 235 ++
+ qt5/src/poppler-qiodeviceoutstream.cc | 64 +
+ qt5/src/poppler-qt5.h | 1812 +++++++++++
+ qt5/src/poppler-sound.cc | 132 +
+ qt5/src/poppler-textbox.cc | 63 +
+ qt5/tests/.gitignore | 30 +
+ qt5/tests/CMakeLists.txt | 75 +
+ qt5/tests/Makefile.am | 152 +
+ qt5/tests/README.unittest | 23 +
+ qt5/tests/check_actualtext.cpp | 33 +
+ qt5/tests/check_attachments.cpp | 157 +
+ qt5/tests/check_dateConversion.cpp | 142 +
+ qt5/tests/check_fonts.cpp | 248 ++
+ qt5/tests/check_goostring.cpp | 61 +
+ qt5/tests/check_lexer.cpp | 128 +
+ qt5/tests/check_links.cpp | 96 +
+ qt5/tests/check_metadata.cpp | 275 ++
+ qt5/tests/check_optcontent.cpp | 484 +++
+ qt5/tests/check_pagelabelinfo.cpp | 43 +
+ qt5/tests/check_pagelayout.cpp | 49 +
+ qt5/tests/check_pagemode.cpp | 73 +
+ qt5/tests/check_password.cpp | 88 +
+ qt5/tests/check_permissions.cpp | 44 +
+ qt5/tests/check_search.cpp | 91 +
+ qt5/tests/check_strings.cpp | 250 ++
+ qt5/tests/poppler-attachments.cpp | 39 +
+ qt5/tests/poppler-fonts.cpp | 89 +
+ qt5/tests/poppler-forms.cpp | 166 +
+ qt5/tests/poppler-texts.cpp | 40 +
+ qt5/tests/stress-poppler-dir.cpp | 67 +
+ qt5/tests/stress-poppler-qt5.cpp | 74 +
+ qt5/tests/test-password-qt5.cpp | 136 +
+ qt5/tests/test-poppler-qt5.cpp | 235 ++
106 files changed, 21480 insertions(+), 4 deletions(-)
commit 714ee1e61d853394818dca7155b1b882408ffc6a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 16 19:00:01 2013 +0200
+Date: Sun Jun 16 19:00:01 2013 +0200
Pass down the recursion param
@@ -9897,7 +11926,7 @@
commit 1f3e3828b9a57e044b86640b9bf9ad2437cc5656
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 15 17:21:36 2013 +0200
+Date: Sat Jun 15 17:21:36 2013 +0200
Add quotes since use_cairo can have spaces
@@ -9908,7 +11937,7 @@
commit fe3ffab19d54326052fd0ff8ee3ee1feb9fa928c
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Tue Jun 11 23:08:07 2013 +0200
+Date: Tue Jun 11 23:08:07 2013 +0200
Windows compile fixes
@@ -9917,7 +11946,7 @@
commit 99908cb0c8a784791ffa0682c8f105acdef0d5ab
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Jun 11 10:02:01 2013 +0200
+Date: Tue Jun 11 10:02:01 2013 +0200
MinGW32 may or may not define __MINGW_PRINTF_FORMAT
@@ -9924,26 +11953,26 @@
Moreover __USE_MINGW_ANSI_STDIO might be defined as 0
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 0673f3d8024554c414f578e0770086f475e6a605
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 11 00:19:19 2013 +0200
+Date: Tue Jun 11 00:19:19 2013 +0200
0.23.2
- CMakeLists.txt | 4 ++--
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ 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 7f1bf8d94302c15a2ff68debfb6fba49df526d16
Author: Christoph Duelli <duelli at melosgmbh.de>
-Date: Thu May 16 16:16:32 2013 +0200
+Date: Thu May 16 16:16:32 2013 +0200
Do not pollute global namespace with internal classes
@@ -9955,18 +11984,18 @@
commit 07992075a6d1d29db57f997f67d5a4a6deacbbb4
Merge: 4a0bd6f 25f453e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 9 12:17:53 2013 +0200
+Date: Sun Jun 9 12:17:53 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/Catalog.cc
- qt4/src/poppler-private.h
- utils/HtmlOutputDev.cc
+ poppler/Catalog.cc
+ qt4/src/poppler-private.h
+ utils/HtmlOutputDev.cc
commit 25f453ef49004452ac4c201d59d9ce2ef52ffeee
Author: Julien Nabet <serval2412 at yahoo.fr>
-Date: Sun Jun 9 12:12:06 2013 +0200
+Date: Sun Jun 9 12:12:06 2013 +0200
Prefer prefix ++/-- operators for non-primitive types
@@ -9980,7 +12009,7 @@
commit ed01688a899c5e7560a93ca2424ca302ff3452f1
Author: Julien Nabet <serval2412 at yahoo.fr>
-Date: Sun Jun 9 12:10:01 2013 +0200
+Date: Sun Jun 9 12:10:01 2013 +0200
Fix mismatched allocation and deallocation
@@ -9991,7 +12020,7 @@
commit a27890ac441fbd613ddfe6fcf404b92be371e554
Author: Julien Nabet <serval2412 at yahoo.fr>
-Date: Sun Jun 9 12:08:06 2013 +0200
+Date: Sun Jun 9 12:08:06 2013 +0200
Fix memory leak
@@ -10001,13 +12030,13 @@
commit 4a0bd6fdb2e9e3c589e1bdb282e7c2bfca8567b1
Merge: bbd27c9 17a16a2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 9 12:06:10 2013 +0200
+Date: Sun Jun 9 12:06:10 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 17a16a2731b1110a12c7163c139d85bccee04492
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 9 12:04:40 2013 +0200
+Date: Sun Jun 9 12:04:40 2013 +0200
Fix mismatched free/delete
@@ -10018,7 +12047,7 @@
commit bbd27c92b5e5034dc2899ea26b47fcb983209f82
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Jun 6 23:52:36 2013 +0200
+Date: Thu Jun 6 23:52:36 2013 +0200
Speed-up some tiling on a 10x factor
@@ -10025,13 +12054,13 @@
Bug #64892
poppler/SplashOutputDev.cc | 15 ++++++++++++++-
- splash/Splash.cc | 15 +++++++++++----
- splash/Splash.h | 3 ++-
+ splash/Splash.cc | 15 +++++++++++----
+ splash/Splash.h | 3 ++-
3 files changed, 27 insertions(+), 6 deletions(-)
commit 7847769a24bd3ccf863f653bc2215e84157ccfb6
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Jun 4 15:31:06 2013 +0200
+Date: Tue Jun 4 15:31:06 2013 +0200
Use fseeko64/ftello64 for MinGW32
@@ -10040,7 +12069,7 @@
commit 0c3548087b379dd6ffa2291d03f0ea1c7e6a69d1
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Jun 4 15:31:05 2013 +0200
+Date: Tue Jun 4 15:31:05 2013 +0200
Allow to build without multithreading
@@ -10050,7 +12079,7 @@
commit 1e74ac4589daf80dcac54b094145d32c90069738
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Thu Jun 6 01:03:48 2013 +0200
+Date: Thu Jun 6 01:03:48 2013 +0200
[qt4] fix autotools
@@ -10059,7 +12088,7 @@
commit 342cc0d8a101e99199d447d632a1cd5ba7beb5b2
Author: Li Junling <lijunling at sina.com>
-Date: Tue Jun 4 22:39:35 2013 +0200
+Date: Tue Jun 4 22:39:35 2013 +0200
Fix memory leak
@@ -10068,7 +12097,7 @@
commit 52945a072b6f864e80485cc4321a27530a76c452
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 4 22:35:32 2013 +0200
+Date: Tue Jun 4 22:35:32 2013 +0200
Move the iccColorSpaceCache from Gfx to OutputDev
@@ -10077,7 +12106,7 @@
goes down from 150 to 133 seconds
poppler/Gfx.cc | 61 ++++++++++++++--------------------
- poppler/Gfx.h | 12 ++-----
+ poppler/Gfx.h | 12 ++-----
poppler/GfxState.cc | 93
++++++++++++++++++++++++++--------------------------
poppler/GfxState.h | 33 ++++++++++---------
@@ -10087,7 +12116,7 @@
commit 7d4bda198b8ac767bdf4e0a4fdcaae5541113f92
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 3 23:34:11 2013 +0200
+Date: Mon Jun 3 23:34:11 2013 +0200
Compile
@@ -10096,7 +12125,7 @@
commit 395b3fa021850225e1fea66736f3a3f00571571f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 3 23:31:52 2013 +0200
+Date: Mon Jun 3 23:31:52 2013 +0200
Fix #end -> #endif
@@ -10105,7 +12134,7 @@
commit 425d1b4835389e2031631ce54cee157af39f1cb6
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Mon Jun 3 20:04:21 2013 +0200
+Date: Mon Jun 3 20:04:21 2013 +0200
Check for the correct number of arguments
@@ -10114,7 +12143,7 @@
commit 9d3eb07a1ea01b98aabe4f32481dd4a83bc8f2a5
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Jun 3 08:49:37 2013 +0200
+Date: Mon Jun 3 08:49:37 2013 +0200
Fix cmake build to use ansi stdio extensions when using a mingw
compiler
@@ -10126,12 +12155,12 @@
commit 287afe2290d64ca63cdb75fef8f3fbdc20997970
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Sun Jun 2 23:29:00 2013 +0200
+Date: Sun Jun 2 23:29:00 2013 +0200
Add a thread stresser in qt4
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 9 +-
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 9 +-
qt4/tests/stress-threads-qt4.cpp | 298
+++++++++++++++++++++++++++++++++++++++
3 files changed, 307 insertions(+), 1 deletion(-)
@@ -10138,7 +12167,7 @@
commit 77ecb3823c2db4a6cca5af5889c07c73f90de7f0
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Sat Jun 1 19:04:10 2013 +0200
+Date: Sat Jun 1 19:04:10 2013 +0200
Add a pthread option to pdftoppm
@@ -10153,7 +12182,7 @@
commit caa19f4961146915f51be6c72f60c3aa43037235
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 1 17:22:54 2013 +0200
+Date: Sat Jun 1 17:22:54 2013 +0200
qt4: Fix test binary name in help
@@ -10162,7 +12191,7 @@
commit a0b48b1d05f08605bca5e1a2e2518e16578f6055
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 1 14:42:42 2013 +0200
+Date: Sat Jun 1 14:42:42 2013 +0200
Fix printf format warning for size_t
@@ -10181,7 +12210,7 @@
commit 860737c2a19c734a0c5b65ad506ba229ba439985
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 1 12:05:17 2013 +0200
+Date: Sat Jun 1 12:05:17 2013 +0200
Use ansi stdio extensions when using a mingw compiler
@@ -10193,14 +12222,14 @@
https://bugs.freedesktop.org/show_bug.cgi?id=65238
- CMakeLists.txt | 4 ++++
- configure.ac | 3 +++
+ CMakeLists.txt | 4 ++++
+ configure.ac | 3 +++
poppler/poppler-config.h.in | 5 +++++
3 files changed, 12 insertions(+)
commit dd30ce39252a3820254b43f90699849ab5a1ca58
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri May 31 12:24:55 2013 +0200
+Date: Fri May 31 12:24:55 2013 +0200
Fix warning on narrowing conversion from int to DWORD
@@ -10220,13 +12249,13 @@
commit 01a825f3f9f5dcf686fc123d2cf80b9c525d0d89
Merge: a57f937 b4b1310
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 1 13:47:29 2013 +0200
+Date: Sat Jun 1 13:47:29 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit b4b13102716cd33636a94fd99c49487924761670
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 1 13:45:53 2013 +0200
+Date: Sat Jun 1 13:45:53 2013 +0200
Fix crash on malformed file
@@ -10239,21 +12268,21 @@
commit a57f93780de12732875e0195127a92bff835ff61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 28 00:11:10 2013 +0200
+Date: Tue May 28 00:11:10 2013 +0200
0.23.1
- CMakeLists.txt | 4 ++--
- NEWS | 11 +++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 11 +++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 17 insertions(+), 6 deletions(-)
commit 299a1447e3d9a845b5e964f29e698046abdb63f2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 28 00:10:43 2013 +0200
+Date: Tue May 28 00:10:43 2013 +0200
Build poppler-forms in the autotools buildsystem
@@ -10262,7 +12291,7 @@
commit dcfaf20503868d0956ee81208265a975b480fb52
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 27 23:40:49 2013 +0200
+Date: Mon May 27 23:40:49 2013 +0200
Dist these two files too
@@ -10271,7 +12300,7 @@
commit de7a3fb715811be6be9ed51b1c5ab1a63c523403
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 27 23:40:07 2013 +0200
+Date: Mon May 27 23:40:07 2013 +0200
Add missing copyright
@@ -10281,13 +12310,13 @@
commit 30282d3fdbbb3029d9a0f838b2cd979bb962235c
Merge: 61f6658 56044ef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 27 00:20:12 2013 +0200
+Date: Mon May 27 00:20:12 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 56044ef482c26f10a8a1371dace049c144659dc7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 27 00:18:22 2013 +0200
+Date: Mon May 27 00:18:22 2013 +0200
Fix infinite loop while feeding wrong data in stdin
@@ -10301,38 +12330,38 @@
commit 61f665885daeb0009ecac2cc85188f23d6addb60
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 27 00:01:24 2013 +0200
+Date: Mon May 27 00:01:24 2013 +0200
Fix big file support in cmake
Tested by Fabio
- CMakeLists.txt | 2 ++
- cmake/modules/CheckFileOffsetBits.c | 14 +++++++++++
+ CMakeLists.txt | 2 ++
+ cmake/modules/CheckFileOffsetBits.c | 14 +++++++++++
cmake/modules/CheckFileOffsetBits.cmake | 44
+++++++++++++++++++++++++++++++++
- config.h.cmake | 6 ++---
+ config.h.cmake | 6 ++---
4 files changed, 63 insertions(+), 3 deletions(-)
commit f536a4ec37246e10f03fe4de309bd31deb6a4727
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu May 16 21:06:56 2013 +0200
+Date: Thu May 16 21:06:56 2013 +0200
Do not use deprecated gtk_scrolled_window_add_with_viewport()
https://bugs.freedesktop.org/show_bug.cgi?id=64683
- glib/demo/find.c | 4 ++++
- glib/demo/images.c | 4 ++++
- glib/demo/layers.c | 4 ++++
- glib/demo/render.c | 4 ++++
+ glib/demo/find.c | 4 ++++
+ glib/demo/images.c | 4 ++++
+ glib/demo/layers.c | 4 ++++
+ glib/demo/render.c | 4 ++++
glib/demo/selections.c | 4 ++++
- test/gtk-test.cc | 4 ++++
+ test/gtk-test.cc | 4 ++++
6 files changed, 24 insertions(+)
commit c10f2f8777927d8cfe547941ea2f70fcce14da7a
Author: Pino Toscano <pino at kde.org>
-Date: Mon May 20 00:09:45 2013 +0200
+Date: Mon May 20 00:09:45 2013 +0200
fix typo in error message
@@ -10342,13 +12371,13 @@
commit 71d327194293cb3d1a0e274eaf4451c7afe81e8a
Merge: 7b2df1f 6a98b56
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 17 23:04:12 2013 +0200
+Date: Fri May 17 23:04:12 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 6a98b56f6ded957477ddcccd4ff849a870020395
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 17 23:01:20 2013 +0200
+Date: Fri May 17 23:01:20 2013 +0200
Make an invalid nSharedGroupsFirst a real error
@@ -10360,11 +12389,11 @@
commit 7b2df1f935192c89eacddd98c4bf92f38013c8e0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 17 20:56:51 2013 +0200
+Date: Fri May 17 20:56:51 2013 +0200
A simple form dumper
- qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/CMakeLists.txt | 1 +
qt4/tests/poppler-forms.cpp | 166
++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 167 insertions(+)
@@ -10372,13 +12401,13 @@
commit 54f539b4436a1a3e0eab2ef0904c302865082982
Merge: b3d8f51 3a6e2de
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 16 21:27:47 2013 +0200
+Date: Thu May 16 21:27:47 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 3a6e2de1d35e3ee4fd86f71713c49bec8e09e41d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 16 21:27:02 2013 +0200
+Date: Thu May 16 21:27:02 2013 +0200
Make sure that Title: doesn't contain \n or \n
@@ -10389,7 +12418,7 @@
commit b3d8f510e30fb4d8da9069390d5e9bd8a283fbd6
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu May 16 20:52:09 2013 +0200
+Date: Thu May 16 20:52:09 2013 +0200
Fix splashModeBGR8 rendering
@@ -10397,13 +12426,13 @@
Bug #64381
- splash/Splash.cc | 4 ++--
+ splash/Splash.cc | 4 ++--
splash/SplashBitmap.cc | 24 ++++++++++++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
commit 8640933a3aa7dbafa21765d029e97b4bba76716c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Apr 25 19:18:30 2013 +0200
+Date: Thu Apr 25 19:18:30 2013 +0200
Fix printf format specifiers (Goffset is a long long, not a int)
@@ -10412,7 +12441,7 @@
commit f8e8805bbce3e94b16b77fece0072645c66f6a31
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Apr 25 19:06:09 2013 +0200
+Date: Thu Apr 25 19:06:09 2013 +0200
Re-enable commented-out printf-format attribute on OutStream::printf
@@ -10428,7 +12457,7 @@
commit 013b2b247268f9b8dcd8e0461580e0bbcf7554c1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Apr 25 17:58:25 2013 +0200
+Date: Thu Apr 25 17:58:25 2013 +0200
XRef stream writing: Write 32-bit offsets when possible
@@ -10442,31 +12471,31 @@
commit ea61a9dc012fbffd9bc9fe8a09264ba8744635fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 23:15:55 2013 +0200
+Date: Mon May 13 23:15:55 2013 +0200
0.23.0
Includes news, soversions, updated copyrights, etc
- CMakeLists.txt | 6 +++---
- NEWS | 12 ++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- goo/gfile.cc | 1 +
- goo/gfile.h | 1 +
+ CMakeLists.txt | 6 +++---
+ NEWS | 12 ++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ goo/gfile.cc | 1 +
+ goo/gfile.h | 1 +
poppler/CairoOutputDev.h | 2 +-
- poppler/Makefile.am | 2 +-
- poppler/Stream.cc | 1 +
- poppler/Stream.h | 1 +
- poppler/XRef.cc | 1 +
+ poppler/Makefile.am | 2 +-
+ poppler/Stream.cc | 1 +
+ poppler/Stream.h | 1 +
+ poppler/XRef.cc | 1 +
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
14 files changed, 28 insertions(+), 11 deletions(-)
commit 7a5eee1cbebe241b8bd44027fc07682944686910
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 23:00:40 2013 +0200
+Date: Mon May 13 23:00:40 2013 +0200
Add check_pagelabelinfo test
@@ -10476,13 +12505,13 @@
commit 30a519f21dd5df8d41a43a58b2cbd95fe657df73
Merge: 998a9e7 0c0aef2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 20:40:04 2013 +0200
+Date: Mon May 13 20:40:04 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 19:57:02 2013 +0200
+Date: Mon May 13 19:57:02 2013 +0200
0.22.4 version
@@ -10489,8 +12518,8 @@
Also increase soversion since Gfx.h got a new member
CMakeLists.txt | 4 ++--
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
@@ -10497,7 +12526,7 @@
commit 4d6662d05f6b652af97ac6e0eb1f1c1dca8e9550
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 19:55:21 2013 +0200
+Date: Mon May 13 19:55:21 2013 +0200
0.22.4 NEWS
@@ -10506,7 +12535,7 @@
commit 93e08d96867d636a70ab04ee4ad22c2214ae4b6a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 19:51:52 2013 +0200
+Date: Mon May 13 19:51:52 2013 +0200
Update copyright years
@@ -10516,16 +12545,16 @@
commit 998a9e7c982a72b0e931304b719de40f30094d12
Merge: 5e73cb0 73d09cd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 19:30:26 2013 +0200
+Date: Mon May 13 19:30:26 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- splash/Splash.cc
+ splash/Splash.cc
commit 73d09cd55f3bd307450c2dd095e039ea39c69cea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 13 19:28:40 2013 +0200
+Date: Mon May 13 19:28:40 2013 +0200
Fix compilation with fixed point mode enabled
@@ -10537,13 +12566,13 @@
commit 5e73cb059e27f68b329513de609d52e84d73f8af
Merge: 5e9654a b3e44fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 7 22:00:02 2013 +0200
+Date: Tue May 7 22:00:02 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit b3e44fc59a9258ad701bc67132dea0646fd8b61a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 7 21:53:31 2013 +0200
+Date: Tue May 7 21:53:31 2013 +0200
We need UnicodeParsedString here too
@@ -10555,27 +12584,27 @@
commit 5e9654a3eb28b2c8b0985545778dd0e45829f8e1
Merge: eeecd97 a107428
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:45:34 2013 +0200
+Date: Thu Apr 25 20:45:34 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/Gfx.h
+ poppler/Gfx.h
commit a107428e7db0c420b60418a33b9f815909ac9a33
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:44:36 2013 +0200
+Date: Thu Apr 25 20:44:36 2013 +0200
Update my C of the last two previous commits
- poppler/Gfx.cc | 2 +-
- poppler/Gfx.h | 2 +-
+ poppler/Gfx.cc | 2 +-
+ poppler/Gfx.h | 2 +-
utils/HtmlOutputDev.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit eeecd9718f201dc795b2cb8469c43860aec6e07d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:29:24 2013 +0200
+Date: Thu Apr 25 20:29:24 2013 +0200
Do not start drawing a form we are already drawing
@@ -10582,12 +12611,12 @@
Bug #63190
poppler/Gfx.cc | 23 +++++++++++++++++++----
- poppler/Gfx.h | 2 ++
+ poppler/Gfx.h | 2 ++
2 files changed, 21 insertions(+), 4 deletions(-)
commit 43d66e11aa9e692c1c6b3a237e7e972d317e5c4d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:27:43 2013 +0200
+Date: Thu Apr 25 20:27:43 2013 +0200
Make sure getKids returns != 0 before using it
@@ -10598,7 +12627,7 @@
commit ec298b3b780f885464aa00880150eaa2b9b50b08
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:29:24 2013 +0200
+Date: Thu Apr 25 20:29:24 2013 +0200
Do not start drawing a form we are already drawing
@@ -10605,12 +12634,12 @@
Bug #63190
poppler/Gfx.cc | 23 +++++++++++++++++++----
- poppler/Gfx.h | 2 ++
+ poppler/Gfx.h | 2 ++
2 files changed, 21 insertions(+), 4 deletions(-)
commit 11ab42e7e90099d0cebf8f02197413fd5dee044b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 25 20:27:43 2013 +0200
+Date: Thu Apr 25 20:27:43 2013 +0200
Make sure getKids returns != 0 before using it
@@ -10621,7 +12650,7 @@
commit 4ee78e77f7d6cadc8e150ceff96b546ddca329d4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Apr 20 16:41:56 2013 +0200
+Date: Sat Apr 20 16:41:56 2013 +0200
cairo: Always use the trasnfer function if present in setSoftMask
@@ -10642,7 +12671,7 @@
commit 3c2a92b06a6541071bd1e555606bb2096de17ef6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Apr 20 16:41:56 2013 +0200
+Date: Sat Apr 20 16:41:56 2013 +0200
cairo: Always use the trasnfer function if present in setSoftMask
@@ -10664,13 +12693,13 @@
commit fd648e83e60db7157b7273ffddc02308b0c5813b
Merge: 970e9f6 53b9cec
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 21 23:30:16 2013 +0200
+Date: Sun Apr 21 23:30:16 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 53b9cec6c1334020f90b885cff6fc30293437e5f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Apr 21 23:28:40 2013 +0200
+Date: Sun Apr 21 23:28:40 2013 +0200
Splash: Always consider a softmask transfer function
@@ -10681,7 +12710,7 @@
commit 970e9f6304c3b59ac3e44495b90a5cfe7c7ceb8b
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Apr 12 13:26:55 2013 +0200
+Date: Fri Apr 12 13:26:55 2013 +0200
Remove unused variables from Lexer::getObj()
@@ -10693,13 +12722,13 @@
commit f8bf602620b3c7570f483ac66fc4d6a76a81a882
Merge: bbd27dc 62a5b4d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 14 16:40:51 2013 +0200
+Date: Sun Apr 14 16:40:51 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit 62a5b4d5c6d5c368d190b86eab63ccb07d642c01
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Apr 14 16:37:14 2013 +0200
+Date: Sun Apr 14 16:37:14 2013 +0200
Check for strcpy_s() and strcat_s() at configure time
@@ -10712,7 +12741,7 @@
Bug #63459
ConfigureChecks.cmake | 2 ++
- configure.ac | 1 +
+ configure.ac | 1 +
test/perf-test.cc | 6 ++++--
3 files changed, 7 insertions(+), 2 deletions(-)
@@ -10719,16 +12748,16 @@
commit bbd27dc4ce7b24af890d80f597f74e5d7ee0215a
Merge: ea3698c 5bc0080
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 12 00:10:27 2013 +0200
+Date: Fri Apr 12 00:10:27 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/TextOutputDev.h
+ poppler/TextOutputDev.h
commit 5bc00809ebe560a180d5df93eb50bdf0ff0e97e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 11 23:29:00 2013 +0200
+Date: Thu Apr 11 23:29:00 2013 +0200
Increase poppler core soname
@@ -10738,19 +12767,19 @@
commit 115d4c1465291adde86c3c905f265ac03374441f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 11 23:28:17 2013 +0200
+Date: Thu Apr 11 23:28:17 2013 +0200
Increase version number to 0.22.3
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit ae1a3553b85e2616a339aacb6efecd15db373858
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 11 23:26:44 2013 +0200
+Date: Thu Apr 11 23:26:44 2013 +0200
News file
@@ -10759,12 +12788,12 @@
commit 1fefe98fc86cf8449346bdc230dff5758b1bb7a3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 11 23:22:20 2013 +0200
+Date: Thu Apr 11 23:22:20 2013 +0200
Update copyrgihts
poppler/CairoOutputDev.cc | 2 +-
- poppler/PDFDoc.cc | 2 +-
+ poppler/PDFDoc.cc | 2 +-
poppler/TextOutputDev.cc | 2 +-
poppler/TextOutputDev.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
@@ -10772,13 +12801,13 @@
commit ea3698cfffc9c132081f5691287ef1fd17911b2a
Merge: fcc1468 aaaea5d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 10 20:42:01 2013 +0200
+Date: Wed Apr 10 20:42:01 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit aaaea5d0f2f427e82625a04f90c178e24892e539
Author: Marek Kasik <mkasik at redhat.com>
-Date: Wed Apr 10 16:41:48 2013 +0200
+Date: Wed Apr 10 16:41:48 2013 +0200
man pages: Fix typos
@@ -10791,13 +12820,13 @@
commit fcc14682899ff4981bfece74dbc8c290a625b05c
Merge: f11e216 e6559a0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 7 17:44:12 2013 +0200
+Date: Sun Apr 7 17:44:12 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit e6559a0d836df127ed5061794dc737d435ef534c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 7 17:42:23 2013 +0200
+Date: Sun Apr 7 17:42:23 2013 +0200
Fix crash in KDE bug #317710
@@ -10815,13 +12844,13 @@
commit f11e21627121c3ff81c0ec7f4d71936a2dd590c3
Merge: e1ffa91 b9fdb0c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 23:26:54 2013 +0200
+Date: Sat Apr 6 23:26:54 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit e1ffa9100cf6b4a444be7ed76b11698a5c5bb441
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Apr 6 23:21:58 2013 +0200
+Date: Sat Apr 6 23:21:58 2013 +0200
Fix endstream detection
@@ -10838,13 +12867,13 @@
You can test it with bug-poppler16579.pdf if You just change temporary
- if (longNumber <= INT_MAX && longNumber >= INT_MIN &&
- *end_ptr == '\0') {
+ if (longNumber <= INT_MAX && longNumber >= INT_MIN &&
+ *end_ptr == '\0') {
in XRef.cc to
- if (gFalse && longNumber <= INT_MAX && longNumber >=
- INT_MIN && *end_ptr == '\0') {
+ if (gFalse && longNumber <= INT_MAX && longNumber >=
+ INT_MIN && *end_ptr == '\0') {
poppler/Lexer.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
poppler/Lexer.h | 2 ++
@@ -10854,7 +12883,7 @@
commit b9fdb0cb767a228c56f3f0635a7f78e3e0a8c7b6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 23:20:48 2013 +0200
+Date: Sat Apr 6 23:20:48 2013 +0200
Last commit was Thomas' forgot his (C)
@@ -10864,13 +12893,13 @@
commit 94bee4601cbbda0e7c6205a04650e0510f198aee
Merge: 42368fb b312210
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 23:19:25 2013 +0200
+Date: Sat Apr 6 23:19:25 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
commit b312210b630f96baeb8b2f3b49b0b79779609d98
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 23:18:18 2013 +0200
+Date: Sat Apr 6 23:18:18 2013 +0200
Fix for complete rewrites in repaired files
@@ -10888,7 +12917,7 @@
commit 42368fb9452c3719a7bbd159f1c1421068f40653
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 18:28:35 2013 +0200
+Date: Sat Apr 6 18:28:35 2013 +0200
Add missing free()
@@ -10897,7 +12926,7 @@
commit 2264e7a95e5dc252de1b5736a1edd6bf5de3ad1f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Apr 6 18:27:57 2013 +0200
+Date: Sat Apr 6 18:27:57 2013 +0200
implement Crypt filter
@@ -10911,7 +12940,7 @@
commit a65a4e6f878ff033b780b2f1e3362f2918c93b6b
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Sat Apr 6 18:25:21 2013 +0200
+Date: Sat Apr 6 18:25:21 2013 +0200
No need to keep the mutex attributes around all the time
@@ -10920,7 +12949,7 @@
commit 73ff5ad58cfe7ec9415cc1459b6ca083fee608f4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 18:19:28 2013 +0200
+Date: Sat Apr 6 18:19:28 2013 +0200
Pass the recursion flag
@@ -10932,7 +12961,7 @@
commit 837e3704e76ea857b3de45503840e9b855096fef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 6 17:01:08 2013 +0200
+Date: Sat Apr 6 17:01:08 2013 +0200
Make our mutexes recursive
@@ -10953,28 +12982,28 @@
commit 0a243c8c14d09a40f25338999c3ca06273277b45
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Fri Apr 5 00:00:07 2013 +0200
+Date: Fri Apr 5 00:00:07 2013 +0200
Add a GooFile class to encapsulate file read access using offsets
Bug #62735
- ConfigureChecks.cmake | 2 ++
- config.h.cmake | 6 ++++
- configure.ac | 1 +
- goo/gfile.cc | 80
+ ConfigureChecks.cmake | 2 ++
+ config.h.cmake | 6 ++++
+ configure.ac | 1 +
+ goo/gfile.cc | 80
++++++++++++++++++++++++++++++++++++++++++++++
- goo/gfile.h | 30 +++++++++++++++++
+ goo/gfile.h | 30 +++++++++++++++++
poppler/GlobalParamsWin.cc | 19 ++++-------
- poppler/PDFDoc.cc | 37 ++++++---------------
- poppler/PDFDoc.h | 4 ++-
- poppler/Stream.cc | 46 +++++++++-----------------
- poppler/Stream.h | 17 +++-------
+ poppler/PDFDoc.cc | 37 ++++++---------------
+ poppler/PDFDoc.h | 4 ++-
+ poppler/Stream.cc | 46 +++++++++-----------------
+ poppler/Stream.h | 17 +++-------
10 files changed, 158 insertions(+), 84 deletions(-)
commit 70e6af4739d2eea58e6f3200a8c9467597a12ae5
Author: Rodrigo Rivas Costa <rodrigorivascosta at gmail.com>
-Date: Thu Apr 4 23:10:09 2013 +0200
+Date: Thu Apr 4 23:10:09 2013 +0200
Be pedantic about setjmp use
@@ -10986,7 +13015,7 @@
commit c7e28e3d672654f31f1a0f95245a1fba3bc9c28f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 25 22:55:58 2013 +0100
+Date: Mon Mar 25 22:55:58 2013 +0100
Only write the file once when saving
@@ -10997,7 +13026,7 @@
commit 09ddb34f202be2111c70901724d64d3b61483c7a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 25 22:55:58 2013 +0100
+Date: Mon Mar 25 22:55:58 2013 +0100
Only write the file once when saving
@@ -11008,7 +13037,7 @@
commit 75378557f409a5a2305ea0fb42c56184c74ba887
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 24 12:53:29 2013 +0100
+Date: Sun Mar 24 12:53:29 2013 +0100
glib: Always start from the beginning when starting a new search on
a page
@@ -11024,7 +13053,7 @@
commit 4ee6757dd7de9211faf8601531342a199225a06d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 24 12:53:29 2013 +0100
+Date: Sun Mar 24 12:53:29 2013 +0100
glib: Always start from the beginning when starting a new search on
a page
@@ -11040,7 +13069,7 @@
commit 83cf2d3d3ecce6340d858a2ee037cd5120ac1db5
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Mar 9 08:44:36 2013 -0600
+Date: Sat Mar 9 08:44:36 2013 -0600
TextOutputDev: Set text matrix when painting selection
@@ -11052,7 +13081,7 @@
commit a3bc584fdd7f74a7dab701c743df0bb0bf74a03e
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Mar 9 08:44:36 2013 -0600
+Date: Sat Mar 9 08:44:36 2013 -0600
TextOutputDev: Set text matrix when painting selection
@@ -11065,13 +13094,13 @@
commit 8cbdbc64897a34beb226d4dc4c58095f10013f29
Merge: 2bce2cf a01e2d4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 20 22:37:06 2013 +0100
+Date: Wed Mar 20 22:37:06 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit a01e2d41fcb638fe340bd3d4d22bd13db245e0fd
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Mar 20 22:35:08 2013 +0100
+Date: Wed Mar 20 22:35:08 2013 +0100
check order bounding box values in tiling pattern
@@ -11082,7 +13111,7 @@
commit 2bce2cf2a523f9b8db7f5e255384044b8dfe1a24
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 19 22:53:47 2013 +0100
+Date: Tue Mar 19 22:53:47 2013 +0100
Avoid blackboxes on weird files using the thin line mode
@@ -11095,13 +13124,13 @@
commit b2d07cbf0c2f94bd25e1422e366ff78031815867
Merge: 80cf78f 3206950
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 18 21:06:59 2013 +0100
+Date: Mon Mar 18 21:06:59 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 3206950658521009b52f638cc5e712e0cef42706
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 18 21:06:09 2013 +0100
+Date: Mon Mar 18 21:06:09 2013 +0100
Spec says Zoom -> 0 means no zoom change
@@ -11110,7 +13139,7 @@
commit 13ee9f8b7d42ed7d7bc0f9dbf190ff66e6ab5a81
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 18 18:15:57 2013 +0100
+Date: Mon Mar 18 18:15:57 2013 +0100
cmake: drop search of gthread-2.0 and gio-2.0 from GTK
@@ -11121,7 +13150,7 @@
commit 47e869e60fb147caca825380eeaa2a0851d502b9
Author: Michael Weiser <michael at weiser.dinsnail.net>
-Date: Mon Mar 18 18:15:14 2013 +0100
+Date: Mon Mar 18 18:15:14 2013 +0100
cmake: search also for gio-2.0 as GLIB library
@@ -11131,13 +13160,13 @@
commit 80cf78f2020e2f4cf33ed49fe522c6861d710588
Merge: b21780e 72c8312
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Mar 18 20:02:08 2013 +1030
+Date: Mon Mar 18 20:02:08 2013 +1030
Merge remote-tracking branch 'origin/poppler-0.22'
commit 72c8312d77704211f55c8de35b47bd811c792878
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Mar 17 19:39:14 2013 +1030
+Date: Sun Mar 17 19:39:14 2013 +1030
cairo: Don't change image interpolation when printing
@@ -11148,7 +13177,7 @@
commit b21780e69dd92f3f2bcb7851608d3e0557dc81f8
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Mar 16 23:20:35 2013 +0100
+Date: Sat Mar 16 23:20:35 2013 +0100
Fix typo
@@ -11158,16 +13187,16 @@
commit 75849a0d7c205c048714b90883695b6bebd2298c
Merge: ec7140b 5a51812
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 12 20:27:59 2013 +0100
+Date: Tue Mar 12 20:27:59 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/Stream.h
+ poppler/Stream.h
commit 5a51812b7c1457feb8acaa106f43d7d5252b3980
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Mar 12 20:25:50 2013 +0100
+Date: Tue Mar 12 20:25:50 2013 +0100
Fix compile when not using libjpeg
@@ -11176,32 +13205,32 @@
commit 341e863d65fdd5619a071e4fd903fa82bf33c757
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 11 19:20:06 2013 +0100
+Date: Mon Mar 11 19:20:06 2013 +0100
0.22.2
- CMakeLists.txt | 4 ++--
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 22 insertions(+), 6 deletions(-)
commit ec7140b3f56b034fbbc53cb8066ba01fe9f60f47
Merge: c86062f 5db6585
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 8 16:41:21 2013 +0100
+Date: Fri Mar 8 16:41:21 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/Stream.cc
- poppler/Stream.h
+ poppler/Stream.cc
+ poppler/Stream.h
commit 5db6585c2b02dd4071f1adabd53509506333dcf8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 8 16:38:49 2013 +0100
+Date: Fri Mar 8 16:38:49 2013 +0100
Make the non jpeglib based DCTStream compile
@@ -11210,7 +13239,7 @@
commit 6402e291e1f9374fbaf4de3b97b21f43d38d6ab8
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Mar 8 16:37:11 2013 +0100
+Date: Fri Mar 8 16:37:11 2013 +0100
Workaround broken jpeg stream definitions
@@ -11225,13 +13254,13 @@
commit c86062f982d6eb08cb27b654b6317c71ab77c692
Merge: 677e5b2 4e142b6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 4 20:13:36 2013 +0100
+Date: Mon Mar 4 20:13:36 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 4e142b60790638e4495b4fd6551702470cf4c38f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 4 20:12:01 2013 +0100
+Date: Mon Mar 4 20:12:01 2013 +0100
Make sure we don't try to paint in x < 0
@@ -11242,7 +13271,7 @@
commit 677e5b265a0d39a988f65d642a4f964a279fad28
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 3 19:07:32 2013 +0100
+Date: Sun Mar 3 19:07:32 2013 +0100
Small improvements over locker class
@@ -11258,56 +13287,56 @@
previously it was a gFalse (i guess Thomas made a c&p typo here)
* Have only one constructor like Adam suggested.
- goo/GooMutex.h | 33 +++++++++--------
- poppler/Annot.cc | 92
+ goo/GooMutex.h | 33 +++++++++--------
+ poppler/Annot.cc | 92
+++++++++++++++++++++++-----------------------
- poppler/Annot.h | 6 +--
- poppler/Array.cc | 15 ++++----
+ poppler/Annot.h | 6 +--
+ poppler/Array.cc | 15 ++++----
poppler/CairoFontEngine.cc | 8 ++--
- poppler/Catalog.cc | 52 +++++++++++++-------------
- poppler/Catalog.h | 10 ++---
- poppler/Dict.cc | 20 +++++-----
- poppler/PDFDoc.cc | 12 +++---
- poppler/Page.cc | 16 ++++----
- poppler/Stream.cc | 8 ++--
- poppler/XRef.cc | 18 ++++-----
+ poppler/Catalog.cc | 52 +++++++++++++-------------
+ poppler/Catalog.h | 10 ++---
+ poppler/Dict.cc | 20 +++++-----
+ poppler/PDFDoc.cc | 12 +++---
+ poppler/Page.cc | 16 ++++----
+ poppler/Stream.cc | 8 ++--
+ poppler/XRef.cc | 18 ++++-----
12 files changed, 147 insertions(+), 143 deletions(-)
commit d5c929fc253c2748bb8fa3642d9b5383c5fe96f8
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Mar 3 18:00:11 2013 +0100
+Date: Sun Mar 3 18:00:11 2013 +0100
Add a locker helper and a bool -> enum changes
Bug #59933
- goo/GooMutex.h | 16 +++++++
- poppler/Annot.cc | 114
+ goo/GooMutex.h | 16 +++++++
+ poppler/Annot.cc | 114
+++++++++++++++++----------------------------
- poppler/Annot.h | 4 +-
- poppler/Array.cc | 22 +++------
+ poppler/Annot.h | 4 +-
+ poppler/Array.cc | 22 +++------
poppler/CairoFontEngine.cc | 10 ++--
- poppler/Catalog.cc | 79 ++++++++++---------------------
- poppler/Catalog.h | 9 ++--
- poppler/Dict.cc | 29 ++++--------
- poppler/FontInfo.cc | 2 +-
- poppler/PDFDoc.cc | 21 ++-------
- poppler/Page.cc | 32 ++++++-------
- poppler/Page.h | 3 +-
- poppler/Stream.cc | 12 ++---
- poppler/XRef.cc | 29 ++++--------
+ poppler/Catalog.cc | 79 ++++++++++---------------------
+ poppler/Catalog.h | 9 ++--
+ poppler/Dict.cc | 29 ++++--------
+ poppler/FontInfo.cc | 2 +-
+ poppler/PDFDoc.cc | 21 ++-------
+ poppler/Page.cc | 32 ++++++-------
+ poppler/Page.h | 3 +-
+ poppler/Stream.cc | 12 ++---
+ poppler/XRef.cc | 29 ++++--------
14 files changed, 145 insertions(+), 237 deletions(-)
commit 1f4a012f7570ffd2120e3e8c2236de5408f3dda3
Merge: 15d4039 a766740
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 1 19:16:52 2013 +0100
+Date: Fri Mar 1 19:16:52 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit a766740cf5a5a7580935a026bf15fbd668aa0fdf
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Mar 1 19:12:22 2013 +0100
+Date: Fri Mar 1 19:12:22 2013 +0100
Restore CTM on early exits
@@ -11319,13 +13348,13 @@
commit 15d40392a29dded8a29c2dc9d7c15b402515e033
Merge: be5d9af 39882df
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 28 19:46:59 2013 +0100
+Date: Thu Feb 28 19:46:59 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 39882dfecdccc00db353946a31d395582ee37022
Author: José Aliste <jaliste at src.gnome.org>
-Date: Wed Feb 27 01:33:38 2013 +0100
+Date: Wed Feb 27 01:33:38 2013 +0100
Correct rendering of underline and strike out annotations
@@ -11338,17 +13367,17 @@
commit be5d9af38655496a2eaa4eb12cea84461c5aeb3f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Feb 23 23:41:46 2013 +0100
+Date: Sat Feb 23 23:41:46 2013 +0100
expose thin line modes in qt frontend
qt4/src/poppler-page.cc | 5 ++++-
- qt4/src/poppler-qt4.h | 6 ++++--
+ qt4/src/poppler-qt4.h | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
commit f96cbacfdbc97ace35f843854992f06e9322f485
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Feb 23 23:39:52 2013 +0100
+Date: Sat Feb 23 23:39:52 2013 +0100
Refine splashThinLineShape support
@@ -11357,21 +13386,21 @@
commit 47453a78e52aa43edd148aef53b67306603161f5
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Feb 20 23:12:17 2013 +0100
+Date: Wed Feb 20 23:12:17 2013 +0100
More threading safety
- poppler/Annot.cc | 97
+ poppler/Annot.cc | 97
+++++++++++++++++++++++++++++++++++------
- poppler/Annot.h | 8 +++-
- poppler/FontInfo.cc | 29 ++++++------
- poppler/FontInfo.h | 5 ++-
- poppler/Page.cc | 11 ++++-
- poppler/Page.h | 6 +--
- poppler/SplashOutputDev.cc | 7 ++-
- poppler/SplashOutputDev.h | 5 ++-
- poppler/XRef.cc | 4 +-
- qt4/src/poppler-page.cc | 9 ++--
+ poppler/Annot.h | 8 +++-
+ poppler/FontInfo.cc | 29 ++++++------
+ poppler/FontInfo.h | 5 ++-
+ poppler/Page.cc | 11 ++++-
+ poppler/Page.h | 6 +--
+ poppler/SplashOutputDev.cc | 7 ++-
+ poppler/SplashOutputDev.h | 5 ++-
+ poppler/XRef.cc | 4 +-
+ qt4/src/poppler-page.cc | 9 ++--
qt4/src/poppler-ps-converter.cc | 3 +-
11 files changed, 139 insertions(+), 45 deletions(-)
@@ -11378,13 +13407,13 @@
commit 60c5e072d4b930507469e6e8c234971725a4aa26
Merge: 0d42a6d 8d62625
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 20 21:08:53 2013 +0100
+Date: Wed Feb 20 21:08:53 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 8d62625610746ad70ffb88d845791fa03f5e35cc
Author: Thomas Fischer <fischer at unix-ag.uni-kl.de>
-Date: Wed Feb 20 21:07:10 2013 +0100
+Date: Wed Feb 20 21:07:10 2013 +0100
height -> maskHeight
@@ -11396,13 +13425,13 @@
commit 0d42a6dab479d27de1ecb2b47ad3f7568b1ee638
Merge: 7eb7880 8fb243b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 20 00:00:09 2013 +0100
+Date: Wed Feb 20 00:00:09 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 8fb243bf11a979af8bfa36427436940706c9f71d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 23:59:17 2013 +0100
+Date: Tue Feb 19 23:59:17 2013 +0100
Initialize cSrcNonIso[3] in splashModeXBGR8
@@ -11413,7 +13442,7 @@
commit 8a0199a0247c1a03a4d64375ca8bc900570d1817
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 23:11:46 2013 +0100
+Date: Tue Feb 19 23:11:46 2013 +0100
Fix indent
@@ -11423,13 +13452,13 @@
commit 7eb7880907cb7b6bd1032013d6ce4c49aa3525c4
Merge: 2c84acb 1389aa4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 22:26:37 2013 +0100
+Date: Tue Feb 19 22:26:37 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 22:25:56 2013 +0100
+Date: Tue Feb 19 22:25:56 2013 +0100
fix indent
@@ -11439,13 +13468,13 @@
commit 2c84acbfd02eeeaf0d20542798e907cb011c1e57
Merge: 401c35b ffd33e7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 11:32:11 2013 +0100
+Date: Tue Feb 19 11:32:11 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit ffd33e7b5aea44bc54a74f433f6bfff859b913dd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 11:31:22 2013 +0100
+Date: Tue Feb 19 11:31:22 2013 +0100
Fix missing ) here too
@@ -11454,7 +13483,7 @@
commit 14466ecc320387c9b6568280614a96e6f56309b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 11:31:02 2013 +0100
+Date: Tue Feb 19 11:31:02 2013 +0100
Forgot my C here
@@ -11463,7 +13492,7 @@
commit 401c35b797d3c25c734fbfb5b95be16a666a6012
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 22:33:07 2013 +0100
+Date: Mon Feb 18 22:33:07 2013 +0100
Fix closing ) as suggested by William Bader
@@ -11473,13 +13502,13 @@
commit 94364adade4dc27e5d80bc14511d4f2b7ea4ab0d
Merge: 164805b 47f30fa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 20:34:34 2013 +0100
+Date: Mon Feb 18 20:34:34 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 47f30fa96e62fc215c0e80f42517908760ef8065
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Feb 18 20:38:10 2013 +1100
+Date: Mon Feb 18 20:38:10 2013 +1100
Minor rewording of contributor README
@@ -11488,17 +13517,17 @@
commit 164805b4471256d3915c5e49fff28c9cdcbf89e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 20:05:12 2013 +0100
+Date: Mon Feb 18 20:05:12 2013 +0100
Move the commented test to a proper one
- poppler/Makefile.am | 3 +-
- poppler/PageLabelInfo.cc | 160
+ poppler/Makefile.am | 3 +-
+ poppler/PageLabelInfo.cc | 160
+-------------------------------------
- poppler/PageLabelInfo_p.h | 147
+ poppler/PageLabelInfo_p.h | 147
++++++++++++++++++++++++++++++++++
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 4 +
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 4 +
qt4/tests/check_pagelabelinfo.cpp | 43 ++++++++++
6 files changed, 198 insertions(+), 160 deletions(-)
@@ -11505,13 +13534,13 @@
commit 527b91a0ef97906041ffe57e88f0d26e1c407af0
Merge: df35562 95609be
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 19:49:14 2013 +0100
+Date: Mon Feb 18 19:49:14 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 95609be551fc4413874b8980010be70fbbab112a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 19:47:19 2013 +0100
+Date: Mon Feb 18 19:47:19 2013 +0100
Use the toLatin function in PageLabelInfo::indexToLabel
@@ -11524,13 +13553,13 @@
commit df3556240d5e4b4546b3c42b29be6d2be83a2802
Merge: 4dacd7c 5c7057c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 12 23:55:24 2013 +0100
+Date: Tue Feb 12 23:55:24 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 5c7057c61ed6e270e001c1f86632f265bebb6890
Author: Nuno Araujo <nuno.araujo at russo79.com>
-Date: Tue Feb 12 23:54:47 2013 +0100
+Date: Tue Feb 12 23:54:47 2013 +0100
Fix the build with automake-1.13
@@ -11541,13 +13570,13 @@
commit 4dacd7cdeb19d16fe7737c71e34904c7363c6b63
Merge: 7f2c255 9fc4b9f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 12 22:59:56 2013 +0100
+Date: Tue Feb 12 22:59:56 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
commit 9fc4b9f7a7e6105a6fd85aed9c21b78742e89ddd
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Feb 12 22:58:17 2013 +0100
+Date: Tue Feb 12 22:58:17 2013 +0100
true->TRUE
@@ -11558,7 +13587,7 @@
commit 7f2c255ff28386ba992717f729f25a979f240375
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Feb 12 22:48:40 2013 +0100
+Date: Tue Feb 12 22:48:40 2013 +0100
Introduce option SplashThinLineMode
@@ -11566,13 +13595,13 @@
poppler/SplashOutputDev.cc | 9 ++++++++-
poppler/SplashOutputDev.h | 3 ++-
- splash/Splash.cc | 37 ++++++++++++++++++++++++++++++-------
- splash/Splash.h | 9 +++++++--
- splash/SplashClip.cc | 7 ++++---
- splash/SplashClip.h | 4 +++-
- splash/SplashTypes.h | 8 +++++++-
- splash/SplashXPath.cc | 14 ++++++++++++--
- splash/SplashXPath.h | 17 ++++++++++++++++-
+ splash/Splash.cc | 37 ++++++++++++++++++++++++++++++-------
+ splash/Splash.h | 9 +++++++--
+ splash/SplashClip.cc | 7 ++++---
+ splash/SplashClip.h | 4 +++-
+ splash/SplashTypes.h | 8 +++++++-
+ splash/SplashXPath.cc | 14 ++++++++++++--
+ splash/SplashXPath.h | 17 ++++++++++++++++-
splash/SplashXPathScanner.cc | 9 +++++----
splash/SplashXPathScanner.h | 17 ++++++++++++++++-
11 files changed, 110 insertions(+), 24 deletions(-)
@@ -11580,39 +13609,39 @@
commit c2ebcbea2267f861c491c0cd6c1fbf2dc2aff7d2
Merge: 48ed05d dca21f8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 10 12:01:13 2013 +0100
+Date: Sun Feb 10 12:01:13 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
- poppler/Parser.cc
+ poppler/Parser.cc
commit dca21f86359b6b2a925f7b05a2f36ab854cefbce
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 10 11:47:21 2013 +0100
+Date: Sun Feb 10 11:47:21 2013 +0100
0.22.1
CMakeLists.txt | 2 +-
- NEWS | 9 +++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 9 +++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
commit e8e9245f6a4884da3940fc281b7ff1a42d7f5964
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 10 11:43:14 2013 +0100
+Date: Sun Feb 10 11:43:14 2013 +0100
Update C year here too
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ebbacd897e2b529d1c3637b6af438b8dcc1d7ce8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 10 11:42:21 2013 +0100
+Date: Sun Feb 10 11:42:21 2013 +0100
Update C
@@ -11621,7 +13650,7 @@
commit 48ed05d95598b642a57456a843baf9f246502bb6
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Feb 6 21:56:01 2013 +1030
+Date: Wed Feb 6 21:56:01 2013 +1030
Make Goffset long long and factor out all fseek/ftell into gfile.cc
@@ -11631,20 +13660,20 @@
Bug 60095
- goo/gfile.cc | 38 ++++++++++++++++++++++++
- goo/gfile.h | 7 +++++
- goo/gtypes.h | 19 +-----------
- poppler/Stream.cc | 67
+ goo/gfile.cc | 38 ++++++++++++++++++++++++
+ goo/gfile.h | 7 +++++
+ goo/gtypes.h | 19 +-----------
+ poppler/Stream.cc | 67
++++++------------------------------------
- poppler/XRef.cc | 4 +--
+ poppler/XRef.cc | 4 +--
poppler/poppler-config.h.cmake | 6 ----
- poppler/poppler-config.h.in | 6 ----
- utils/pdfinfo.cc | 16 ++--------
+ poppler/poppler-config.h.in | 6 ----
+ utils/pdfinfo.cc | 16 ++--------
8 files changed, 60 insertions(+), 103 deletions(-)
commit fbcd64386c1b189db6e06234577261973bdc88cc
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 22:24:50 2013 +1030
+Date: Fri Jan 25 22:24:50 2013 +1030
cairo: support uncolored tiling patterns
@@ -11656,20 +13685,20 @@
commit c60ad119363c65d097dff56a68c1ab3fb2933f0b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 27 15:50:26 2013 +1030
+Date: Sun Jan 27 15:50:26 2013 +1030
A few more missing Goffsets
- glib/poppler-input-stream.h | 2 +-
- poppler/PDFDoc.cc | 16 ++++++++--------
- poppler/PDFDoc.h | 6 +++---
- poppler/Stream.cc | 4 ++--
- poppler/Stream.h | 4 ++--
+ glib/poppler-input-stream.h | 2 +-
+ poppler/PDFDoc.cc | 16 ++++++++--------
+ poppler/PDFDoc.h | 6 +++---
+ poppler/Stream.cc | 4 ++--
+ poppler/Stream.h | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
commit 9b113dc86a27085693ac4bcad061780c881ea7f9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 27 11:32:34 2013 +1030
+Date: Sun Jan 27 11:32:34 2013 +1030
Use sys/types.h instead of stdio.h for the off_t type
@@ -11680,7 +13709,7 @@
commit f3aa5236361dca3db64f110520ebe721ba1c9464
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 27 18:50:10 2013 +0100
+Date: Sun Jan 27 18:50:10 2013 +0100
use Goffset also for length in MemStream ctor
@@ -11690,7 +13719,7 @@
commit eb5ce6990522bac91d8f5d0d3636c46178386d25
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 27 15:20:42 2013 +0100
+Date: Sun Jan 27 15:20:42 2013 +0100
avoid max() macro expansion
@@ -11701,7 +13730,7 @@
commit 6b716b1ab60b573b5770d8636992247387bc3513
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 27 15:18:04 2013 +0100
+Date: Sun Jan 27 15:18:04 2013 +0100
cmake: provide HAVE_FSEEK64 and HAVE_FSEEKO in poppler-config
@@ -11713,7 +13742,7 @@
commit fe59ac914230b80aa82b314398a8a038ef083e06
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Jan 26 16:44:49 2013 +1030
+Date: Sat Jan 26 16:44:49 2013 +1030
Read 8 byte xref offsets when sizeof(Goffset) < 8
@@ -11726,33 +13755,33 @@
commit 098d98dfc3846150098f5b20f3f5a07cb565c465
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Sat Jan 26 19:31:20 2013 +0100
+Date: Sat Jan 26 19:31:20 2013 +0100
Rename function
Makes it say more what it does
- poppler/GfxState.cc | 3 ++-
- poppler/GfxState.h | 3 ++-
+ poppler/GfxState.cc | 3 ++-
+ poppler/GfxState.h | 3 ++-
poppler/SplashOutputDev.cc | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
commit 97e93d7583f2a6a5b1c8b51474744ca05277dc28
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Sat Jan 26 16:56:00 2013 +0100
+Date: Sat Jan 26 16:56:00 2013 +0100
Remove unused deviceHasTextClip
poppler/CairoOutputDev.h | 1 -
- poppler/OutputDev.h | 1 -
- poppler/PSOutputDev.h | 1 -
+ poppler/OutputDev.h | 1 -
+ poppler/PSOutputDev.h | 1 -
poppler/SplashOutputDev.h | 1 -
- utils/pdftohtml.cc | 1 -
+ utils/pdftohtml.cc | 1 -
5 files changed, 5 deletions(-)
commit 1bb3ddc2264cb65dffd553a952ee4518344df0de
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 25 19:37:24 2013 +0100
+Date: Fri Jan 25 19:37:24 2013 +0100
A few Goffsets we missed
@@ -11762,62 +13791,62 @@
poppler/Decrypt.h | 3 ++-
poppler/Gfx.cc | 4 ++--
- poppler/Gfx.h | 4 ++--
+ poppler/Gfx.h | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
commit 5f8b1275a19b2036c6e9323a744d8bc64af31c36
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 25 19:32:58 2013 +0100
+Date: Fri Jan 25 19:32:58 2013 +0100
New year!
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 574907e6a74e62a5ee6d7f17c43fdd9bcb07e069
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 25 19:31:59 2013 +0100
+Date: Fri Jan 25 19:31:59 2013 +0100
Adrian C for 2013 because of the big files support
- cpp/poppler-private.cpp | 1 +
- cpp/poppler-private.h | 1 +
- goo/gtypes.h | 1 +
- poppler/Decrypt.cc | 1 +
- poppler/Decrypt.h | 1 +
- poppler/Error.cc | 1 +
- poppler/Error.h | 1 +
- poppler/Hints.cc | 1 +
- poppler/Hints.h | 1 +
- poppler/JBIG2Stream.cc | 1 +
- poppler/JBIG2Stream.h | 1 +
- poppler/JPEG2000Stream.cc | 1 +
- poppler/JPEG2000Stream.h | 1 +
- poppler/Lexer.cc | 2 +-
- poppler/Lexer.h | 1 +
- poppler/Object.cc | 1 +
- poppler/Object.h | 1 +
- poppler/PDFDoc.cc | 1 +
- poppler/PDFDoc.h | 1 +
- poppler/PageTransition.cc | 1 +
- poppler/Parser.cc | 1 +
- poppler/Parser.h | 1 +
- poppler/SecurityHandler.cc | 1 +
- poppler/Stream.cc | 1 +
- poppler/Stream.h | 1 +
- poppler/XRef.cc | 1 +
- poppler/XRef.h | 1 +
- qt4/src/poppler-private.cc | 1 +
+ cpp/poppler-private.cpp | 1 +
+ cpp/poppler-private.h | 1 +
+ goo/gtypes.h | 1 +
+ poppler/Decrypt.cc | 1 +
+ poppler/Decrypt.h | 1 +
+ poppler/Error.cc | 1 +
+ poppler/Error.h | 1 +
+ poppler/Hints.cc | 1 +
+ poppler/Hints.h | 1 +
+ poppler/JBIG2Stream.cc | 1 +
+ poppler/JBIG2Stream.h | 1 +
+ poppler/JPEG2000Stream.cc | 1 +
+ poppler/JPEG2000Stream.h | 1 +
+ poppler/Lexer.cc | 2 +-
+ poppler/Lexer.h | 1 +
+ poppler/Object.cc | 1 +
+ poppler/Object.h | 1 +
+ poppler/PDFDoc.cc | 1 +
+ poppler/PDFDoc.h | 1 +
+ poppler/PageTransition.cc | 1 +
+ poppler/Parser.cc | 1 +
+ poppler/Parser.h | 1 +
+ poppler/SecurityHandler.cc | 1 +
+ poppler/Stream.cc | 1 +
+ poppler/Stream.h | 1 +
+ poppler/XRef.cc | 1 +
+ poppler/XRef.h | 1 +
+ qt4/src/poppler-private.cc | 1 +
qt4/src/poppler-qiodeviceoutstream-private.h | 1 +
- qt4/src/poppler-qiodeviceoutstream.cc | 1 +
- utils/pdfinfo.cc | 2 +-
- utils/pdfunite.cc | 1 +
+ qt4/src/poppler-qiodeviceoutstream.cc | 1 +
+ utils/pdfinfo.cc | 2 +-
+ utils/pdfunite.cc | 1 +
32 files changed, 32 insertions(+), 2 deletions(-)
commit 95b81ae9b5a345c9caa3d658b9b543d1937c6c02
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 21:37:51 2013 +1030
+Date: Fri Jan 25 21:37:51 2013 +1030
gitignore
@@ -11826,7 +13855,7 @@
commit 576dc53c857d99bb5d81fe7c9c52fe314a6e58ee
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Jan 25 21:27:13 2013 +1030
+Date: Fri Jan 25 21:27:13 2013 +1030
splash: fix uninitialized memory
@@ -11837,13 +13866,13 @@
commit a9768588cd6086f4ca4e6906db038cfdbfd551d5
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 21:24:29 2013 +1030
+Date: Fri Jan 25 21:24:29 2013 +1030
win32 large file support
Bug 44085
- goo/gtypes.h | 2 ++
+ goo/gtypes.h | 2 ++
poppler/Stream.cc | 13 +++++++++++++
utils/pdfinfo.cc | 3 +++
3 files changed, 18 insertions(+)
@@ -11850,7 +13879,7 @@
commit a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 21:23:43 2013 +1030
+Date: Fri Jan 25 21:23:43 2013 +1030
Large file support
@@ -11859,54 +13888,54 @@
Bug 44085
- cpp/poppler-private.cpp | 2 +-
- cpp/poppler-private.h | 2 +-
- glib/poppler-input-stream.cc | 10 +-
- glib/poppler-input-stream.h | 16 +--
- goo/gtypes.h | 15 +++
- poppler/Decrypt.cc | 2 +-
- poppler/Decrypt.h | 2 +-
- poppler/Error.cc | 10 +-
- poppler/Error.h | 5 +-
- poppler/Hints.cc | 4 +-
- poppler/Hints.h | 6 +-
- poppler/JBIG2Stream.cc | 8 +-
- poppler/JBIG2Stream.h | 2 +-
- poppler/JPEG2000Stream.cc | 2 +-
- poppler/JPEG2000Stream.h | 2 +-
- poppler/Lexer.h | 8 +-
- poppler/Object.h | 8 +-
- poppler/PDFDoc.cc | 54 +++++-----
- poppler/PDFDoc.h | 14 +--
- poppler/Parser.cc | 10 +-
- poppler/Parser.h | 2 +-
- poppler/Stream.cc | 88 ++++++++---------
- poppler/Stream.h | 102 +++++++++----------
- poppler/XRef.cc | 141
+ cpp/poppler-private.cpp | 2 +-
+ cpp/poppler-private.h | 2 +-
+ glib/poppler-input-stream.cc | 10 +-
+ glib/poppler-input-stream.h | 16 +--
+ goo/gtypes.h | 15 +++
+ poppler/Decrypt.cc | 2 +-
+ poppler/Decrypt.h | 2 +-
+ poppler/Error.cc | 10 +-
+ poppler/Error.h | 5 +-
+ poppler/Hints.cc | 4 +-
+ poppler/Hints.h | 6 +-
+ poppler/JBIG2Stream.cc | 8 +-
+ poppler/JBIG2Stream.h | 2 +-
+ poppler/JPEG2000Stream.cc | 2 +-
+ poppler/JPEG2000Stream.h | 2 +-
+ poppler/Lexer.h | 8 +-
+ poppler/Object.h | 8 +-
+ poppler/PDFDoc.cc | 54 +++++-----
+ poppler/PDFDoc.h | 14 +--
+ poppler/Parser.cc | 10 +-
+ poppler/Parser.h | 2 +-
+ poppler/Stream.cc | 88 ++++++++---------
+ poppler/Stream.h | 102 +++++++++----------
+ poppler/XRef.cc | 141
+++++++++++++++++----------
- poppler/XRef.h | 34 +++----
- poppler/poppler-config.h.in | 6 ++
- qt4/src/poppler-private.cc | 2 +-
+ poppler/XRef.h | 34 +++----
+ poppler/poppler-config.h.in | 6 ++
+ qt4/src/poppler-private.cc | 2 +-
qt4/src/poppler-qiodeviceoutstream-private.h | 2 +-
- qt4/src/poppler-qiodeviceoutstream.cc | 4 +-
- test/perf-test.cc | 6 +-
- utils/pdfinfo.cc | 6 +-
- utils/pdfunite.cc | 2 +-
+ qt4/src/poppler-qiodeviceoutstream.cc | 4 +-
+ test/perf-test.cc | 6 +-
+ utils/pdfinfo.cc | 6 +-
+ utils/pdfunite.cc | 2 +-
32 files changed, 320 insertions(+), 257 deletions(-)
commit 6eebbb9c015f98b713205e56ab2f1d4d430e9206
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 21:22:51 2013 +1030
+Date: Fri Jan 25 21:22:51 2013 +1030
Add Int64 object type
Bug 44085
- poppler/Lexer.cc | 46
+ poppler/Lexer.cc | 46
++++++++++++++++++++--------------------------
- poppler/Object.cc | 6 +++---
- poppler/Object.h | 26 +++++++++++++++-----------
- poppler/PDFDoc.cc | 4 ++--
+ poppler/Object.cc | 6 +++---
+ poppler/Object.h | 26 +++++++++++++++-----------
+ poppler/PDFDoc.cc | 4 ++--
poppler/SecurityHandler.cc | 4 ++--
qt4/tests/check_lexer.cpp | 24 +++++++++++++++++-------
test/pdf-fullrewrite.cc | 9 +--------
@@ -11914,7 +13943,7 @@
commit be495d73ce7324963a979cffc149330f5512288b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jan 25 21:14:21 2013 +1030
+Date: Fri Jan 25 21:14:21 2013 +1030
use getNum instead of getReal
@@ -11923,7 +13952,7 @@
commit a5adb6738e1e191c64457e0c07ee2e3422a042dd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 19 18:13:33 2013 +0100
+Date: Sat Jan 19 18:13:33 2013 +0100
Don't use config.h but poppler-config.h
@@ -11934,7 +13963,7 @@
commit 8eb489c355d734a72e140ce7e32470d048362499
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Jan 19 17:43:08 2013 +0100
+Date: Sat Jan 19 17:43:08 2013 +0100
Make rendering thread-safe
@@ -11942,9 +13971,9 @@
glib/poppler-input-stream.cc | 4 ++
glib/poppler-input-stream.h | 1 +
- poppler/Annot.cc | 52 +++++++++----------
- poppler/Array.cc | 48 +++++++++++++++++-
- poppler/Array.h | 15 ++++--
+ poppler/Annot.cc | 52 +++++++++----------
+ poppler/Array.cc | 48 +++++++++++++++++-
+ poppler/Array.h | 15 ++++--
poppler/ArthurOutputDev.cc | 3 +-
poppler/ArthurOutputDev.h | 3 +-
poppler/CairoFontEngine.cc | 33 +++++++++---
@@ -11951,46 +13980,46 @@
poppler/CairoFontEngine.h | 11 ++--
poppler/CairoOutputDev.cc | 15 ++++--
poppler/CairoOutputDev.h | 5 +-
- poppler/Catalog.cc | 84 +++++++++++++++++++++++++++----
- poppler/Catalog.h | 15 ++++--
- poppler/Dict.cc | 67 ++++++++++++++++++++++++-
- poppler/Dict.h | 11 +++-
- poppler/Gfx.cc | 18 ++++---
- poppler/Gfx.h | 8 +--
+ poppler/Catalog.cc | 84 +++++++++++++++++++++++++++----
+ poppler/Catalog.h | 15 ++++--
+ poppler/Dict.cc | 67 ++++++++++++++++++++++++-
+ poppler/Dict.h | 11 +++-
+ poppler/Gfx.cc | 18 ++++---
+ poppler/Gfx.h | 8 +--
poppler/GlobalParamsWin.cc | 4 +-
- poppler/Object.h | 7 +--
- poppler/OutputDev.h | 4 +-
- poppler/PDFDoc.cc | 66 ++++++++++++++++++------
- poppler/PDFDoc.h | 11 ++--
+ poppler/Object.h | 7 +--
+ poppler/OutputDev.h | 4 +-
+ poppler/PDFDoc.cc | 66 ++++++++++++++++++------
+ poppler/PDFDoc.h | 11 ++--
poppler/PSOutputDev.cc | 12 ++---
- poppler/PSOutputDev.h | 4 +-
- poppler/Page.cc | 75 ++++++++++++++++++++++++---
- poppler/Page.h | 18 +++++--
- poppler/Parser.cc | 3 +-
+ poppler/PSOutputDev.h | 4 +-
+ poppler/Page.cc | 75 ++++++++++++++++++++++++---
+ poppler/Page.h | 18 +++++--
+ poppler/Parser.cc | 3 +-
poppler/PreScanOutputDev.cc | 4 +-
poppler/PreScanOutputDev.h | 4 +-
poppler/SplashOutputDev.cc | 16 +++---
poppler/SplashOutputDev.h | 5 +-
- poppler/Stream.cc | 117
+ poppler/Stream.cc | 117
++++++++++++++++++++++++++++++++-----------
- poppler/Stream.h | 35 +++++++++----
+ poppler/Stream.h | 35 +++++++++----
poppler/TextOutputDev.cc | 5 +-
poppler/TextOutputDev.h | 3 +-
- poppler/XRef.cc | 99 +++++++++++++++++++++++++++++++++---
- poppler/XRef.h | 16 +++++-
+ poppler/XRef.cc | 99 +++++++++++++++++++++++++++++++++---
+ poppler/XRef.h | 16 +++++-
qt4/src/poppler-document.cc | 23 ++++-----
qt4/src/poppler-page.cc | 64 ++++++++++++++++++++---
qt4/src/poppler-private.cc | 3 +-
qt4/src/poppler-private.h | 74 +--------------------------
- test/gtk-test.cc | 2 +-
+ test/gtk-test.cc | 2 +-
utils/HtmlOutputDev.cc | 3 +-
- utils/HtmlOutputDev.h | 3 +-
+ utils/HtmlOutputDev.h | 3 +-
utils/ImageOutputDev.h | 3 +-
45 files changed, 793 insertions(+), 283 deletions(-)
commit 3db9472e2b016f1b411174273f27848193ab18e5
Author: José Aliste <jaliste at src.gnome.org>
-Date: Fri Jan 18 15:22:03 2013 +0100
+Date: Fri Jan 18 15:22:03 2013 +0100
Add a null check for gfxFont
@@ -12001,7 +14030,7 @@
commit 4b69217f72f3fd313f73df059eb1e6294878a95e
Author: Peter Dyballa <Peter_Dyballa at Freenet.DE>
-Date: Fri Jan 11 00:32:46 2013 +0100
+Date: Fri Jan 11 00:32:46 2013 +0100
Use CPPFLAGS for CPPFLAGS not CFLAGS
@@ -12012,7 +14041,7 @@
commit 8b6dc55e530b2f5ede6b9dfb64aafdd1d5836492
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 10 22:31:52 2013 +0100
+Date: Thu Jan 10 22:31:52 2013 +0100
Fix invalid memory access in 1150.pdf.asan.8.69
@@ -12021,7 +14050,7 @@
commit e14b6e9c13d35c9bd1e0c50906ace8e707816888
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 10 20:52:02 2013 +0100
+Date: Thu Jan 10 20:52:02 2013 +0100
Fix invalid memory access in 2030.pdf.asan.69.463
@@ -12030,7 +14059,7 @@
commit 0388837f01bc467045164f9ddaff787000a8caaa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 10 20:29:06 2013 +0100
+Date: Thu Jan 10 20:29:06 2013 +0100
Fix another invalid memory access in 1091.pdf.asan.72.42
@@ -12039,7 +14068,7 @@
commit 957aa252912cde85d76c41e9710b33425a82b696
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 10 19:16:19 2013 +0100
+Date: Thu Jan 10 19:16:19 2013 +0100
Fix invalid memory accesses in 1091.pdf.asan.72.42
@@ -12048,7 +14077,7 @@
commit bbc2d8918fe234b7ef2c480eb148943922cc0959
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 10 19:07:48 2013 +0100
+Date: Thu Jan 10 19:07:48 2013 +0100
Fix invalid memory accesses in 1036.pdf.asan.23.17
@@ -12057,7 +14086,7 @@
commit a9b8ab4657dec65b8b86c225d12c533ad7e984e2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 9 22:56:45 2013 +0100
+Date: Wed Jan 9 22:56:45 2013 +0100
Fix crash in broken file 1031.pdf.asan.48.15
@@ -12066,7 +14095,7 @@
commit 7266a634e01e20648cc877371edc95651d30d4fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 9 22:52:45 2013 +0100
+Date: Wed Jan 9 22:52:45 2013 +0100
Forgot the C of the last commit
@@ -12075,7 +14104,7 @@
commit a205e71a2dbe0c8d4f4905a76a3f79ec522eacec
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 9 22:47:28 2013 +0100
+Date: Wed Jan 9 22:47:28 2013 +0100
Do not crash in broken documents like 1007.pdf.asan.48.4
@@ -12084,7 +14113,7 @@
commit b1026b5978c385328f2a15a2185c599a563edf91
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 9 22:17:09 2013 +0100
+Date: Wed Jan 9 22:17:09 2013 +0100
Initialize refLine totally
@@ -12095,7 +14124,7 @@
commit bef2c42f381c74fdb8bbb43babe1a93a0e229fb0
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Jan 3 15:27:36 2013 +1030
+Date: Thu Jan 3 15:27:36 2013 +1030
Parser: return error if stream encountered when allowStreams = false
@@ -12117,21 +14146,21 @@
commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 29 19:22:54 2012 +0100
+Date: Sat Dec 29 19:22:54 2012 +0100
0.22.0
- CMakeLists.txt | 6 +++---
- NEWS | 14 ++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 6 +++---
+ NEWS | 14 ++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 22 insertions(+), 8 deletions(-)
commit bf5ef68c89d4189b18458b764f807cfc6599bad7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 29 19:43:11 2012 +0100
+Date: Sat Dec 29 19:43:11 2012 +0100
regtest: Print test results when the test has finished
@@ -12144,7 +14173,7 @@
commit 80c7f6aa3fa83175fafc71fa8c834350d513a48f
Author: Jason Crain <jason at aquaticape.us>
-Date: Fri Nov 23 23:31:01 2012 -0600
+Date: Fri Nov 23 23:31:01 2012 -0600
TextOutputDev: Use page size for max value in TextPage::visitSelection
@@ -12155,7 +14184,7 @@
commit 0d31edfa5617f4fecb04d5476de54a63b6146686
Author: Ross Lagerwall <rosslagerwall at gmail.com>
-Date: Fri Nov 30 09:23:55 2012 +0000
+Date: Fri Nov 30 09:23:55 2012 +0000
pdf-inspector Change from the deprecated GtkTable to GtkGrid
@@ -12169,7 +14198,7 @@
commit 9977a4f26b5698b0b85ca911e7392013941944e0
Author: Ross Lagerwall <rosslagerwall at gmail.com>
-Date: Tue Nov 13 15:49:44 2012 +0000
+Date: Tue Nov 13 15:49:44 2012 +0000
pdf-inspector: Remove deprectated has-separator property
@@ -12180,7 +14209,7 @@
commit 806d116a38c2a6552c9bcee2c6f753d7059c17aa
Author: Ross Lagerwall <rosslagerwall at gmail.com>
-Date: Tue Nov 13 15:44:15 2012 +0000
+Date: Tue Nov 13 15:44:15 2012 +0000
pdf-inspector: Add correct title and copyright
@@ -12191,7 +14220,7 @@
commit 7d5bf74c19768fa3447819a4debff06d5d83900a
Author: Ross Lagerwall <rosslagerwall at gmail.com>
-Date: Tue Nov 13 15:23:36 2012 +0000
+Date: Tue Nov 13 15:23:36 2012 +0000
pdf-inspector: Fix crash by not freeing filename_g
@@ -12205,7 +14234,7 @@
commit d61c6d4944d6f7c9e8b517dd28958124f4923d08
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Dec 28 01:18:48 2012 +0100
+Date: Fri Dec 28 01:18:48 2012 +0100
Repair pdfunite
@@ -12231,7 +14260,7 @@
commit be4804bff2b722ceac180da52ad436fee548f9ee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 28 01:17:14 2012 +0100
+Date: Fri Dec 28 01:17:14 2012 +0100
dos2unix
@@ -12240,7 +14269,7 @@
commit 703c77eb59aa22ab6372d56a20ee81dc7dfa6e4a
Author: Even Rouault <even.rouault at mines-paris.org>
-Date: Fri Dec 28 00:57:17 2012 +0100
+Date: Fri Dec 28 00:57:17 2012 +0100
Fix very long loop in JPXStream::getImageParams()
@@ -12249,7 +14278,7 @@
commit 7e0be7854adc49e4e00c0badb0dc470fbdf6d612
Author: Even Rouault <even.rouault at mines-paris.org>
-Date: Fri Dec 28 00:44:29 2012 +0100
+Date: Fri Dec 28 00:44:29 2012 +0100
Avoid DoS due to huge number of JPX tiles in a stream
@@ -12258,7 +14287,7 @@
commit 2017dbebd9afd4f172242ff8462fce739d911e64
Author: Even Rouault <even.rouault at mines-paris.org>
-Date: Fri Dec 28 00:30:13 2012 +0100
+Date: Fri Dec 28 00:30:13 2012 +0100
Do not crash on 0 or negative nBits values
@@ -12267,7 +14296,7 @@
commit 858df0dc04e2f306e806fe0fc4fb5c8ec804e263
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 27 23:30:27 2012 +0100
+Date: Thu Dec 27 23:30:27 2012 +0100
Fix arg typo
@@ -12276,7 +14305,7 @@
commit 1dd6280d79ad22461208702b3c929377887c99ff
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 15 16:39:23 2012 +0100
+Date: Sat Dec 15 16:39:23 2012 +0100
0.21.4 soversion increases
@@ -12288,19 +14317,19 @@
commit 99d0288bb0b6879ae5414d174939bbd9c1e90bd3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 15 16:37:19 2012 +0100
+Date: Sat Dec 15 16:37:19 2012 +0100
0.21.4 version increase
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 2bc48d5369f1dbecfc4db2878f33bdeb80d8d90f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 15 16:36:38 2012 +0100
+Date: Sat Dec 15 16:36:38 2012 +0100
0.21.4 NEWS
@@ -12309,24 +14338,24 @@
commit b3423d54b1254597d7ca953872211fa3aa83e29c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 15 16:29:54 2012 +0100
+Date: Sat Dec 15 16:29:54 2012 +0100
Updated copyrights
- goo/JpegWriter.h | 2 +-
- goo/PNGWriter.cc | 1 +
- goo/PNGWriter.h | 1 +
- goo/TiffWriter.cc | 1 +
- goo/TiffWriter.h | 1 +
+ goo/JpegWriter.h | 2 +-
+ goo/PNGWriter.cc | 1 +
+ goo/PNGWriter.h | 1 +
+ goo/TiffWriter.cc | 1 +
+ goo/TiffWriter.h | 1 +
poppler/GlobalParams.cc | 2 +-
poppler/TextOutputDev.cc | 1 +
- splash/Splash.cc | 1 +
+ splash/Splash.cc | 1 +
utils/HtmlOutputDev.cc | 1 +
9 files changed, 9 insertions(+), 2 deletions(-)
commit 487f20d24830a97cad4773ae27f0c2cc58df2ed0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 13 20:40:39 2012 +0100
+Date: Thu Dec 13 20:40:39 2012 +0100
Check obj1 is a dict before using it
@@ -12337,7 +14366,7 @@
commit 03045469206adbd797e3a38fee3a16cdd1716812
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 13 19:24:54 2012 +0100
+Date: Thu Dec 13 19:24:54 2012 +0100
Fix crop on EPS conversion
@@ -12352,7 +14381,7 @@
commit 5d50b2765428e5a417967be2f41452ab05917db7
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Tue Dec 11 18:54:30 2012 +0100
+Date: Tue Dec 11 18:54:30 2012 +0100
Correct bad semantics
@@ -12364,7 +14393,7 @@
commit e306bad391a3ff49593f1f3bac0717d62599bd13
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 9 22:40:27 2012 +0100
+Date: Sun Dec 9 22:40:27 2012 +0100
pngwriter: move #include <png.h> into .cc file
@@ -12374,15 +14403,15 @@
This requires HtmlOutputDev.cc to include <png.h> on its own (which
is correct, since it uses the libpng API directly).
- goo/PNGWriter.cc | 98
+ goo/PNGWriter.cc | 98
+++++++++++++++++++++++++++++---------------------
- goo/PNGWriter.h | 12 ++-----
+ goo/PNGWriter.h | 12 ++-----
utils/HtmlOutputDev.cc | 4 +++
3 files changed, 64 insertions(+), 50 deletions(-)
commit cf338551e9d031cc00d56cea0d258ec5fd96e79a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 9 22:22:03 2012 +0100
+Date: Sun Dec 9 22:22:03 2012 +0100
tiffwriter: move #include <tiffio.h> into .cc file
@@ -12396,7 +14425,7 @@
commit 0dfa51f0bfa787ee9c865fd4f05e4bd964c260fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 9 22:31:50 2012 +0100
+Date: Sun Dec 9 22:31:50 2012 +0100
Having a look at the log Marek has (C) in this file
@@ -12405,7 +14434,7 @@
commit f1b2e29e1d5f420903085318f06c4dc83ebb24f3
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Dec 9 20:59:26 2012 +0100
+Date: Sun Dec 9 20:59:26 2012 +0100
Fix crash when rendering on mono1
@@ -12414,7 +14443,7 @@
commit 71bad47ed6a36d825b0d08992c8db56845c71e40
Author: Marek Kasik <mkasik at redhat.com>
-Date: Sun Dec 9 20:20:00 2012 +0100
+Date: Sun Dec 9 20:20:00 2012 +0100
Filter stuff that might end up in the shell
@@ -12426,7 +14455,7 @@
commit c35d030472e6cb140c3dff30b91541772c992eb0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 8 23:51:59 2012 +0100
+Date: Sat Dec 8 23:51:59 2012 +0100
Add private copy constructor and operator= to make sure we don't
use the default ones
@@ -12433,16 +14462,16 @@
Since using them would results in bad things happening
- goo/GooHash.h | 16 ++++++++++++++++
- goo/GooList.h | 16 ++++++++++++++++
+ goo/GooHash.h | 16 ++++++++++++++++
+ goo/GooList.h | 16 ++++++++++++++++
goo/PNGWriter.h | 5 ++++-
goo/TiffWriter.h | 5 ++++-
- goo/gfile.h | 4 ++++
+ goo/gfile.h | 4 ++++
5 files changed, 44 insertions(+), 2 deletions(-)
commit f6741d9242bf2d9c13c8d534c50c8e4d404afc7f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Dec 2 09:34:35 2012 +1030
+Date: Sun Dec 2 09:34:35 2012 +1030
jpegwriter: move #include "jpeglib.h" into .cc file
@@ -12454,16 +14483,16 @@
Bug 57687
- goo/JpegWriter.cc | 120
+ goo/JpegWriter.cc | 120
++++++++++++++++++++++++++++++++-----------------
- goo/JpegWriter.h | 25 ++++++-----
+ goo/JpegWriter.h | 25 ++++++-----
splash/SplashBitmap.cc | 2 +-
- utils/pdftocairo.cc | 4 +-
+ utils/pdftocairo.cc | 4 +-
4 files changed, 95 insertions(+), 56 deletions(-)
commit e78dbb1b7dbd20c3ae547b02270ab0648c1bfc61
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Dec 2 09:10:32 2012 +1030
+Date: Sun Dec 2 09:10:32 2012 +1030
Reformat goo/*Writer files to poppler style
@@ -12479,7 +14508,7 @@
commit 1bfe4b22cf893dd498d6f306ee9cf942c72fe3ed
Author: Matthias Kramm <kramm at quiss.org>
-Date: Mon Nov 19 12:39:56 2012 -0800
+Date: Mon Nov 19 12:39:56 2012 -0800
Fix linewidths in monochrome mode.
@@ -12492,7 +14521,7 @@
commit e5008bdb26df0135edfbd30a811df2332f4e036c
Author: José Aliste <jaliste at src.gnome.org>
-Date: Sat Dec 8 10:33:21 2012 -0300
+Date: Sat Dec 8 10:33:21 2012 -0300
glib-demo: Update the demo to modify flags of annotations
@@ -12504,7 +14533,7 @@
commit 8cd5cae953de374276c11711dc106de15c8dcad0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 8 18:57:07 2012 +0100
+Date: Sat Dec 8 18:57:07 2012 +0100
regtest: Use the number of cpus as default number of worker threads
@@ -12513,18 +14542,18 @@
commit 605c363b04ba3853883010c0a413054fe246d9aa
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 8 18:45:22 2012 +0100
+Date: Sat Dec 8 18:45:22 2012 +0100
regtest: Remove trailing whitespaces
regtest/TestReferences.py | 10 +++++-----
- regtest/TestRun.py | 10 +++++-----
- regtest/main.py | 6 +++---
+ regtest/TestRun.py | 10 +++++-----
+ regtest/main.py | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
commit 787a8438708397f0a1bf26e93726f544c91533e6
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 2 08:03:10 2012 +0100
+Date: Sun Dec 2 08:03:10 2012 +0100
Fix compile warning on deprecated conversion from string constant
@@ -12540,7 +14569,7 @@
commit cb3a10417ae659fdb7b77132c569c93ec00bc95e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Dec 2 01:41:05 2012 +0100
+Date: Sun Dec 2 01:41:05 2012 +0100
Fixed check_lexer on 32-bit systems
@@ -12549,7 +14578,7 @@
commit 8550576bdf74180b62f54f9fd59213fbcd0a1be1
Author: José Aliste <jaliste at src.gnome.org>
-Date: Sat Dec 8 10:33:04 2012 -0300
+Date: Sat Dec 8 10:33:04 2012 -0300
glib: Add poppler_annot_set_flags
@@ -12561,22 +14590,22 @@
commit 15dcc5426ce319429e1a2c518902effb2ddf06cf
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Thu Dec 6 18:45:46 2012 +0100
+Date: Thu Dec 6 18:45:46 2012 +0100
implement parallel testing using Python's Queue class
- regtest/Printer.py | 36 +++++++++++++++++-----------
+ regtest/Printer.py | 36 +++++++++++++++++-----------
regtest/TestReferences.py | 23 +++++++++++++++++-
- regtest/TestRun.py | 58
+ regtest/TestRun.py | 58
++++++++++++++++++++++++++++++++++++----------
regtest/backends/cairo.py | 5 ++--
regtest/backends/splash.py | 5 ++--
- regtest/main.py | 11 ++++++++-
+ regtest/main.py | 11 ++++++++-
6 files changed, 104 insertions(+), 34 deletions(-)
commit c46646020826136b403e9aae8e2ded24c7165522
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 2 10:04:28 2012 +0100
+Date: Sun Dec 2 10:04:28 2012 +0100
glib-demo: Do not use deprecated gtk_color_button_{get,set}_rgba()
@@ -12590,21 +14619,21 @@
commit f8c1b55e764a6e79b0530fb1be9ee11917f4237e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 22:19:17 2012 +0100
+Date: Sat Dec 1 22:19:17 2012 +0100
0.21.3
- CMakeLists.txt | 4 ++--
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 23 insertions(+), 6 deletions(-)
commit e3716d9d735a1093399a3c5c33ea5471a6adc405
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 22:34:00 2012 +0100
+Date: Sat Dec 1 22:34:00 2012 +0100
Build on make check correctly
@@ -12614,13 +14643,13 @@
commit c7ae96b162e8a05269a54c31f8e7c411edc84553
Merge: 1f279c3 b1dacd1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 21:26:24 2012 +0100
+Date: Sat Dec 1 21:26:24 2012 +0100
Merge commit 'b1dacd1e6ab00eb1976491eb2b45c76671011b38'
commit 1f279c32dcdc899b509fc00aaa57382bc8af90f3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 20:37:52 2012 +0100
+Date: Sat Dec 1 20:37:52 2012 +0100
Update copyrights
@@ -12629,7 +14658,7 @@
commit 5daa17c013be8ebe180ff48207e189bd9bd50a84
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 20:06:17 2012 +0100
+Date: Sat Dec 1 20:06:17 2012 +0100
Initialize to NULL, fixes crash
@@ -12641,7 +14670,7 @@
commit f673be852e6564e039b5ec24e5bf583149b1d5a4
Author: Jason Crain <jason at aquaticape.us>
-Date: Sat Dec 1 20:03:00 2012 +0100
+Date: Sat Dec 1 20:03:00 2012 +0100
Allow large chars in TextPage
@@ -12650,7 +14679,7 @@
commit aca122432951c4c0a2a5dbaba046d848f2153b84
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 18:27:55 2012 +0200
+Date: Sat Jun 23 18:27:55 2012 +0200
Fix compile warning on unused variable filename_g
@@ -12659,7 +14688,7 @@
commit c702066961b1cc2a9c0fb16546e9db93c312813b
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 18:23:59 2012 +0200
+Date: Sat Jun 23 18:23:59 2012 +0200
Do not use 'size' uninitialized
@@ -12668,18 +14697,18 @@
commit 14bdeacb0eb8e4a1d3995f310a1b526e4dcc96dc
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 18:09:01 2012 +0200
+Date: Sat Jun 23 18:09:01 2012 +0200
Fix compile warnings on deprecated conversion from string constant to
'char*'
- poppler/FileSpec.cc | 3 ++-
+ poppler/FileSpec.cc | 3 ++-
poppler/GlobalParamsWin.cc | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
commit 72d4a1ba998218de876e2a0e939bbec4b7795299
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 17:52:13 2012 +0200
+Date: Sat Jun 23 17:52:13 2012 +0200
Fix compile warning on signed/unsigned comparison
@@ -12688,7 +14717,7 @@
commit 1262111e70ff161e495505bd6a262cc0357a943c
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 17:46:54 2012 +0200
+Date: Sat Jun 23 17:46:54 2012 +0200
Remove unused variable
@@ -12697,7 +14726,7 @@
commit 85572b85950ed4e4421f1e61e704e5c250ca27d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 1 01:50:25 2012 +0100
+Date: Sat Dec 1 01:50:25 2012 +0100
Silence gcc warning
@@ -12708,7 +14737,7 @@
commit a97aead193a927b91a4e33d7b5d2ba7179e664df
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Nov 30 21:30:19 2012 +0100
+Date: Fri Nov 30 21:30:19 2012 +0100
Splash: Implement bilinear image scaling
@@ -12715,14 +14744,14 @@
Bug #22138
poppler/SplashOutputDev.cc | 10 +--
- splash/Splash.cc | 183
+ splash/Splash.cc | 183
++++++++++++++++++++++++++++++++++++++++++---
- splash/Splash.h | 13 +++-
+ splash/Splash.h | 13 +++-
3 files changed, 188 insertions(+), 18 deletions(-)
commit e6806d893a9a104e3f23d69d0245ad0e4948a409
Author: Pino Toscano <pino at kde.org>
-Date: Wed Nov 28 17:59:36 2012 +0100
+Date: Wed Nov 28 17:59:36 2012 +0100
cmake: Enable compiler warnings for C code
@@ -12736,7 +14765,7 @@
commit bdb17da35de49b9fd1a549c3afd5e36004552080
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Nov 26 20:38:03 2012 +0100
+Date: Mon Nov 26 20:38:03 2012 +0100
cairo: Fix uninitaliazed warning in CairoOutputDev
@@ -12755,7 +14784,7 @@
commit beff044e4fdf44e80ad7c75255cb71a83e70a293
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Nov 27 22:19:01 2012 +0100
+Date: Tue Nov 27 22:19:01 2012 +0100
glib-demo: Fix warning on signedness
@@ -12777,7 +14806,7 @@
commit b484749ffa58315e4b61738d652347d7a77da982
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Nov 27 19:38:59 2012 +0100
+Date: Tue Nov 27 19:38:59 2012 +0100
glib-demo: Fix set but unused warning
@@ -12796,7 +14825,7 @@
commit 8438daf7bf7ab1b96c6899baab7e47d9c634cb3d
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 24 14:54:31 2012 +0200
+Date: Sun Jun 24 14:54:31 2012 +0200
glib-demo: pgd_text_view_query_tooltip(): return a gboolean
@@ -12807,7 +14836,7 @@
commit ff9e211cfb60eb820b9b046da546352fa59d7df9
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:56:02 2012 +0200
+Date: Sat Jun 23 22:56:02 2012 +0200
glib-demo: Remove set but unused variable textinfo
@@ -12818,7 +14847,7 @@
commit 8e5ae33bc63eca5297dea12fc281ba223f5be09a
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:44:22 2012 +0200
+Date: Sat Jun 23 22:44:22 2012 +0200
glib-demo: Fix warning "operation on 'page' may be undefined
[-Wsequence-point]"
@@ -12830,7 +14859,7 @@
commit c6f98d62b885e1d7f6ce1f265d4a87dca36494de
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:38:35 2012 +0200
+Date: Sat Jun 23 22:38:35 2012 +0200
glib-demo: Remove unused variable slice_selector
@@ -12841,7 +14870,7 @@
commit da56d280e2a51229c93117d8b537897ba63296cf
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:36:29 2012 +0200
+Date: Sat Jun 23 22:36:29 2012 +0200
glib-demo: Remove unused variable region
@@ -12852,7 +14881,7 @@
commit c792e59064018e0fd899f32080489419517f2bbe
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:34:44 2012 +0200
+Date: Sat Jun 23 22:34:44 2012 +0200
glib-demo: Do not use 'text' uninitialized
@@ -12863,7 +14892,7 @@
commit c5a8f7eda14030436e6905dd826e72cabbcf0e5f
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 22:26:53 2012 +0200
+Date: Sat Jun 23 22:26:53 2012 +0200
glib-demo: Fix warning on unused variable selection
@@ -12874,7 +14903,7 @@
commit 4ceb3f4f4ca0092e79bb36723a7332b071491666
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jun 23 18:36:12 2012 +0200
+Date: Sat Jun 23 18:36:12 2012 +0200
glib-demo: Fix warnings on unused variables
@@ -12885,7 +14914,7 @@
commit 5c5945d163fe406960ccc2e3a71882722b9e69d1
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Nov 27 19:21:34 2012 +0100
+Date: Tue Nov 27 19:21:34 2012 +0100
Enable compiler warnings for C code
@@ -12897,7 +14926,7 @@
commit 55940e989701eb9118015e30f4f48eb654fa34c4
Author: Pino Toscano <pino at kde.org>
-Date: Tue Nov 27 16:05:15 2012 +0100
+Date: Tue Nov 27 16:05:15 2012 +0100
fix my previous GooString::insert fix
@@ -12907,7 +14936,7 @@
extend qt4's check_goostring with few more checks covering this
(and the previous) fix
- goo/GooString.cc | 2 +-
+ goo/GooString.cc | 2 +-
qt4/tests/check_goostring.cpp | 39
+++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
@@ -12914,7 +14943,7 @@
commit dcbc9686d97f4f6596c43d1f701207278c25f8eb
Author: Pino Toscano <pino at kde.org>
-Date: Mon Nov 26 14:44:21 2012 +0100
+Date: Mon Nov 26 14:44:21 2012 +0100
glib/cmake: Include Gio-2.0 for introspection
@@ -12941,7 +14970,7 @@
commit 169e4cb001fa235ca608d3d0b42ea4214161fc2d
Author: Pino Toscano <pino at kde.org>
-Date: Mon Nov 26 14:42:59 2012 +0100
+Date: Mon Nov 26 14:42:59 2012 +0100
glib/cmake: Show all suppressed introspection scanner warnings
@@ -12954,7 +14983,7 @@
commit 62c0dbbe9f1987c78eeb87f248d35e7fd73e968a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 26 00:40:57 2012 +0100
+Date: Mon Nov 26 00:40:57 2012 +0100
Check GooString::insert
@@ -12961,13 +14990,13 @@
Checks we don't break what we just fixed with Pino's patch
qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 7 ++++++-
+ qt4/tests/Makefile.am | 7 ++++++-
qt4/tests/check_goostring.cpp | 22 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
commit 01e438ca47776075c8171bda090e7d859fd9f620
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Mon Nov 26 00:39:05 2012 +0100
+Date: Mon Nov 26 00:39:05 2012 +0100
Don't use memcpy to copy classes
@@ -12978,7 +15007,7 @@
commit 7ba15d11e56175601104d125d5e4a47619c224bf
Author: Pino Toscano <pino at kde.org>
-Date: Mon Nov 26 00:29:35 2012 +0100
+Date: Mon Nov 26 00:29:35 2012 +0100
fix GooString::insert()
@@ -13001,7 +15030,7 @@
commit 703f85a10cf7ad61d2f2d3a5faf347fdddcb4738
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 25 12:36:33 2012 +0100
+Date: Sun Nov 25 12:36:33 2012 +0100
glib: Fix returns tag in PopplerAttachmentSaveFunc api doc
@@ -13010,7 +15039,7 @@
commit 52896031783b28cee350ea92c8736e2c2e4e9d33
Author: José Aliste <jaliste at src.gnome.org>
-Date: Mon Nov 19 23:47:19 2012 +0100
+Date: Mon Nov 19 23:47:19 2012 +0100
glib: Add missing ":" at the end of some functions documentation
@@ -13019,14 +15048,14 @@
https://bugs.freedesktop.org/show_bug.cgi?id=56218
- glib/poppler-annot.cc | 2 +-
+ glib/poppler-annot.cc | 2 +-
glib/poppler-form-field.cc | 10 +++++-----
- glib/poppler-layer.cc | 12 ++++++------
+ glib/poppler-layer.cc | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
commit 60dfc1a3471f824f40b0bef5b97a7b04bd78e72b
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Oct 20 10:17:01 2012 +0200
+Date: Sat Oct 20 10:17:01 2012 +0200
glib: Exclude poppler-input-stream.h from introspection files
@@ -13043,7 +15072,7 @@
commit c84753e12029fcc6113f80dedc9a943ce1deb214
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Oct 20 09:40:09 2012 +0200
+Date: Sat Oct 20 09:40:09 2012 +0200
glib: Include Gio-2.0 for introspection
@@ -13068,7 +15097,7 @@
commit 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Oct 20 09:30:05 2012 +0200
+Date: Sat Oct 20 09:30:05 2012 +0200
glib: Show all suppressed introspection scanner warnings
@@ -13079,7 +15108,7 @@
commit 16812829a7d4816717731318b1aa1bc3ab5e3935
Author: Jason Crain <jason at aquaticape.us>
-Date: Mon Aug 27 22:42:11 2012 -0500
+Date: Mon Aug 27 22:42:11 2012 -0500
Update fill and stroke color in CairoOutputDev::startPage
@@ -13088,13 +15117,13 @@
https://bugs.freedesktop.org/show_bug.cgi?id=54526
- glib/poppler-page.cc | 2 +-
+ glib/poppler-page.cc | 2 +-
poppler/CairoOutputDev.cc | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
commit c93702bea0718d67660f2255344dcf9b0f502d57
Author: José Aliste <jaliste at src.gnome.org>
-Date: Tue Nov 20 11:25:41 2012 +0100
+Date: Tue Nov 20 11:25:41 2012 +0100
glib: Ensure text is only computed on first render
@@ -13108,7 +15137,7 @@
commit b0297110c455eb18096268b59d6095d428380de5
Author: Jason Crain <jason at aquaticape.us>
-Date: Wed Nov 21 14:15:59 2012 -0600
+Date: Wed Nov 21 14:15:59 2012 -0600
glib: check if words end with spaces
@@ -13125,26 +15154,26 @@
commit b1dacd1e6ab00eb1976491eb2b45c76671011b38
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 23 00:12:24 2012 +0100
+Date: Fri Nov 23 00:12:24 2012 +0100
0.21.2
- CMakeLists.txt | 4 ++--
- NEWS | 13 +++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 13 +++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 19 insertions(+), 6 deletions(-)
commit 2d2a3af7159945c3fd54f22878e2eb09e019bbc6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 23 00:06:39 2012 +0100
+Date: Fri Nov 23 00:06:39 2012 +0100
Update copyrights
- goo/TiffWriter.cc | 1 +
- goo/TiffWriter.h | 1 +
+ goo/TiffWriter.cc | 1 +
+ goo/TiffWriter.h | 1 +
poppler/CairoRescaleBox.cc | 1 +
poppler/CairoRescaleBox.h | 38 ++++++++++++++++++++++++++++++++++++++
splash/SplashBitmap.cc | 2 +-
@@ -13152,7 +15181,7 @@
commit e0d0177562ff546b59b3bc8eb68a08dc740d6f6c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Nov 14 22:44:20 2012 +1030
+Date: Wed Nov 14 22:44:20 2012 +1030
cairo: Fix crash in CairoImageOutputDev with setSoftMaskFromImageMask
@@ -13165,7 +15194,7 @@
commit f050717f986a6c2833876d14083363a540fa849a
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Nov 14 23:50:10 2012 +1030
+Date: Wed Nov 14 23:50:10 2012 +1030
cairo: fix soft mask when image resolution != smask resolution
@@ -13179,7 +15208,7 @@
commit 87fd5275514b63f13622b79a8fcfe443ccc4f45d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Nov 11 18:53:12 2012 +1030
+Date: Sun Nov 11 18:53:12 2012 +1030
cairo: make drawImage work with images > 32767 in width/height
@@ -13207,7 +15236,7 @@
commit d1c509c48fc422649d0c2c2d70af5e13e3472874
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 17 10:04:55 2012 +1030
+Date: Sat Nov 17 10:04:55 2012 +1030
pdftocairo: add tiff support
@@ -13220,21 +15249,21 @@
commit 6d3fe48cf30b298b4436462904d781ea441c1f3d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 17 10:03:22 2012 +1030
+Date: Sat Nov 17 10:03:22 2012 +1030
tiff: remove splash dependency and add RGBA support
Bug 57006
- goo/TiffWriter.cc | 47
+ goo/TiffWriter.cc | 47
+++++++++++++++++++----------------------------
- goo/TiffWriter.h | 13 ++++++++++---
+ goo/TiffWriter.h | 13 ++++++++++---
splash/SplashBitmap.cc | 23 +++++++++++++++++++++--
3 files changed, 50 insertions(+), 33 deletions(-)
commit 15f600a5702788f7e5b91cd67bc2438179921939
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 15 22:17:27 2012 +0100
+Date: Thu Nov 15 22:17:27 2012 +0100
Don't do a check for sanity that then we don't use
@@ -13245,19 +15274,19 @@
commit c7e3c2d7087e4fc36564ba7bd55e27e100e0a5e5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 14 14:58:45 2012 +0100
+Date: Wed Nov 14 14:58:45 2012 +0100
Remove unused code
- fofi/FoFiTrueType.cc | 658
+ fofi/FoFiTrueType.cc | 658
-------------------------------------------
- fofi/FoFiTrueType.h | 11 +-
+ fofi/FoFiTrueType.h | 11 +-
splash/SplashFTFontEngine.cc | 42 +--
3 files changed, 2 insertions(+), 709 deletions(-)
commit 06951f529e6514a0c26d6d821ab5fab0920a7cf3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:37:22 2012 +0100
+Date: Tue Nov 13 23:37:22 2012 +0100
Simplify >= 0 ifs for unsigned
@@ -13266,7 +15295,7 @@
commit fa813adc3f7b7ee3cc819f1e0cb85e01f13c2c01
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:37:01 2012 +0100
+Date: Tue Nov 13 23:37:01 2012 +0100
Remove < 0 ifs for unsigned
@@ -13275,17 +15304,17 @@
commit 1969bcd693289eba1138fcaa74a684cb3ff2aefc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:36:40 2012 +0100
+Date: Tue Nov 13 23:36:40 2012 +0100
Remove unused members
poppler/Gfx.cc | 3 ---
- poppler/Gfx.h | 5 +----
+ poppler/Gfx.h | 5 +----
2 files changed, 1 insertion(+), 7 deletions(-)
commit 3a6e5ed5e28b6113696a7ae60b0b85d7097eb731
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:35:53 2012 +0100
+Date: Tue Nov 13 23:35:53 2012 +0100
Remove >= 0 checks for unsigned variables
@@ -13295,7 +15324,7 @@
commit 0dcc2d711810dd64aa8d8721ce53a6b72e12c47c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:35:10 2012 +0100
+Date: Tue Nov 13 23:35:10 2012 +0100
Remove unused var
@@ -13304,7 +15333,7 @@
commit 1fc97862d30bf723135310bfc8701e6788bfd284
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 23:24:19 2012 +0100
+Date: Tue Nov 13 23:24:19 2012 +0100
size can't be smaller than 0 because it's a size_t
@@ -13313,7 +15342,7 @@
commit bb801a9b889bc0e62cf8b853c26cc6636b4af9a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 13 22:51:17 2012 +0100
+Date: Tue Nov 13 22:51:17 2012 +0100
Removed unused var
@@ -13322,7 +15351,7 @@
commit fd651fb49653e89d96b032e010a7d8e891536bb0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 12 00:42:49 2012 +0100
+Date: Mon Nov 12 00:42:49 2012 +0100
Parse the args (so that -v says vesion only)
@@ -13333,33 +15362,33 @@
commit 7e2e9567f51d01be9a88848e1141c6d4f0f768a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 9 20:02:25 2012 +0100
+Date: Fri Nov 9 20:02:25 2012 +0100
0.21.1
- CMakeLists.txt | 4 ++--
- NEWS | 14 ++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 14 ++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
8 files changed, 22 insertions(+), 8 deletions(-)
commit 98b7cfd289abb53a745a88d6ec99e95df477fc8f
Merge: 40efa72 d254174
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 9 00:38:19 2012 +0100
+Date: Fri Nov 9 00:38:19 2012 +0100
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
- poppler/Form.cc
+ poppler/Form.cc
commit 40efa72987ebf62cbf2c761c10a209e2e6be612e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Nov 4 11:20:29 2012 +0100
+Date: Sun Nov 4 11:20:29 2012 +0100
Replaced forward declaration of enum CryptAlgorithm with a proper
#include
@@ -13386,7 +15415,7 @@
commit 0f7c17d7f92d4cdfbd8816dba666aeed924d8bc2
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Nov 2 10:54:17 2012 +0100
+Date: Fri Nov 2 10:54:17 2012 +0100
qt4: Export information about the document form type
@@ -13393,16 +15422,16 @@
This patch also wraps the code that checks the form type and moves it
from pdfinfo to the Catalog class.
- poppler/Catalog.cc | 19 +++++++++++++++++++
- poppler/Catalog.h | 9 +++++++++
+ poppler/Catalog.cc | 19 +++++++++++++++++++
+ poppler/Catalog.h | 9 +++++++++
qt4/src/poppler-document.cc | 16 ++++++++++++++++
- qt4/src/poppler-qt4.h | 18 ++++++++++++++++++
- utils/pdfinfo.cc | 19 ++++++++++---------
+ qt4/src/poppler-qt4.h | 18 ++++++++++++++++++
+ utils/pdfinfo.cc | 19 ++++++++++---------
5 files changed, 72 insertions(+), 9 deletions(-)
commit f3f5a166bcd16b6f2cb516cceb2b3f41b6faf0b4
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Nov 2 01:53:24 2012 +0100
+Date: Fri Nov 2 01:53:24 2012 +0100
Editable FormFieldChoice: Clear editedChoice when one of the
predefined option is selected
@@ -13415,7 +15444,7 @@
commit ddcd5dc0ceecc02f0d4f740cb6c9b557dfd33c74
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Nov 1 00:58:51 2012 +0100
+Date: Thu Nov 1 00:58:51 2012 +0100
FormFieldChoice ctor: Added support to recognize user strings as
/V value
@@ -13428,7 +15457,7 @@
commit 1302bf52bba7e6446f01358240a4b5b583e196a9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 19:56:37 2012 +0100
+Date: Wed Oct 31 19:56:37 2012 +0100
FormFieldChoice ctor: Stop scanning if /V is a string and the
corresponding option has been identified
@@ -13438,7 +15467,7 @@
commit d254174e08146115ad04ac1f1bf82bb26e56c684
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 16:57:56 2012 +0100
+Date: Wed Oct 31 16:57:56 2012 +0100
FormFieldChoice::updateSelection: Fixed wrong loop condition
@@ -13447,7 +15476,7 @@
commit 401de95f5ab42ab0f5d8fd92d76b5def50f84a2b
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 19:43:51 2012 +0100
+Date: Wed Oct 31 19:43:51 2012 +0100
FormFieldChoice ctor: Look for selected options in /I instead of /V
if /I is available
@@ -13462,7 +15491,7 @@
commit cfd3a46a857100cb634e18192b762e7342165348
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 15:44:32 2012 +0100
+Date: Wed Oct 31 15:44:32 2012 +0100
FormFieldChoice: Handle /V values containing the export value instead
of the option name
@@ -13480,7 +15509,7 @@
commit ce99940bcac0447f32ee2ad46efb09af93989c12
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Oct 13 00:13:33 2012 +0200
+Date: Sat Oct 13 00:13:33 2012 +0200
FormFieldChoice::updateSelection: Write /I too
@@ -13494,7 +15523,7 @@
commit 102553e2104a1b223c8ac924aa6702829adebbdb
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 16:57:56 2012 +0100
+Date: Wed Oct 31 16:57:56 2012 +0100
FormFieldChoice::updateSelection: Fixed wrong loop condition
@@ -13503,7 +15532,7 @@
commit d7522ea1d2e66beef64f705e8986142f15fcf613
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Oct 31 15:26:37 2012 +0100
+Date: Wed Oct 31 15:26:37 2012 +0100
FormFieldChoice ctor: Don't convert "human-readable" option names
to unicode
@@ -13528,18 +15557,18 @@
commit da08ebeee241198907378c6461721fddb5106875
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Oct 28 12:13:22 2012 +1030
+Date: Sun Oct 28 12:13:22 2012 +1030
Don't allow invalid unicode to be passed to backends
poppler/CharCodeToUnicode.cc | 11 +++++++++--
- poppler/UTF.cc | 11 +++++++++++
- poppler/UTF.h | 4 ++++
+ poppler/UTF.cc | 11 +++++++++++
+ poppler/UTF.h | 4 ++++
3 files changed, 24 insertions(+), 2 deletions(-)
commit 9f92feda5eff9b2542c64349f33ae3cf250e7f4b
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Nov 2 23:05:55 2012 +0100
+Date: Fri Nov 2 23:05:55 2012 +0100
Memory leak in CharCodeToUnicode
@@ -13550,7 +15579,7 @@
commit ef11b4f0e642dff0be02bf3327eb56bf0b364847
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Nov 2 22:44:27 2012 +0100
+Date: Fri Nov 2 22:44:27 2012 +0100
Implement overprint in qt interface
@@ -13560,15 +15589,15 @@
qt4/src/poppler-page.cc | 38 +++++++++++++-----------
qt4/src/poppler-private.h | 69
++++++++++++++++++++++++++++----------------
- qt4/src/poppler-qt4.h | 11 ++++++-
+ qt4/src/poppler-qt4.h | 11 ++++++-
splash/SplashBitmap.cc | 70
+++++++++++++++++++++++++++++++++++++++++++++
- splash/SplashBitmap.h | 5 +++-
+ splash/SplashBitmap.h | 5 +++-
6 files changed, 169 insertions(+), 47 deletions(-)
commit ae8fc0cbfc6123189e17b3cf1286e0540f181646
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Oct 30 21:22:04 2012 +1030
+Date: Tue Oct 30 21:22:04 2012 +1030
cairo: support parameterized Gouraud shading
@@ -13579,7 +15608,7 @@
commit 3be4e835d765f2f060e2a2e07dd23905c3212cdd
Author: Pino Toscano <pino at kde.org>
-Date: Wed Oct 24 18:37:06 2012 +0200
+Date: Wed Oct 24 18:37:06 2012 +0200
dos2unix
@@ -13590,13 +15619,13 @@
commit 77a980472e76b568346a49057b0217111a14a4cd
Merge: 74d6217 46fb365
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 23 00:23:53 2012 +0200
+Date: Tue Oct 23 00:23:53 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 46fb3653c7ae44c34d12d799df8f70d649eaa995
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 23 00:22:55 2012 +0200
+Date: Tue Oct 23 00:22:55 2012 +0200
Fix the or-ing of flags
@@ -13605,7 +15634,7 @@
commit 74d6217ba164fdfe263b4edac8047b60506e39a6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 21 17:48:57 2012 +0200
+Date: Sun Oct 21 17:48:57 2012 +0200
regstest: Add print_test_result_ln() and use it for failed test
results
@@ -13618,7 +15647,7 @@
commit 4e9b8d2cca44241a501bb8095b3980d17fcda6c5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 21 17:48:22 2012 +0200
+Date: Sun Oct 21 17:48:22 2012 +0200
regtest: Do not rewrite lines in verbose mode
@@ -13627,7 +15656,7 @@
commit 2a25264afe3c59931f6a3638e2d6c6c2e0e5dfba
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 19 17:22:56 2012 +0200
+Date: Fri Oct 19 17:22:56 2012 +0200
make static
@@ -13638,7 +15667,7 @@
commit bc4a54c0a4430216c9aeaf2c3bddbaeef5a004e4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 19 17:22:13 2012 +0200
+Date: Fri Oct 19 17:22:13 2012 +0200
Compile with clang
@@ -13648,13 +15677,13 @@
commit f38194cfae8f8690bc3767cbdcf140519564366c
Merge: 80cf434 5312984
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 19 00:02:02 2012 +0200
+Date: Fri Oct 19 00:02:02 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 5312984b40355b067001704e9c688ea0a72b1159
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 19 00:00:53 2012 +0200
+Date: Fri Oct 19 00:00:53 2012 +0200
Define the numbers a bit better so gcc in i386 understands them better
@@ -13663,7 +15692,7 @@
commit 80cf43472e5913f5f64bf73cb4a8ac5a53063f2e
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Wed Oct 17 08:27:13 2012 +0200
+Date: Wed Oct 17 08:27:13 2012 +0200
added accessors for FormWidgetChoice::editChoice property to qt4
frontend
@@ -13675,22 +15704,22 @@
commit 0b3ff2dc4e1ba37dd66f5913b10a9d69e31c40ce
Merge: fb5cb0f 528b64b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 17 00:28:40 2012 +0200
+Date: Wed Oct 17 00:28:40 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
- CMakeLists.txt
- NEWS
- configure.ac
- cpp/Doxyfile
- poppler/Annot.cc
- poppler/Form.h
- qt4/src/Doxyfile
+ CMakeLists.txt
+ NEWS
+ configure.ac
+ cpp/Doxyfile
+ poppler/Annot.cc
+ poppler/Form.h
+ qt4/src/Doxyfile
commit 528b64bb077ed37c0d8fc7ae2ef3dc2c0dbb26ca
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Sep 4 23:10:17 2012 +0200
+Date: Tue Sep 4 23:10:17 2012 +0200
Free entries in the xref form a linked list: terminate it properly
when writing the XRef
@@ -13704,7 +15733,7 @@
commit fb5cb0fbdfcd06556661b38b0c598922fff2d759
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Oct 4 11:20:42 2012 +0200
+Date: Thu Oct 4 11:20:42 2012 +0200
Create the 24x24 rectangle for text annotation icons from the top-left
corner instead of bottom-left
@@ -13714,7 +15743,7 @@
commit 35c07fe40d7b18e19f6ef0f5615f9f5ac8195cf7
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 15:24:02 2012 +0200
+Date: Tue Oct 9 15:24:02 2012 +0200
AnnotWidget: Avoid repeatedly deleting and creating xref entries
for appearance streams
@@ -13737,7 +15766,7 @@
commit 2127a977bbe9985aa58561116508ad4f08430a2c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 12:49:26 2012 +0200
+Date: Tue Oct 9 12:49:26 2012 +0200
Generate and write the appearance stream in
AnnotWidget::updateWidgetApperance()
@@ -13751,7 +15780,7 @@
commit 0446e2cc1073f4579a90284d28bc5872e46e0536
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 10:47:40 2012 +0200
+Date: Tue Oct 9 10:47:40 2012 +0200
Killed FormField::isModified() in favor of a new AnnotWidget callback
@@ -13768,7 +15797,7 @@
commit 68d732ab2d55ae15e194ececfffa753977fae84c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 15:24:02 2012 +0200
+Date: Tue Oct 9 15:24:02 2012 +0200
AnnotWidget: Avoid repeatedly deleting and creating xref entries
for appearance streams
@@ -13791,7 +15820,7 @@
commit e2993cc9551dc7521528904646f941c9747473f7
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 12:49:26 2012 +0200
+Date: Tue Oct 9 12:49:26 2012 +0200
Generate and write the appearance stream in
AnnotWidget::updateWidgetApperance()
@@ -13805,7 +15834,7 @@
commit df924493922e8c0f7b1e19c2847d33b28a098913
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Oct 9 10:47:40 2012 +0200
+Date: Tue Oct 9 10:47:40 2012 +0200
Killed FormField::isModified() in favor of a new AnnotWidget callback
@@ -13822,7 +15851,7 @@
commit 0a5bda01ace9f8576d687c5a28feb5cf09b48a92
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 14 23:05:27 2012 +0200
+Date: Sun Oct 14 23:05:27 2012 +0200
New/old header for cmake buildsystem
@@ -13831,21 +15860,21 @@
commit 6d46f0b477143eb0df09f718e96dd2ff2a7dd61b
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Sep 22 20:50:07 2012 +0200
+Date: Sat Sep 22 20:50:07 2012 +0200
Split our UTF.h into xpdf based UTF8.h and a poppler specific UTF.h
poppler/GlobalParams.cc | 2 +-
- poppler/Makefile.am | 1 +
- poppler/UTF.h | 79
+ poppler/Makefile.am | 1 +
+ poppler/UTF.h | 79
+---------------------------------------------
- poppler/UTF8.h | 84
+ poppler/UTF8.h | 84
+++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 87 insertions(+), 79 deletions(-)
commit 03cbba935c90ce9a6d9ad44f7cda4901c2f81f2e
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Sep 22 19:58:40 2012 +0200
+Date: Sat Sep 22 19:58:40 2012 +0200
Do not use mapUTF8() directly in CairoOutputDev
@@ -13854,7 +15883,7 @@
commit f219bdbcadcb0334d595bbd9afd01f00c37d1978
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Oct 14 22:59:55 2012 +0200
+Date: Sun Oct 14 22:59:55 2012 +0200
Make sure array index is >= 0
@@ -13868,7 +15897,7 @@
commit 65a2555607e03c94d77ae9ebdb34ab6d4f8844b6
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Oct 12 23:54:57 2012 +0200
+Date: Fri Oct 12 23:54:57 2012 +0200
FormFieldChoice ctor: Fixed wrong index variable
@@ -13879,7 +15908,7 @@
commit 710bb3383306a9aa6debbfe1364029ee12a15576
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Oct 12 23:54:57 2012 +0200
+Date: Fri Oct 12 23:54:57 2012 +0200
FormFieldChoice ctor: Fixed wrong index variable
@@ -13890,27 +15919,27 @@
commit ce18c9b3d5251305eb76d294fdf4b4de9382b3a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 10 19:54:57 2012 +0200
+Date: Wed Oct 10 19:54:57 2012 +0200
0.20.5
CMakeLists.txt | 2 +-
- NEWS | 15 +++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 15 +++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
5 files changed, 19 insertions(+), 4 deletions(-)
commit b112602334a5de84ae30c2e90d9bc6d4609f7f96
Author: Tobias Koening <tobias.koenig at kdab.com>
-Date: Mon Oct 8 22:32:34 2012 +0200
+Date: Mon Oct 8 22:32:34 2012 +0200
[qt4] make LinkRendition properties available
Bug #55378
- poppler/Link.cc | 34 +++++++++++++++++++-----
- poppler/Link.h | 17 +++++++++---
+ poppler/Link.cc | 34 +++++++++++++++++++-----
+ poppler/Link.h | 17 +++++++++---
qt4/src/poppler-annotation.cc | 2 --
qt4/src/poppler-annotation.h | 1 +
qt4/src/poppler-link.cc | 60
@@ -13922,7 +15951,7 @@
commit 6d6bd660dbb652f2f3e87c81c55a87d1fc11ec70
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Oct 6 10:26:55 2012 +0200
+Date: Sat Oct 6 10:26:55 2012 +0200
glib: chain up finalize to the parent class
@@ -13931,12 +15960,12 @@
https://bugs.freedesktop.org/show_bug.cgi?id=55521
glib/poppler-document.cc | 6 ++++++
- glib/poppler-page.cc | 2 ++
+ glib/poppler-page.cc | 2 ++
2 files changed, 8 insertions(+)
commit ac3875a9e7f2f4f31881d3d1b3081f2adaef65a1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Oct 6 10:26:55 2012 +0200
+Date: Sat Oct 6 10:26:55 2012 +0200
glib: chain up finalize to the parent class
@@ -13945,19 +15974,19 @@
https://bugs.freedesktop.org/show_bug.cgi?id=55521
glib/poppler-document.cc | 6 ++++++
- glib/poppler-page.cc | 2 ++
+ glib/poppler-page.cc | 2 ++
2 files changed, 8 insertions(+)
commit 042d332c1c9f628e3bfaabf3da9e04436a8677b5
Merge: 7b9a9f8 e044814
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 4 00:53:01 2012 +0200
+Date: Thu Oct 4 00:53:01 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit e044814c0657a6c5b44939a01dcbdc8d83396d43
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Oct 4 00:51:04 2012 +0200
+Date: Thu Oct 4 00:51:04 2012 +0200
Do not render invalid outlines
@@ -13969,13 +15998,13 @@
commit 7b9a9f809d07303fe5adff9210731613df8b2adf
Merge: 3b0962c 9451b7a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 3 01:24:04 2012 +0200
+Date: Wed Oct 3 01:24:04 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 9451b7a61b6dcaa6c4a76f3efda82f1ebd408654
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 3 01:21:45 2012 +0200
+Date: Wed Oct 3 01:21:45 2012 +0200
Fix crash when parsing some unknown colorspaces
@@ -13987,13 +16016,13 @@
commit 3b0962cd14b15ce92c0916f58ed5ba00aebe80b0
Merge: a9d7ea2 42908e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 2 19:51:48 2012 +0200
+Date: Tue Oct 2 19:51:48 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 42908e6e72d95cec0f70b202c4b1c23f7e47c2a4
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Tue Oct 2 19:31:04 2012 +0200
+Date: Tue Oct 2 19:31:04 2012 +0200
support automake-1.12 in autogen.sh
@@ -14005,16 +16034,16 @@
commit a9d7ea2eb549acbf6ca7e2a299ffed46ff3d8758
Merge: 397d7b4 9bb6845
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 15:31:29 2012 +0200
+Date: Wed Sep 26 15:31:29 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
- poppler/XRef.cc
+ poppler/XRef.cc
commit 9bb68456de41d24db7acf61204bc3f4e36e98505
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 15:13:47 2012 +0200
+Date: Wed Sep 26 15:13:47 2012 +0200
Initilize rootNum
@@ -14026,13 +16055,13 @@
commit 397d7b4597ad4bc8ab41fd7a99078473a3c93eb0
Merge: 6013d49 2c0f70a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 15:00:04 2012 +0200
+Date: Wed Sep 26 15:00:04 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 2c0f70afff03798165c2b609e115dc7e9c034c57
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 26 14:58:05 2012 +0200
+Date: Wed Sep 26 14:58:05 2012 +0200
More crash fixes for broken documents
@@ -14042,7 +16071,7 @@
commit 78558d24692c68212da35a88deb68069c5a06d81
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 26 14:32:05 2012 +0200
+Date: Wed Sep 26 14:32:05 2012 +0200
Fix more crashes in broken files
@@ -14054,7 +16083,7 @@
commit e8822c0f3a46195ec7c6e55c556dd0c5716be742
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 14:21:46 2012 +0200
+Date: Wed Sep 26 14:21:46 2012 +0200
Add unlikelys
@@ -14063,7 +16092,7 @@
commit 31874f2e065b0d68f726ef404de98f42489c80c7
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 26 14:17:00 2012 +0200
+Date: Wed Sep 26 14:17:00 2012 +0200
Less crashes in broken files
@@ -14076,7 +16105,7 @@
commit 81b1d9207840ec1e66eef469b29a36a8556b7265
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 13:38:54 2012 +0200
+Date: Wed Sep 26 13:38:54 2012 +0200
Add some unlikelys
@@ -14085,7 +16114,7 @@
commit 9ae1184e3049cabc695c8645a10eaef748b6e641
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 26 12:32:26 2012 +0200
+Date: Wed Sep 26 12:32:26 2012 +0200
More fixes against broken files
@@ -14099,7 +16128,7 @@
commit 1d72c14b3877ae730ac0aa92f36923269e8a2004
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 26 11:48:14 2012 +0200
+Date: Wed Sep 26 11:48:14 2012 +0200
Fix crash in 158.pdf.asan.d.451
@@ -14109,13 +16138,13 @@
commit 6013d49d852c58c4c23f787fd7dd64731c0918f1
Merge: b97c28c 671df5d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 26 00:53:28 2012 +0200
+Date: Wed Sep 26 00:53:28 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 671df5dad0732882ceb9e053c3f947dfe0597f3d
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Wed Sep 26 00:52:32 2012 +0200
+Date: Wed Sep 26 00:52:32 2012 +0200
Don't close the stream if it's not a stream
@@ -14125,16 +16154,16 @@
commit b97c28c42a18d1c2a8fabea52c092d948811d582
Merge: 32bb874 f8c116f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 25 23:22:23 2012 +0200
+Date: Tue Sep 25 23:22:23 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
- qt4/src/Makefile.am
+ qt4/src/Makefile.am
commit f8c116f1e0fbf3516ce228fbb34c33d6b618bed0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 25 23:07:55 2012 +0200
+Date: Tue Sep 25 23:07:55 2012 +0200
Add LCMS_FLAGS
@@ -14146,7 +16175,7 @@
commit 32bb87419c360a3b14c717c0f385198b70a1b2e7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 23 18:15:13 2012 +0200
+Date: Sun Sep 23 18:15:13 2012 +0200
regtest: Reduce the noise of the default output when running tests
@@ -14155,20 +16184,20 @@
about the failing pages. Previous verbose output is available passing
--verbose command line output.
- regtest/Printer.py | 96
+ regtest/Printer.py | 96
+++++++++++++++++++++++++++++++++++++
- regtest/TestReferences.py | 8 ++--
- regtest/TestRun.py | 35 +++++++-------
- regtest/backends/__init__.py | 13 +++--
- regtest/commands/create-refs.py | 3 +-
- regtest/commands/find-regression.py | 5 +-
- regtest/commands/run-tests.py | 3 +-
- regtest/main.py | 3 ++
+ regtest/TestReferences.py | 8 ++--
+ regtest/TestRun.py | 35 +++++++-------
+ regtest/backends/__init__.py | 13 +++--
+ regtest/commands/create-refs.py | 3 +-
+ regtest/commands/find-regression.py | 5 +-
+ regtest/commands/run-tests.py | 3 +-
+ regtest/main.py | 3 ++
8 files changed, 137 insertions(+), 29 deletions(-)
commit ca6afce24aac2ef9d88e215177b11760f7468a6d
Author: Lu Wang <coolwanglu at gmail.com>
-Date: Fri Sep 21 21:33:05 2012 +0200
+Date: Fri Sep 21 21:33:05 2012 +0200
Do not call drawing routines if we don't need non text
@@ -14179,44 +16208,44 @@
commit 70030b91ce2280f23c3e5adf863f1d336c9c5faf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 21 08:18:29 2012 +0200
+Date: Fri Sep 21 08:18:29 2012 +0200
Increase sonames
- CMakeLists.txt | 2 +-
- glib/CMakeLists.txt | 2 +-
- glib/Makefile.am | 2 +-
- poppler/Makefile.am | 2 +-
+ 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 +-
+ qt4/src/Makefile.am | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
commit 2323e38f1a54cb58ec31b4cf15e6c2b1db742ca5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 21 08:12:52 2012 +0200
+Date: Fri Sep 21 08:12:52 2012 +0200
Version increase
CMakeLists.txt | 4 ++--
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
commit 11a9a620276d199701be5811eb63687ace85ace1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 21 08:10:15 2012 +0200
+Date: Fri Sep 21 08:10:15 2012 +0200
Drop the s from AdditionalActionsType
qt4/src/poppler-annotation-private.h | 5 +++--
- qt4/src/poppler-annotation.cc | 6 +++---
- qt4/src/poppler-annotation.h | 6 +++---
+ qt4/src/poppler-annotation.cc | 6 +++---
+ qt4/src/poppler-annotation.h | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
commit 028e0e7ddf8c30d311feb937385ef21acd34a52d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 20 18:13:08 2012 +0200
+Date: Thu Sep 20 18:13:08 2012 +0200
0.21.0 news
@@ -14225,19 +16254,19 @@
commit 2f2d053352e04e434d83dd93dfdbd08ab5b23f2e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 20 18:12:57 2012 +0200
+Date: Thu Sep 20 18:12:57 2012 +0200
Update copyrights
- poppler/Annot.cc | 3 ++-
- poppler/Annot.h | 1 +
+ poppler/Annot.cc | 3 ++-
+ poppler/Annot.h | 1 +
poppler/TextOutputDev.cc | 2 +-
- poppler/UTF.h | 1 +
+ poppler/UTF.h | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
commit 9fad83913791478b63fc76360f1a13e955cdcf4a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 17 23:15:10 2012 +0200
+Date: Mon Sep 17 23:15:10 2012 +0200
Move to init
@@ -14246,7 +16275,7 @@
commit c470a3929c0a02b8a543fcada22138ab1fc18176
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Sep 17 23:13:48 2012 +0200
+Date: Mon Sep 17 23:13:48 2012 +0200
Support encrypted pdf files in pdfseparate
@@ -14258,7 +16287,7 @@
commit 9b613dcf3c77bc2801d1125dc9bbc5a4dd04e16b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 17 23:12:43 2012 +0200
+Date: Mon Sep 17 23:12:43 2012 +0200
Compile
@@ -14267,7 +16296,7 @@
commit fb5c383bd5be7090fc78380b4bb3244c3316c0cd
Author: William Bader <williambader at hotmail.com>
-Date: Mon Sep 17 00:03:49 2012 +0200
+Date: Mon Sep 17 00:03:49 2012 +0200
Make pdftoppm -tiff -overprint work
@@ -14279,15 +16308,15 @@
commit 3794916572a0531b10ee57c9f189497489b90bc8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 17:53:47 2012 +0200
+Date: Sun Sep 16 17:53:47 2012 +0200
Fix the siblings field correctly
Fixes KDE bug #302334
- poppler/Form.cc | 45
+ poppler/Form.cc | 45
+++++++++++++++++++++++++--------------------
- poppler/Form.h | 24 +++++++++++++-----------
+ poppler/Form.h | 24 +++++++++++++-----------
qt4/src/poppler-form.cc | 13 ++++++++++---
3 files changed, 48 insertions(+), 34 deletions(-)
@@ -14294,13 +16323,13 @@
commit e8b6d2ac3a874dd5de166b52625fa628004ea5fe
Merge: 7cb4072 9f51baa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 14:08:34 2012 +0200
+Date: Sun Sep 16 14:08:34 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 9f51baaf7a86680f2195ecdb978f1eb59a8aa734
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 14:07:45 2012 +0200
+Date: Sun Sep 16 14:07:45 2012 +0200
Rework the #ifdef so that i don't get a gcc warning
@@ -14309,7 +16338,7 @@
commit b63049f97629a93ec346033e0ec56fc11f34c4fe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 14:05:01 2012 +0200
+Date: Sun Sep 16 14:05:01 2012 +0200
Forgot to add the new test to autotools
@@ -14319,13 +16348,13 @@
commit 7cb40726f9e80ee2b2f27ca6ce151b46c6ec091d
Merge: e980d11 c6d7084
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 13:50:19 2012 +0200
+Date: Sun Sep 16 13:50:19 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit c6d7084d316e94b5b042b086f5440f8543ff5947
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 16 13:48:51 2012 +0200
+Date: Sun Sep 16 13:48:51 2012 +0200
Fix parsing of numbers
@@ -14332,7 +16361,7 @@
-2147483648 is an integer
-2147483649 is a real
- poppler/Lexer.cc | 14 +++++-
+ poppler/Lexer.cc | 14 +++++-
qt4/tests/CMakeLists.txt | 1 +
qt4/tests/check_lexer.cpp | 118
++++++++++++++++++++++++++++++++++++++++++++++
@@ -14341,13 +16370,13 @@
commit e980d11061c19f13c75f93506e07903b4d1c7f97
Merge: b72c02d 3658088
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 15 20:41:50 2012 +0200
+Date: Sat Sep 15 20:41:50 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 365808837080574080b4f8da079124c172fb2123
Author: Alexey Pavlov <alexpux at gmail.com>
-Date: Sat Sep 15 20:38:10 2012 +0200
+Date: Sat Sep 15 20:38:10 2012 +0200
Fix build using mingw64 with winpthread
@@ -14359,13 +16388,13 @@
Bug #54851
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
- poppler/strtok_r.cpp | 16 +++++++++++++++-
+ poppler/poppler-config.h.in | 2 +-
+ poppler/strtok_r.cpp | 16 +++++++++++++++-
3 files changed, 17 insertions(+), 3 deletions(-)
commit b72c02d1a2ec8180b3ddfd2bb2b462c0189377d5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 13 19:56:45 2012 +0200
+Date: Thu Sep 13 19:56:45 2012 +0200
Remove the fonts loop
@@ -14376,7 +16405,7 @@
commit cb93d51ccb6b1f6938946ae5d38fb9817005fd7a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 12 00:12:07 2012 +0200
+Date: Wed Sep 12 00:12:07 2012 +0200
Make gcc happy
@@ -14389,7 +16418,7 @@
commit 3349a8dd7e0469cc5b5aaa8dd929c6078183ef86
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Sep 12 00:04:45 2012 +0200
+Date: Wed Sep 12 00:04:45 2012 +0200
Splash: Avoid bogus memory error for tilingPattern
@@ -14407,7 +16436,7 @@
commit 2e77799a1668f949612f551425d0665c59ff1d93
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Sep 11 23:33:25 2012 +0200
+Date: Tue Sep 11 23:33:25 2012 +0200
Splash: Implement DeviceN support
@@ -14494,20 +16523,20 @@
application
and the cirumstances if it wants to use this new mode or not.
- poppler/Function.cc | 14 +
- poppler/Function.h | 4 +
- poppler/GfxState.cc | 341 +++++++++++++++++-
- poppler/GfxState.h | 41 ++-
+ poppler/Function.cc | 14 +
+ poppler/Function.h | 4 +
+ poppler/GfxState.cc | 341 +++++++++++++++++-
+ poppler/GfxState.h | 41 ++-
poppler/SplashOutputDev.cc | 173 ++++++++-
- poppler/SplashOutputDev.h | 3 +
- splash/Splash.cc | 255 ++++++++++++-
- splash/Splash.h | 7 +-
+ poppler/SplashOutputDev.h | 3 +
+ splash/Splash.cc | 255 ++++++++++++-
+ splash/Splash.h | 7 +-
splash/SplashBitmap.cc | 115 +++++-
- splash/SplashBitmap.h | 8 +-
- splash/SplashState.cc | 30 +-
- splash/SplashState.h | 3 +
- splash/SplashTypes.h | 30 +-
- utils/pdftoppm.cc | 878
+ splash/SplashBitmap.h | 8 +-
+ splash/SplashState.cc | 30 +-
+ splash/SplashState.h | 3 +
+ splash/SplashTypes.h | 30 +-
+ utils/pdftoppm.cc | 878
++++++++++++++++++++++-----------------------
14 files changed, 1415 insertions(+), 487 deletions(-)
@@ -14514,19 +16543,19 @@
commit cb2ed646c4ef4161e443ee0a377d1111b3be28ff
Merge: f3a1b76 3ce4d21
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 11 19:29:19 2012 +0200
+Date: Tue Sep 11 19:29:19 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit f3a1b765bd6a58d327a80feedbe30e1c0792076e
Author: Jason Crain <jason at aquaticape.us>
-Date: Tue Sep 11 19:28:28 2012 +0200
+Date: Tue Sep 11 19:28:28 2012 +0200
Allow multiple fonts in a TextWord
Bug #6923
- glib/poppler-page.cc | 49 ++++++-----
+ glib/poppler-page.cc | 49 ++++++-----
poppler/TextOutputDev.cc | 224
++++++++++++++++++++++-------------------------
poppler/TextOutputDev.h | 21 ++---
@@ -14534,7 +16563,7 @@
commit 3ce4d213480471dfd8e307c24c99bf3c6308cd6f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 11 19:24:58 2012 +0200
+Date: Tue Sep 11 19:24:58 2012 +0200
Do not use isnan as it is C99
@@ -14543,7 +16572,7 @@
commit 4d7a64a23fd4b4b5ee0d47ead8677f374aaaf6c9
Author: Jason Crain <jason at aquaticape.us>
-Date: Tue Sep 11 19:24:11 2012 +0200
+Date: Tue Sep 11 19:24:11 2012 +0200
Check for NaN in TextPage::addChar
@@ -14552,7 +16581,7 @@
commit e79b70ec13ab4d2cce8f245d150fa9329b436658
Author: Tobias Koenig <tokoe at kdab.com>
-Date: Tue Sep 11 16:39:55 2012 +0200
+Date: Tue Sep 11 16:39:55 2012 +0200
Make 'additional actions' available in Annotation API of Qt4 frontend
@@ -14559,14 +16588,14 @@
Bug #53589
qt4/src/poppler-annotation-private.h | 3 ++
- qt4/src/poppler-annotation.cc | 99
+ qt4/src/poppler-annotation.cc | 99
+++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-annotation.h | 68 ++++++++++++++++++++++++-
+ qt4/src/poppler-annotation.h | 68 ++++++++++++++++++++++++-
3 files changed, 168 insertions(+), 2 deletions(-)
commit 5f338ea7d01cabc0f8c50690d0bc262d85baa0ed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 10 19:47:20 2012 +0200
+Date: Mon Sep 10 19:47:20 2012 +0200
Fix typo
@@ -14575,28 +16604,28 @@
commit 5fd691dc58aac817bca81c87c4820afcf53989d1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 10 19:29:01 2012 +0200
+Date: Mon Sep 10 19:29:01 2012 +0200
0.20.40.20.40.20.40.20.4
- CMakeLists.txt | 4 ++--
- NEWS | 13 +++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 13 +++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 19 insertions(+), 6 deletions(-)
commit 1b40cdd9f863cd3868db85b5ccfa77a8350c56d6
Merge: 6c40a55 b3e86db
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 10 18:49:52 2012 +0200
+Date: Mon Sep 10 18:49:52 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit b3e86dbdba82956f125e37f69176072e2d0127f2
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Sun Sep 9 23:35:45 2012 +0200
+Date: Sun Sep 9 23:35:45 2012 +0200
Try to find another rootNum if actual rootNum doesn't point to a dict
@@ -14609,23 +16638,23 @@
commit 6c40a553a3c8825931c59797059392fd110531cc
Merge: 17fc1bf 558a7d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 23:27:40 2012 +0200
+Date: Sun Sep 9 23:27:40 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit 558a7d9b046bbbe185dea263b48a3cb2664378fc
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 23:25:47 2012 +0200
+Date: Sun Sep 9 23:25:47 2012 +0200
Fix invalid memory access in solves 1066.pdf.asan.38.75
- splash/SplashClip.cc | 23 +++++++++++++++++++++++
+ splash/SplashClip.cc | 23 +++++++++++++++++++++++
splash/SplashXPathScanner.cc | 3 +++
2 files changed, 26 insertions(+)
commit d0df8e54512f584ca2b3edbae1c19e167948e5c3
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 23:21:38 2012 +0200
+Date: Sun Sep 9 23:21:38 2012 +0200
Fix invalid memory access in 1106.pdf.asan.30.120.patch
@@ -14634,7 +16663,7 @@
commit 86b89864396a1dcf027e5793e6ac75411977bcf9
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Sun Sep 9 23:08:49 2012 +0200
+Date: Sun Sep 9 23:08:49 2012 +0200
Fix crash in 1255.pdf.SIGSEGV.56f.285
@@ -14643,7 +16672,7 @@
commit 96931732f343d2bbda9af9488b485da031866c3b
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 22:47:57 2012 +0200
+Date: Sun Sep 9 22:47:57 2012 +0200
Fix invalid memory access in 61.pdf.asan.13.95
@@ -14653,7 +16682,7 @@
commit 26917d69c4da6a110db02b120133c36579fbb17c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 22:23:36 2012 +0200
+Date: Sun Sep 9 22:23:36 2012 +0200
Add unlikely
@@ -14662,7 +16691,7 @@
commit e6a3c797c01aa343f640f2e6f45de5bf379aa8ad
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 22:22:59 2012 +0200
+Date: Sun Sep 9 22:22:59 2012 +0200
Fix wrong memory access in 68.pdf.asan.7.1030
@@ -14671,7 +16700,7 @@
commit 48fe18cf277cd2a4e665c74b3a594482f762f4b6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 22:09:44 2012 +0200
+Date: Sun Sep 9 22:09:44 2012 +0200
Fix memory leak
@@ -14680,17 +16709,17 @@
commit b87aafc0cdb36c3555053f2684c45f1a9d7b2f94
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 21:42:48 2012 +0200
+Date: Sun Sep 9 21:42:48 2012 +0200
Add unlikelys to the ifs
- poppler/DCTStream.cc | 4 ++--
+ poppler/DCTStream.cc | 4 ++--
poppler/JBIG2Stream.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit a019eef2f8ca53addd7ccab7f9c47657f4e52286
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 21:41:09 2012 +0200
+Date: Sun Sep 9 21:41:09 2012 +0200
Fix crash in 1162.pdf.SIGSEGV.28e.182
@@ -14699,7 +16728,7 @@
commit ad7c6ac88f2315c9ce003308d1b4988592d4434b
Author: William Bader <williambader at hotmail.com>
-Date: Sun Sep 9 21:31:58 2012 +0200
+Date: Sun Sep 9 21:31:58 2012 +0200
Fix crash in 1028.pdf.SIGSEGV.ae6.33
@@ -14708,7 +16737,7 @@
commit b861af714daee4125e54b250dddf82106f5a8ce8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 21:15:06 2012 +0200
+Date: Sun Sep 9 21:15:06 2012 +0200
Fix memory leak
@@ -14718,13 +16747,13 @@
commit 17fc1bfa8013cafe3b348f0cc07ef08bf9c7dd9a
Merge: e0118be a4f5911
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 12:52:49 2012 +0200
+Date: Sun Sep 9 12:52:49 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
commit a4f59113574a8d7460c6ce5000cb09d20fe52b74
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 9 12:49:43 2012 +0200
+Date: Sun Sep 9 12:49:43 2012 +0200
Fix memory leak
@@ -14733,7 +16762,7 @@
commit 28240046f8fe37ca96f9a80cb1ea3a59af9c66f3
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Sep 9 12:48:26 2012 +0200
+Date: Sun Sep 9 12:48:26 2012 +0200
Fix crash in 589.pdf.SIGSEGV.8b1.929
@@ -14743,19 +16772,19 @@
commit e0118be3ba38bd00fa2a9c20c5b4cd82e820ba0b
Merge: 2c41430 ccd3db5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 8 18:15:43 2012 +0200
+Date: Sat Sep 8 18:15:43 2012 +0200
Merge remote-tracking branch 'origin/poppler-0.20'
Conflicts:
- glib/poppler-document.cc
- poppler/PDFDoc.cc
- poppler/XRef.h
- utils/HtmlFonts.cc
+ glib/poppler-document.cc
+ poppler/PDFDoc.cc
+ poppler/XRef.h
+ utils/HtmlFonts.cc
commit ccd3db5a7723ddb692f6dc85ed9d0f5e3dde189f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 8 18:10:14 2012 +0200
+Date: Sat Sep 8 18:10:14 2012 +0200
Only complain when the malloc really failed
@@ -14764,25 +16793,25 @@
commit 2c41430732f517d4d57e914a315ba315a2545541
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 6 22:12:38 2012 +0200
+Date: Thu Sep 6 22:12:38 2012 +0200
Add missing licenses
- goo/grandom.cc | 2 ++
- goo/grandom.h | 2 ++
+ goo/grandom.cc | 2 ++
+ goo/grandom.h | 2 ++
splash/SplashScreen.cc | 1 +
- utils/pdfinfo.cc | 1 +
+ utils/pdfinfo.cc | 1 +
4 files changed, 6 insertions(+)
commit be88963a5955ac033e7a7d224bdcc4049085a9dc
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Aug 9 13:18:22 2012 +0200
+Date: Thu Aug 9 13:18:22 2012 +0200
pdf-fullrewrite: Added support for encrypted documents, checks on
output documents, incremental update mode
- test/CMakeLists.txt | 1 +
- test/Makefile.am | 3 +-
+ test/CMakeLists.txt | 1 +
+ test/Makefile.am | 3 +-
test/pdf-fullrewrite.cc | 354
++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 342 insertions(+), 16 deletions(-)
@@ -14789,7 +16818,7 @@
commit 381be58e9e0d0e323acbd975a2334eca6d9018fd
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 13:00:06 2012 +0200
+Date: Sat Aug 4 13:00:06 2012 +0200
pdfinfo: Show info about the encryption algorithm
@@ -14798,7 +16827,7 @@
commit 273e8c896e95b548093159dc8bb14d48ce447053
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Aug 15 18:09:02 2012 +0200
+Date: Wed Aug 15 18:09:02 2012 +0200
Mark object streams as DontRewrite
@@ -14811,7 +16840,7 @@
commit 59db8deaa7b1907831b526de3011dc22d0ffb333
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Aug 9 20:08:44 2012 +0200
+Date: Thu Aug 9 20:08:44 2012 +0200
Mark XRef streams as Unencrypted and DontRewrite
@@ -14833,7 +16862,7 @@
commit 116722cc74e267ac44dd5a70924557cdf6f25d02
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 12:47:22 2012 +0200
+Date: Sat Aug 4 12:47:22 2012 +0200
Encrypt strWeird streams before writing them in PDFDoc::writeObject
@@ -14844,7 +16873,7 @@
commit 695889c1330ca5b37338b8363dbf233fce936bc6
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 12:24:25 2012 +0200
+Date: Sat Aug 4 12:24:25 2012 +0200
Encrypt strings before writing them in PDFDoc::writeString
@@ -14853,7 +16882,7 @@
commit 4ab8e7be536db40db8a1a4af50dad3ba59c49f14
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 02:06:11 2012 +0200
+Date: Sat Aug 4 02:06:11 2012 +0200
Propagate encryption parameters to PDFDoc's write functions
@@ -14867,7 +16896,7 @@
commit 9e43f9a8bcbee9060309b9679dbcc6b501a79cfb
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Aug 1 16:14:22 2012 +0200
+Date: Wed Aug 1 16:14:22 2012 +0200
Separated header and footer write commands from the rest of
PDFDoc::writeObject
@@ -14884,7 +16913,7 @@
commit 4d19a002801531b07f11382daaf9880e4691a10e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 01:36:06 2012 +0200
+Date: Sat Aug 4 01:36:06 2012 +0200
Do not change encrypted documents' ID, not even in case of full
rewrite
@@ -14897,7 +16926,7 @@
commit 800b2e37d3c4c73147bf9e11d9f38afe2183ab9d
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Aug 1 14:07:10 2012 +0200
+Date: Wed Aug 1 14:07:10 2012 +0200
Initial support for saving encrypted documents
@@ -14914,7 +16943,7 @@
commit 6647153d47b1d67d2a4d6b90dce2184ab6c7dda6
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Aug 9 12:26:53 2012 +0200
+Date: Thu Aug 9 12:26:53 2012 +0200
Added field XRefEntry::flags, and turned XRefEntry::updated into
a flag
@@ -14928,7 +16957,7 @@
commit a284c6c6623587abb7da7e4c171c42e006ea477b
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 01:57:41 2012 +0200
+Date: Sat Aug 4 01:57:41 2012 +0200
Be able to output overflown integers back
@@ -14940,7 +16969,7 @@
commit 53baea19658a27f15c7ed870a24be82b8219ddfe
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Aug 4 01:32:08 2012 +0200
+Date: Sat Aug 4 01:32:08 2012 +0200
FlateStream::unfilteredReset should call str->unfilteredReset()
@@ -14952,7 +16981,7 @@
commit 4e5fee4e9156480173f05e7b3d0bdf604127d481
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Aug 6 02:08:27 2012 +0200
+Date: Mon Aug 6 02:08:27 2012 +0200
Initialize AES encryption with random CBC IV data
@@ -14961,7 +16990,7 @@
commit 1b008f273359b8df6b64ffa94bb2828e42ffa63e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Aug 6 02:08:40 2012 +0200
+Date: Mon Aug 6 02:08:40 2012 +0200
Replaced srand/rand calls in SplashScreen with grandom calls
@@ -14970,7 +16999,7 @@
commit faff947d8106048b19ba74dd483b90b8cebb16c7
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Aug 6 02:06:47 2012 +0200
+Date: Mon Aug 6 02:06:47 2012 +0200
Added goo/grandom.[cc|h] with POSIX implementation
@@ -14977,16 +17006,16 @@
CMakeLists.txt | 2 ++
ConfigureChecks.cmake | 1 +
config.h.cmake | 3 +++
- configure.ac | 1 +
+ configure.ac | 1 +
goo/Makefile.am | 6 +++--
goo/grandom.cc | 68
+++++++++++++++++++++++++++++++++++++++++++++++++++
- goo/grandom.h | 32 ++++++++++++++++++++++++
+ goo/grandom.h | 32 ++++++++++++++++++++++++
7 files changed, 111 insertions(+), 2 deletions(-)
commit af8d05d1ab89b74e307e90aaf19c750528f5f561
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Aug 3 12:46:06 2012 +0200
+Date: Fri Aug 3 12:46:06 2012 +0200
Added encryption support in Decrypt.cc/.h
@@ -14997,7 +17026,7 @@
commit ba6ff179aa78a42a384166ace2df80101cfbe7b9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Aug 2 18:56:29 2012 +0200
+Date: Thu Aug 2 18:56:29 2012 +0200
Refactoring of Decrypt.cc/.h in preparation for encryption support
@@ -15008,20 +17037,20 @@
commit cd1ab1e34032d5620140bd0b6b6ec4b74f89ae19
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 22:36:14 2012 +0200
+Date: Thu Aug 30 22:36:14 2012 +0200
Update Adrian's copyrights
- goo/GooString.cc | 1 +
+ goo/GooString.cc | 1 +
poppler/CharCodeToUnicode.cc | 1 +
poppler/TextOutputDev.cc | 2 +-
- poppler/UTF.cc | 23 +++++++++++++++++++++++
+ poppler/UTF.cc | 23 +++++++++++++++++++++++
utils/HtmlOutputDev.cc | 2 +-
5 files changed, 27 insertions(+), 2 deletions(-)
commit ce8a579f339507da3fd7802e1531fbf6849c0c98
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 28 22:16:34 2012 +0930
+Date: Tue Aug 28 22:16:34 2012 +0930
Move text to unicode conversion into a separate function
@@ -15028,16 +17057,16 @@
This also ensures UTF-16 ActualText strings are converted to UCS-4
before calling addChar.
- goo/GooString.cc | 2 +-
+ goo/GooString.cc | 2 +-
poppler/TextOutputDev.cc | 32 ++++----------------------------
- poppler/UTF.cc | 34 ++++++++++++++++++++++++++++++++++
- poppler/UTF.h | 8 ++++++++
- utils/pdfinfo.cc | 37 ++++++-------------------------------
+ poppler/UTF.cc | 34 ++++++++++++++++++++++++++++++++++
+ poppler/UTF.h | 8 ++++++++
+ utils/pdfinfo.cc | 37 ++++++-------------------------------
5 files changed, 53 insertions(+), 60 deletions(-)
commit cac13e782cf4413703cfd1fa23e76133dfbe5ef9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 28 21:48:16 2012 +0930
+Date: Tue Aug 28 21:48:16 2012 +0930
text: increase the tolerance for overlapping glyphs
@@ -15055,28 +17084,27 @@
commit 6f6386219449e70c2c3bc3559fdde3df4a57a809
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Mar 8 20:52:28 2012 +1030
+Date: Thu Mar 8 20:52:28 2012 +1030
Convert UTF-16 to UCS-4 when reading toUnicode cmap
to ensure only UCS-4 values are used with the "Unicode" type.
- CMakeLists.txt | 3 +-
- poppler/CairoOutputDev.cc | 2 +-
- poppler/CharCodeToUnicode.cc | 12 ++---
- poppler/GlobalParams.cc | 2 +-
- poppler/Makefile.am | 3 +-
- poppler/TextOutputDev.cc | 19 +-------
- poppler/UTF.cc | 47 ++++++++++++++++++++
- poppler/UTF.h | 103
- +++++++++++++++++++++++++++++++++++++++++++
- poppler/UTF8.h | 84 -----------------------------------
- utils/HtmlOutputDev.cc | 14 +-----
- 10 files changed, 165 insertions(+), 124 deletions(-)
+ CMakeLists.txt | 3 ++-
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CharCodeToUnicode.cc | 12 ++++++-----
+ poppler/GlobalParams.cc | 2 +-
+ poppler/Makefile.am | 3 ++-
+ poppler/TextOutputDev.cc | 19 +-----------------
+ poppler/UTF.cc | 47
+ ++++++++++++++++++++++++++++++++++++++++++++
+ poppler/{UTF8.h => UTF.h} | 23 ++++++++++++++++++++--
+ utils/HtmlOutputDev.cc | 14 +------------
+ 9 files changed, 83 insertions(+), 42 deletions(-)
commit b3b0f5abe4fdcc39d884670e4a998d39324659f6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:57:51 2012 +0200
+Date: Thu Aug 30 00:57:51 2012 +0200
qt4: unbreak spacing
@@ -15085,7 +17113,7 @@
commit 6356c0bbae47db291a3585d31c7727bc3f8d97a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:57:51 2012 +0200
+Date: Thu Aug 30 00:57:51 2012 +0200
qt4: unbreak spacing
@@ -15094,7 +17122,7 @@
commit 46948868dee6d4e68b658c68d7df482590e34da3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:43:45 2012 +0200
+Date: Thu Aug 30 00:43:45 2012 +0200
Accept FileSpec as Dict too and not only as Ref
@@ -15105,17 +17133,17 @@
commit debc8fb497bc22c0f9f34d785852981a87475c30
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:35:40 2012 +0200
+Date: Thu Aug 30 00:35:40 2012 +0200
Take into account the embFile returned by the core may be NULL
qt4/src/poppler-embeddedfile-private.h | 4 +++-
- qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++-------
+ qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
commit 3ca67a59fc15782abb1e479eb2b8916de5b1b6ed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:34:06 2012 +0200
+Date: Thu Aug 30 00:34:06 2012 +0200
Return NULL EmbFile if the FileSpec is not ok
@@ -15126,7 +17154,7 @@
commit 9264b375eec19e639c524b677f770ad750b1cb43
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:43:45 2012 +0200
+Date: Thu Aug 30 00:43:45 2012 +0200
Accept FileSpec as Dict too and not only as Ref
@@ -15137,17 +17165,17 @@
commit 01528eaedc77d5559f6dc4229b66f1a819678fb7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:35:40 2012 +0200
+Date: Thu Aug 30 00:35:40 2012 +0200
Take into account the embFile returned by the core may be NULL
qt4/src/poppler-embeddedfile-private.h | 4 +++-
- qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++-------
+ qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
commit c1fba45be106dc30a5136efe41493b1cf6d2a1b5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 00:34:06 2012 +0200
+Date: Thu Aug 30 00:34:06 2012 +0200
Return NULL EmbFile if the FileSpec is not ok
@@ -15158,7 +17186,7 @@
commit 1881486e9817304d0817ce24b177c1bc79587138
Author: Tobias Koenig <tobias.koenig at kdab.com>
-Date: Fri Aug 24 19:12:20 2012 +0200
+Date: Fri Aug 24 19:12:20 2012 +0200
annots: Unify parsing of additional actions entries
@@ -15171,7 +17199,7 @@
commit 686ec0cc92e25f74eaa9e09a328724cbdf939bca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 15 20:02:05 2012 +0200
+Date: Wed Aug 15 20:02:05 2012 +0200
Remove declared but not implemented function
@@ -15180,7 +17208,7 @@
commit 0b3259c1d5679cb8d59d770e5fbe7e1bc141a025
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 15 20:02:05 2012 +0200
+Date: Wed Aug 15 20:02:05 2012 +0200
Remove declared but not implemented function
@@ -15189,7 +17217,7 @@
commit 5fd2a35227c22dbddedfb397eff0e0a09c3d1b03
Author: Pino Toscano <pino at kde.org>
-Date: Wed Aug 15 19:51:43 2012 +0200
+Date: Wed Aug 15 19:51:43 2012 +0200
poppler-config.h: remove WITH_FONTCONFIGURATION_* macros
@@ -15196,12 +17224,12 @@
no public header uses them anymore, so need to expose them
poppler/poppler-config.h.cmake | 10 ----------
- poppler/poppler-config.h.in | 10 ----------
+ poppler/poppler-config.h.in | 10 ----------
2 files changed, 20 deletions(-)
commit edd0ea4847c143adb1d15a57b42b0ce2b2c80b0e
Author: Pino Toscano <pino at kde.org>
-Date: Wed Aug 15 19:31:50 2012 +0200
+Date: Wed Aug 15 19:31:50 2012 +0200
ignore more qt4 tests
@@ -15210,7 +17238,7 @@
commit 2df57857000c5adbee6b029ff7a79acc707786a0
Author: Pino Toscano <pino at kde.org>
-Date: Wed Aug 15 18:59:15 2012 +0200
+Date: Wed Aug 15 18:59:15 2012 +0200
build: remove extra fontconfig CFLAGS and LIBS
@@ -15230,7 +17258,7 @@
commit 3e802949264d9310df057daff891a3fccb2eb8d3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 15 00:02:23 2012 +0200
+Date: Wed Aug 15 00:02:23 2012 +0200
PSOutputDev: Always write HiResBoundingBox
@@ -15242,7 +17270,7 @@
commit e83568065f77ba722b147b3b10faed1ff66f22dc
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 11 01:38:08 2012 +0200
+Date: Sat Aug 11 01:38:08 2012 +0200
remove extra execution permissions
@@ -15253,7 +17281,7 @@
commit 9a5a19ee2f9cd536c3527b30c0256ca9dce3638c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 11 01:38:08 2012 +0200
+Date: Sat Aug 11 01:38:08 2012 +0200
remove extra execution permissions
@@ -15262,21 +17290,21 @@
commit 1b2903c104012fdd3c982d57898910945dff9a15
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 11 00:05:10 2012 +0200
+Date: Sat Aug 11 00:05:10 2012 +0200
0.20.3
- CMakeLists.txt | 4 ++--
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 22 insertions(+), 6 deletions(-)
commit 40e7b744d32152ab4c6201b8bda7fb7caf6bfd4e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 5 15:07:16 2012 +0200
+Date: Sun Aug 5 15:07:16 2012 +0200
If NULL, NULL fails as password try EMPTY, EMPTY before failing
@@ -15288,7 +17316,7 @@
commit a53e0641365608f832b455404f1ee584d278e0c4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 5 15:07:16 2012 +0200
+Date: Sun Aug 5 15:07:16 2012 +0200
If NULL, NULL fails as password try EMPTY, EMPTY before failing
@@ -15300,7 +17328,7 @@
commit 3ca2bc0d3abdf92741b7921ea402c9de09e531f6
Author: Markus Trippelsdorf <markus at trippelsdorf.de>
-Date: Fri Aug 3 00:48:12 2012 +0200
+Date: Fri Aug 3 00:48:12 2012 +0200
Fix segfault when scaleImage returns NULL
@@ -15311,7 +17339,7 @@
commit 31fe12c63f0133d124e2115aba607857aaff0978
Author: Markus Trippelsdorf <markus at trippelsdorf.de>
-Date: Fri Aug 3 00:48:12 2012 +0200
+Date: Fri Aug 3 00:48:12 2012 +0200
Fix segfault when scaleImage returns NULL
@@ -15322,7 +17350,7 @@
commit d3c339017857cd762d8419260e33e1cc4e197743
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Aug 2 00:22:19 2012 +0200
+Date: Thu Aug 2 00:22:19 2012 +0200
PSOutputDev: Fix Bitmaps in level2sep or level3sep
@@ -15333,7 +17361,7 @@
commit 768cf5877f48f8cee80fe96e2ee52f42f230dfdf
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Aug 2 00:22:19 2012 +0200
+Date: Thu Aug 2 00:22:19 2012 +0200
PSOutputDev: Fix Bitmaps in level2sep or level3sep
@@ -15344,29 +17372,29 @@
commit d0e55aa49484263882345fa648e1e907d2b172f2
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Aug 1 22:56:49 2012 +0200
+Date: Wed Aug 1 22:56:49 2012 +0200
Splash: Blend mode enhancements for CMYK
poppler/SplashOutputDev.cc | 76
++++++++++++++++++++++++++++++++--------------
- splash/Splash.cc | 22 --------------
+ splash/Splash.cc | 22 --------------
2 files changed, 54 insertions(+), 44 deletions(-)
commit 315447843a368556a8536bc30e579c9bf338682e
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Aug 1 22:56:49 2012 +0200
+Date: Wed Aug 1 22:56:49 2012 +0200
Splash: Blend mode enhancements for CMYK
poppler/SplashOutputDev.cc | 76
++++++++++++++++++++++++++++++++--------------
- splash/Splash.cc | 22 --------------
+ splash/Splash.cc | 22 --------------
2 files changed, 54 insertions(+), 44 deletions(-)
commit 78c6a5615013d26b8a2babb13b3c4f7d6a1d70a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 31 23:32:19 2012 +0200
+Date: Tue Jul 31 23:32:19 2012 +0200
Replace c++ style includes with c style ones
@@ -15378,7 +17406,7 @@
commit c0c88b3707fc7337e814ae4252d80002641a19ee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 31 23:32:19 2012 +0200
+Date: Tue Jul 31 23:32:19 2012 +0200
Replace c++ style includes with c style ones
@@ -15390,7 +17418,7 @@
commit dcbc923bd3592a81876f84005fbaddcea18641cc
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jul 22 18:40:46 2012 +0200
+Date: Sun Jul 22 18:40:46 2012 +0200
Make sure xScale and yScale are always initialized
@@ -15401,7 +17429,7 @@
commit 36481939e3064de920e49d9d1742a85473a50963
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jul 22 18:40:46 2012 +0200
+Date: Sun Jul 22 18:40:46 2012 +0200
Make sure xScale and yScale are always initialized
@@ -15412,7 +17440,7 @@
commit ef7c2418e12d3e6a79f1d89a0051b005fadbc344
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Jul 21 00:01:49 2012 +0200
+Date: Sat Jul 21 00:01:49 2012 +0200
Fix conversion to ps when having multiple strips
@@ -15423,7 +17451,7 @@
commit 6b567565b7b9d591fbd7441592096960a303bd39
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Jul 21 00:01:49 2012 +0200
+Date: Sat Jul 21 00:01:49 2012 +0200
Fix conversion to ps when having multiple strips
@@ -15434,7 +17462,7 @@
commit 349b21acc249c130fb053bc4a0c75019f75bd35b
Author: Torsten Kasch <tk at CeBiTec.Uni-Bielefeld.DE>
-Date: Thu Jul 19 00:18:14 2012 +0200
+Date: Thu Jul 19 00:18:14 2012 +0200
Unify poppler-config.h includes in core "installed" headers
@@ -15445,8 +17473,8 @@
goo/JpegWriter.h | 2 +-
goo/PNGWriter.h | 2 +-
goo/TiffWriter.h | 2 +-
- goo/gfile.h | 2 +-
- goo/gmem.h | 2 +-
+ goo/gfile.h | 2 +-
+ goo/gmem.h | 2 +-
splash/SplashFTFont.h | 2 +-
splash/SplashMath.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
@@ -15453,7 +17481,7 @@
commit 34327b2c201392f96e3449941411b7ad4b3e8bcb
Author: Torsten Kasch <tk at CeBiTec.Uni-Bielefeld.DE>
-Date: Thu Jul 19 00:18:14 2012 +0200
+Date: Thu Jul 19 00:18:14 2012 +0200
Unify poppler-config.h includes in core "installed" headers
@@ -15464,8 +17492,8 @@
goo/JpegWriter.h | 2 +-
goo/PNGWriter.h | 2 +-
goo/TiffWriter.h | 2 +-
- goo/gfile.h | 2 +-
- goo/gmem.h | 2 +-
+ goo/gfile.h | 2 +-
+ goo/gmem.h | 2 +-
splash/SplashFTFont.h | 2 +-
splash/SplashMath.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
@@ -15472,7 +17500,7 @@
commit 8fe700217ab6ce786a8272f2c338e3dab434c56e
Author: Torsten Kasch <tk at CeBiTec.Uni-Bielefeld.DE>
-Date: Thu Jul 19 00:06:45 2012 +0200
+Date: Thu Jul 19 00:06:45 2012 +0200
autoconf: Do not assume the shell is bash compatible
@@ -15483,7 +17511,7 @@
commit 15c6ae699f083ea6c9716c1098ae9833a56eeb3e
Author: Torsten Kasch <tk at CeBiTec.Uni-Bielefeld.DE>
-Date: Thu Jul 19 00:06:45 2012 +0200
+Date: Thu Jul 19 00:06:45 2012 +0200
autoconf: Do not assume the shell is bash compatible
@@ -15494,7 +17522,7 @@
commit f5311da76ec7cd7c1e6cdfc4e18df6dd56e8398b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 19 00:01:49 2012 +0200
+Date: Thu Jul 19 00:01:49 2012 +0200
pdfseparate: Return 0 on success
@@ -15503,7 +17531,7 @@
commit dc8833a36b514c13cfd6b1fd4665d2fddd71f357
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 19 00:01:49 2012 +0200
+Date: Thu Jul 19 00:01:49 2012 +0200
pdfseparate: Return 0 on success
@@ -15512,7 +17540,7 @@
commit 51f22ca0badfc41c19cba66cabd63184244f81c7
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Jul 16 23:32:23 2012 +0200
+Date: Mon Jul 16 23:32:23 2012 +0200
PSOutputDev: Fix DeviceN images with alternate Lab colorspace in
level 3 PostScript
@@ -15521,12 +17549,12 @@
poppler/PSOutputDev.cc | 54
+++++++++++++++++++++++++++++++++++++++++++-------
- poppler/PSOutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
2 files changed, 48 insertions(+), 8 deletions(-)
commit 31ef967033407de91109ff46db9c60cb8748bc55
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Jul 16 23:32:23 2012 +0200
+Date: Mon Jul 16 23:32:23 2012 +0200
PSOutputDev: Fix DeviceN images with alternate Lab colorspace in
level 3 PostScript
@@ -15535,12 +17563,12 @@
poppler/PSOutputDev.cc | 54
+++++++++++++++++++++++++++++++++++++++++++-------
- poppler/PSOutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
2 files changed, 48 insertions(+), 8 deletions(-)
commit f9f5238d32615f93d07afa3aa7384a8b30737203
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Jul 13 00:56:48 2012 +0200
+Date: Fri Jul 13 00:56:48 2012 +0200
Fix Splash::arbitraryTransformImage causes bogus memory allocation
size
@@ -15548,14 +17576,14 @@
Bug #49523
poppler/SplashOutputDev.cc | 2 +-
- splash/Splash.cc | 79
+ splash/Splash.cc | 79
++++++++++++++++++++++++++--------------------
- splash/Splash.h | 4 +--
+ splash/Splash.h | 4 +--
3 files changed, 48 insertions(+), 37 deletions(-)
commit 950d5f3dec4bff5d3c523d55689d7b70215dc110
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Jul 13 00:56:48 2012 +0200
+Date: Fri Jul 13 00:56:48 2012 +0200
Fix Splash::arbitraryTransformImage causes bogus memory allocation
size
@@ -15563,27 +17591,27 @@
Bug #49523
poppler/SplashOutputDev.cc | 2 +-
- splash/Splash.cc | 79
+ splash/Splash.cc | 79
++++++++++++++++++++++++++--------------------
- splash/Splash.h | 4 +--
+ splash/Splash.h | 4 +--
3 files changed, 48 insertions(+), 37 deletions(-)
commit e09be3bc6ba1290fd31bde0c3d19c4ffcbadbf00
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 10 23:06:53 2012 +0200
+Date: Tue Jul 10 23:06:53 2012 +0200
0.20.2
CMakeLists.txt | 2 +-
- NEWS | 11 +++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 11 +++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
5 files changed, 15 insertions(+), 4 deletions(-)
commit e15fe0e1e6accf779caeb1179a8d62161c0aa650
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Jul 5 17:44:02 2012 +0200
+Date: Thu Jul 5 17:44:02 2012 +0200
Fix handling of DeviceN images in level 3 PostScript
@@ -15594,7 +17622,7 @@
commit 31837201cf5b3db735c89ef4969105b7a6ab465d
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Jul 5 17:44:02 2012 +0200
+Date: Thu Jul 5 17:44:02 2012 +0200
Fix handling of DeviceN images in level 3 PostScript
@@ -15605,28 +17633,28 @@
commit 262203bd86403e43034fbfbbeef5a5894a62ecb2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 30 14:36:28 2012 +0200
+Date: Sat Jun 30 14:36:28 2012 +0200
[qt4] Refactor part of ::search() functions
qt4/src/poppler-page-private.h | 7 ++++-
- qt4/src/poppler-page.cc | 61
+ qt4/src/poppler-page.cc | 61
+++++++++++++++++++-----------------------
2 files changed, 34 insertions(+), 34 deletions(-)
commit bd71f80c409dbb47231088c3c6661946ccde6e67
Author: Adam Reichold <adamreichold at myopera.com>
-Date: Thu Jun 28 17:42:17 2012 +0200
+Date: Thu Jun 28 17:42:17 2012 +0200
[qt4] add whole-page search method to Poppler::Page
qt4/src/poppler-page.cc | 39 +++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 14 ++++++++++++++
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
2 files changed, 53 insertions(+)
commit 46ebe7dc84b14ce8dda7b3b1da516b9d99ac3344
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 29 01:56:55 2012 +0200
+Date: Fri Jun 29 01:56:55 2012 +0200
PSOutputDev: Correct %%DocumentCustomColors
@@ -15637,7 +17665,7 @@
commit 02c4e6bf4cc0f5535946fe31815081a40b1de986
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 29 01:56:55 2012 +0200
+Date: Fri Jun 29 01:56:55 2012 +0200
PSOutputDev: Correct %%DocumentCustomColors
@@ -15648,7 +17676,7 @@
commit 2b8d95aeede56c75699bb83ca3b23ea199b81c2c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 28 00:18:07 2012 +0200
+Date: Thu Jun 28 00:18:07 2012 +0200
Add some security checks to JPXStream decoding
@@ -15660,7 +17688,7 @@
commit f7990386d268a444c297958e9c50ed27a0825a00
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 28 00:18:07 2012 +0200
+Date: Thu Jun 28 00:18:07 2012 +0200
Add some security checks to JPXStream decoding
@@ -15672,31 +17700,31 @@
commit c5c6eed1623506e1206e89cee0b7c887d815ba62
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 24 23:43:03 2012 +0200
+Date: Sun Jun 24 23:43:03 2012 +0200
Change SplashBitmap gmallocn to gmallocn_checkoverflow
Fixes abort in KDE bug #302372
- splash/Splash.cc | 37 +++++++++++++++++++++++--------------
+ splash/Splash.cc | 37 +++++++++++++++++++++++--------------
splash/SplashBitmap.cc | 18 +++++++++++-------
2 files changed, 34 insertions(+), 21 deletions(-)
commit f48eb669ae5c729c026554802e666e64399c0900
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 24 23:43:03 2012 +0200
+Date: Sun Jun 24 23:43:03 2012 +0200
Change SplashBitmap gmallocn to gmallocn_checkoverflow
Fixes abort in KDE bug #302372
- splash/Splash.cc | 37 +++++++++++++++++++++++--------------
+ splash/Splash.cc | 37 +++++++++++++++++++++++--------------
splash/SplashBitmap.cc | 18 +++++++++++-------
2 files changed, 34 insertions(+), 21 deletions(-)
commit c87738ee234aafc6eda5a263ad789205037020e1
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jun 24 20:20:38 2012 +0200
+Date: Sun Jun 24 20:20:38 2012 +0200
copy resources content defined in the pages dict
@@ -15707,7 +17735,7 @@
commit ff48a5d67a130211fbbb98aa0011bca0c1185114
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jun 24 20:20:38 2012 +0200
+Date: Sun Jun 24 20:20:38 2012 +0200
copy resources content defined in the pages dict
@@ -15718,7 +17746,7 @@
commit 6cdf879e389f05abba30b3fad8083b7fff23056e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Jun 24 11:48:04 2012 +0200
+Date: Sun Jun 24 11:48:04 2012 +0200
qt4: Do not hang on malformed /Annots objects
@@ -15733,7 +17761,7 @@
commit bd1dab39a857b852c09d21f64254ffc1f24c2df0
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Jun 24 11:48:04 2012 +0200
+Date: Sun Jun 24 11:48:04 2012 +0200
qt4: Do not hang on malformed /Annots objects
@@ -15748,7 +17776,7 @@
commit 31db47d077825045edd1a2d229e873a6f8e09fb1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jun 17 12:00:43 2012 +0200
+Date: Sun Jun 17 12:00:43 2012 +0200
Simplify AnnotAppearance::getAppearanceStream()
@@ -15763,17 +17791,17 @@
commit b15d02b92aca1348564e70d0245064bc27eefce8
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Fri May 18 01:47:55 2012 +0200
+Date: Fri May 18 01:47:55 2012 +0200
Add the possibility of using lcms1 even if lcms2 is installed
CMakeLists.txt | 20 +++++++++++++-------
- configure.ac | 31 +++++++++++++++----------------
+ configure.ac | 31 +++++++++++++++----------------
2 files changed, 28 insertions(+), 23 deletions(-)
commit 0cc2738737ed411159c8c8045eff5d1a4463ed16
Author: Mark Brand <mabrand at mabrand.nl>
-Date: Thu Jun 14 20:31:26 2012 +0200
+Date: Thu Jun 14 20:31:26 2012 +0200
fix typo to compile in Windows
@@ -15782,7 +17810,7 @@
commit 3575becd60585324bcefc0631b1bac47c1db3c5c
Author: Mark Brand <mabrand at mabrand.nl>
-Date: Thu Jun 14 20:31:26 2012 +0200
+Date: Thu Jun 14 20:31:26 2012 +0200
fix typo to compile in Windows
@@ -15791,7 +17819,7 @@
commit 2e1410ea62fe99e52c94f878d02181f0b59f1cd5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 11 15:17:59 2012 +0200
+Date: Mon Jun 11 15:17:59 2012 +0200
Add some security checks to JBIG2Stream decoding
@@ -15804,7 +17832,7 @@
commit 06618065c8a97a5bec125560546b98edfc1210f3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 11 15:17:59 2012 +0200
+Date: Mon Jun 11 15:17:59 2012 +0200
Add some security checks to JBIG2Stream decoding
@@ -15817,7 +17845,7 @@
commit 6a76d21661add4f84ee0859c4e7a4c23e7a63bc4
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 10 19:44:18 2012 +0200
+Date: Sun Jun 10 19:44:18 2012 +0200
Check value of first page in linearization table
@@ -15829,7 +17857,7 @@
commit e3fe88df3646a80945210ba426eb4681a98b55e9
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Jun 10 19:44:18 2012 +0200
+Date: Sun Jun 10 19:44:18 2012 +0200
Check value of first page in linearization table
@@ -15841,21 +17869,21 @@
commit 1240eee8c0d0d01113443e0fda87721775a76da9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 10 20:42:55 2012 +0200
+Date: Sun Jun 10 20:42:55 2012 +0200
0.20.1
- CMakeLists.txt | 4 ++--
- NEWS | 25 +++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 25 +++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 31 insertions(+), 6 deletions(-)
commit d483436517c5d9679fd6f4ec5544128ffcc2188e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 10 20:15:01 2012 +0200
+Date: Sun Jun 10 20:15:01 2012 +0200
Update copyrights
@@ -15864,7 +17892,7 @@
commit c783037619e2b4c101e8ecd7e61c94ee077b4be2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 10 20:15:01 2012 +0200
+Date: Sun Jun 10 20:15:01 2012 +0200
Update copyrights
@@ -15873,7 +17901,7 @@
commit d791101fbdebf7a3b3f333939f9bbff6bbecf45f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 10 19:09:17 2012 +0200
+Date: Sun Jun 10 19:09:17 2012 +0200
Do use NULL function
@@ -15885,7 +17913,7 @@
commit f3f9d8f28a97338da92c842d5668b0ef3495ef13
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 10 19:09:17 2012 +0200
+Date: Sun Jun 10 19:09:17 2012 +0200
Do use NULL function
@@ -15897,17 +17925,17 @@
commit 8b3fa65f293804dab7ae2fd069132d0d6f44bbb2
Author: Tobias Koenig <tobias.koenig at kdab.com>
-Date: Sun Jun 10 17:48:08 2012 +0200
+Date: Sun Jun 10 17:48:08 2012 +0200
[qt4] Add accessor methods for poster information
qt4/src/poppler-movie.cc | 15 +++++++++++++++
- qt4/src/poppler-qt4.h | 15 +++++++++++++++
+ qt4/src/poppler-qt4.h | 15 +++++++++++++++
2 files changed, 30 insertions(+)
commit e8aa8266254bfd2189d5b5105e3d76caa4cc6713
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jun 10 16:58:54 2012 +0200
+Date: Sun Jun 10 16:58:54 2012 +0200
use setoverprintmode only if rip knows it
@@ -15916,7 +17944,7 @@
commit 92ef16e3699da949c80716c3fd4b438fe79c134d
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jun 10 16:58:54 2012 +0200
+Date: Sun Jun 10 16:58:54 2012 +0200
use setoverprintmode only if rip knows it
@@ -15925,7 +17953,7 @@
commit 6e3503b5591b105fa92e6cc6568b8819f6acd625
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu May 24 23:17:27 2012 +0200
+Date: Thu May 24 23:17:27 2012 +0200
qt4: Keep page rotation into account when normalizing annotation
coords
@@ -15938,7 +17966,7 @@
commit 99aa734ae2d3ba51f840d4c8ef450488fb702a31
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu May 24 23:17:27 2012 +0200
+Date: Thu May 24 23:17:27 2012 +0200
qt4: Keep page rotation into account when normalizing annotation
coords
@@ -15951,7 +17979,7 @@
commit 4f2ac544f36aa11747c3e13ff69fc19bdd0136dc
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Jun 9 01:31:29 2012 +0200
+Date: Sat Jun 9 01:31:29 2012 +0200
Fix saving to xml
@@ -15962,7 +17990,7 @@
commit bde31ce7b223abc86d25e06f3d73668b792c70df
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Jun 9 01:31:29 2012 +0200
+Date: Sat Jun 9 01:31:29 2012 +0200
Fix saving to xml
@@ -15973,7 +18001,7 @@
commit 0df0aa439eed1d9838a80942e00af08e9acabb8d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 2 17:33:23 2012 +0200
+Date: Sat Jun 2 17:33:23 2012 +0200
glib-demo: Add find options to find demo
@@ -15983,7 +18011,7 @@
commit 52b3ede4bfd1e2288a0efca34da5d6239d3563e9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 2 16:25:06 2012 +0200
+Date: Sat Jun 2 16:25:06 2012 +0200
glib-demo: Show search matches in a document view
@@ -15993,7 +18021,7 @@
commit ed0c761c2190a3c1959a60ae9b7961f58a43c939
Author: Thomas Schenker <mail.thomas.schenker at googlemail.com>
-Date: Sat Jun 2 11:54:21 2012 +0200
+Date: Sat Jun 2 11:54:21 2012 +0200
glib: Add poppler_page_find_text_with_options
@@ -16002,16 +18030,16 @@
https://bugs.freedesktop.org/show_bug.cgi?id=2951
- glib/poppler-page.cc | 52
+ glib/poppler-page.cc | 52
+++++++++++++++++++++++++++----------
- glib/poppler-page.h | 3 +++
- glib/poppler.h | 18 +++++++++++++
- glib/reference/poppler-sections.txt | 2 ++
+ glib/poppler-page.h | 3 +++
+ glib/poppler.h | 18 +++++++++++++
+ glib/reference/poppler-sections.txt | 2 ++
4 files changed, 62 insertions(+), 13 deletions(-)
commit 126b55c9a44ccb0dba55e758843e9ee4aa43ee2b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 2 17:19:30 2012 +0200
+Date: Sat Jun 2 17:19:30 2012 +0200
Implement whole words only option to search text
@@ -16023,7 +18051,7 @@
commit 20210fbb6117649b20f6930031f24b8fc97b773d
Author: Luis Parravicini <lparravi at gmail.com>
-Date: Mon May 28 23:44:17 2012 +0200
+Date: Mon May 28 23:44:17 2012 +0200
pdftohtml: Add -fontfullname
@@ -16036,7 +18064,7 @@
commit 03f979a7e59c4eb5ecb8acc324c7faf700144589
Author: Gerald Schmidt <solahcin at gmail.com>
-Date: Sat May 26 17:46:59 2012 +0200
+Date: Sat May 26 17:46:59 2012 +0200
Make the output more xhtml compliant
@@ -16046,7 +18074,7 @@
commit ba6406222f828e354323223fc4bdb01c1726fb49
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon May 21 18:16:06 2012 +0200
+Date: Mon May 21 18:16:06 2012 +0200
Added Annot::removeReferencedObjects + Always set annotations'
page field
@@ -16059,17 +18087,17 @@
dictionary
contained /P
- poppler/Annot.cc | 40
+ poppler/Annot.cc | 40
++++++++++++++++++++++++++++++++++------
- poppler/Annot.h | 13 +++++++++----
- poppler/Page.cc | 7 ++++---
- poppler/Page.h | 2 +-
+ poppler/Annot.h | 13 +++++++++----
+ poppler/Page.cc | 7 ++++---
+ poppler/Page.h | 2 +-
qt4/src/poppler-annotation.cc | 8 --------
5 files changed, 48 insertions(+), 22 deletions(-)
commit 9904b8f10abf068a7816bd90976ccbb320387645
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu May 24 18:24:48 2012 +0930
+Date: Thu May 24 18:24:48 2012 +0930
glib docs: fix typo
@@ -16078,7 +18106,7 @@
commit 028f580056f99719cfb8af7bbe8184ceac02cb16
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun May 13 21:36:36 2012 +0930
+Date: Sun May 13 21:36:36 2012 +0930
add sustitute font name to GlobalParamsWin32 to fix compilation
@@ -16087,13 +18115,13 @@
commit 1916d000a86336213ffd6e9bd44ce873e8955895
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat May 12 16:31:38 2012 +0930
+Date: Sat May 12 16:31:38 2012 +0930
Include substitute font name in system font cache
Bug 49826
- poppler/FontInfo.cc | 1 +
+ poppler/FontInfo.cc | 1 +
poppler/GlobalParams.cc | 58
+++++++++++++++++++++++++++----------------------
2 files changed, 33 insertions(+), 26 deletions(-)
@@ -16100,7 +18128,7 @@
commit b47d38e2ccd8563394df89765e277bde95730052
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu May 24 18:24:48 2012 +0930
+Date: Thu May 24 18:24:48 2012 +0930
glib docs: fix typo
@@ -16109,7 +18137,7 @@
commit 14a29dbff585cbe55247431a346c2ac3e12473fe
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun May 13 21:36:36 2012 +0930
+Date: Sun May 13 21:36:36 2012 +0930
add sustitute font name to GlobalParamsWin32 to fix compilation
@@ -16118,13 +18146,13 @@
commit 7436b2c8a853f5121eb7dd13168ab997f1cf7d80
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat May 12 16:31:38 2012 +0930
+Date: Sat May 12 16:31:38 2012 +0930
Include substitute font name in system font cache
Bug 49826
- poppler/FontInfo.cc | 1 +
+ poppler/FontInfo.cc | 1 +
poppler/GlobalParams.cc | 58
+++++++++++++++++++++++++++----------------------
2 files changed, 33 insertions(+), 26 deletions(-)
@@ -16131,7 +18159,7 @@
commit 1c6e84555572a6bf3a2e3fbe9a54b40f11c122ad
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri May 18 16:22:46 2012 +0200
+Date: Fri May 18 16:22:46 2012 +0200
qt4: Make TextAnnotation ctor public
@@ -16140,7 +18168,7 @@
commit fe28614e7aab6e029f4b420353b67a7eea24de36
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri May 18 16:22:46 2012 +0200
+Date: Fri May 18 16:22:46 2012 +0200
qt4: Make TextAnnotation ctor public
@@ -16149,7 +18177,7 @@
commit 8e504bf2543621973fdaddbd29055ce435540146
Author: Ville Skyttä <ville.skytta at iki.fi>
-Date: Wed May 16 23:49:01 2012 +0300
+Date: Wed May 16 23:49:01 2012 +0300
pdfseparate.1: Syntax fixes.
@@ -16158,7 +18186,7 @@
commit 918456372548810c9efbf0533fa155034dd081f2
Author: Ville Skyttä <ville.skytta at iki.fi>
-Date: Wed May 16 23:49:01 2012 +0300
+Date: Wed May 16 23:49:01 2012 +0300
pdfseparate.1: Syntax fixes.
@@ -16167,18 +18195,18 @@
commit 892e486addcbcad619613c7be1ca692a0d36d6e5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 21 20:28:42 2012 +0200
+Date: Mon May 21 20:28:42 2012 +0200
Compile++
cmake/modules/FindGTK.cmake | 8 ++++----
glib/demo/CMakeLists.txt | 6 +++---
- test/CMakeLists.txt | 6 +++---
+ test/CMakeLists.txt | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
commit 794e89ed41d03997778fc4c59b7f1ba557b5e6b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 21 20:18:42 2012 +0200
+Date: Mon May 21 20:18:42 2012 +0200
Compile
@@ -16187,7 +18215,7 @@
commit 78e6c9905a52c0cd4bfc1e56874f50689f04a1c6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 20 12:11:27 2012 +0200
+Date: Sun May 20 12:11:27 2012 +0200
glib-demo: Make text characters list fill and expand in text demo
@@ -16196,7 +18224,7 @@
commit 610eb24426d9b36ac7da40a2fceb3dbeeec19a5c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 20 12:08:09 2012 +0200
+Date: Sun May 20 12:08:09 2012 +0200
glib-demo: Add a button to remove annots from the annot view
@@ -16205,20 +18233,20 @@
commit 11a3093e093319e88f14af0ab6c15009104d17ee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 20 11:22:49 2012 +0200
+Date: Sun May 20 11:22:49 2012 +0200
glib: Add poppler_page_remove_annot()
https://bugs.freedesktop.org/show_bug.cgi?id=40473
- glib/poppler-page.cc | 19 +++++++++++++++++++
- glib/poppler-page.h | 2 ++
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-page.cc | 19 +++++++++++++++++++
+ glib/poppler-page.h | 2 ++
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 22 insertions(+)
commit 0dd157ae7f19cd91ea425a607b968f08addc3a40
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 20 10:37:47 2012 +0200
+Date: Sun May 20 10:37:47 2012 +0200
glib: Take a reference of the core annotation when creating a
PopplerAnnot
@@ -16235,7 +18263,7 @@
commit f818b842f54d6860920b39778228e8b247b4e761
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat May 19 12:32:33 2012 +0200
+Date: Sat May 19 12:32:33 2012 +0200
glib-demo: Fix runtime warning
@@ -16244,37 +18272,37 @@
commit a24e326425e198eeb70c4d9205bb7a0a3a9db297
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat May 19 12:09:45 2012 +0200
+Date: Sat May 19 12:09:45 2012 +0200
gtk-tests: Port to GTK+ 3.0
- configure.ac | 4 +-
- glib/demo/annots.c | 74 +++++++-------
+ configure.ac | 4 +-
+ glib/demo/annots.c | 74 +++++++-------
glib/demo/attachments.c | 4 +-
- glib/demo/find.c | 4 +-
- glib/demo/fonts.c | 4 +-
- glib/demo/forms.c | 64 ++++++------
- glib/demo/images.c | 21 ++--
- glib/demo/info.cc | 67 ++++++------
- glib/demo/layers.c | 22 ++--
- glib/demo/links.c | 6 +-
- glib/demo/main.c | 31 ++----
- glib/demo/outline.c | 2 +-
- glib/demo/page.c | 23 ++---
- glib/demo/print.c | 14 +--
- glib/demo/render.c | 263
+ glib/demo/find.c | 4 +-
+ glib/demo/fonts.c | 4 +-
+ glib/demo/forms.c | 64 ++++++------
+ glib/demo/images.c | 21 ++--
+ glib/demo/info.cc | 67 ++++++------
+ glib/demo/layers.c | 22 ++--
+ glib/demo/links.c | 6 +-
+ glib/demo/main.c | 31 ++----
+ glib/demo/outline.c | 2 +-
+ glib/demo/page.c | 23 ++---
+ glib/demo/print.c | 14 +--
+ glib/demo/render.c | 263
++++++++++++++----------------------------------
glib/demo/selections.c | 77 ++++++--------
- glib/demo/text.c | 22 ++--
+ glib/demo/text.c | 22 ++--
glib/demo/transitions.c | 4 +-
- glib/demo/utils.c | 101 +++++++++----------
- glib/demo/utils.h | 6 +-
- test/gtk-test.cc | 48 +++++----
+ glib/demo/utils.c | 101 +++++++++----------
+ glib/demo/utils.h | 6 +-
+ test/gtk-test.cc | 48 +++++----
21 files changed, 350 insertions(+), 511 deletions(-)
commit 9f7d919e68a26bb7dd809986d8394fe20b750bd0
Author: Anthony Wesley <awesley at smartnetworks.com.au>
-Date: Thu May 17 19:54:47 2012 +0200
+Date: Thu May 17 19:54:47 2012 +0200
Fix logic on SplashBitmap::writeImgFile
@@ -16283,7 +18311,7 @@
commit 87093d1250807f660042295747a012032f84c034
Author: Anthony Wesley <awesley at smartnetworks.com.au>
-Date: Thu May 17 19:54:47 2012 +0200
+Date: Thu May 17 19:54:47 2012 +0200
Fix logic on SplashBitmap::writeImgFile
@@ -16292,33 +18320,33 @@
commit 7e7997e12faccf4c0513811b324a2fd0fa960a96
Author: Igor Slepchin <igor.slepchin at gmail.com>
-Date: Tue May 15 23:16:27 2012 +0200
+Date: Tue May 15 23:16:27 2012 +0200
Determine if font is bold or italic based on FontDescriptor.
Bug #49758
- utils/HtmlFonts.cc | 24 ++++++++++++++++++------
- utils/HtmlFonts.h | 3 ++-
+ utils/HtmlFonts.cc | 24 ++++++++++++++++++------
+ utils/HtmlFonts.h | 3 ++-
utils/HtmlOutputDev.cc | 4 +---
3 files changed, 21 insertions(+), 10 deletions(-)
commit 3a249aa8ad5e9f7511bcafd0416ce51c7efe5f4d
Author: Igor Slepchin <igor.slepchin at gmail.com>
-Date: Tue May 15 23:16:27 2012 +0200
+Date: Tue May 15 23:16:27 2012 +0200
Determine if font is bold or italic based on FontDescriptor.
Bug #49758
- utils/HtmlFonts.cc | 24 ++++++++++++++++++------
- utils/HtmlFonts.h | 3 ++-
+ utils/HtmlFonts.cc | 24 ++++++++++++++++++------
+ utils/HtmlFonts.h | 3 ++-
utils/HtmlOutputDev.cc | 4 +---
3 files changed, 21 insertions(+), 10 deletions(-)
commit ff2c251dbaef9b964af48f51ebb517626ac3145c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 20:13:32 2012 +0200
+Date: Sun May 13 20:13:32 2012 +0200
glib-demo: Use poppler_document_new_from_gfile to load the given uri
@@ -16327,19 +18355,19 @@
commit a7629331ab4ba5b256213af1f1b2954a49953c34
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 20:13:03 2012 +0200
+Date: Sun May 13 20:13:03 2012 +0200
glib: Add poppler_document_new_from_gfile
- glib/poppler-document.cc | 46
+ glib/poppler-document.cc | 46
+++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 4 ++++
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-document.h | 4 ++++
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 51 insertions(+)
commit 95277b1f481e274ab0ce22ffb44b40437bffa3c8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 20:11:12 2012 +0200
+Date: Sun May 13 20:11:12 2012 +0200
glib Add missing cancellable param in poppler_document_new_from_stream
doc
@@ -16349,7 +18377,7 @@
commit 329bb1e2b4f4b58832847bcf805d19ac0fd5ef02
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 19:45:55 2012 +0200
+Date: Sun May 13 19:45:55 2012 +0200
glib: Make sure password is always converted to latin1
@@ -16362,7 +18390,7 @@
commit c4bf7b162028a2f9ffcd2baba2759bdb14fae51f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 19:45:55 2012 +0200
+Date: Sun May 13 19:45:55 2012 +0200
glib: Make sure password is always converted to latin1
@@ -16375,7 +18403,7 @@
commit 7714b4e319c48ee915061a172208245ae7c4141b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 19:30:17 2012 +0200
+Date: Sun May 13 19:30:17 2012 +0200
glib: Fix memory leak when document fails to load
@@ -16384,7 +18412,7 @@
commit 4d0786a97e061a752686968bd7976bdda01b1f84
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 19:30:17 2012 +0200
+Date: Sun May 13 19:30:17 2012 +0200
glib: Fix memory leak when document fails to load
@@ -16393,7 +18421,7 @@
commit 1d1c8175c57ebe6518f4252ab92a20286b7d4c6f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 13 18:41:25 2012 +0200
+Date: Sun May 13 18:41:25 2012 +0200
glib: Add poppler_document_new_from_stream
@@ -16402,34 +18430,34 @@
those cases. A PopplerCachedFileLoader has been added to handle all
other cases.
- configure.ac | 10 +--
- glib/Makefile.am | 4 +
+ configure.ac | 10 +--
+ glib/Makefile.am | 4 +
glib/poppler-cached-file-loader.cc | 108 +++++++++++++++++++++++++++
- glib/poppler-cached-file-loader.h | 44 +++++++++++
- glib/poppler-document.cc | 69 ++++++++++++++++++
- glib/poppler-document.h | 6 ++
- glib/poppler-input-stream.cc | 141
+ glib/poppler-cached-file-loader.h | 44 +++++++++++
+ glib/poppler-document.cc | 69 ++++++++++++++++++
+ glib/poppler-document.h | 6 ++
+ glib/poppler-input-stream.cc | 141
++++++++++++++++++++++++++++++++++++
- glib/poppler-input-stream.h | 74 +++++++++++++++++++
- glib/reference/poppler-docs.sgml | 4 +
- glib/reference/poppler-sections.txt | 1 +
- poppler-glib-uninstalled.pc.in | 2 +-
- poppler-glib.pc.in | 2 +-
+ glib/poppler-input-stream.h | 74 +++++++++++++++++++
+ glib/reference/poppler-docs.sgml | 4 +
+ glib/reference/poppler-sections.txt | 1 +
+ poppler-glib-uninstalled.pc.in | 2 +-
+ poppler-glib.pc.in | 2 +-
12 files changed, 458 insertions(+), 7 deletions(-)
commit 13d2aa303eb1fd900f1045efec14af8002477b02
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun May 13 17:25:15 2012 +0200
+Date: Sun May 13 17:25:15 2012 +0200
remove unnecesary transparency group handling in splash
Bug #13487
- poppler/Gfx.cc | 64
+ poppler/Gfx.cc | 64
+++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Gfx.h | 4 ++-
- poppler/GfxState.cc | 4 ++-
- poppler/OutputDev.h | 1 +
+ poppler/Gfx.h | 4 ++-
+ poppler/GfxState.cc | 4 ++-
+ poppler/OutputDev.h | 1 +
poppler/SplashOutputDev.cc | 11 ++++++++
poppler/SplashOutputDev.h | 1 +
6 files changed, 82 insertions(+), 3 deletions(-)
@@ -16436,17 +18464,17 @@
commit b477443e8a4c52500529aaf3be76f01a61e85f28
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun May 13 17:25:15 2012 +0200
+Date: Sun May 13 17:25:15 2012 +0200
remove unnecesary transparency group handling in splash
Bug #13487
- poppler/Gfx.cc | 64
+ poppler/Gfx.cc | 64
+++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Gfx.h | 4 ++-
- poppler/GfxState.cc | 4 ++-
- poppler/OutputDev.h | 1 +
+ poppler/Gfx.h | 4 ++-
+ poppler/GfxState.cc | 4 ++-
+ poppler/OutputDev.h | 1 +
poppler/SplashOutputDev.cc | 11 ++++++++
poppler/SplashOutputDev.h | 1 +
6 files changed, 82 insertions(+), 3 deletions(-)
@@ -16453,7 +18481,7 @@
commit a76867003a7bff5ab03016156c75b4c928788d50
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 13 13:10:40 2012 +0200
+Date: Sun May 13 13:10:40 2012 +0200
Distribute cmake/modules/FindLCMS2.cmake
@@ -16464,7 +18492,7 @@
commit 8f040dec2ce2eae24dd1eb15900d4d284e4b3848
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 13 13:10:40 2012 +0200
+Date: Sun May 13 13:10:40 2012 +0200
Distribute cmake/modules/FindLCMS2.cmake
@@ -16475,7 +18503,7 @@
commit 7f47630a7fc19214cd48dbd164ecf577ba35cc46
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 23:12:04 2012 +0200
+Date: Thu May 10 23:12:04 2012 +0200
Compile with the unsupported ENABLE_PLUGINS defined
@@ -16484,21 +18512,21 @@
commit 22264cb230fc5902aea14ab43fa013a8ebdbf812
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 23:04:33 2012 +0200
+Date: Thu May 10 23:04:33 2012 +0200
Make it compile
Sorry :-/
- goo/gfile.cc | 82
+ goo/gfile.cc | 82
--------------------------------------------------
- goo/gfile.h | 4 ---
+ goo/gfile.h | 4 ---
poppler/GlobalParams.h | 2 +-
3 files changed, 1 insertion(+), 87 deletions(-)
commit 44bf99a7b8683a077f2a5db50541099c109aa069
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 22:59:18 2012 +0200
+Date: Thu May 10 22:59:18 2012 +0200
Kill the concept of "base dir"
@@ -16509,18 +18537,18 @@
Fixes bug 49448
- goo/gfile.cc | 46
+ goo/gfile.cc | 46
----------------------------------------------
- goo/gfile.h | 3 ---
- poppler/GfxState.cc | 16 ++--------------
+ goo/gfile.h | 3 ---
+ poppler/GfxState.cc | 16 ++--------------
poppler/GlobalParams.cc | 21 ---------------------
poppler/GlobalParams.h | 3 ---
- test/perf-test.cc | 1 -
+ test/perf-test.cc | 1 -
6 files changed, 2 insertions(+), 88 deletions(-)
commit bb091e38a1c0248ba24b0711b4afc0b0524cce10
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 22:38:41 2012 +0200
+Date: Thu May 10 22:38:41 2012 +0200
Make it be something closer to real english
@@ -16529,7 +18557,7 @@
commit 67f3c3e0d03ec63df7c6028cbd626e384d231c2b
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed May 9 16:48:15 2012 +0200
+Date: Wed May 9 16:48:15 2012 +0200
GooString formatting: add support for uppercase hexadecimal + Use
it in Annot::layoutText
@@ -16542,7 +18570,7 @@
commit 1f7f8a78409e6bcc90bd32ea2aaa75ed3a7b6218
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed May 9 16:18:05 2012 +0200
+Date: Wed May 9 16:18:05 2012 +0200
Use error() instead of fprintf(stderr, ...) in Annot::layoutText
@@ -16551,24 +18579,24 @@
commit a7a2e72f9ba43816a81278e0565d31807ac5ceb5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 22:31:24 2012 +0200
+Date: Thu May 10 22:31:24 2012 +0200
More gs cleanup and forgot the (C) on modification
- goo/gfile.cc | 2 +-
- goo/gfile.h | 2 +-
+ goo/gfile.cc | 2 +-
+ goo/gfile.h | 2 +-
utils/pdftohtml.cc | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
commit ad36d22d1f11339be90403534b921cce120fdbad
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 22:24:40 2012 +0200
+Date: Thu May 10 22:24:40 2012 +0200
pdftohtml: Remove the option to invoke gs
- goo/gfile.cc | 8 ---
- goo/gfile.h | 3 --
- utils/pdftohtml.1 | 8 +--
+ goo/gfile.cc | 8 ---
+ goo/gfile.h | 3 --
+ utils/pdftohtml.1 | 8 +--
utils/pdftohtml.cc | 149
++++++++++++-----------------------------------------
4 files changed, 36 insertions(+), 132 deletions(-)
@@ -16575,21 +18603,21 @@
commit 4114c928fa2560937e02319f57937f1c267a9817
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 21:09:14 2012 +0200
+Date: Thu May 10 21:09:14 2012 +0200
0.20.0
- CMakeLists.txt | 6 +++---
- NEWS | 16 ++++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 6 +++---
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 24 insertions(+), 8 deletions(-)
commit df05d084cb26807c39695280cd8ea52d13aa1255
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 10 20:54:13 2012 +0200
+Date: Thu May 10 20:54:13 2012 +0200
Bring back the begin/endMarkedContent virtuals
@@ -16602,7 +18630,7 @@
commit b6159fea4a13ecfd1c38b3a666a797c5147dd952
Author: William Bader <williambader at hotmail.com>
-Date: Thu May 10 20:02:19 2012 +0200
+Date: Thu May 10 20:02:19 2012 +0200
splash uses cmykTransferC for M, Y and K in two places
@@ -16611,7 +18639,7 @@
commit c2146219d555cab277906daefd2589f9056f536c
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Thu May 10 13:26:18 2012 +0200
+Date: Thu May 10 13:26:18 2012 +0200
Add missing function parameter
@@ -16620,7 +18648,7 @@
commit 753f6ab9347f972223ec21b7ed4b4f7ebed3d420
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 3 15:29:57 2012 -0700
+Date: Thu May 3 15:29:57 2012 -0700
Compile with ENABLE_PLUGINS defined
@@ -16632,7 +18660,7 @@
commit 23df93aaf495428b580bafd0fd1f41515828b08d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 3 14:50:09 2012 -0700
+Date: Thu May 3 14:50:09 2012 -0700
We don't support the keyBinding concept
@@ -16643,7 +18671,7 @@
commit e55838b41959acc311e9b00dc390c9816a9afac2
Author: Jason <jasongross9+bugzilla at gmail.com>
-Date: Wed May 2 19:35:26 2012 +0200
+Date: Wed May 2 19:35:26 2012 +0200
glib: Use delete[] to free array allocated with new[]
@@ -16654,7 +18682,7 @@
commit dec873463b06bfe76ff48e36282877e6ac11b59d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 23:36:57 2012 +0200
+Date: Sun Apr 29 23:36:57 2012 +0200
Add the objUint type
@@ -16663,7 +18691,7 @@
commit 50c0b294d08114920a5db711876e20d991f474a6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 22:33:09 2012 +0200
+Date: Sun Apr 29 22:33:09 2012 +0200
Make sure the index to dcHuffTables and acHuffTables is in bounds
@@ -16675,7 +18703,7 @@
commit 9e36206465289c96cb189c648a6f5121714c647b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 22:18:12 2012 +0200
+Date: Sun Apr 29 22:18:12 2012 +0200
include for memcpy
@@ -16684,7 +18712,7 @@
commit 931051fe0bb445545355027d999515bc3d4b32ef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 22:07:34 2012 +0200
+Date: Sun Apr 29 22:07:34 2012 +0200
Make sure the index for refLine is in bounds
@@ -16696,7 +18724,7 @@
commit 53b9c2e2806320d0d0e35134b75da5da72514742
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 22:00:18 2012 +0200
+Date: Sun Apr 29 22:00:18 2012 +0200
Just call getNum if isNum is true
@@ -16708,7 +18736,7 @@
commit da8d858c4fc610718a5f14b14dc3a4a11564a73d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 20:28:37 2012 +0200
+Date: Sun Apr 29 20:28:37 2012 +0200
Do not access args[-1]
@@ -16720,7 +18748,7 @@
commit 934b1a7cd502fe5537a350cdfc650989992693f7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 19:59:15 2012 +0200
+Date: Sun Apr 29 19:59:15 2012 +0200
Do not access invalid lookup indexes
@@ -16731,7 +18759,7 @@
commit e80fd082914fe29fad7e60c321a747eb8634e413
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 18:27:41 2012 +0200
+Date: Sun Apr 29 18:27:41 2012 +0200
[qt4] the qualified name may be unicode encoded
@@ -16740,7 +18768,7 @@
commit 251be1787a2a003862691f5a825eb3468eceb6a2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 18:26:42 2012 +0200
+Date: Sun Apr 29 18:26:42 2012 +0200
Fix getFullyQualifiedName with unicode field names
@@ -16753,7 +18781,7 @@
commit be41f1c7905d695d17e19ced83a1018531d00199
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 16:02:45 2012 +0200
+Date: Sun Apr 29 16:02:45 2012 +0200
SplashOutputDev: Fix rendering of knockout groups
@@ -16760,15 +18788,15 @@
Bug #12185
poppler/SplashOutputDev.cc | 31 ++++++++++++++++++++++++++++---
- splash/Splash.cc | 21 ++++++++++++++++++---
- splash/Splash.h | 6 ++++--
+ splash/Splash.cc | 21 ++++++++++++++++++---
+ splash/Splash.h | 6 ++++--
splash/SplashBitmap.cc | 22 +++++++++++++++++++++-
- splash/SplashBitmap.h | 2 ++
+ splash/SplashBitmap.h | 2 ++
5 files changed, 73 insertions(+), 9 deletions(-)
commit 800cb9ec7189a539d64b99fa181cd4126496c1ec
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Sat Apr 28 17:15:30 2012 +0200
+Date: Sat Apr 28 17:15:30 2012 +0200
Reconstruct xref table if xref needed but missing
@@ -16779,21 +18807,21 @@
commit 410822d7013ce1f61325afdb61d75ea64666755e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 27 01:10:22 2012 +0200
+Date: Fri Apr 27 01:10:22 2012 +0200
0.19.4
- CMakeLists.txt | 4 ++--
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
6 files changed, 23 insertions(+), 6 deletions(-)
commit b1d5c6c0a20a4a24b42de66db23e0f63d10ca52d
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Apr 24 21:00:11 2012 +0200
+Date: Tue Apr 24 21:00:11 2012 +0200
Output XRef stream when incrementally updating if there's already
a XRef stream
@@ -16806,7 +18834,7 @@
commit 2ecf3b2e49a4c35e995d25016b810592260edfeb
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Apr 24 18:10:15 2012 +0200
+Date: Tue Apr 24 18:10:15 2012 +0200
Refactoring of XRef table write support (in preparation for XRef
stream write support)
@@ -16828,7 +18856,7 @@
commit cf7a20adbd15f901d414ce06825459c33eeef3f5
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Apr 25 18:51:23 2012 +0200
+Date: Wed Apr 25 18:51:23 2012 +0200
Fix slow rendering of pdf with a lot of image masks in pattern
colorspace
@@ -16837,11 +18865,11 @@
poppler/CairoOutputDev.cc | 6 +++---
poppler/CairoOutputDev.h | 6 +++---
- poppler/Gfx.cc | 4 ++--
- poppler/OutputDev.cc | 5 +++--
- poppler/OutputDev.h | 6 +++---
+ poppler/Gfx.cc | 4 ++--
+ poppler/OutputDev.cc | 5 +++--
+ poppler/OutputDev.h | 6 +++---
poppler/PSOutputDev.cc | 4 ++--
- poppler/PSOutputDev.h | 4 ++--
+ poppler/PSOutputDev.h | 4 ++--
poppler/SplashOutputDev.cc | 35 +++++++++++------------------------
poppler/SplashOutputDev.h | 4 ++--
9 files changed, 31 insertions(+), 43 deletions(-)
@@ -16848,7 +18876,7 @@
commit 26fd142a3608283fd41e07b54067a51a9db76e93
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 21 18:16:46 2012 +0200
+Date: Sat Apr 21 18:16:46 2012 +0200
Preserve z-index after annotation removal
@@ -16857,7 +18885,7 @@
commit 7b10014c1fe9ef1cba57fd6b01c63129ac31386a
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 21 17:53:22 2012 +0200
+Date: Sat Apr 21 17:53:22 2012 +0200
Do not remove appearance stream if it's shared with other annotations
@@ -16868,7 +18896,7 @@
commit 7684c325929493ad9de01a891de0aef197e176dd
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 21 20:26:49 2012 +0200
+Date: Sat Apr 21 20:26:49 2012 +0200
AnnotText: Always force 24x24 size with custom stamps, not only on
first rendering
@@ -16878,7 +18906,7 @@
commit 44cd46a6e04a87bd702dab4a662042f69f16c4ad
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 23 20:02:55 2012 +0200
+Date: Mon Apr 23 20:02:55 2012 +0200
Do not try to access nPatches - 1 if nPatches is 0
@@ -16889,7 +18917,7 @@
commit a92f87b83e3c6c9078508c644aa09f4f2b14e9cc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 23 00:06:18 2012 +0200
+Date: Mon Apr 23 00:06:18 2012 +0200
Do not complain if the entry is missing
@@ -16900,7 +18928,7 @@
commit 114e113e3278d02baaffd6c0da7fda266283c176
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 21 21:08:55 2012 +0200
+Date: Sat Apr 21 21:08:55 2012 +0200
Do not allocate XRef entries whose generation number is 65535
@@ -16909,7 +18937,7 @@
commit ad8785b053aa115b593b2f20073e2989d59a77c9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 18 22:51:33 2012 +0200
+Date: Wed Apr 18 22:51:33 2012 +0200
Remove duplicate call
@@ -16918,7 +18946,7 @@
commit 80d4e1843c56801508f476fed64ecb3201ba18c8
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Apr 17 20:25:57 2012 +0200
+Date: Tue Apr 17 20:25:57 2012 +0200
Do not draw border in AnnotText::draw
@@ -16927,7 +18955,7 @@
commit a1e3d868ccd7fb84d52d94754d8681c97119fb6e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Mar 30 21:52:04 2012 +0200
+Date: Fri Mar 30 21:52:04 2012 +0200
Save/restore gfx state when drawing annot border
@@ -16936,7 +18964,7 @@
commit 7fbeaac5c0d0240564add6c252c1ba7c14639d98
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 17 20:36:51 2012 +0200
+Date: Tue Apr 17 20:36:51 2012 +0200
Be sure we are checking a non free entry
@@ -16945,7 +18973,7 @@
commit d1254c7e8e995302542093968a0c2967f3c0b5ff
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Tue Apr 17 20:36:03 2012 +0200
+Date: Tue Apr 17 20:36:03 2012 +0200
Do not complain if the entry does not exist
@@ -16959,7 +18987,7 @@
commit bcbe9497a4fa50b41852abd538ad139c7b6693e5
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Tue Apr 17 20:21:58 2012 +0200
+Date: Tue Apr 17 20:21:58 2012 +0200
Copying graphics library CFLAGS to cpp frontend Makefile.am.
@@ -16972,7 +19000,7 @@
commit 44c9df8277877ee1021317a3b6c253f80310f826
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Tue Apr 17 20:21:00 2012 +0200
+Date: Tue Apr 17 20:21:00 2012 +0200
Do not clear FREETYPE_CFLAGS, FREETYPE_LIBS before PKG_CHECK_MODULES()
@@ -16987,23 +19015,23 @@
before
PKG_CONFIG_MODULES(), like:
- dnl Check for freetype headers
- FREETYPE_LIBS=
- FREETYPE_CFLAGS=
+ dnl Check for freetype headers
+ FREETYPE_LIBS=
+ FREETYPE_CFLAGS=
- PKG_CHECK_MODULES(FREETYPE, freetype2,
- [freetype_pkgconfig=yes],
- [freetype_pkgconfig=no])
+ PKG_CHECK_MODULES(FREETYPE, freetype2,
+ [freetype_pkgconfig=yes],
+ [freetype_pkgconfig=no])
- if test "x$freetype_pkgconfig" = "xyes"; then
+ if test "x$freetype_pkgconfig" = "xyes"; then
- AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include
- files])
+ AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include
+ files])
- else
+ else
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
- [...]
+ AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+ [...]
Checking the history why these values are cleared, it seems that
the initial revision of poppler did not use pkg-config to detect
@@ -17021,7 +19049,7 @@
commit 9e0f0368e543df46b40cbd7bed6fdc1abf846e7d
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Tue Apr 17 20:19:41 2012 +0200
+Date: Tue Apr 17 20:19:41 2012 +0200
Do not append "-ansi" to CXXFLAG, if "-std=XXX" is already specified.
@@ -17044,7 +19072,7 @@
commit 2f1e7ef252b8d1f7ee6004825c2926f0f5e181a5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 23:11:41 2012 +0200
+Date: Thu Apr 12 23:11:41 2012 +0200
Do not crash in broken documents
@@ -17057,7 +19085,7 @@
commit 19fb9caecb1b265a8b8651e9bcf4b779f593fefd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 22:24:50 2012 +0200
+Date: Thu Apr 12 22:24:50 2012 +0200
Fix crash when the destination file does not exist
@@ -17068,7 +19096,7 @@
commit fa4848eae370437ab1b9863124e9a340830f66c7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Apr 13 22:11:01 2012 +0930
+Date: Fri Apr 13 22:11:01 2012 +0930
man pages: add missing section heading
@@ -17077,23 +19105,23 @@
commit 08a14aa37b177bb4586869857ae678cb4bcd4039
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 21:52:30 2012 +0200
+Date: Thu Apr 12 21:52:30 2012 +0200
0.19.3
- CMakeLists.txt | 4 ++--
- NEWS | 26 +++++++++++++++++++++++++-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 26 +++++++++++++++++++++++++-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
8 files changed, 33 insertions(+), 9 deletions(-)
commit 52227b59d1fa2a2029bfff2f8a167efd81faebbb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 20:52:55 2012 +0200
+Date: Thu Apr 12 20:52:55 2012 +0200
Update (C)
@@ -17102,7 +19130,7 @@
commit 40cb3f27f4dcad4fe8c48f0b638eac7913fc3722
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 20:50:38 2012 +0200
+Date: Thu Apr 12 20:50:38 2012 +0200
Do not pass those params to createGfx since they aren't used
@@ -17113,19 +19141,19 @@
commit 9a10d31fca7f060f24bae9efe15662f02a9684ca
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Apr 12 20:31:23 2012 +0200
+Date: Thu Apr 12 20:31:23 2012 +0200
qt4: Remove unimplemented revision setters from public API
qt4/src/poppler-annotation-private.h | 2 ++
- qt4/src/poppler-annotation.cc | 62
+ qt4/src/poppler-annotation.cc | 62
++++++++----------------------------
- qt4/src/poppler-annotation.h | 13 --------
+ qt4/src/poppler-annotation.h | 13 --------
3 files changed, 16 insertions(+), 61 deletions(-)
commit 0531329aeb8783c48f056929e6e81cebda33500f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 20:07:13 2012 +0200
+Date: Thu Apr 12 20:07:13 2012 +0200
[qt4] Mark the dummy stuff as deprecated
@@ -17134,7 +19162,7 @@
commit 67b7b2bdd0943680437d96349c3415aa40082cbb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 20:06:52 2012 +0200
+Date: Thu Apr 12 20:06:52 2012 +0200
[qt4] initialize the dummy members here too
@@ -17143,7 +19171,7 @@
commit bf171382afb6b50284c3855e3a1815a15ec34366
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 19:24:42 2012 +0200
+Date: Thu Apr 12 19:24:42 2012 +0200
Add since markers
@@ -17152,7 +19180,7 @@
commit e36fd775394ee752c0f62f789359c72b52094975
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 12 18:58:29 2012 +0200
+Date: Thu Apr 12 18:58:29 2012 +0200
Remove unneeded forward declaration
@@ -17161,7 +19189,7 @@
commit c1aa4a8c0aa9d46757e3849776acac42731e02d1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Apr 12 00:39:33 2012 +0200
+Date: Thu Apr 12 00:39:33 2012 +0200
qt4: Annotation appearance invalidation
@@ -17173,17 +19201,17 @@
commit 4338ae354c66e4df8d7d70a156517e27b3b80539
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Mar 25 22:58:33 2012 +0200
+Date: Sun Mar 25 22:58:33 2012 +0200
qt4: Added HideAnnotations option to PSConverter
qt4/src/poppler-ps-converter.cc | 23 ++++++++++++++++++++++-
- qt4/src/poppler-qt4.h | 3 ++-
+ qt4/src/poppler-qt4.h | 3 ++-
2 files changed, 24 insertions(+), 2 deletions(-)
commit e50993b3b47a759c93ccdeeaef289d6985b05bb1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 22 19:58:12 2012 +0100
+Date: Thu Mar 22 19:58:12 2012 +0100
qt4: DOM annotation store - Black color is different than invalid
color
@@ -17193,19 +19221,19 @@
commit 4739a6a02097f110c37defdfa616351459902806
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Mar 19 19:17:33 2012 +0100
+Date: Mon Mar 19 19:17:33 2012 +0100
qt4: Annotation removal
qt4/src/poppler-annotation-private.h | 3 +++
- qt4/src/poppler-annotation.cc | 29 +++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 5 +++++
- qt4/src/poppler-qt4.h | 8 ++++++++
+ qt4/src/poppler-annotation.cc | 29 +++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc | 5 +++++
+ qt4/src/poppler-qt4.h | 8 ++++++++
4 files changed, 45 insertions(+)
commit 25a64d69aaab61c8cf944107e649e19920244a2b
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Mar 20 01:46:07 2012 +0100
+Date: Tue Mar 20 01:46:07 2012 +0100
qt4: TextAnnotation write support + basic textFont getter
@@ -17217,7 +19245,7 @@
commit a31a8118ba07aa7f90c69130476fb7d86f8614ad
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Mar 11 23:57:51 2012 +0100
+Date: Sun Mar 11 23:57:51 2012 +0100
qt4: GeomAnnotation, InkAnnotation and CaretAnnotation write support
@@ -17228,7 +19256,7 @@
commit e4052b52002447772e24571fd13f0f22fd2bfb16
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 10 17:48:56 2012 +0100
+Date: Sat Mar 10 17:48:56 2012 +0100
qt4: HighlightAnnotation and StampAnnotation write support
@@ -17239,7 +19267,7 @@
commit b5e948b6130cdb04387a8244179337c7904dcd03
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 17:44:50 2012 +0100
+Date: Wed Mar 14 17:44:50 2012 +0100
qt4: Annotation insertion and LineAnnotation support
@@ -17250,28 +19278,28 @@
types will be added in the next patches.
qt4/src/poppler-annotation-private.h | 12 ++
- qt4/src/poppler-annotation.cc | 297
+ qt4/src/poppler-annotation.cc | 297
+++++++++++++++++++++++++++++++++--
- qt4/src/poppler-annotation.h | 4 +-
- qt4/src/poppler-page.cc | 5 +
- qt4/src/poppler-qt4.h | 9 ++
+ qt4/src/poppler-annotation.h | 4 +-
+ qt4/src/poppler-page.cc | 5 +
+ qt4/src/poppler-qt4.h | 9 ++
5 files changed, 316 insertions(+), 11 deletions(-)
commit 20b4feec612448be8a800173ddadbf257657477e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Mar 9 19:31:16 2012 +0100
+Date: Fri Mar 9 19:31:16 2012 +0100
qt4: Basic setters to edit annotations
qt4/src/poppler-annotation-helper.h | 15 ++++
qt4/src/poppler-annotation-private.h | 1 +
- qt4/src/poppler-annotation.cc | 128
+ qt4/src/poppler-annotation.cc | 128
++++++++++++++++++++++++++++++++---
3 files changed, 135 insertions(+), 9 deletions(-)
commit 0e8c35b59f0fba926b30c9a87823c92ae03bf116
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Mar 9 01:04:28 2012 +0100
+Date: Fri Mar 9 01:04:28 2012 +0100
qt4: Changes to Annotation API (part 2/2)
@@ -17291,17 +19319,17 @@
qt4/src/poppler-annotation-helper.h | 31 +-
qt4/src/poppler-annotation-private.h | 23 +-
- qt4/src/poppler-annotation.cc | 1254
+ qt4/src/poppler-annotation.cc | 1254
+++++++++++++++++++++++++++++++---
- qt4/src/poppler-annotation.h | 58 +-
- qt4/src/poppler-link.cc | 2 +-
- qt4/src/poppler-page.cc | 778 +--------------------
- qt4/src/poppler-qt4.h | 4 +-
+ qt4/src/poppler-annotation.h | 58 +-
+ qt4/src/poppler-link.cc | 2 +-
+ qt4/src/poppler-page.cc | 778 +--------------------
+ qt4/src/poppler-qt4.h | 4 +-
7 files changed, 1217 insertions(+), 933 deletions(-)
commit 73b91207649a81740183e2288809d3b84b52f595
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 7 17:05:50 2012 +0100
+Date: Wed Mar 7 17:05:50 2012 +0100
qt4: Changes to Annotation API (part 1/2)
@@ -17342,16 +19370,16 @@
support.
4) Minor fixes
- - Popup size was incorrectly stored as an integer value, now
- it's part of
- a QRectF.
- - Typo: LinkAnnotation::linkDestionation() --> linkDestination
- - Dash array is now exported as QVector<doubles> instead of
- a marks/spaces
- integer pair
- - GeomAnnotation's geometricalPointWidth removed, because it
- was never
- referenced and it doesn't exist in PDF specs
+ - Popup size was incorrectly stored as an integer value, now
+ it's part of
+ a QRectF.
+ - Typo: LinkAnnotation::linkDestionation() --> linkDestination
+ - Dash array is now exported as QVector<doubles> instead of
+ a marks/spaces
+ integer pair
+ - GeomAnnotation's geometricalPointWidth removed, because it
+ was never
+ referenced and it doesn't exist in PDF specs
5) AnnotationPrivate data is now explicitly shared
Annotation private data has been rearranged so that it's now
@@ -17362,16 +19390,16 @@
to user.
qt4/src/poppler-annotation-private.h | 19 +-
- qt4/src/poppler-annotation.cc | 1022
+ qt4/src/poppler-annotation.cc | 1022
++++++++++++++++++++++++----------
- qt4/src/poppler-annotation.h | 292 +++++++---
- qt4/src/poppler-page.cc | 92 ++-
- qt4/src/poppler-qt4.h | 6 +
+ qt4/src/poppler-annotation.h | 292 +++++++---
+ qt4/src/poppler-page.cc | 92 ++-
+ qt4/src/poppler-qt4.h | 6 +
5 files changed, 997 insertions(+), 434 deletions(-)
commit 7f0f080277d35f6f2e426ca2a3ff76c2856daeaf
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Apr 10 00:08:49 2012 +0930
+Date: Tue Apr 10 00:08:49 2012 +0930
cairo: fix stroke pattern with transparency group
@@ -17386,7 +19414,7 @@
commit 5ea305c3924cead302092378ab67300c3099afd9
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Apr 8 23:11:30 2012 +0930
+Date: Sun Apr 8 23:11:30 2012 +0930
cairo: only align stroke coords for horizontal and vertical lines
@@ -17399,7 +19427,7 @@
commit 8414d8f621b8abb018e80f2255cfb511a1e558d4
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Apr 9 12:08:20 2012 +0930
+Date: Mon Apr 9 12:08:20 2012 +0930
cairo: ensure 0 width lines with stroke_adjust are aligned
@@ -17412,7 +19440,7 @@
commit af1a84eb90656de68bb14f2c4ae4f813c51bc3a3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Apr 9 17:17:29 2012 +0930
+Date: Mon Apr 9 17:17:29 2012 +0930
cairo: fix paintTransparencyGroup when both mask and fill opacity
are required
@@ -17424,7 +19452,7 @@
commit 46b3a70cae3b37cb4270a83afaddd6734442b752
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Apr 9 19:32:24 2012 +0200
+Date: Mon Apr 9 19:32:24 2012 +0200
Caption text rendering in AnnotLine
@@ -17435,7 +19463,7 @@
commit 855607828447ecec2c8444650d015e21bd17d2e2
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Apr 9 16:45:50 2012 +0200
+Date: Mon Apr 9 16:45:50 2012 +0200
AnnotFreeText rendering improvements (auto word-wrap, quadding,
border style, font/border color)
@@ -17447,7 +19475,7 @@
commit 80f662162698c1ec27771d9cf5e2e6bc3d21c4df
Author: Ihar Filipau <thephilips at gmail.com>
-Date: Thu Apr 12 00:19:26 2012 +0200
+Date: Thu Apr 12 00:19:26 2012 +0200
Fix the mask inversion
@@ -17456,7 +19484,7 @@
commit 06591d848e53598973f7d5fddac50785a46e8027
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Apr 11 23:49:29 2012 +0200
+Date: Wed Apr 11 23:49:29 2012 +0200
Fix Splash CMYK merge error
@@ -17472,22 +19500,22 @@
******
poppler/SplashOutputDev.cc | 9 +++++++++
- splash/Splash.cc | 2 +-
+ splash/Splash.cc | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
commit 1f45afde6410f03c79fcf4b66d5834079879d38f
Author: Ihar Filipau <thephilips at gmail.com>
-Date: Mon Apr 9 19:17:41 2012 +0200
+Date: Mon Apr 9 19:17:41 2012 +0200
Add producer and version to xml output
utils/HtmlOutputDev.cc | 2 +-
- utils/pdf2xml.dtd | 4 ++++
+ utils/pdf2xml.dtd | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
commit cef6ac0ebbf8451beaadb3ddb6c991bbb7239432
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Apr 8 23:15:15 2012 +0200
+Date: Sun Apr 8 23:15:15 2012 +0200
FIX: Do not append a NUL character to Unicode page labels
@@ -17496,7 +19524,7 @@
commit 3d4985f14e54ddcc64ea654b23e931b7e6acfbdc
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 7 11:28:36 2012 +0200
+Date: Sat Apr 7 11:28:36 2012 +0200
Do not trust the rect of AnnotTextMarkup when drawing
@@ -17505,7 +19533,7 @@
commit c6296cd8c1ca398beac20f1e88c87b9082386247
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Apr 7 00:30:54 2012 +0200
+Date: Sat Apr 7 00:30:54 2012 +0200
Do not trust the rect of AnnotLine, AnnotPolygon and AnnotInk
when drawing
@@ -17517,7 +19545,7 @@
commit 503620ae74d719da52e3374725e490c62f7be7a3
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 29 19:07:05 2012 +0200
+Date: Thu Mar 29 19:07:05 2012 +0200
Do not recreate Annots when writing to PS, Export poppler-generated
Annot appearance resource dict
@@ -17537,16 +19565,16 @@
ownership, in
fact the returned object is destroyed by ~Page.
- poppler/Annot.cc | 28 ++++++++++++++++++++++++++++
- poppler/Annot.h | 5 +++--
- poppler/FontInfo.cc | 11 ++++-------
+ poppler/Annot.cc | 28 ++++++++++++++++++++++++++++
+ poppler/Annot.h | 5 +++--
+ poppler/FontInfo.cc | 11 ++++-------
poppler/PSOutputDev.cc | 12 +++---------
- poppler/Page.h | 2 +-
+ poppler/Page.h | 2 +-
5 files changed, 39 insertions(+), 19 deletions(-)
commit 2733504890333b0925d95e01310726d11fed44d8
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Mar 23 20:54:58 2012 +0100
+Date: Fri Mar 23 20:54:58 2012 +0100
Basic AnnotFreeText rendering (hardcoded font, WinAnsi characters
only)
@@ -17561,7 +19589,7 @@
commit 3023a59c0a1a5974b232f6f8cb629eabb6797616
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Mar 25 22:04:11 2012 +0200
+Date: Sun Mar 25 22:04:11 2012 +0200
AnnotTextMarkup rendering improvements
@@ -17575,7 +19603,7 @@
commit 8927ddc448edc016043107e88e3bc3b2b8b03269
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Thu Mar 22 17:33:01 2012 +0100
+Date: Thu Mar 22 17:33:01 2012 +0100
Improvements to AnnotLine::draw
@@ -17584,7 +19612,7 @@
commit bd7a40fd0312c753d1871558b566376304f1ff35
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 21 22:48:05 2012 +0100
+Date: Wed Mar 21 22:48:05 2012 +0100
AnnotInk rendering
@@ -17595,7 +19623,7 @@
commit 6a8794abe639db8284db079e028cbcd66e138884
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 21 22:33:13 2012 +0100
+Date: Wed Mar 21 22:33:13 2012 +0100
AnnotPolygon rendering
@@ -17606,7 +19634,7 @@
commit f389c50458079f24164b1c12b1151c8617485acb
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 21 21:12:59 2012 +0100
+Date: Wed Mar 21 21:12:59 2012 +0100
Do not fill AnnotGeometry with transparent color
@@ -17617,7 +19645,7 @@
commit c63cc22dd82f827305ad57f241ad49998f2a1c23
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 8 12:28:17 2012 +0200
+Date: Sun Apr 8 12:28:17 2012 +0200
Remove extra copy() (memleak)
@@ -17626,7 +19654,7 @@
commit ed0c9640abcbea459e3a276ee0b27631b01c32c4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 8 12:24:20 2012 +0200
+Date: Sun Apr 8 12:24:20 2012 +0200
Do not crash if mallocing too much memory
@@ -17639,7 +19667,7 @@
commit f1e621adbbb74ec709022b2a31195331651c83fa
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Apr 8 19:42:05 2012 +0930
+Date: Sun Apr 8 19:42:05 2012 +0930
cairo: use correct userfont font bbox
@@ -17652,7 +19680,7 @@
commit f5b708c3e04ba50756cd9f9530cf82f547443ce9
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Fri Apr 6 15:22:36 2012 +0200
+Date: Fri Apr 6 15:22:36 2012 +0200
ttc<->ttf fallback is expected for CJK font list in GlobalParamsWin.cc
@@ -17664,7 +19692,7 @@
commit 4e940b14a6fddde9a1714976ff8045e26cbf7d40
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Apr 2 20:03:11 2012 +0930
+Date: Mon Apr 2 20:03:11 2012 +0930
cairo: fix regression caused by mesh gradients
@@ -17673,7 +19701,7 @@
commit 74a7d963de75c0097eedcf4224d13cf275a64757
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 1 19:35:48 2012 +0200
+Date: Sun Apr 1 19:35:48 2012 +0200
regtest: remove debug print to show bisect exit status in Bisect.py
@@ -17682,7 +19710,7 @@
commit 2749db77eb8ccdbc4b0771163c8942f882f259f4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 1 19:20:37 2012 +0200
+Date: Sun Apr 1 19:20:37 2012 +0200
regtest: Fix crash when creating HTML report for a single test
@@ -17691,7 +19719,7 @@
commit 1c8e1bb637347d0d31945f9d265b29e7b49396e2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 1 19:11:57 2012 +0200
+Date: Sun Apr 1 19:11:57 2012 +0200
regtest: Don't show results for crashed or failed to run tests in
HTML report
@@ -17701,26 +19729,26 @@
commit a5f4936dfb3e60ca37f932cc066aa10765f3cbc9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sat Mar 24 23:13:48 2012 +0100
+Date: Sat Mar 24 23:13:48 2012 +0100
Fix: annotDisplayDecideCbk was not propagated
- poppler/OutputDev.h | 6 +++++-
+ poppler/OutputDev.h | 6 +++++-
poppler/PSOutputDev.cc | 11 ++++++++---
- poppler/PSOutputDev.h | 5 ++++-
- poppler/Page.cc | 3 ++-
- utils/HtmlOutputDev.h | 5 ++++-
+ poppler/PSOutputDev.h | 5 ++++-
+ poppler/Page.cc | 3 ++-
+ utils/HtmlOutputDev.h | 5 ++++-
5 files changed, 23 insertions(+), 7 deletions(-)
commit aab8c9a026f781da47ecedd453e225f906361444
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 29 21:49:38 2012 +0200
+Date: Thu Mar 29 21:49:38 2012 +0200
Increase version
CMakeLists.txt | 4 ++--
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
@@ -17727,7 +19755,7 @@
commit f7e65b62480631d0485167a81a588a176630dd8d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 29 21:48:11 2012 +0200
+Date: Thu Mar 29 21:48:11 2012 +0200
0.19.2 news
@@ -17736,7 +19764,7 @@
commit 627e072eb1edbfabf549656e9abf10100ed7340c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 29 21:40:13 2012 +0200
+Date: Thu Mar 29 21:40:13 2012 +0200
Update copyrights
@@ -17745,7 +19773,7 @@
commit e9ad888b003d343d8ca60f044c7cf10a8df81cf4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 29 19:49:34 2012 +0200
+Date: Thu Mar 29 19:49:34 2012 +0200
Add quotes to the poppler version define
@@ -17754,7 +19782,7 @@
commit 8172bb03b6e8f1c16e1a152fb251b10446f54129
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
-Date: Mon Mar 26 11:13:34 2012 +0200
+Date: Mon Mar 26 11:13:34 2012 +0200
define POPPLER_VERSION as C string
@@ -17765,7 +19793,7 @@
commit 4a38d933d06d189317b1b9028c3fa4ae2a1551af
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Thu Mar 29 19:34:25 2012 +0200
+Date: Thu Mar 29 19:34:25 2012 +0200
per-collection fallback for missing CID-keyed fonts on Win32
@@ -17774,7 +19802,7 @@
commit a0b3e0938e08847d10c5d7b7528c7c5d43a7a3b8
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 29 07:52:30 2012 +0200
+Date: Thu Mar 29 07:52:30 2012 +0200
Fix help message
@@ -17785,7 +19813,7 @@
commit 631224dc0c721119c91984f1940c9e51edf17eca
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Tue Mar 20 00:56:50 2012 +0100
+Date: Tue Mar 20 00:56:50 2012 +0100
Annotation removal
@@ -17797,7 +19825,7 @@
commit 20476370a445a26f1fae9db6ad58727ee3c63550
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 28 23:16:37 2012 +0200
+Date: Wed Mar 28 23:16:37 2012 +0200
Basic support for Annot appearance stream removal and invalidation
@@ -17808,7 +19836,7 @@
commit e9a066c3a53cc1cb73dd43a243390ae4e3c76ca3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 28 23:33:37 2012 +0200
+Date: Wed Mar 28 23:33:37 2012 +0200
Fix another typo in macGlyphNames
@@ -17817,7 +19845,7 @@
commit 3d277b230e806a648fcc6d9e7af39370aa89c2ae
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Feb 18 09:19:51 2012 +1030
+Date: Sat Feb 18 09:19:51 2012 +1030
Fix typo in "mu" glyph name in truetype 'post' table standard mac
ordering
@@ -17831,13 +19859,13 @@
commit 47b910d35b2cf5914ed4c07f751c5e8c304be7fc
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Mar 28 20:21:44 2012 +0200
+Date: Wed Mar 28 20:21:44 2012 +0200
Add quotes
this is quite small fix. In poppler's configure, basically the shell
variables are not enclosed, and not quoted, aslike
- if test x$use_glib = x; then
+ if test x$use_glib = x; then
This syntax make the test command confused when use_glib is multi-word
value, as, "no (required cairo output)". In such case, test cannot
know
@@ -17850,7 +19878,7 @@
commit 78224609f6c1d87deee72b60a8f8f9f6c36ac75f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 28 20:21:11 2012 +0200
+Date: Wed Mar 28 20:21:11 2012 +0200
Workaround Windows problem with libjpeg
@@ -17875,20 +19903,20 @@
commit d8cf31f8c7e190939525ad68cd4617fb48fea60e
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Mar 28 20:20:43 2012 +0200
+Date: Wed Mar 28 20:20:43 2012 +0200
update Makefile.am to reflect LIBJPEG_CFLAGS, LIBTIFF_CFLAGS,
LIBPNG_CFLAGS for related sources.
goo/Makefile.am | 15 +++++++++++++++
- poppler/Makefile.am | 6 ++++++
+ poppler/Makefile.am | 6 ++++++
splash/Makefile.am | 16 ++++++++++++++++
- utils/Makefile.am | 6 ++++++
+ utils/Makefile.am | 6 ++++++
4 files changed, 43 insertions(+)
commit f0c13f5efc641c63627b8f0b0815b6b511d8d196
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Mar 28 20:20:06 2012 +0200
+Date: Wed Mar 28 20:20:06 2012 +0200
Configure improvements for libs in non default paths
@@ -17900,7 +19928,7 @@
commit e55f485d803cb1f82e0d8a53d1998e1887c7920f
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Mar 28 20:19:08 2012 +0200
+Date: Wed Mar 28 20:19:08 2012 +0200
Improve m4/libjpeg.m4
@@ -17914,7 +19942,7 @@
commit e88c17d45220eea60a3dd7fab26a067616388c5f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 28 20:05:45 2012 +0200
+Date: Wed Mar 28 20:05:45 2012 +0200
Fix compile in windows
@@ -17923,7 +19951,7 @@
commit ee0eaabe24019d2af226ef03e3f456787525e040
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Mar 19 00:05:49 2012 +0100
+Date: Mon Mar 19 00:05:49 2012 +0100
Added Array::remove (and Object::arrayRemove)
@@ -17934,7 +19962,7 @@
commit d6a1b7dcaeac1e49533519b9f8a279fd64d04c67
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Mar 27 00:00:05 2012 +0200
+Date: Tue Mar 27 00:00:05 2012 +0200
Some regression fixes/improvements
@@ -17956,9 +19984,9 @@
fitting to the needs.
poppler/CharCodeToUnicode.cc | 5 +
- poppler/Gfx.cc | 329
+ poppler/Gfx.cc | 329
++++++++++++++++++++-----------------------
- poppler/GfxFont.cc | 3 +-
+ poppler/GfxFont.cc | 3 +-
poppler/GlobalParams.cc | 78 +++++++---
poppler/GlobalParams.h | 6 +-
5 files changed, 218 insertions(+), 203 deletions(-)
@@ -17965,7 +19993,7 @@
commit a5257efe00d0fe850b1abe5c552f7581027ac64c
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Mar 26 19:28:55 2012 +0200
+Date: Mon Mar 26 19:28:55 2012 +0200
Re-added forceRasterize to PSOutputDev (and qt4 fix too)â€
@@ -17979,16 +20007,16 @@
output if
forceRasterization was set.
- glib/poppler-page.cc | 2 +-
+ glib/poppler-page.cc | 2 +-
poppler/GlobalParams.cc | 16 ----------------
poppler/GlobalParams.h | 3 ---
poppler/PSOutputDev.cc | 6 +++++-
- poppler/PSOutputDev.h | 3 +++
+ poppler/PSOutputDev.h | 3 +++
5 files changed, 9 insertions(+), 21 deletions(-)
commit 55d039ada063a9427de6dd59846ce1570ab26e9f
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Mon Mar 26 22:31:29 2012 +0200
+Date: Mon Mar 26 22:31:29 2012 +0200
CJK improvements
@@ -18004,7 +20032,7 @@
commit a8b0fa4d07480242afba7751995e38eaf3147ac5
Author: Horst Prote <prote at fmi.uni-stuttgart.de>
-Date: Mon Mar 26 21:04:32 2012 +1030
+Date: Mon Mar 26 21:04:32 2012 +1030
don't add newline to last line extracted by TextSelectionDumper
@@ -18015,7 +20043,7 @@
commit c40e2315cd796ba928969d13a761f5f19d8438fc
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 23 21:49:42 2012 +1030
+Date: Fri Mar 23 21:49:42 2012 +1030
cairo: use a transparency group with
setSoftMaskFromImageMask/unsetSoftMaskFromImageMask
@@ -18035,7 +20063,7 @@
commit 7b57afea2e433fc7b6f359a62b1289f0e1da3267
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Mar 24 08:27:34 2012 +1030
+Date: Sat Mar 24 08:27:34 2012 +1030
cairo: update cairo mesh pattern to 1.12 api
@@ -18048,7 +20076,7 @@
commit 2f156b34fc8755ddd2a32cac830f3073d6b2c481
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Fri Mar 23 20:00:18 2012 +0100
+Date: Fri Mar 23 20:00:18 2012 +0100
Fix compile in mingw-gcc
@@ -18057,7 +20085,7 @@
commit 06b6db92dd1ec32f9a55347073f8b533aa074ee1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Sun Mar 18 23:58:05 2012 +0100
+Date: Sun Mar 18 23:58:05 2012 +0100
Added XRef::removeIndirectObject
@@ -18068,7 +20096,7 @@
commit a2e9b7c02ffa0e5edc4da18cc726993bc92fc684
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Mar 19 19:17:09 2012 +0100
+Date: Mon Mar 19 19:17:09 2012 +0100
Fix in AnnotMarkup's popup window handling
@@ -18081,7 +20109,7 @@
commit 05641304df67beae546a2fe18071f3be52707aa8
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Mon Mar 19 20:56:45 2012 +0100
+Date: Mon Mar 19 20:56:45 2012 +0100
Basic Annot border editing support
@@ -18091,7 +20119,7 @@
commit 3e6275a05066c152b265cc27275d9e4107c089e9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Fri Mar 16 21:47:02 2012 +0100
+Date: Fri Mar 16 21:47:02 2012 +0100
Yet new setters to AnnotFreeText
@@ -18101,7 +20129,7 @@
commit f69f41056fc8cd8a70b38024f255e9074af20bdc
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 20 15:18:33 2012 +0100
+Date: Tue Mar 20 15:18:33 2012 +0100
cmake: reset CMAKE_REQUIRED_INCLUDES/CMAKE_REQUIRED_LIBRARIES
@@ -18110,7 +20138,7 @@
commit 4a9238441a5317c3304296e4e6430cccefe8322c
Author: Ihar Filipau <thephilips at gmail.com>
-Date: Fri Mar 16 00:07:45 2012 +0100
+Date: Fri Mar 16 00:07:45 2012 +0100
Flip images if they need to
@@ -18122,7 +20150,7 @@
commit 6d68d0d3acc8c8e0d9d310b2e1ba2b07d6bfe942
Author: Ihar Filipau <thephilips at gmail.com>
-Date: Thu Mar 15 22:56:10 2012 +0100
+Date: Thu Mar 15 22:56:10 2012 +0100
pdftohtml: extract mask images even if they are not JPEG
@@ -18130,12 +20158,12 @@
utils/HtmlOutputDev.cc | 203
+++++++++++++++++++++++++++++++------------------
- utils/HtmlOutputDev.h | 3 +
+ utils/HtmlOutputDev.h | 3 +
2 files changed, 131 insertions(+), 75 deletions(-)
commit 60155e0fc7224a6b479bf62133f72c460fe48078
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:46:53 2012 +0100
+Date: Thu Mar 15 20:46:53 2012 +0100
Install poppler-media.h
@@ -18144,7 +20172,7 @@
commit 6a173844d5ca6f32e188406ab14cae6a7548fc1d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:44:12 2012 +0100
+Date: Thu Mar 15 20:44:12 2012 +0100
Add the export
@@ -18153,24 +20181,24 @@
commit e401f8e6ba3e18d5a3a4920cd111b2174c75f415
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:32:12 2012 +0100
+Date: Thu Mar 15 20:32:12 2012 +0100
Increase version and sonames
- CMakeLists.txt | 4 ++--
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- glib/CMakeLists.txt | 2 +-
- glib/Makefile.am | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 4 ++--
+ 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 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
commit ce059698e8c5097f75e7a0f828af0936aa104af0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:27:45 2012 +0100
+Date: Thu Mar 15 20:27:45 2012 +0100
0.19.1 news
@@ -18182,7 +20210,7 @@
commit 2041d5721871adb2a23999c16ecbdc60abb7b1c4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:20:31 2012 +0100
+Date: Thu Mar 15 20:20:31 2012 +0100
Update C years
@@ -18193,7 +20221,7 @@
commit 95d684aa2a87d01296f5e93516f2ac3f54adbec8
Author: Guillermo Amaral <gamaral at kde.org>
-Date: Thu Mar 15 20:13:20 2012 +0100
+Date: Thu Mar 15 20:13:20 2012 +0100
Remove the QIODevice and go with a not so good but more safer
QByteArray
@@ -18200,20 +20228,20 @@
Bug #47336
- qt4/src/CMakeLists.txt | 1 -
- qt4/src/Makefile.am | 1 -
- qt4/src/poppler-media.cc | 35 ++++++++++-----
- qt4/src/poppler-media.h | 4 +-
- qt4/src/poppler-page.cc | 1 -
+ qt4/src/CMakeLists.txt | 1 -
+ qt4/src/Makefile.am | 1 -
+ qt4/src/poppler-media.cc | 35 ++++++++++-----
+ qt4/src/poppler-media.h | 4 +-
+ qt4/src/poppler-page.cc | 1 -
qt4/src/poppler-streamsequentialdevice-private.h | 51
---------------------
- qt4/src/poppler-streamsequentialdevice.cc | 56
+ qt4/src/poppler-streamsequentialdevice.cc | 56
------------------------
7 files changed, 26 insertions(+), 123 deletions(-)
commit 9fee12f9bee7252db0974ef69870b69ff1452053
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 19:23:47 2012 +0100
+Date: Thu Mar 15 19:23:47 2012 +0100
Compile++
@@ -18222,27 +20250,27 @@
commit aa1e6d12d063a64a22841f7996101b45aa680ec7
Author: Guillermo Amaral <gamaral at kdab.com>
-Date: Thu Mar 15 00:35:31 2012 +0100
+Date: Thu Mar 15 00:35:31 2012 +0100
Added media rendition support for Qt4
- qt4/src/CMakeLists.txt | 3 +
- qt4/src/poppler-annotation.cc | 66 ++++++++++
- qt4/src/poppler-annotation.h | 47 ++++++-
- qt4/src/poppler-link.cc | 44 +++++++
- qt4/src/poppler-link.h | 38 +++++-
- qt4/src/poppler-media.cc | 149
+ qt4/src/CMakeLists.txt | 3 +
+ qt4/src/poppler-annotation.cc | 66 ++++++++++
+ qt4/src/poppler-annotation.h | 47 ++++++-
+ qt4/src/poppler-link.cc | 44 +++++++
+ qt4/src/poppler-link.h | 38 +++++-
+ qt4/src/poppler-media.cc | 149
+++++++++++++++++++++++
- qt4/src/poppler-media.h | 94 ++++++++++++++
- qt4/src/poppler-page.cc | 32 ++++-
- qt4/src/poppler-qt4.h | 2 +
+ qt4/src/poppler-media.h | 94 ++++++++++++++
+ qt4/src/poppler-page.cc | 32 ++++-
+ qt4/src/poppler-qt4.h | 2 +
qt4/src/poppler-streamsequentialdevice-private.h | 51 ++++++++
- qt4/src/poppler-streamsequentialdevice.cc | 56 +++++++++
+ qt4/src/poppler-streamsequentialdevice.cc | 56 +++++++++
11 files changed, 579 insertions(+), 3 deletions(-)
commit 258e2197afa49e60b0b13a05408fc8d484dd8147
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:25:00 2012 +0100
+Date: Wed Mar 14 23:25:00 2012 +0100
Added some new setters to AnnotFreeText
@@ -18252,7 +20280,7 @@
commit 84a62ac157e03880c1c1eda60c3927bd4414640e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:24:28 2012 +0100
+Date: Wed Mar 14 23:24:28 2012 +0100
Added some new setters to AnnotGeometry, AnnotInk and AnnotCaret
@@ -18263,7 +20291,7 @@
commit 233c9a097bdc382f6a2eb6319ee15528c72e9632
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:23:59 2012 +0100
+Date: Wed Mar 14 23:23:59 2012 +0100
Added some new setters to AnnotTextMarkup and AnnotStamp
@@ -18274,7 +20302,7 @@
commit 8fb3ac6cf66233b80959ba99a2c706111050f5f1
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:23:23 2012 +0100
+Date: Wed Mar 14 23:23:23 2012 +0100
Added Page::getDoc()
@@ -18283,7 +20311,7 @@
commit dc4cb07c1e735006d5168e0e65f5143d7fc53e12
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:22:10 2012 +0100
+Date: Wed Mar 14 23:22:10 2012 +0100
Added some new setters to AnnotLine and AnnotPolygon
@@ -18294,7 +20322,7 @@
commit 4931018eecc37dbbe0df1a456347ab200f1b057a
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:21:07 2012 +0100
+Date: Wed Mar 14 23:21:07 2012 +0100
Make Dict::set remove the entry if object is Null
@@ -18303,7 +20331,7 @@
commit 13ac2c0bed3fa5515a3c068488cb6a0b17410a97
Author: Fabio D'Urso <fabiodurso at hotmail.it>
-Date: Wed Mar 14 23:20:13 2012 +0100
+Date: Wed Mar 14 23:20:13 2012 +0100
Added some new setters to Annot and AnnotMarkup
@@ -18314,7 +20342,7 @@
commit aa2b5ffa7961aac0aea33ae9a42bf1f38a756b1b
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 14 16:25:35 2012 +0100
+Date: Wed Mar 14 16:25:35 2012 +0100
qt4: replace ObjectReference with simplier Ref
@@ -18323,20 +20351,20 @@
this needed a couple of explicit initializations of Ref (since it's
a simple struct with no methods) and a private operator== for it
- qt4/src/CMakeLists.txt | 1 -
+ qt4/src/CMakeLists.txt | 1 -
qt4/src/poppler-annotation-private.h | 4 +-
- qt4/src/poppler-annotation.cc | 1 +
- qt4/src/poppler-link.cc | 16 ++++---
- qt4/src/poppler-link.h | 5 +-
+ qt4/src/poppler-annotation.cc | 1 +
+ qt4/src/poppler-link.cc | 16 ++++---
+ qt4/src/poppler-link.h | 5 +-
qt4/src/poppler-objectreference.cc | 89
------------------------------------
qt4/src/poppler-objectreference_p.h | 77 -------------------------------
- qt4/src/poppler-page.cc | 7 ++-
+ qt4/src/poppler-page.cc | 7 ++-
8 files changed, 21 insertions(+), 179 deletions(-)
commit e5b914b2bfbb5e95ecde5f1ce148374b1d58dadd
Author: Ihar Filipau <thephilips at gmail.com>
-Date: Tue Mar 13 23:54:26 2012 +0100
+Date: Tue Mar 13 23:54:26 2012 +0100
Add possibilty of controlling word breaks percentage
@@ -18343,13 +20371,13 @@
Bug #47022
utils/HtmlOutputDev.cc | 7 +++++--
- utils/pdftohtml.1 | 5 +++++
- utils/pdftohtml.cc | 7 +++++++
+ utils/pdftohtml.1 | 5 +++++
+ utils/pdftohtml.cc | 7 +++++++
3 files changed, 17 insertions(+), 2 deletions(-)
commit 4388cb69114e406ec29e8b6976d1a900e4ab1b7d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 11 23:37:39 2012 +0100
+Date: Sun Mar 11 23:37:39 2012 +0100
Make doUpdateFont protected
@@ -18362,39 +20390,39 @@
commit 448cfc431b7067af38da51e725ac0f1b2a0bc8f8
Author: Tobias Koenig <tokoe at kdab.com>
-Date: Sun Mar 11 23:22:18 2012 +0100
+Date: Sun Mar 11 23:22:18 2012 +0100
support for LinkMovie object in Qt4 frontend
Bug #40561
- qt4/src/CMakeLists.txt | 1 +
+ qt4/src/CMakeLists.txt | 1 +
qt4/src/poppler-annotation-private.h | 4 ++
- qt4/src/poppler-annotation.h | 4 ++
- qt4/src/poppler-link.cc | 42 +++++++++++++----
- qt4/src/poppler-link.h | 43 +++++++++++++++--
+ qt4/src/poppler-annotation.h | 4 ++
+ qt4/src/poppler-link.cc | 42 +++++++++++++----
+ qt4/src/poppler-link.h | 43 +++++++++++++++--
qt4/src/poppler-objectreference.cc | 89
++++++++++++++++++++++++++++++++++++
qt4/src/poppler-objectreference_p.h | 77 +++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 39 ++++++++++++----
+ qt4/src/poppler-page.cc | 39 ++++++++++++----
8 files changed, 276 insertions(+), 23 deletions(-)
commit a0d151deabf8243c98ff9953f8a43bb56fbf95a9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 11 16:05:15 2012 +0100
+Date: Sun Mar 11 16:05:15 2012 +0100
regtest: Add find-regression command to run git bisect automatically
- regtest/Bisect.py | 113
+ regtest/Bisect.py | 113
++++++++++++++++++++++++++++++++++++
- regtest/builder/__init__.py | 86 +++++++++++++++++++++++++++
- regtest/builder/autotools.py | 63 ++++++++++++++++++++
- regtest/commands/find-regression.py | 77 ++++++++++++++++++++++++
+ regtest/builder/__init__.py | 86 +++++++++++++++++++++++++++
+ regtest/builder/autotools.py | 63 ++++++++++++++++++++
+ regtest/commands/find-regression.py | 77 ++++++++++++++++++++++++
4 files changed, 339 insertions(+)
commit 856768c380ecea30ce9727b81c4c44b4f9489626
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 10 18:15:58 2012 +0100
+Date: Sat Mar 10 18:15:58 2012 +0100
regtest: Add information about skipped tests in the summary
@@ -18403,7 +20431,7 @@
commit 508c7c3ef1f22459daa822f8287cab382119e753
Author: Tobias Koenig <tobias.koenig at kdab.com>
-Date: Wed Mar 7 18:35:05 2012 +0100
+Date: Wed Mar 7 18:35:05 2012 +0100
Fix logic error in Rendition parsing code
@@ -18417,7 +20445,7 @@
commit 68625258ab3cfc3e8e10a727e397f80bed0d1f5c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Mar 4 18:37:53 2012 +1030
+Date: Sun Mar 4 18:37:53 2012 +1030
glib demo: make ctrl-q quit the demo
@@ -18426,7 +20454,7 @@
commit 684b47727ba810ad6bf239e2838aa65b6f6cec36
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Mar 4 18:10:49 2012 +1030
+Date: Sun Mar 4 18:10:49 2012 +1030
glib demo: show font encoding in font demo
@@ -18435,18 +20463,18 @@
commit 48c08d28645d82ab9d67433a0150f6e1ba24b7c6
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Mar 4 17:49:56 2012 +1030
+Date: Sun Mar 4 17:49:56 2012 +1030
glib: add poppler_fonts_iter_get_encoding
- glib/poppler-document.cc | 26 ++++++++++++++++++++++++++
- glib/poppler-document.h | 1 +
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-document.cc | 26 ++++++++++++++++++++++++++
+ glib/poppler-document.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 28 insertions(+)
commit 8d935569a977675afac35cf1bd5f2611b6a771b6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 5 21:59:09 2012 +0100
+Date: Mon Mar 5 21:59:09 2012 +0100
Fix regression in some PSOutputDev array sizing
@@ -18455,7 +20483,7 @@
commit 2484bc0f29aef74c45ea39ef1e24804ed736154c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 4 23:47:24 2012 +0100
+Date: Sun Mar 4 23:47:24 2012 +0100
Fix mismatch in some functions declarations
@@ -18464,7 +20492,7 @@
commit 35c960d198d2efa97d15e962662114c5c31b8d20
Author: Even Rouault <even.rouault at mines-paris.org>
-Date: Sun Mar 4 20:32:42 2012 +0100
+Date: Sun Mar 4 20:32:42 2012 +0100
Do not crash on malformed files with 0 bits in the color map of
an image
@@ -18474,7 +20502,7 @@
commit dae29c6c201cd69cbf4f008de865cc19a36f29b3
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Mar 4 15:22:02 2012 +0100
+Date: Sun Mar 4 15:22:02 2012 +0100
CJK substitute implementation on WIndows platforms.
@@ -18496,8 +20524,8 @@
gswin32c -q -dBATCH -sFONTDIR=<windows font directory>
-sCIDFMAP=<popper data dir>/cidfmap mkcidfm.ps
- poppler/GlobalParams.cc | 5 +++
- poppler/GlobalParams.h | 2 +
+ poppler/GlobalParams.cc | 5 +++
+ poppler/GlobalParams.h | 2 +
poppler/GlobalParamsWin.cc | 106
++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 103 insertions(+), 10 deletions(-)
@@ -18504,7 +20532,7 @@
commit 32e47ee03840cc8f21c00497025864d77edb75f5
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Mar 4 15:21:13 2012 +0100
+Date: Sun Mar 4 15:21:13 2012 +0100
Improve CJK suport in PSOutputDev
@@ -18545,7 +20573,7 @@
commit 61037a6de157e39331ae7a8b12ee5a115fd7e936
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Mar 4 17:40:40 2012 +1030
+Date: Sun Mar 4 17:40:40 2012 +1030
glib demo: fix typo
@@ -18554,7 +20582,7 @@
commit aff5b0a4f04c12ad7733aedbc9997367f5873aa1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 3 20:10:17 2012 +0100
+Date: Sat Mar 3 20:10:17 2012 +0100
regtest: Ignore backends with no results when creating html report
@@ -18563,7 +20591,7 @@
commit 9d28b8db3561845f4ca94c29479a259ceaf78bc5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 3 14:42:51 2012 +0100
+Date: Sat Mar 3 14:42:51 2012 +0100
regtest: Add --pretty-diff option to create-report command
@@ -18576,7 +20604,7 @@
for text
files is very slow.
- regtest/HTMLReport.py | 128
+ regtest/HTMLReport.py | 128
+++++++++++++++++++++++++++++++++++++-
regtest/commands/create-report.py | 4 ++
2 files changed, 129 insertions(+), 3 deletions(-)
@@ -18583,24 +20611,24 @@
commit 670ea176495b8b580daba061840c914714bf422d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 2 22:22:16 2012 +1030
+Date: Fri Mar 2 22:22:16 2012 +1030
pdffonts: list the encoding of each font
Bug 46888
- poppler/CMap.h | 2 ++
- poppler/FontInfo.cc | 3 +++
- poppler/FontInfo.h | 2 ++
+ poppler/CMap.h | 2 ++
+ poppler/FontInfo.cc | 3 +++
+ poppler/FontInfo.h | 2 ++
poppler/GfxFont.cc | 26 ++++++++++++++++++++++++++
- poppler/GfxFont.h | 4 ++++
- utils/pdffonts.1 | 3 +++
- utils/pdffonts.cc | 7 ++++---
+ poppler/GfxFont.h | 4 ++++
+ utils/pdffonts.1 | 3 +++
+ utils/pdffonts.cc | 7 ++++---
7 files changed, 44 insertions(+), 3 deletions(-)
commit 3ab6b5ebf3b6c0d59bcb2ec68eae1aa95cab1d0e
Author: William Bader <williambader at hotmail.com>
-Date: Fri Mar 2 19:40:44 2012 +0100
+Date: Fri Mar 2 19:40:44 2012 +0100
Fix pdftops -passfonts regression
@@ -18614,39 +20642,39 @@
poppler/GlobalParams.cc | 9 +--------
poppler/GlobalParams.h | 4 +---
- utils/pdftops.cc | 10 +++++-----
+ utils/pdftops.cc | 10 +++++-----
3 files changed, 7 insertions(+), 16 deletions(-)
commit 6c1ee34424b1122c0a2222b776d8d475f7c555cd
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 2 18:41:58 2012 +1030
+Date: Fri Mar 2 18:41:58 2012 +1030
Update poppler copyright
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit cdb1350d1e28cf3bceda75736ca91e13d193de84
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 1 18:58:02 2012 +0100
+Date: Thu Mar 1 18:58:02 2012 +0100
Increase versions
- CMakeLists.txt | 4 ++--
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- glib/CMakeLists.txt | 2 +-
- glib/Makefile.am | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 4 ++--
+ 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 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
commit 2c9e6fa5b3bc6cd01618c3fb4f46533bfce97466
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 1 18:48:17 2012 +0100
+Date: Thu Mar 1 18:48:17 2012 +0100
0.19.0 news file
@@ -18655,36 +20683,36 @@
commit 14f6abfcb83f91755e6de05cd33870934bba3cfb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 1 17:53:25 2012 +0100
+Date: Thu Mar 1 17:53:25 2012 +0100
Update copyrights
- goo/JpegWriter.cc | 2 +-
+ goo/JpegWriter.cc | 2 +-
poppler/CairoFontEngine.cc | 1 +
poppler/CairoOutputDev.cc | 3 ++-
poppler/CairoOutputDev.h | 2 +-
poppler/CairoRescaleBox.cc | 15 +++++++++++++++
- poppler/FontInfo.cc | 2 +-
- poppler/FontInfo.h | 1 +
- poppler/Gfx.cc | 2 +-
- poppler/GfxFont.cc | 1 +
+ poppler/FontInfo.cc | 2 +-
+ poppler/FontInfo.h | 1 +
+ poppler/Gfx.cc | 2 +-
+ poppler/GfxFont.cc | 1 +
poppler/GlobalParams.cc | 2 ++
poppler/GlobalParams.h | 1 +
- poppler/Lexer.cc | 1 +
+ poppler/Lexer.cc | 1 +
poppler/NameToUnicodeTable.h | 2 +-
utils/ImageOutputDev.cc | 1 +
utils/ImageOutputDev.h | 1 +
- utils/parseargs.cc | 1 +
- utils/parseargs.h | 1 +
- utils/pdffonts.cc | 1 +
- utils/pdfimages.cc | 1 +
- utils/pdftocairo.cc | 2 +-
- utils/pdftoppm.cc | 2 +-
+ utils/parseargs.cc | 1 +
+ utils/parseargs.h | 1 +
+ utils/pdffonts.cc | 1 +
+ utils/pdfimages.cc | 1 +
+ utils/pdftocairo.cc | 2 +-
+ utils/pdftoppm.cc | 2 +-
21 files changed, 37 insertions(+), 8 deletions(-)
commit e63ca8184168f824575be9bbb64e9b1eac1eff94
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Mar 1 21:46:12 2012 +1030
+Date: Thu Mar 1 21:46:12 2012 +1030
pdftocairo: document that -scale-to will preserve aspect ratio
@@ -18695,7 +20723,7 @@
commit fa82a7ce1372e5976ad95624115fcd7a4d9bd22c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Mar 1 21:43:32 2012 +1030
+Date: Thu Mar 1 21:43:32 2012 +1030
pdftocairo: allow one of -scale-to-[xy] = -1 to mean the aspect
ratio is to be preserved
@@ -18708,7 +20736,7 @@
commit a2b008223ad6887f00d76c535f2b0b0f13f52b76
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Feb 28 21:38:19 2012 +1030
+Date: Tue Feb 28 21:38:19 2012 +1030
glib: add copy button to selections demo
@@ -18717,7 +20745,7 @@
commit b666d19308a043206e405c7e9d4ad709d68d331b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Feb 28 21:07:06 2012 +1030
+Date: Tue Feb 28 21:07:06 2012 +1030
glib: show substitute font name in demo
@@ -18726,19 +20754,19 @@
commit 18bc59fcf5a59b1fd51a631c02e900790c3a6dc0
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Feb 28 21:06:38 2012 +1030
+Date: Tue Feb 28 21:06:38 2012 +1030
glib: add poppler_fonts_iter_get_substitute_name
- glib/poppler-document.cc | 27 +++++++++++++++++++++++++++
- glib/poppler-document.h | 1 +
- glib/reference/poppler-docs.sgml | 4 ++++
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-document.cc | 27 +++++++++++++++++++++++++++
+ glib/poppler-document.h | 1 +
+ glib/reference/poppler-docs.sgml | 4 ++++
+ glib/reference/poppler-sections.txt | 1 +
4 files changed, 33 insertions(+)
commit 4eaafe67de79fb63ebf61f031a97bbc0ed6a8891
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 29 23:22:34 2012 +0100
+Date: Wed Feb 29 23:22:34 2012 +0100
Change nnnnnn to number
@@ -18750,7 +20778,7 @@
commit aec6cb67951e56e4557a11c4fdf301e585268fe4
Author: William Bader <williambader at hotmail.com>
-Date: Wed Feb 29 23:18:16 2012 +0100
+Date: Wed Feb 29 23:18:16 2012 +0100
Fix stuff lost when merging xpdf303
@@ -18762,13 +20790,13 @@
poppler/PSOutputDev.cc | 284
+++++++++++++++++++++++++++++++++++++++++--------
- poppler/Stream.cc | 55 ++++++++--
- poppler/Stream.h | 39 ++++++-
+ poppler/Stream.cc | 55 ++++++++--
+ poppler/Stream.h | 39 ++++++-
3 files changed, 320 insertions(+), 58 deletions(-)
commit e977925a1eb15083e6b020b31da77ddef9d5df02
Author: William Bader <williambader at hotmail.com>
-Date: Wed Feb 29 23:12:24 2012 +0100
+Date: Wed Feb 29 23:12:24 2012 +0100
Fix double alloc
@@ -18779,7 +20807,7 @@
commit e13efe04facdc10f3acffece3b057544f018f40c
Author: William Bader <williambader at hotmail.com>
-Date: Wed Feb 29 23:10:43 2012 +0100
+Date: Wed Feb 29 23:10:43 2012 +0100
Fix memory leak
@@ -18790,7 +20818,7 @@
commit adfc03e441b2a86dab5216dc560fd79343dfbe4f
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Feb 29 21:10:56 2012 +0100
+Date: Wed Feb 29 21:10:56 2012 +0100
Only use Hints table when there are no parse errors
@@ -18803,7 +20831,7 @@
commit 7ec31b8dc40ec8a3534fbb89964aa011aeb81f5e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Feb 27 21:15:39 2012 +1030
+Date: Mon Feb 27 21:15:39 2012 +1030
pdftoppm: document that -scale-to will preserve aspect ratio
@@ -18812,7 +20840,7 @@
commit 38ace7db5de0b2b247fd520e48a8f26e5d28c9d7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Feb 25 20:02:22 2012 +1030
+Date: Sat Feb 25 20:02:22 2012 +1030
pdftoppm: allow one of -scale-to-[xy] = -1 to mean the aspect ratio
is to be preserved
@@ -18825,20 +20853,20 @@
commit 738b879ebb536cc84d7ec96543d484023b69e6d3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 25 20:53:58 2012 +0100
+Date: Sat Feb 25 20:53:58 2012 +0100
regtest: Add create-report command to generate html report of
test results
- regtest/HTMLReport.py | 197
+ regtest/HTMLReport.py | 197
++++++++++++++++++++++++++++++++++++++
- regtest/backends/__init__.py | 20 +++-
+ regtest/backends/__init__.py | 20 +++-
regtest/commands/create-report.py | 57 +++++++++++
3 files changed, 273 insertions(+), 1 deletion(-)
commit d5faabd509c2860ab199ee89b8ef9d4c14fa5118
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 25 20:50:53 2012 +0100
+Date: Sat Feb 25 20:50:53 2012 +0100
regtest: Use diff.png extension for image diff files
@@ -18852,7 +20880,7 @@
commit 2a5f1594a23cf521497f904b502fbadf56a9e780
Author: William Bader <williambader at hotmail.com>
-Date: Sat Feb 25 16:32:33 2012 +0100
+Date: Sat Feb 25 16:32:33 2012 +0100
Fix PSOutputDev regression with -level1
@@ -18861,7 +20889,7 @@
commit 6a5deb0a86ad227cce3f85b1f58a9b86755cd812
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Feb 25 19:39:02 2012 +1030
+Date: Sat Feb 25 19:39:02 2012 +1030
autoconf: PKG_CHECK_EXISTS should not have the variable prefix in
the first argument
@@ -18871,7 +20899,7 @@
commit 8f4566c14a727fb75c4c353989cf5eb96516c2e3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Feb 22 21:21:52 2012 +1030
+Date: Wed Feb 22 21:21:52 2012 +1030
autoconf: replace openjpeg compile test with a version test
@@ -18883,7 +20911,7 @@
commit 30f38bf425e2f76b3f6cc4c080137ac7219a9dbe
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Feb 22 21:01:59 2012 +1030
+Date: Wed Feb 22 21:01:59 2012 +1030
autoconf: Use pkgconfig to check for libopenjpeg
@@ -18898,7 +20926,7 @@
commit 466340d257ff0fe7e3a88a4e013e3feec3f7b70a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 23 23:47:15 2012 +0100
+Date: Thu Feb 23 23:47:15 2012 +0100
Combine UTF16 surrogate pairs
@@ -18909,7 +20937,7 @@
commit 675ef2bda3c4e06b39e2ba09b3b19d99cfb001b6
Author: Oliver Sander <sander at mi.fu-berlin.de>
-Date: Thu Feb 23 23:22:50 2012 +0100
+Date: Thu Feb 23 23:22:50 2012 +0100
Compile
@@ -18918,7 +20946,7 @@
commit 7705e65c231cc3af296bf19f5cba110cabb72e7d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 23 23:09:23 2012 +0100
+Date: Thu Feb 23 23:09:23 2012 +0100
Generate outlines in pdftohtml in -xml mode.
@@ -18926,14 +20954,14 @@
utils/HtmlOutputDev.cc | 130
++++++++++++++++++++++++++++++++++++-------------
- utils/HtmlOutputDev.h | 7 ++-
- utils/pdf2xml.dtd | 7 ++-
- utils/pdftohtml.cc | 5 +-
+ utils/HtmlOutputDev.h | 7 ++-
+ utils/pdf2xml.dtd | 7 ++-
+ utils/pdftohtml.cc | 5 +-
4 files changed, 108 insertions(+), 41 deletions(-)
commit 30446bdd7e202eed88d131e04477c76861fd145c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 23 22:56:17 2012 +0100
+Date: Thu Feb 23 22:56:17 2012 +0100
Use an Identity CharCodeToUnicode for Adobe-Identity and Adobe-UCS
collections
@@ -18944,12 +20972,12 @@
poppler/CharCodeToUnicode.cc | 18 +++++++++++++-----
poppler/CharCodeToUnicode.h | 7 +++++--
- poppler/GfxFont.cc | 13 +++++++------
+ poppler/GfxFont.cc | 13 +++++++------
3 files changed, 25 insertions(+), 13 deletions(-)
commit 71104f1ec55d3be999afaa1b62405454b31066a9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 23 19:34:57 2012 +0100
+Date: Thu Feb 23 19:34:57 2012 +0100
Remove unneded CharCodeToUnicode includes
@@ -18961,7 +20989,7 @@
commit c0c8cc1592ee6aa13157e34f8083b951d487a413
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Feb 23 21:13:23 2012 +1030
+Date: Thu Feb 23 21:13:23 2012 +1030
glib docs: fix typo
@@ -18970,7 +20998,7 @@
commit fde3bed0f400a50f31f1f6bcee44ac1b2c17ddc6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 22 00:03:37 2012 +0100
+Date: Wed Feb 22 00:03:37 2012 +0100
pdfinfo: decode utf-16 surrogate pairs
@@ -18982,20 +21010,20 @@
commit 3361564364a1799fc3d6c6df9f208c5531c407dc
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Feb 21 22:20:02 2012 +0100
+Date: Tue Feb 21 22:20:02 2012 +0100
Expand glyph name ligatures such as "ff", "ffi" etc to normal form
Bug 7002
- poppler/GfxFont.cc | 14 +++++++++++++-
- poppler/UnicodeTypeTable.cc | 9 +++++++++
- poppler/UnicodeTypeTable.h | 3 +++
+ poppler/GfxFont.cc | 14 +++++++++++++-
+ poppler/UnicodeTypeTable.cc | 9 +++++++++
+ poppler/UnicodeTypeTable.h | 3 +++
3 files changed, 25 insertions(+), 1 deletion(-)
commit d0186c558f4a84a9317687ad50b460d34fb5fdf0
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 20 22:18:00 2012 +0100
+Date: Mon Feb 20 22:18:00 2012 +0100
cmake: support for lcms2
@@ -19003,29 +21031,29 @@
CMake build system,
importing the FindLCMS2.cmake from kdelibs
- CMakeLists.txt | 26 +++++++++++++--
+ CMakeLists.txt | 26 +++++++++++++--
cmake/modules/FindLCMS2.cmake | 73
+++++++++++++++++++++++++++++++++++++++++++
- config.h.cmake | 3 ++
- utils/CMakeLists.txt | 3 ++
+ config.h.cmake | 3 ++
+ utils/CMakeLists.txt | 3 ++
4 files changed, 102 insertions(+), 3 deletions(-)
commit e48c22d3b70412015b9cc07a9a6ce07845274e13
Author: Koji Otani <sho at bbr.jp>
-Date: Mon Feb 20 22:04:01 2012 +0100
+Date: Mon Feb 20 22:04:01 2012 +0100
Add support for lcms2
- configure.ac | 24 ++++++-
- poppler/GfxState.cc | 159
+ configure.ac | 24 ++++++-
+ poppler/GfxState.cc | 159
+++++++++++++++++++++++++++-----------------
- qt4/src/poppler-document.cc | 5 ++
- utils/pdftocairo.cc | 17 +++++
+ qt4/src/poppler-document.cc | 5 ++
+ utils/pdftocairo.cc | 17 +++++
4 files changed, 143 insertions(+), 62 deletions(-)
commit 1bcae7aa8f87cc85ee6b477bf0abb49452e46505
Author: Igor Slepchin <igor.redhat at gmail.com>
-Date: Sun Feb 19 23:40:50 2012 +0100
+Date: Sun Feb 19 23:40:50 2012 +0100
Consistently check if pdftohtml needs to generate outlines.
@@ -19034,7 +21062,7 @@
commit 126bf08105e319f9216654782e5a63f99f1d1825
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 19 23:18:25 2012 +0100
+Date: Sun Feb 19 23:18:25 2012 +0100
Update glyph names to Unicode values mapping
@@ -19049,7 +21077,7 @@
commit c0fec84312a37f62bdbfdee7c8e9b520af28330a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 19 14:47:24 2012 +0100
+Date: Sun Feb 19 14:47:24 2012 +0100
fix typo, GString -> GooString
@@ -19058,7 +21086,7 @@
commit aaae8996766f259dcc329755c7cccde7c916c1fb
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Feb 16 22:22:15 2012 +1030
+Date: Thu Feb 16 22:22:15 2012 +1030
cairo: set mask matrix before drawing an image with a mask
@@ -19069,7 +21097,7 @@
commit fff439f25d9bbd199db5646deccd80733138898e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Feb 19 15:45:31 2012 +1030
+Date: Sun Feb 19 15:45:31 2012 +1030
update .gitignore
@@ -19078,7 +21106,7 @@
commit 1cc3e152d6e879eb13fbdf2964ede3e01d13d097
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Feb 19 15:43:09 2012 +1030
+Date: Sun Feb 19 15:43:09 2012 +1030
glib docs: fix typo
@@ -19087,7 +21115,7 @@
commit 4f4db591276ec156c55b3a3c2020a1cf82f1519b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Feb 19 15:37:04 2012 +1030
+Date: Sun Feb 19 15:37:04 2012 +1030
cairo: fix pdftocairo crash when pdf document uses actualText
@@ -19096,7 +21124,7 @@
commit 9b72ee4e4c8658b2f7cd542d601a5c3be621d3fc
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Feb 18 17:34:12 2012 +0100
+Date: Sat Feb 18 17:34:12 2012 +0100
Make some of the unfilteredResets be really unfiltered
@@ -19106,7 +21134,7 @@
commit 33aded82fbd98832eaab7cb7487fe6a1c7ef15f5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 18 17:21:10 2012 +0100
+Date: Sat Feb 18 17:21:10 2012 +0100
Rework XRef getNumObjects and getSize
@@ -19121,7 +21149,7 @@
commit 521d3740e9b7d2cfacf29f089a4a8f6c962de807
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Feb 13 22:05:18 2012 +1030
+Date: Mon Feb 13 22:05:18 2012 +1030
pdfimages: add -list option to list all images
@@ -19130,13 +21158,13 @@
utils/ImageOutputDev.cc | 204
++++++++++++++++++++++++++++++++++++++++++------
utils/ImageOutputDev.h | 20 ++++-
- utils/pdfimages.1 | 101 ++++++++++++++++++++++++
- utils/pdfimages.cc | 12 ++-
+ utils/pdfimages.1 | 101 ++++++++++++++++++++++++
+ utils/pdfimages.cc | 12 ++-
4 files changed, 307 insertions(+), 30 deletions(-)
commit 119b6b752314c9b13440eddf5bd1d5cef2966e80
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Feb 6 16:50:11 2012 +1030
+Date: Mon Feb 6 16:50:11 2012 +1030
cairo: don't read inline image streams twice
@@ -19147,34 +21175,34 @@
commit a76135391555145ec740d49a7141e60da0ea5dee
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Feb 14 20:11:19 2012 +0100
+Date: Tue Feb 14 20:11:19 2012 +0100
Add a configuration option for the test data dir
This makes 'make distcheck' run succesfully.
- CMakeLists.txt | 20 ++++++++++++++++++++
- Makefile.am | 2 +-
- configure.ac | 42
+ CMakeLists.txt | 20 ++++++++++++++++++++
+ Makefile.am | 2 +-
+ configure.ac | 42
+++++++++++++++++++++++++++++++++++++++++
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 1 +
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 1 +
qt4/tests/check_actualtext.cpp | 2 +-
qt4/tests/check_attachments.cpp | 14 +++++++-------
- qt4/tests/check_fonts.cpp | 18 +++++++++---------
- qt4/tests/check_links.cpp | 6 +++---
- qt4/tests/check_metadata.cpp | 32 +++++++++++++++----------------
+ qt4/tests/check_fonts.cpp | 18 +++++++++---------
+ qt4/tests/check_links.cpp | 6 +++---
+ qt4/tests/check_metadata.cpp | 32 +++++++++++++++----------------
qt4/tests/check_optcontent.cpp | 12 ++++++------
qt4/tests/check_pagelayout.cpp | 6 +++---
- qt4/tests/check_pagemode.cpp | 10 +++++-----
- qt4/tests/check_password.cpp | 12 ++++++------
+ qt4/tests/check_pagemode.cpp | 10 +++++-----
+ qt4/tests/check_password.cpp | 12 ++++++------
qt4/tests/check_permissions.cpp | 2 +-
- qt4/tests/check_search.cpp | 4 ++--
+ qt4/tests/check_search.cpp | 4 ++--
16 files changed, 124 insertions(+), 60 deletions(-)
commit 59946e0c34e762eb5f5a13b4ae8c9ec7fb21379a
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Feb 14 19:37:21 2012 +0100
+Date: Tue Feb 14 19:37:21 2012 +0100
Overprint implementation in postscript and splash device
@@ -19244,31 +21272,31 @@
with the SPLASH_CMYK directive.
poppler/PSOutputDev.cc | 67 ++++++++++--
- poppler/PSOutputDev.h | 3 +-
+ poppler/PSOutputDev.h | 3 +-
poppler/SplashOutputDev.cc | 62 ++++++++++--
- poppler/SplashOutputDev.h | 4 +-
- splash/Splash.cc | 70 +++++++++----
- splash/Splash.h | 4 +-
- splash/SplashState.cc | 5 +-
- splash/SplashState.h | 247
+ poppler/SplashOutputDev.h | 4 +-
+ splash/Splash.cc | 70 +++++++++----
+ splash/Splash.h | 4 +-
+ splash/SplashState.cc | 5 +-
+ splash/SplashState.h | 247
+++++++++++++++++++++++----------------------
- utils/pdftops.cc | 13 +++
+ utils/pdftops.cc | 13 +++
9 files changed, 308 insertions(+), 167 deletions(-)
commit b505920db6d3dac58c7e9f4f8917f4c4449b08a0
Merge: 9250449 a631281
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 14 19:18:54 2012 +0100
+Date: Tue Feb 14 19:18:54 2012 +0100
Merge remote-tracking branch 'origin/xpdf303merge'
Conflicts:
- utils/HtmlOutputDev.cc
- utils/HtmlOutputDev.h
+ utils/HtmlOutputDev.cc
+ utils/HtmlOutputDev.h
commit 9250449aaa279840d789b3a7cef75d06a0fd88e7
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Feb 12 23:16:41 2012 +0100
+Date: Sun Feb 12 23:16:41 2012 +0100
Improve moc detection when cross compiling
@@ -19277,7 +21305,7 @@
commit 66cf1fdb3ba6894f61d9078f5c30046b464347ae
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 12 22:27:58 2012 +0100
+Date: Sun Feb 12 22:27:58 2012 +0100
qt4: remove non-existing 'qt' include dirs
@@ -19288,7 +21316,7 @@
commit 53d8fc4d2978b70e8926e3df71facd1f39de9348
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 12 17:36:55 2012 +0100
+Date: Sun Feb 12 17:36:55 2012 +0100
man pages: fix minor issues with hypens and %
@@ -19298,7 +21326,7 @@
commit a63128179c65b5d9d6d9d41fa601a593b0a05d94
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Thu Feb 9 22:02:52 2012 +0100
+Date: Thu Feb 9 22:02:52 2012 +0100
[xpdf303] Fix merge issue
@@ -19307,7 +21335,7 @@
commit cd5a6a4d02e579e543067d1847164aff90363f16
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Thu Feb 9 22:01:42 2012 +0100
+Date: Thu Feb 9 22:01:42 2012 +0100
[xpdf303] Fix merge bug
@@ -19316,7 +21344,7 @@
commit 597fa37cacec928c40d0491174ce843fe01f26d9
Author: Igor Slepchin <igor.slepchin at gmail.com>
-Date: Wed Feb 8 19:22:13 2012 -0500
+Date: Wed Feb 8 19:22:13 2012 -0500
Close li tags in generated outlines.
@@ -19329,7 +21357,7 @@
commit 2fc36dba5f63703896722adb5127896e4c2840e7
Author: Igor Slepchin <igor.slepchin at gmail.com>
-Date: Thu Feb 9 00:15:13 2012 +0100
+Date: Thu Feb 9 00:15:13 2012 +0100
Get rid of static data members; merge duplicated jpeg dumping code.
@@ -19339,12 +21367,12 @@
utils/HtmlOutputDev.cc | 143
+++++++++++++++++++------------------------------
- utils/HtmlOutputDev.h | 15 ++++--
+ utils/HtmlOutputDev.h | 15 ++++--
2 files changed, 65 insertions(+), 93 deletions(-)
commit f655efe327ddd3b6a68353a62589d4e4f8a318a8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 8 23:58:27 2012 +0100
+Date: Wed Feb 8 23:58:27 2012 +0100
Fix memory leak when using HtmlOutputDev::mapEncodingToHtml
@@ -19353,12 +21381,12 @@
utils/HtmlOutputDev.cc | 47
++++++++++++++++++++++++-----------------------
- utils/HtmlOutputDev.h | 7 ++++---
+ utils/HtmlOutputDev.h | 7 ++++---
2 files changed, 28 insertions(+), 26 deletions(-)
commit 68f02d19c571fce956c7f4af6ccd0ff9ba8b1b03
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 8 23:47:46 2012 +0100
+Date: Wed Feb 8 23:47:46 2012 +0100
Fix leak in pdftohtml getInfoString
@@ -19370,7 +21398,7 @@
commit 2b7ba166c28e32653db4ae7acf90e06e0dd5975b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 8 19:12:52 2012 +0100
+Date: Wed Feb 8 19:12:52 2012 +0100
[xpdf303] Compile fixes
@@ -19380,7 +21408,7 @@
commit b8c9b179c9491cf6755b07bfdec4174e78b7d241
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 6 19:55:07 2012 +0100
+Date: Mon Feb 6 19:55:07 2012 +0100
[xpdf303] Adapt better to what we did and what xpdf303 does
@@ -19391,55 +21419,55 @@
poppler/SplashOutputDev.h | 1 -
splash/SplashFTFont.cc | 40
+++++++++++++++++++---------------------
- splash/SplashFTFont.h | 1 -
+ splash/SplashFTFont.h | 1 -
splash/SplashFTFontEngine.cc | 7 +++----
splash/SplashFTFontEngine.h | 5 ++---
splash/SplashFontEngine.cc | 3 +--
splash/SplashFontEngine.h | 1 -
- utils/pdftoppm.cc | 2 +-
+ utils/pdftoppm.cc | 2 +-
12 files changed, 26 insertions(+), 49 deletions(-)
commit ea6bc19564865e04431d9154802ae7fba975a716
Merge: e17f095 92ce79f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 6 01:18:25 2012 +0100
+Date: Mon Feb 6 01:18:25 2012 +0100
Merge branch 'master' into xpdf303merge
Conflicts:
- poppler/CairoOutputDev.cc
- poppler/CairoOutputDev.h
- poppler/FontInfo.cc
- poppler/GfxFont.cc
- poppler/GfxState.cc
- poppler/GlobalParams.cc
- poppler/GlobalParams.h
- poppler/Lexer.cc
+ poppler/CairoOutputDev.cc
+ poppler/CairoOutputDev.h
+ poppler/FontInfo.cc
+ poppler/GfxFont.cc
+ poppler/GfxState.cc
+ poppler/GlobalParams.cc
+ poppler/GlobalParams.h
+ poppler/Lexer.cc
commit e17f09563276ee25b6acfc127b6ea360da650030
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 6 00:25:53 2012 +0100
+Date: Mon Feb 6 00:25:53 2012 +0100
[xpdf303] TextOutputDev and associated changes
- cpp/poppler-page.cpp | 10 +-
- glib/poppler-page.cc | 5 +-
- poppler/ArthurOutputDev.cc | 1 +
- poppler/CairoOutputDev.cc | 2 +-
- poppler/Gfx.cc | 6 +-
- poppler/PSOutputDev.cc | 6 +-
+ cpp/poppler-page.cpp | 10 +-
+ glib/poppler-page.cc | 5 +-
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/Gfx.cc | 6 +-
+ poppler/PSOutputDev.cc | 6 +-
poppler/TextOutputDev.cc | 360
++++++++++++++++++++++++++++-----------------
poppler/TextOutputDev.h | 18 ++-
qt4/src/poppler-page.cc | 12 +-
- test/perf-test.cc | 2 +-
- utils/pdftotext.1 | 4 +
- utils/pdftotext.cc | 10 +-
+ test/perf-test.cc | 2 +-
+ utils/pdftotext.1 | 4 +
+ utils/pdftotext.cc | 10 +-
12 files changed, 270 insertions(+), 166 deletions(-)
commit 548648bf29dc1551443eb1925814342e7aadee46
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 5 23:08:44 2012 +0100
+Date: Sun Feb 5 23:08:44 2012 +0100
[xpdf303] Merge PDFDoc encryption related code
@@ -19448,31 +21476,31 @@
commit 6ee907f291427b8751a872b31210bf32e8d2b722
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 5 22:57:25 2012 +0100
+Date: Sun Feb 5 22:57:25 2012 +0100
[xpdf303] More merges from Thomas, basically PSOutputDev and some
other small stuff
- poppler/GfxFont.cc | 4 +-
- poppler/GlobalParams.cc | 95 ++-
- poppler/GlobalParams.h | 18 +-
- poppler/GlobalParamsWin.cc | 16 +-
- poppler/Hints.cc | 2 +-
+ poppler/GfxFont.cc | 4 +-
+ poppler/GlobalParams.cc | 95 ++-
+ poppler/GlobalParams.h | 18 +-
+ poppler/GlobalParamsWin.cc | 16 +-
+ poppler/Hints.cc | 2 +-
poppler/PSOutputDev.cc | 1814
++++++++++++++++++++++---------------------
- poppler/PSOutputDev.h | 51 +-
- poppler/Parser.cc | 13 +-
- poppler/Parser.h | 7 +-
- poppler/PreScanOutputDev.cc | 70 +-
- poppler/PreScanOutputDev.h | 16 +-
- poppler/XRef.cc | 91 ++-
- poppler/XRef.h | 3 +-
- utils/pdftops.cc | 2 +-
+ poppler/PSOutputDev.h | 51 +-
+ poppler/Parser.cc | 13 +-
+ poppler/Parser.h | 7 +-
+ poppler/PreScanOutputDev.cc | 70 +-
+ poppler/PreScanOutputDev.h | 16 +-
+ poppler/XRef.cc | 91 ++-
+ poppler/XRef.h | 3 +-
+ utils/pdftops.cc | 2 +-
14 files changed, 1231 insertions(+), 971 deletions(-)
commit 92ce79f47f929392f48737612a9690088573f63d
Author: Igor Slepchin <igor.redhat at gmail.com>
-Date: Sun Feb 5 15:55:39 2012 +0100
+Date: Sun Feb 5 15:55:39 2012 +0100
Proper unicode support when dumping PDF outline.
@@ -19484,17 +21512,17 @@
Conflicts:
- utils/HtmlOutputDev.cc
+ utils/HtmlOutputDev.cc
utils/HtmlOutputDev.cc | 197
++++++++++++++++++++++++++-----------------------
- utils/HtmlOutputDev.h | 6 +-
- utils/pdftohtml.cc | 3 +-
+ utils/HtmlOutputDev.h | 6 +-
+ utils/pdftohtml.cc | 3 +-
3 files changed, 112 insertions(+), 94 deletions(-)
commit 38ec58ed1cb54722aece875287b847643aa2c4b8
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Feb 4 17:13:30 2012 +1030
+Date: Sat Feb 4 17:13:30 2012 +1030
Lexer: convert integer to real when overflow occurs
@@ -19505,7 +21533,7 @@
commit df89de61b7d01f0f816e773cdb809faa3053e962
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 20:01:30 2012 +0100
+Date: Tue Jan 31 20:01:30 2012 +0100
glib: Exclude poppler-private.h from introspection files
@@ -19517,7 +21545,7 @@
commit 88cb6d9360bc943fc2cdda262dc46bf831641541
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 4 12:04:03 2012 +0100
+Date: Sat Feb 4 12:04:03 2012 +0100
glib: Update gtk-doc makefile and m4 file
@@ -19528,7 +21556,7 @@
commit 3f4164f84bbf748a2f919741669ef20db0fbda9f
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Feb 1 10:44:17 2012 +0100
+Date: Wed Feb 1 10:44:17 2012 +0100
gtk-doc: Fix build when builddir != srcdir
@@ -19539,7 +21567,7 @@
commit 8daeb82f982eba25fe8c7d07358f0a6593ddc89a
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Feb 2 13:01:45 2012 +0100
+Date: Thu Feb 2 13:01:45 2012 +0100
gtk-doc: Fix API documentation for poppler_page_free_annot_mapping()
@@ -19553,7 +21581,7 @@
commit f8ce9966e4f480949799a26c01bd861f4011b587
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 4 11:51:34 2012 +0100
+Date: Sat Feb 4 11:51:34 2012 +0100
gtk-doc: Remove reference to non existent method poppler_layer_free()
@@ -19564,7 +21592,7 @@
commit f58f3525f135bc47e89c23c33e96e43db10d4853
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Feb 2 15:59:47 2012 +0100
+Date: Thu Feb 2 15:59:47 2012 +0100
gtk-doc: Add more glib API documentation for poppler-document
@@ -19577,19 +21605,19 @@
commit 080247f6a47bc929b25f6e000f4474801af74b1f
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Feb 2 15:45:37 2012 +0100
+Date: Thu Feb 2 15:45:37 2012 +0100
gtk-doc: remove references to removed pixbuf functions
Bug #45549.
- glib/poppler-page.cc | 6 ++----
+ glib/poppler-page.cc | 6 ++----
glib/reference/poppler-sections.txt | 4 ----
2 files changed, 2 insertions(+), 8 deletions(-)
commit 47780d9ed1fd69068fdb9b9782e2cb37e2a5b217
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Feb 2 15:43:30 2012 +0100
+Date: Thu Feb 2 15:43:30 2012 +0100
gtk-doc: do not build doc for glib-demo
@@ -19602,24 +21630,24 @@
commit e320f335cc6e54c60bd2436799dd1f05beb060ba
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Feb 4 11:32:50 2012 +0100
+Date: Sat Feb 4 11:32:50 2012 +0100
gtk-doc: Fix typo's
Bug #45549.
- glib/poppler-annot.cc | 6 +++---
- glib/poppler-annot.h | 2 +-
- glib/poppler-document.cc | 2 +-
- glib/poppler-media.cc | 2 +-
- glib/poppler-page.cc | 3 +--
- glib/poppler-page.h | 4 ++--
+ glib/poppler-annot.cc | 6 +++---
+ glib/poppler-annot.h | 2 +-
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-media.cc | 2 +-
+ glib/poppler-page.cc | 3 +--
+ glib/poppler-page.h | 4 ++--
glib/reference/poppler-sections.txt | 4 +++-
7 files changed, 12 insertions(+), 11 deletions(-)
commit 1fe27b07975e9a9455708563118fb73cce696f81
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 12:49:01 2012 +0100
+Date: Tue Jan 31 12:49:01 2012 +0100
cairo: Remove unused variable in CairoFontEngine.cc
@@ -19630,7 +21658,7 @@
commit e3d80c79815ce46daf3c3f2b944f49eaf19bfea5
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 14:42:04 2012 +0100
+Date: Tue Jan 31 14:42:04 2012 +0100
Fix return value of downscale_box_filter()
@@ -19641,7 +21669,7 @@
commit e074e526fa206403b84da5ce0f27d7357223c7ac
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 13:02:16 2012 +0100
+Date: Tue Jan 31 13:02:16 2012 +0100
Fix return value of poppler_attachment_save
@@ -19652,7 +21680,7 @@
commit bc389cff91c350d7da186d4cf707c389c77bbc29
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 14:03:08 2012 +0100
+Date: Tue Jan 31 14:03:08 2012 +0100
glib-demo: Do not use deprecated gtk_dialog_set_has_separator()
@@ -19663,21 +21691,21 @@
commit e52e3c24663edaa630d9187e832223b474b74089
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 13:39:05 2012 +0100
+Date: Tue Jan 31 13:39:05 2012 +0100
glib-demo: Do not use deprecated GtkComboBox API
Bug #45439.
- glib/demo/annots.c | 6 ++++++
- glib/demo/print.c | 9 ++++++++-
- glib/demo/render.c | 16 ++++++++++++++++
+ glib/demo/annots.c | 6 ++++++
+ glib/demo/print.c | 9 ++++++++-
+ glib/demo/render.c | 16 ++++++++++++++++
glib/demo/selections.c | 8 ++++++++
4 files changed, 38 insertions(+), 1 deletion(-)
commit 165ab4ec122d0e1a6f30dcfba80aefc422cd83b7
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jan 31 12:15:51 2012 +0100
+Date: Tue Jan 31 12:15:51 2012 +0100
Fix build for builddir != srcdir
@@ -19688,7 +21716,7 @@
commit e424a13bb516464d59ad76fd0933e92f3307b21b
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Fri Feb 3 00:12:10 2012 +0100
+Date: Fri Feb 3 00:12:10 2012 +0100
pdfseparate fixes by Thomas after his last commit
@@ -19697,38 +21725,38 @@
commit 4fcd42cfa4424992cd4b36af38bc6230ce0706c9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 1 22:53:03 2012 +0100
+Date: Wed Feb 1 22:53:03 2012 +0100
[xpdf303] More merges from Thomas (with minor fixes from me)
Basically fonts related and some other small stuff
- poppler/Annot.cc | 6 +-
- poppler/ArthurOutputDev.cc | 47 +--
- poppler/CMap.cc | 153 ++++++++
- poppler/CMap.h | 16 +
- poppler/CairoFontEngine.cc | 43 +--
- poppler/CharCodeToUnicode.h | 1 +
- poppler/FontInfo.cc | 8 +-
- poppler/Gfx.cc | 363 +++++++++++--------
- poppler/GfxFont.cc | 831
+ poppler/Annot.cc | 6 +-
+ poppler/ArthurOutputDev.cc | 47 +--
+ poppler/CMap.cc | 153 ++++++++
+ poppler/CMap.h | 16 +
+ poppler/CairoFontEngine.cc | 43 +--
+ poppler/CharCodeToUnicode.h | 1 +
+ poppler/FontInfo.cc | 8 +-
+ poppler/Gfx.cc | 363 +++++++++++--------
+ poppler/GfxFont.cc | 831
+++++++++++++++++++++++++++++---------------
- poppler/GfxFont.h | 34 +-
- poppler/GfxState.cc | 81 +++--
- poppler/GfxState.h | 2 +
+ poppler/GfxFont.h | 34 +-
+ poppler/GfxState.cc | 81 +++--
+ poppler/GfxState.h | 2 +
poppler/GlobalParams.cc | 738 ++++++++++++++++++++++-----------------
poppler/GlobalParams.h | 112 +++---
poppler/GlobalParamsWin.cc | 180 ++++++++--
poppler/PSOutputDev.cc | 591 +++++++++++++++----------------
- poppler/PSOutputDev.h | 12 +-
- poppler/PreScanOutputDev.cc | 10 +-
- poppler/SplashOutputDev.cc | 59 ++--
- poppler/XRef.cc | 16 +-
+ poppler/PSOutputDev.h | 12 +-
+ poppler/PreScanOutputDev.cc | 10 +-
+ poppler/SplashOutputDev.cc | 59 ++--
+ poppler/XRef.cc | 16 +-
20 files changed, 2008 insertions(+), 1295 deletions(-)
commit 0089357de8ea96f3e394ea9cb37e8182ccf15ae2
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Wed Feb 1 19:17:38 2012 +0100
+Date: Wed Feb 1 19:17:38 2012 +0100
pdfseparate: Produce PDF/X conformant pdf pages if the original PDF
was PDF/X conformant.
@@ -19741,7 +21769,7 @@
commit be62a4f2e7d5db3b6d85d1b3026979f9561e6e15
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Jan 30 17:07:28 2012 +0100
+Date: Mon Jan 30 17:07:28 2012 +0100
Fix build with latest mingw-w64 headers
@@ -19748,13 +21776,13 @@
Fixes bug #45407.
(cherry picked from commit 58c17c3a61f18a6808ec9ba37e82734a655090ac)
- glib/poppler-annot.cc | 1 +
+ glib/poppler-annot.cc | 1 +
glib/poppler-document.cc | 1 +
2 files changed, 2 insertions(+)
commit acbc63348ce5e279e4d66ed4f240dc8d61df4e57
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Mon Jan 30 20:46:04 2012 +1030
+Date: Mon Jan 30 20:46:04 2012 +1030
pdftocairo/automake: link with lcms
@@ -19763,7 +21791,7 @@
commit 9548573a16629fecdbd44c9aac8b626ec6f53b81
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 30 00:32:52 2012 +0100
+Date: Mon Jan 30 00:32:52 2012 +0100
glib/cmake: various minor introspection improvements
@@ -19775,7 +21803,7 @@
commit bf2ffb1cc76bcf569419ac495f524c41bb6f1650
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 30 00:21:31 2012 +0100
+Date: Mon Jan 30 00:21:31 2012 +0100
cmake: support $(gir_name)_EXPORT_PACKAGES for g-ir-scanner
@@ -19784,7 +21812,7 @@
commit cbe7131e63c5896010e7e1ad5c0c3aa91611704d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 27 00:36:18 2012 +0100
+Date: Fri Jan 27 00:36:18 2012 +0100
Set OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG if you have it
@@ -19792,14 +21820,14 @@
(cherry picked from commit de6415af1a39ec7dfa4f149c6c5e311b86352cec)
cmake/modules/FindLIBOPENJPEG.cmake | 13 +++++++++++++
- config.h.cmake | 3 +++
- configure.ac | 8 ++++++++
- poppler/JPEG2000Stream.cc | 7 ++++++-
+ config.h.cmake | 3 +++
+ configure.ac | 8 ++++++++
+ poppler/JPEG2000Stream.cc | 7 ++++++-
4 files changed, 30 insertions(+), 1 deletion(-)
commit 641526d1a7e8032ea8f7b8ac42c5ad8c20448d9b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Jan 25 22:44:27 2012 +1030
+Date: Wed Jan 25 22:44:27 2012 +1030
jpeg: set image parameters after jpeg_set_defaults()
@@ -19817,7 +21845,7 @@
commit f7356a88fe983c2ddd7d5a50400768310a26c4d2
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Jan 26 11:33:28 2012 +1030
+Date: Thu Jan 26 11:33:28 2012 +1030
glib: add section in docs for new symbols in 0.18
@@ -19826,7 +21854,7 @@
commit b42c171de93dba56859beb21cfe5312d825fedd6
Author: Alexander Saprykin <xelfium at gmail.com>
-Date: Mon Jan 23 22:07:15 2012 +0100
+Date: Mon Jan 23 22:07:15 2012 +0100
Do not use 50Kb of stack in SplashXPath::addCurve
@@ -19838,7 +21866,7 @@
commit a04fca6266bda6d04068f38f16fe492cb6b8677b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Jan 21 09:41:12 2012 +1030
+Date: Sat Jan 21 09:41:12 2012 +1030
cairo: use fabs when comparing the transformed line width
@@ -19851,7 +21879,7 @@
commit ce1b6c7ca16847f07eeafc29c6503be6fa5a9a3d
Author: Patrick Pfeifer <p2000 at mailinator.com>
-Date: Thu Jan 19 14:54:48 2012 +0100
+Date: Thu Jan 19 14:54:48 2012 +0100
cairo: Fix test for rotation
@@ -19862,23 +21890,23 @@
commit 4765c3289635fe4fb006e7df4f83d7056eb42855
Author: Evan Nemerson <evan at coeus-group.com>
-Date: Sun Jan 15 11:02:50 2012 -0800
+Date: Sun Jan 15 11:02:50 2012 -0800
glib: various minor introspection and documentation improvements
Bug 44790
- glib/Makefile.am | 4 +++-
- glib/poppler-annot.cc | 8 ++++----
+ glib/Makefile.am | 4 +++-
+ glib/poppler-annot.cc | 8 ++++----
glib/poppler-attachment.h | 7 ++++---
glib/poppler-document.cc | 6 ++++--
- glib/poppler-media.h | 7 ++++---
- glib/poppler-page.cc | 23 +++++++++++++++--------
+ glib/poppler-media.h | 7 ++++---
+ glib/poppler-page.cc | 23 +++++++++++++++--------
6 files changed, 34 insertions(+), 21 deletions(-)
commit e8e42988c5cebab2ffa5fe020f30a3a645e90b5f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Jan 16 21:25:19 2012 +1030
+Date: Mon Jan 16 21:25:19 2012 +1030
cairo: ensure paintTransparencyGroup uses same ctm as
beginTransparencyGroup
@@ -19891,7 +21919,7 @@
commit f6c7aa752f9455bba1aa3c72e0998e7911c1d43e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Jan 18 21:19:43 2012 +1030
+Date: Wed Jan 18 21:19:43 2012 +1030
configure.ac: print the glib version required if not found
@@ -19900,7 +21928,7 @@
commit 100488ec7db2d1f3e25bfda42c1603ca86696195
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 15 23:52:28 2012 +1030
+Date: Sun Jan 15 23:52:28 2012 +1030
cairo: restore temporary clip used in CairoOutputDev::fill when
painting a mask
@@ -19913,7 +21941,7 @@
commit 9c092e17e8f0cf0335b431a223e6e44bddc27e64
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 15 23:28:51 2012 +0100
+Date: Sun Jan 15 23:28:51 2012 +0100
[xpdf] More Splash and Gfx changes from Thomas
@@ -19964,34 +21992,34 @@
7. insert enhancements for colorizing masks in pattern colorspace
I adapt the bug fix from bug 27482 to the merge.
- poppler/CairoOutputDev.cc | 101 ++--
- poppler/CairoOutputDev.h | 21 +-
- poppler/Gfx.cc | 705 +++++++++++++++-----------
- poppler/Gfx.h | 22 +-
- poppler/GfxState.cc | 208 +++++---
- poppler/GfxState.h | 37 +-
- poppler/GlobalParams.cc | 17 +
- poppler/GlobalParams.h | 3 +
- poppler/OutputDev.cc | 13 +-
- poppler/OutputDev.h | 25 +-
- poppler/PSOutputDev.cc | 87 ++--
- poppler/PSOutputDev.h | 21 +-
- poppler/PreScanOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.cc | 101 ++--
+ poppler/CairoOutputDev.h | 21 +-
+ poppler/Gfx.cc | 705 +++++++++++++++-----------
+ poppler/Gfx.h | 22 +-
+ poppler/GfxState.cc | 208 +++++---
+ poppler/GfxState.h | 37 +-
+ poppler/GlobalParams.cc | 17 +
+ poppler/GlobalParams.h | 3 +
+ poppler/OutputDev.cc | 13 +-
+ poppler/OutputDev.h | 25 +-
+ poppler/PSOutputDev.cc | 87 ++--
+ poppler/PSOutputDev.h | 21 +-
+ poppler/PreScanOutputDev.cc | 2 +-
poppler/SplashOutputDev.cc | 1179
+++++++++++++++++++++----------------------
- poppler/SplashOutputDev.h | 80 +--
- poppler/TextOutputDev.cc | 8 +
- poppler/TextOutputDev.h | 8 +
- splash/Splash.cc | 11 +-
- splash/Splash.h | 122 ++---
- splash/SplashPattern.cc | 14 -
- splash/SplashPattern.h | 7 -
- utils/pdftoppm.cc | 1 +
+ poppler/SplashOutputDev.h | 80 +--
+ poppler/TextOutputDev.cc | 8 +
+ poppler/TextOutputDev.h | 8 +
+ splash/Splash.cc | 11 +-
+ splash/Splash.h | 122 ++---
+ splash/SplashPattern.cc | 14 -
+ splash/SplashPattern.h | 7 -
+ utils/pdftoppm.cc | 1 +
22 files changed, 1390 insertions(+), 1302 deletions(-)
commit 69df13c49cea2390f2c5036f3d450f134f7a2656
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jan 15 15:07:18 2012 +0100
+Date: Sun Jan 15 15:07:18 2012 +0100
Fix stack overflow in PDFDoc::markObject()
@@ -20002,7 +22030,7 @@
commit cdb56567c60b492ad08befff54f2ff70620b86fe
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun Jan 15 15:04:51 2012 +0100
+Date: Sun Jan 15 15:04:51 2012 +0100
Correctly initialize globalParams
@@ -20011,7 +22039,7 @@
commit 4e205a6625431dcf95375de009b4354746a4f0b7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 15 22:18:30 2012 +1030
+Date: Sun Jan 15 22:18:30 2012 +1030
parseargs: don't use arg->size with GooString argument
@@ -20027,7 +22055,7 @@
commit a7210a7ebc3d3ca88643bfbc2f0d660a5553a668
Author: Arseny Solokha <asolokha at gmx.com>
-Date: Fri Jan 13 18:52:17 2012 +0100
+Date: Fri Jan 13 18:52:17 2012 +0100
Properly initialize globalParams
@@ -20038,7 +22066,7 @@
commit baaf93f0e47a1978f9ea80e9394543a25b763d77
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Jan 12 01:05:07 2012 +1030
+Date: Thu Jan 12 01:05:07 2012 +1030
configure.ac: print the cairo version required if not found
@@ -20049,7 +22077,7 @@
commit 9b8b4232587831fdada37de033c272a3c5049c34
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Jan 12 00:26:03 2012 +1030
+Date: Thu Jan 12 00:26:03 2012 +1030
cairo: avoid setting huge clip area when printing
@@ -20060,7 +22088,7 @@
commit efe115f22f8f00a2863ef265ad6f4e7cc2e0336c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:41:54 2012 +0100
+Date: Tue Jan 10 23:41:54 2012 +0100
compile
@@ -20069,33 +22097,33 @@
commit 52d190d8ff962a57a59218f6871c3a63a443ea53
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:33:40 2012 +0100
+Date: Tue Jan 10 23:33:40 2012 +0100
[xpdf303] tiling "merges" from Thomas, using mostly our "old" code
instead of xpdf's
- poppler/CairoOutputDev.cc | 2 +-
- poppler/CairoOutputDev.h | 4 ++--
- poppler/Gfx.cc | 45
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 4 ++--
+ poppler/Gfx.cc | 45
+++++++++++++++++++++++++++++++++------------
- poppler/Gfx.h | 15 +++++++++------
- poppler/GfxState.cc | 5 ++++-
- poppler/GfxState.h | 7 ++++---
- poppler/OutputDev.h | 3 ++-
- poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 2 +-
+ poppler/Gfx.h | 15 +++++++++------
+ poppler/GfxState.cc | 5 ++++-
+ poppler/GfxState.h | 7 ++++---
+ poppler/OutputDev.h | 3 ++-
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h | 2 +-
poppler/PreScanOutputDev.cc | 15 +++++++--------
- poppler/PreScanOutputDev.h | 2 +-
- poppler/SplashOutputDev.cc | 8 ++++++--
- poppler/SplashOutputDev.h | 3 ++-
- splash/Splash.cc | 32 ++++++++++++++++++++++++--------
- utils/ImageOutputDev.cc | 2 +-
- utils/ImageOutputDev.h | 2 +-
+ poppler/PreScanOutputDev.h | 2 +-
+ poppler/SplashOutputDev.cc | 8 ++++++--
+ poppler/SplashOutputDev.h | 3 ++-
+ splash/Splash.cc | 32 ++++++++++++++++++++++++--------
+ utils/ImageOutputDev.cc | 2 +-
+ utils/ImageOutputDev.h | 2 +-
16 files changed, 99 insertions(+), 50 deletions(-)
commit bf75a957650dd5208ecf1f6db1555a3d00b7949c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:31:27 2012 +0100
+Date: Tue Jan 10 23:31:27 2012 +0100
[xpdf303] Splash::blitTransparent merges from Thomas
@@ -20104,7 +22132,7 @@
commit 296244ab74e56b2781daae0a664617d1da30527c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:30:34 2012 +0100
+Date: Tue Jan 10 23:30:34 2012 +0100
[xpdf303] Merge xpath Splash stuff from Thomas
@@ -20113,7 +22141,7 @@
commit e1ae7b900b01db7c7703da68ad94aa9bda1938f6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:29:38 2012 +0100
+Date: Tue Jan 10 23:29:38 2012 +0100
[xpdf303] Merge splash font stuff from Thomas
@@ -20122,7 +22150,7 @@
poppler/SplashOutputDev.cc | 3 +++
poppler/SplashOutputDev.h | 1 +
splash/SplashFTFont.cc | 34 ++++++++++++++++++++++++++++------
- splash/SplashFTFont.h | 1 +
+ splash/SplashFTFont.h | 1 +
splash/SplashFTFontEngine.cc | 7 ++++---
splash/SplashFTFontEngine.h | 5 +++--
splash/SplashFontEngine.cc | 3 ++-
@@ -20131,7 +22159,7 @@
commit d46b673c46a72132fb3918b64733be552e35952f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 23:28:43 2012 +0100
+Date: Tue Jan 10 23:28:43 2012 +0100
[xpdf303] More merges from Thomas
@@ -20142,7 +22170,7 @@
commit 2cb40bab3b8c49d54c2a49554b30268ccb32899b
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jan 8 21:35:41 2012 +1030
+Date: Sun Jan 8 21:35:41 2012 +1030
Fix typo in pdffonts man page
@@ -20151,7 +22179,7 @@
commit 34ae382915d9d9b2b3c015fee3c24907a6b52b8b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 7 17:14:05 2012 +0100
+Date: Sat Jan 7 17:14:05 2012 +0100
xpdf303: Merge some stuff in Splash [Thomas Freitag]
@@ -20165,20 +22193,20 @@
a) including merge of SplashClip.cc
b) including merge of SplashXPathScanner.cc
- poppler/GfxState.cc | 94 ++-
- poppler/GfxState.h | 17 +-
+ poppler/GfxState.cc | 94 ++-
+ poppler/GfxState.h | 17 +-
poppler/GlobalParams.cc | 7 +
poppler/GlobalParams.h | 3 +
poppler/GlobalParamsWin.cc | 2 +-
- poppler/PDFDoc.cc | 2 +-
+ poppler/PDFDoc.cc | 2 +-
poppler/SplashOutputDev.cc | 134 +++-
poppler/SplashOutputDev.h | 8 +-
- splash/Splash.cc | 1658
+ splash/Splash.cc | 1658
++++++++++++++++++++++++++++++------------
- splash/Splash.h | 42 +-
- splash/SplashClip.cc | 57 +-
- splash/SplashState.cc | 49 ++
- splash/SplashState.h | 12 +
+ splash/Splash.h | 42 +-
+ splash/SplashClip.cc | 57 +-
+ splash/SplashState.cc | 49 ++
+ splash/SplashState.h | 12 +
splash/SplashXPathScanner.cc | 474 +++++++-----
splash/SplashXPathScanner.h | 24 +-
15 files changed, 1845 insertions(+), 738 deletions(-)
@@ -20185,7 +22213,7 @@
commit c2378609ae52523beb64e0f040fc79dce4877e03
Author: Thomas Freitag <thomas.freitag at kabelmail.de>
-Date: Sat Jan 7 11:47:19 2012 +0100
+Date: Sat Jan 7 11:47:19 2012 +0100
regtest: read stderr output before calling wait to fix a possible
deadlock
@@ -20204,7 +22232,7 @@
commit da6bfacb0f858f27bd47f247a25d6bc9ab778411
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Jan 7 10:35:17 2012 +1030
+Date: Sat Jan 7 10:35:17 2012 +1030
Add -subst option to pdffonts to list the substitute font name
and filename
@@ -20211,30 +22239,30 @@
Bug 44416
- poppler/FontInfo.cc | 8 ++++--
- poppler/FontInfo.h | 2 ++
+ poppler/FontInfo.cc | 8 ++++--
+ poppler/FontInfo.h | 2 ++
poppler/GlobalParams.cc | 29 +++++++++++++++++++--
poppler/GlobalParams.h | 3 ++-
- utils/pdffonts.1 | 3 +++
- utils/pdffonts.cc | 67
+ utils/pdffonts.1 | 3 +++
+ utils/pdffonts.cc | 67
+++++++++++++++++++++++++++++++++++--------------
6 files changed, 88 insertions(+), 24 deletions(-)
commit 9979b1b3e36dc8085d8c684692fece463fa474b1
Author: Yi Yang <ahyangyi at gmail.com>
-Date: Sat Jan 7 09:44:42 2012 +1030
+Date: Sat Jan 7 09:44:42 2012 +1030
Include .otf fonts when finding substitute fonts
Bug 44412
- poppler/GfxFont.cc | 2 +-
+ poppler/GfxFont.cc | 2 +-
poppler/GlobalParams.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ebfab832ab4f2642b9ab2ededd25de670a3c7147
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Dec 23 09:55:20 2011 +1030
+Date: Fri Dec 23 09:55:20 2011 +1030
autoconf: Check for cairo-ft and other cairo backends
@@ -20243,13 +22271,13 @@
Bug 43969
- configure.ac | 14 ++++++++++++--
+ configure.ac | 14 ++++++++++++--
utils/Makefile.am | 4 ++--
2 files changed, 14 insertions(+), 4 deletions(-)
commit 51ca2b7c7dec5430d29860fd887ad5c5d9b3f574
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 15 00:26:09 2011 +0100
+Date: Thu Dec 15 00:26:09 2011 +0100
[xpdf303] Some more changes in TextOutputDev
@@ -20258,7 +22286,7 @@
commit c5ce12993a4d2bcd3b3e95b1f08d00dc8960678c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 14 22:49:33 2011 +0100
+Date: Wed Dec 14 22:49:33 2011 +0100
[xpdf303] Merge some stuff from TextOutputDev
@@ -20271,7 +22299,7 @@
commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 6 23:21:15 2011 +0100
+Date: Tue Dec 6 23:21:15 2011 +0100
include strings.h as we use memcpy
@@ -20282,7 +22310,7 @@
commit 743f70f594bf3c9a58d1ff0738b9a2bc3ea03382
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 6 20:27:03 2011 +0100
+Date: Tue Dec 6 20:27:03 2011 +0100
xpdf303: Use xpdf method against recursion while parsing
@@ -20302,7 +22330,7 @@
commit 63c942a45227ef28fb94ef4765171d9812fffafa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 4 17:29:45 2011 +0100
+Date: Sun Dec 4 17:29:45 2011 +0100
Do not fail if we are trying to save a file with Encrypt but that
we have not modified at all
@@ -20314,7 +22342,7 @@
commit 0937d775e59a963b72fa7924e0f7be484f8345fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 4 15:37:20 2011 +0100
+Date: Sun Dec 4 15:37:20 2011 +0100
update name and copyright
(cherry picked from commit 22601c2a64f094ede8085a3ccca3de9daaa556e7)
@@ -20324,7 +22352,7 @@
commit bdb439ac5a751d6146204ae0d61fdbf7828c89c3
Author: Axel Strübing <axel.struebing at freenet.de>
-Date: Thu Nov 24 22:32:57 2011 +0100
+Date: Thu Nov 24 22:32:57 2011 +0100
Fix typo/regression introduced in
f6d026bfa18624ccd321e102bb39ba744998de1e
@@ -20334,7 +22362,7 @@
commit 74e11d8c912dd95d235e44e7b34b8ea1be082b9f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 24 18:54:27 2011 +0100
+Date: Thu Nov 24 18:54:27 2011 +0100
Fix typo
@@ -20343,7 +22371,7 @@
commit ec2a1c3fca92a28c56911729927838f7aacf1078
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 23:13:52 2011 +0100
+Date: Wed Nov 16 23:13:52 2011 +0100
xpdf303: Use the correct sizeof() for the greallocn
@@ -20352,7 +22380,7 @@
commit 544440b9d19ce99f3a7fcacdea70999b1efc217f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 23:09:23 2011 +0100
+Date: Wed Nov 16 23:09:23 2011 +0100
xpdf303: Add XRef::getPermFlags
@@ -20361,7 +22389,7 @@
commit b2e43e531edcecaeacf02a627c98cf7ef57f3e3c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 23:04:04 2011 +0100
+Date: Wed Nov 16 23:04:04 2011 +0100
xpdf303: make strToUnsigned "safer"
@@ -20370,7 +22398,7 @@
commit bd1513742182ed4c80d21401dd30180981879f24
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 22:59:12 2011 +0100
+Date: Wed Nov 16 22:59:12 2011 +0100
xpdf303: Check xrefEntryCompressed entries to be of correct type
and in bounds
@@ -20380,7 +22408,7 @@
commit 3bf3e82d1f3eb19a454239d8c7641fc68ff4e462
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 22:54:17 2011 +0100
+Date: Wed Nov 16 22:54:17 2011 +0100
xpdf303: Adobe apparently ignores the generation number on compressed
objects
@@ -20390,7 +22418,7 @@
commit 73e6f19c4e76762eb5131b168e3b24167ba126cb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 16 22:29:11 2011 +0100
+Date: Wed Nov 16 22:29:11 2011 +0100
xpdf303: Add PDFDoc::fileNameU to windows builds
@@ -20400,7 +22428,7 @@
commit 65388b1aaf9a78efcf9486d5e2d4bdce76f11194
Author: Igor Slepchin <igor.slepchin at gmail.com>
-Date: Tue Nov 15 21:53:40 2011 +0100
+Date: Tue Nov 15 21:53:40 2011 +0100
Output images in pdftohtml -xml mode if no -i option is specified.
@@ -20408,12 +22436,12 @@
utils/HtmlOutputDev.cc | 48
++++++++++++++++++++++++++++++++++++++++--------
- utils/pdf2xml.dtd | 22 +++++++++++++++++-----
+ utils/pdf2xml.dtd | 22 +++++++++++++++++-----
2 files changed, 57 insertions(+), 13 deletions(-)
commit a4c78946bc1fc3d52152af2e319051050ab05e28
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 14 13:22:53 2011 +0100
+Date: Mon Nov 14 13:22:53 2011 +0100
Make GfxColorSpace::parse accept dicts too
@@ -20422,7 +22450,7 @@
commit f6d026bfa18624ccd321e102bb39ba744998de1e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 11 16:37:27 2011 +0100
+Date: Fri Nov 11 16:37:27 2011 +0100
Do not crash if failing to parse the colorspace
@@ -20433,7 +22461,7 @@
commit c9da140bb476dcbb3928950ae9b506de82695cd2
Author: David King <amigadave at amigadave.com>
-Date: Thu Oct 20 11:31:10 2011 +0200
+Date: Thu Oct 20 11:31:10 2011 +0200
glib-demo: Conditionally initialise threading
@@ -20447,7 +22475,7 @@
commit a0db250bbdefff6361551cf9db344bd5268fea11
Author: Vittal Aithal <vittal.aithal at cognidox.com>
-Date: Wed Nov 9 20:07:58 2011 +0100
+Date: Wed Nov 9 20:07:58 2011 +0100
pdfinfo: report page rotation
@@ -20456,7 +22484,7 @@
commit e7dbd17ff07afa465636a90f526cd7ac8c731862
Author: Kenji Uno <ku at digitaldolphins.jp>
-Date: Wed Nov 9 12:39:41 2011 +0100
+Date: Wed Nov 9 12:39:41 2011 +0100
Fix leak in GooString when resizing
@@ -20467,7 +22495,7 @@
commit 6a4f0c32b6723b127034d59a34bf076942e9935f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 6 15:44:06 2011 +0100
+Date: Sun Nov 6 15:44:06 2011 +0100
regtest: Skip tests with results when creating refs
@@ -20479,7 +22507,7 @@
commit eab952d121c7ab88a0d41587cfa449c0978bea04
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 21:58:11 2011 +0100
+Date: Thu Nov 3 21:58:11 2011 +0100
qt4: remove unused variable
@@ -20488,7 +22516,7 @@
commit 85615f04e040dd38792533a4522e437644e97548
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 16:15:40 2011 +0100
+Date: Thu Nov 3 16:15:40 2011 +0100
qt4: get rid of the own F and Ff flags reading
@@ -20501,7 +22529,7 @@
commit 43347b43eeb66b5c8dc9637c36436baacc626bc4
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 16:10:57 2011 +0100
+Date: Thu Nov 3 16:10:57 2011 +0100
qt4: use the flags of the associated Annot object
@@ -20510,7 +22538,7 @@
commit 6c9492202de9b3b43da9eac3e40dc7fe218f21da
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 16:03:11 2011 +0100
+Date: Thu Nov 3 16:03:11 2011 +0100
qt4: remove old commented code
@@ -20519,7 +22547,7 @@
commit f0eca54131f7cdf6c1e0e78a18be0bf642567af4
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 15:46:33 2011 +0100
+Date: Thu Nov 3 15:46:33 2011 +0100
qt4: use the quadding read already in FormField
@@ -20530,7 +22558,7 @@
commit d92bce1ae87d2f351bb1b972c64466502fb212aa
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 3 15:30:45 2011 +0100
+Date: Thu Nov 3 15:30:45 2011 +0100
qt4: include <QFile>
@@ -20539,7 +22567,7 @@
commit 955cd0c7bd3a72340deba098f4242a4904adc60f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 2 20:20:41 2011 +0100
+Date: Wed Nov 2 20:20:41 2011 +0100
Compile with MSVC needed for last change in the qt4 frontend
@@ -20548,25 +22576,25 @@
commit e0f5bc1deebaa9861baffd7c9ba31ea31585cd1d
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Nov 1 14:15:09 2011 +0100
+Date: Tue Nov 1 14:15:09 2011 +0100
qt4: Use PDFDoc(wchar_t *, ...) on Windows
Bug 35378
- qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-document.cc | 6 +++---
qt4/src/poppler-private.h | 17 +++++++++++++++--
2 files changed, 18 insertions(+), 5 deletions(-)
commit 52c1e9c5109299255d13b5b1e7d3eedaab512084
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 1 14:13:10 2011 +0100
+Date: Tue Nov 1 14:13:10 2011 +0100
regtest: Add --update-refs command line option to run-tests command
It allows to update the references of failing tests.
- regtest/TestRun.py | 2 +-
+ regtest/TestRun.py | 2 +-
regtest/backends/__init__.py | 34 ++++++++++++++++++++++++++++++++--
regtest/commands/run-tests.py | 4 ++++
3 files changed, 37 insertions(+), 3 deletions(-)
@@ -20573,21 +22601,21 @@
commit b4896a416b1df14a81b944b3c577fec85c9c7f7d
Author: Rex Dieter <rdieter at math.unl.edu>
-Date: Tue Nov 1 09:40:53 2011 +0100
+Date: Tue Nov 1 09:40:53 2011 +0100
Fix pkg-config files
We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
- configure.ac | 1 +
+ configure.ac | 1 +
poppler-glib-uninstalled.pc.in | 2 +-
- poppler-glib.pc.cmake | 2 +-
- poppler-glib.pc.in | 2 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-glib.pc.in | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
commit 53f1b0c5edfdbef817bff31566893ac4e111516a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 30 16:02:19 2011 +0100
+Date: Sun Oct 30 16:02:19 2011 +0100
pdftocairo: Make sure beginDocument() is always called
@@ -20599,7 +22627,7 @@
commit 8b0dfe9537082eaccd982530f1eddc2fcfc92f8e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 27 19:58:31 2011 +0200
+Date: Thu Oct 27 19:58:31 2011 +0200
xpdf303: Use splashDist instead of splashSqrt and USE_FIXEDPOINT
enhacements
@@ -20606,12 +22634,12 @@
splash/SplashFTFont.cc | 70
+++++++++++++++++++++++++++++++++++++++++++++-----
- splash/SplashFTFont.h | 2 +-
+ splash/SplashFTFont.h | 2 +-
2 files changed, 65 insertions(+), 7 deletions(-)
commit b021bce2583c8e1e3a4c129106d80e7a4e223600
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 27 19:54:22 2011 +0200
+Date: Thu Oct 27 19:54:22 2011 +0200
xpdf303: wops, make it compile
@@ -20620,7 +22648,7 @@
commit 76295f4d401c36bdef3b2a20d18ac57a3b976410
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 27 19:42:42 2011 +0200
+Date: Thu Oct 27 19:42:42 2011 +0200
xpdf303: Adopt xpdf solution for the name too long problem
@@ -20629,7 +22657,7 @@
commit be6d4c19b8ce1515ce995eee408dc5752012c649
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 27 19:34:38 2011 +0200
+Date: Thu Oct 27 19:34:38 2011 +0200
xpdf303: Add brackets
@@ -20638,18 +22666,18 @@
commit 904ae1385e93155a55008977c89aa664b7c8cb9b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 26 14:22:28 2011 +0200
+Date: Wed Oct 26 14:22:28 2011 +0200
Expose POPPLER_VERSION in poppler-config.h
- configure.ac | 3 +++
+ configure.ac | 3 +++
poppler/poppler-config.h.cmake | 5 +++++
- poppler/poppler-config.h.in | 5 +++++
+ poppler/poppler-config.h.in | 5 +++++
3 files changed, 13 insertions(+)
commit aa83d4fe942ef0685c5990ddf3eccc2fbdf82292
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:59:57 2011 +0200
+Date: Thu Oct 20 00:59:57 2011 +0200
xpdf303: Add readFromStream
@@ -20658,7 +22686,7 @@
commit 74d771d58a4d1868669117709eb6811ec28bf840
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:56:58 2011 +0200
+Date: Thu Oct 20 00:56:58 2011 +0200
xpdf303: Add base14SubstFonts
@@ -20667,7 +22695,7 @@
commit 71260f987161d5b122caced6af14e9d64be46e4d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:55:42 2011 +0200
+Date: Thu Oct 20 00:55:42 2011 +0200
xpdf303: GfxFontLoc implementation
@@ -20676,7 +22704,7 @@
commit 586430137985fd303ce87bdb9b902ee9a01341e8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:54:09 2011 +0200
+Date: Thu Oct 20 00:54:09 2011 +0200
xpdf303: More stuff into base14FontMap
@@ -20685,13 +22713,13 @@
commit c0affb1845c339f89ca67608cb9fd9134ff902f5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:51:31 2011 +0200
+Date: Thu Oct 20 00:51:31 2011 +0200
xpdf303: GfxFont::getOrignName/getName rework
- poppler/FontInfo.cc | 4 ++--
- poppler/GfxFont.cc | 4 ----
- poppler/GfxFont.h | 6 +-----
+ poppler/FontInfo.cc | 4 ++--
+ poppler/GfxFont.cc | 4 ----
+ poppler/GfxFont.h | 6 +-----
poppler/PSOutputDev.cc | 8 ++++----
poppler/TextOutputDev.cc | 5 ++---
5 files changed, 9 insertions(+), 18 deletions(-)
@@ -20698,7 +22726,7 @@
commit c5c513b5b72e03f6f0a94d04f7d8a22fe9bdaa80
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:45:30 2011 +0200
+Date: Thu Oct 20 00:45:30 2011 +0200
xpdf303: GfxFontLoc
@@ -20707,7 +22735,7 @@
commit 4ec5e5e6d4785eb7a60744ae7e33c7ba3f603e8e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 20 00:34:10 2011 +0200
+Date: Thu Oct 20 00:34:10 2011 +0200
xpdf303: StdFontMapEntry renaming
@@ -20717,7 +22745,7 @@
commit e71088dc5087303b1ae5f3e72af287ec4e0a1342
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Oct 17 13:42:06 2011 +0200
+Date: Mon Oct 17 13:42:06 2011 +0200
remove useless #if
@@ -20726,7 +22754,7 @@
commit 40b56994dda79653c902977423f349efa55cf21e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Oct 17 20:33:03 2011 +1030
+Date: Mon Oct 17 20:33:03 2011 +1030
utils: Add GooString arg to parseargs and use for paths in pdftocairo
@@ -20734,13 +22762,13 @@
need to know the max path length by using GooString for the path.
utils/parseargs.cc | 12 ++++++++++++
- utils/parseargs.h | 2 ++
+ utils/parseargs.h | 2 ++
utils/pdftocairo.cc | 17 ++++++++---------
3 files changed, 22 insertions(+), 9 deletions(-)
commit 4bb34757dbbff780baba053371274c05b29771e1
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Sep 19 21:11:44 2011 +0930
+Date: Mon Sep 19 21:11:44 2011 +0930
cairo: fix setSoftMask bugs
@@ -20767,7 +22795,7 @@
commit 50adbed183e9bf70eb4c41e8858cf464c3042e45
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 16 12:40:27 2011 +0200
+Date: Sun Oct 16 12:40:27 2011 +0200
Remove poppler-cairo dependency from poppler-glib pkg-config file
@@ -20775,16 +22803,16 @@
depend on
the dynamic library.
- CMakeLists.txt | 1 -
- configure.ac | 2 --
+ CMakeLists.txt | 1 -
+ configure.ac | 2 --
poppler-glib-uninstalled.pc.in | 2 +-
- poppler-glib.pc.cmake | 2 +-
- poppler-glib.pc.in | 2 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-glib.pc.in | 2 +-
5 files changed, 3 insertions(+), 6 deletions(-)
commit acd8ecc9121db58851f73764f046a4f54bd80581
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Oct 8 15:03:24 2011 +1030
+Date: Sat Oct 8 15:03:24 2011 +1030
ps: fix uncolored tiling patterns
@@ -20799,12 +22827,12 @@
Bug 41462
poppler/PSOutputDev.cc | 41 +++++++++++++++++++++++++++++++++++++++++
- poppler/PSOutputDev.h | 1 +
+ poppler/PSOutputDev.h | 1 +
2 files changed, 42 insertions(+)
commit 6e1326b11f98f2b277e53a6cdbcb373ce6c29958
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Oct 7 20:29:36 2011 +1030
+Date: Fri Oct 7 20:29:36 2011 +1030
ps: emit non repeating patterns in PSOutput with inType3Char = true
@@ -20816,7 +22844,7 @@
commit ed05fcb8c442b716c5e382c98f2625701926c86a
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Oct 1 20:19:19 2011 +0930
+Date: Sat Oct 1 20:19:19 2011 +0930
ps: fix tiling pattern fill matrix
@@ -20833,7 +22861,7 @@
commit 087757866de13b6164967a1d241d3c0e47065f1a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 13 12:18:52 2011 +0200
+Date: Thu Oct 13 12:18:52 2011 +0200
xpdf303: Merge SplashT1Font::getGlyphPath changes
@@ -20842,7 +22870,7 @@
commit c84f46ee16a8dcc6e2cad2359df621cc6cdb8fa5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 13 12:16:14 2011 +0200
+Date: Thu Oct 13 12:16:14 2011 +0200
xpdf303: Add GBool type1 to SplashFTFontFile
@@ -20852,7 +22880,7 @@
commit d845da2c3c1acbeaa4b9bb3125f9143e785210ff
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Thu Oct 6 14:49:19 2011 +0200
+Date: Thu Oct 6 14:49:19 2011 +0200
Okular moved to git, fix docs
@@ -20863,7 +22891,7 @@
commit bb40c980f7ab7a6eb9735af17103f87bc65893d6
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Thu Oct 6 14:49:08 2011 +0200
+Date: Thu Oct 6 14:49:08 2011 +0200
Explicitly include fontconfig include dir
@@ -20876,7 +22904,7 @@
commit 776ca137984556530ba938265714934bdc3d6443
Author: Yury G. Kudryashov <urkud.urkud at gmail.com>
-Date: Thu Oct 6 14:48:46 2011 +0200
+Date: Thu Oct 6 14:48:46 2011 +0200
Fix typo in cmake option documentation
@@ -20888,7 +22916,7 @@
commit ab8616dcb637ac1aeb4d5f142c3c4bff9aecd041
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Oct 6 14:21:10 2011 +0200
+Date: Thu Oct 6 14:21:10 2011 +0200
close the file or flush stdout
@@ -20897,7 +22925,7 @@
commit 72c2d563684ab6937a98a0c1c79be3639d29c9ce
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 4 17:46:11 2011 +0200
+Date: Tue Oct 4 17:46:11 2011 +0200
xpdf303: Make sure array length is > 0
@@ -20911,7 +22939,7 @@
commit c814c2452c7f60623fdd0fee6f915adeaf5b49e3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 4 17:40:27 2011 +0200
+Date: Tue Oct 4 17:40:27 2011 +0200
xpdf303: Limit recursion in GfxColorSpace parsing
@@ -20924,17 +22952,17 @@
commit 0e53ba5709296dc2ba1399f885af200d2041f0cd
Author: Glad Deschrijver <glad.deschrijver at gmail.com>
-Date: Sat Oct 1 15:41:51 2011 +0200
+Date: Sat Oct 1 15:41:51 2011 +0200
qt4: Add the option of PSConverter creating EPS
qt4/src/poppler-ps-converter.cc | 3 ++-
- qt4/src/poppler-qt4.h | 6 ++++--
+ qt4/src/poppler-qt4.h | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
commit 04e271a0c10807c9c3967daa1f656e87b97b9901
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 1 14:34:50 2011 +0200
+Date: Sat Oct 1 14:34:50 2011 +0200
Fix typo in documentation
@@ -20946,7 +22974,7 @@
commit 9855529e8e1a83c6d77a9e4221ea2132d44e9fb1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 1 14:27:44 2011 +0200
+Date: Sat Oct 1 14:27:44 2011 +0200
Remove space after % as it confuses libspectre
@@ -20958,7 +22986,7 @@
commit 8e8cde6f374b59222d834e2e7f08fb4a6a4d55a5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 28 23:32:24 2011 +0200
+Date: Wed Sep 28 23:32:24 2011 +0200
xpdf303: More manpage merging
@@ -20967,7 +22995,7 @@
commit f798f00c9ec55bff2eb93938424c436ba2663e7a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 28 23:30:55 2011 +0200
+Date: Wed Sep 28 23:30:55 2011 +0200
xpdf303: mention pdfdetach in non xpdf tools
@@ -20977,7 +23005,7 @@
commit 3fc46ac1c046460ccf46ba4b8a92f728e775694a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 28 23:30:00 2011 +0200
+Date: Wed Sep 28 23:30:00 2011 +0200
xpdf303: Fix pdfdetach man page references
@@ -20986,7 +23014,7 @@
commit 79e1d77fb00a7c7f0bda4ae76328c4211c7f16e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 28 23:27:53 2011 +0200
+Date: Wed Sep 28 23:27:53 2011 +0200
xpdf303: Merge some more manpages
@@ -20996,7 +23024,7 @@
commit 841c96be59ddad32f51d4d114ba1dcc42285ab55
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 28 23:23:25 2011 +0200
+Date: Wed Sep 28 23:23:25 2011 +0200
xpdf303: Merge some man pages
@@ -21007,7 +23035,7 @@
commit d2706a05513134f961e2500e0e596f2769707ce5
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Sep 28 21:20:23 2011 +0930
+Date: Wed Sep 28 21:20:23 2011 +0930
cairo: fix crash when using poppler_page_get_image()
@@ -21016,23 +23044,23 @@
commit 0c0591fa23441c54c9443072615273ea65482d76
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 27 00:45:59 2011 +0200
+Date: Tue Sep 27 00:45:59 2011 +0200
0.18.0
- CMakeLists.txt | 6 ++--
- NEWS | 14 ++++++++
- configure.ac | 4 +--
- cpp/Doxyfile | 2 +-
- gtk-doc.make | 102
+ CMakeLists.txt | 6 ++--
+ NEWS | 14 ++++++++
+ configure.ac | 4 +--
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 102
++++++++++++++++++++++------------------------------
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
7 files changed, 64 insertions(+), 68 deletions(-)
commit 19f5db7acd64330d198f18695175df02141794d7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 27 00:15:15 2011 +0200
+Date: Tue Sep 27 00:15:15 2011 +0200
Update Carlos (C) year
@@ -21041,37 +23069,31 @@
commit 6d34d4af90b8b41360de4dabb000bbcc894775d0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 27 00:09:54 2011 +0200
+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(-)
+ utils/.gitignore | 4 ++--
+ utils/CMakeLists.txt | 28 ++++++++++++++--------------
+ utils/Makefile.am | 16 ++++++++--------
+ utils/{pdfextract.1 => pdfseparate.1} | 16 ++++++++--------
+ utils/{pdfextract.cc => pdfseparate.cc} | 6 +++---
+ utils/{pdfmerge.1 => pdfunite.1} | 14 +++++++-------
+ utils/{pdfmerge.cc => pdfunite.cc} | 6 +++---
+ 7 files changed, 45 insertions(+), 45 deletions(-)
commit baf54c2876edd476ffc68da6518598847bb7ec8a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 26 15:54:46 2011 +0200
+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 -
+ poppler/DCTStream.h | 1 -
+ poppler/Stream.h | 1 -
utils/HtmlOutputDev.cc | 7 ++-----
utils/ImageOutputDev.cc | 9 +++------
4 files changed, 5 insertions(+), 13 deletions(-)
@@ -21078,7 +23100,7 @@
commit bba57e588fd1ee3a61f18405d1d1bf89fceb5b96
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 25 12:21:02 2011 +0200
+Date: Sun Sep 25 12:21:02 2011 +0200
xpdf303: Added the pdfdetach tool
@@ -21098,7 +23120,7 @@
commit f62c2f002c782d3a7887525f031d266aca6eb582
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 24 11:20:13 2011 +0200
+Date: Sat Sep 24 11:20:13 2011 +0200
xpdf303: Parse ActualText in Gfx instead of output devices
@@ -21113,9 +23135,9 @@
poppler/CairoOutputDev.cc | 8 +--
poppler/CairoOutputDev.h | 6 +-
- poppler/Gfx.cc | 40 +++++++++----
- poppler/OutputDev.cc | 6 --
- poppler/OutputDev.h | 4 +-
+ poppler/Gfx.cc | 40 +++++++++----
+ poppler/OutputDev.cc | 6 --
+ poppler/OutputDev.h | 4 +-
poppler/TextOutputDev.cc | 145
+++++++++++++++++++---------------------------
poppler/TextOutputDev.h | 21 ++++---
@@ -21123,7 +23145,7 @@
commit a097447ed13cb021003425f85597e2628935feb2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 24 09:43:05 2011 +0200
+Date: Sat Sep 24 09:43:05 2011 +0200
Use new error syntax in pdfextract
@@ -21133,13 +23155,13 @@
commit 718c735aed540aa49b8dde250ca886c6ad93f5b6
Merge: 6721916 69707f0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 24 09:38:52 2011 +0200
+Date: Sat Sep 24 09:38:52 2011 +0200
Merge branch 'master' into xpdf303merge
commit 69707f0a9b5a94c80817039db943fb4f26e743e3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Sep 19 22:00:34 2011 +0930
+Date: Mon Sep 19 22:00:34 2011 +0930
Update .gitignore
@@ -21149,7 +23171,7 @@
commit 0de477817e424078cfcfcae114e7745809f0848d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Sep 19 21:57:07 2011 +0930
+Date: Mon Sep 19 21:57:07 2011 +0930
utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages
@@ -21159,7 +23181,7 @@
commit ce7372db64ee807dc2b491e121fbe557dbf697e8
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Sep 19 22:04:27 2011 +0930
+Date: Mon Sep 19 22:04:27 2011 +0930
regtest: render cairo at 72ppi
@@ -21171,7 +23193,7 @@
commit 6cf7330089c4dcc1099906d9c37c3607a2a1eeba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 19 18:42:35 2011 +0200
+Date: Mon Sep 19 18:42:35 2011 +0200
regtest: Ignore checksums of crashed, failed and stderr files
@@ -21183,7 +23205,7 @@
commit 6512bf1c5dab37058460882fec3407b396830981
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 18 18:38:32 2011 +0200
+Date: Sun Sep 18 18:38:32 2011 +0200
Render at 72 instead of 150, it's faster :D
@@ -21192,7 +23214,7 @@
commit b828f63ed3896a22f3fe7ddbe2ec2f549d7a2c62
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 18 18:20:47 2011 +0200
+Date: Sun Sep 18 18:20:47 2011 +0200
install pdfextract and pdfmerge manpages
@@ -21201,7 +23223,7 @@
commit 986759dfbe85998c85ee9b0825c7522395567531
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Sun Sep 18 18:19:30 2011 +0200
+Date: Sun Sep 18 18:19:30 2011 +0200
pdfextract and pdfmerge man pages
@@ -21212,7 +23234,7 @@
commit 90da1af542fd7f3cecef31b15da6971345b38209
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
-Date: Sun Sep 18 18:19:04 2011 +0200
+Date: Sun Sep 18 18:19:04 2011 +0200
Complain if %d is not present and it should
@@ -21221,7 +23243,7 @@
commit 40e066a84ddb3a5c41805c095659af5f5704d6d8
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Sun Sep 18 18:16:14 2011 +0200
+Date: Sun Sep 18 18:16:14 2011 +0200
qt_subdir is unneeded
@@ -21231,16 +23253,16 @@
commit 6721916c92d720947b3285c85fdbe6610c6bf013
Merge: 8456a6e e23f6b9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 16:31:10 2011 +0200
+Date: Sun Sep 18 16:31:10 2011 +0200
Merge branch 'master' into xpdf303merge
Conflicts:
- poppler/Gfx.cc
+ poppler/Gfx.cc
commit e23f6b9cade804136bd4bb58182f4fe0b072fbf2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 16:27:50 2011 +0200
+Date: Sun Sep 18 16:27:50 2011 +0200
regtest: Do not create checksums for crashed, failed and stderr files
@@ -21249,7 +23271,7 @@
commit 110b8be1d9f2694b42bd12dcb6af02bfca9866dd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 16:26:58 2011 +0200
+Date: Sun Sep 18 16:26:58 2011 +0200
Fix memory leak
@@ -21258,7 +23280,7 @@
commit 8456a6e1354126dc98357fb806595bd3bc198522
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 16:07:54 2011 +0200
+Date: Sun Sep 18 16:07:54 2011 +0200
xpdf303: Add OCDisplayNode
@@ -21272,7 +23294,7 @@
commit 06c6660dc9fe326f185ff323e643af6714b32ec8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 15:08:44 2011 +0200
+Date: Sun Sep 18 15:08:44 2011 +0200
xpdf303: Parse usage dictionary of optional content groups
@@ -21282,7 +23304,7 @@
commit 528d5b0d40302b3fee3aec69b85bdd1daa4db568
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 14:03:36 2011 +0200
+Date: Sun Sep 18 14:03:36 2011 +0200
xpdf303: Image XObjects can have a OC entry too
@@ -21291,7 +23313,7 @@
commit c40353d3bb761f5be8ddbd2bf5341e83901fb132
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 13:32:07 2011 +0200
+Date: Sun Sep 18 13:32:07 2011 +0200
xpdf303: OC entry is specific to form XObjects
@@ -21300,7 +23322,7 @@
commit 6ddb51d81b064346dc85d2ae72570a956a184d74
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 12:59:28 2011 +0200
+Date: Sun Sep 18 12:59:28 2011 +0200
xpdf303: The spec doesn't say OC must be null or ref
@@ -21310,7 +23332,7 @@
commit 434bb9b38319edc7282be22044bd7761403a38a6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 12:45:12 2011 +0200
+Date: Sun Sep 18 12:45:12 2011 +0200
xpdf303: OC entry can be an optional content group too
@@ -21321,7 +23343,7 @@
commit 56410b80fdabb99e2de0c6589de6ee745936c523
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 12:44:02 2011 +0200
+Date: Sun Sep 18 12:44:02 2011 +0200
xpdf303: Not finding an oc group is not necessarily a syntax error
@@ -21330,7 +23352,7 @@
commit 4bb4439450e342479375cb56d10561457475bd13
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 12:42:15 2011 +0200
+Date: Sun Sep 18 12:42:15 2011 +0200
xpdf303: Fix check of OptionalContentGroup::getState()
@@ -21341,25 +23363,25 @@
commit d737e3098e02e46525c0edf2165462e03ac7a0e6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 11:36:11 2011 +0200
+Date: Sun Sep 18 11:36:11 2011 +0200
xpdf303: Add support for visibility expressions in OptContent
poppler/OptionalContent.cc | 113
+++++++++++++++++++++++++++++++++++----------
- poppler/OptionalContent.h | 3 +-
+ poppler/OptionalContent.h | 3 +-
2 files changed, 91 insertions(+), 25 deletions(-)
commit 258d56ba85902a8ab50eec3fe66dd6425226fa59
Merge: 72a7736 12c6239
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 11:12:38 2011 +0200
+Date: Sun Sep 18 11:12:38 2011 +0200
Merge branch 'master' into xpdf303merge
commit 12c6239ca4f1f6a5de72aebd755f9d1354ea5837
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 11:08:06 2011 +0200
+Date: Sun Sep 18 11:08:06 2011 +0200
regtest: Fix checksum check for tests containing spaces in filename
@@ -21368,7 +23390,7 @@
commit 72a7736389cbe36c1f8a526f1a659cae1a3f85a3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 18 10:47:51 2011 +0200
+Date: Sun Sep 18 10:47:51 2011 +0200
xpdf303: No need to cache optContentConfig object in Annot
@@ -21378,24 +23400,24 @@
commit 93ba92db0a3af35f197a4faa5a528af98ea0f624
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 14 00:58:44 2011 +0200
+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/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 +-
+ regtest/commands/run-tests.py | 2 +-
+ regtest/main.py | 2 +-
9 files changed, 38 insertions(+), 38 deletions(-)
commit da1b5437148e1e6317246b16f7235c8bc280be97
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Sep 13 20:09:56 2011 +0200
+Date: Tue Sep 13 20:09:56 2011 +0200
regtest: Add a way to skip files
@@ -21407,14 +23429,14 @@
comments and are ignored.
regtest/TestReferences.py | 9 +++++++--
- regtest/TestRun.py | 9 +++++++--
- regtest/Utils.py | 20 ++++++++++++++++++++
- regtest/main.py | 6 +++++-
+ 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 at gnome.org>
-Date: Tue Sep 13 19:04:04 2011 +0200
+Date: Tue Sep 13 19:04:04 2011 +0200
regtest: Limit the number of arguments to 1
@@ -21422,60 +23444,60 @@
different tests.
regtest/commands/create-refs.py | 24 ++++++++++++------------
- regtest/commands/run-tests.py | 26 +++++++++++++-------------
- regtest/main.py | 2 +-
+ regtest/commands/run-tests.py | 26 +++++++++++++-------------
+ regtest/main.py | 2 +-
3 files changed, 26 insertions(+), 26 deletions(-)
commit 5ce045d0358318859c844340c639483485b69c58
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Sep 13 18:18:21 2011 +0200
+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 +++++++++++++++++++++++++++++++++++
+ regtest/TestRun.py | 21 ++++++++++-----------
+ regtest/Utils.py | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 23 deletions(-)
commit 10801b6faee9037af054fe74cc4a03620ea41d45
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 12 20:13:17 2011 +0200
+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/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/cairo.py | 39 +++++++
regtest/backends/postscript.py | 35 +++++++
- regtest/backends/splash.py | 39 +++++++
- regtest/backends/text.py | 48 +++++++++
- regtest/commands/__init__.py | 93 +++++++++++++++++
+ 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 ++
+ regtest/commands/run-tests.py | 69 +++++++++++++
+ regtest/main.py | 77 ++++++++++++++
+ regtest/poppler-regtest | 6 ++
14 files changed, 1025 insertions(+)
commit 245e331a14e11a615bf47abbeb34a3561e393b41
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 13:43:49 2011 +0200
+Date: Mon Sep 12 13:43:49 2011 +0200
0.17.4
CMakeLists.txt | 2 +-
- NEWS | 5 +++++
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Mon Sep 12 13:43:35 2011 +0200
+Date: Mon Sep 12 13:43:35 2011 +0200
gir 0.18
@@ -21485,7 +23507,7 @@
commit 61c06d2efad20880e1e0b399cf797dd55f6c8dab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 00:32:38 2011 +0200
+Date: Mon Sep 12 00:32:38 2011 +0200
xpdf303: Useless NULL assignments
@@ -21494,7 +23516,7 @@
commit 4fbcbf1ffb8a98fe8c12643fdab2cbd90b4e60f9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 00:30:52 2011 +0200
+Date: Mon Sep 12 00:30:52 2011 +0200
xpdf303: Set size to 64 instead of 100
@@ -21503,7 +23525,7 @@
commit 1c7203e57e9c7c264f5cada6362a6b449dd8689c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 00:21:03 2011 +0200
+Date: Mon Sep 12 00:21:03 2011 +0200
xpdf303: Avoid calling a "slow" function
@@ -21512,7 +23534,7 @@
commit db4c5789bf95af9f45a7911153acc20a26a447f1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 00:19:49 2011 +0200
+Date: Mon Sep 12 00:19:49 2011 +0200
xpdf303: fix spacing
@@ -21521,7 +23543,7 @@
commit 10c3d15f841865929d2f66353cb01d0d321e8b82
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 12 00:03:13 2011 +0200
+Date: Mon Sep 12 00:03:13 2011 +0200
xpdf303: make limit smaller
@@ -21530,7 +23552,7 @@
commit 1d4e6e739701ba817576752ced169b24c5e95156
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 11 23:57:22 2011 +0200
+Date: Sun Sep 11 23:57:22 2011 +0200
xpdf303: Remove 512 limit in pdftoppm
@@ -21539,7 +23561,7 @@
commit e4e843f1115d95c54967f0386bfb28f685d6c88d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 11 22:49:34 2011 +0200
+Date: Sun Sep 11 22:49:34 2011 +0200
xpdf303: Rework nComps != colorSpace->getNComps() handling
@@ -21548,7 +23570,7 @@
commit dda45b6a67f3f97705e5d806eaf7d37171789e66
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 11 22:46:51 2011 +0200
+Date: Sun Sep 11 22:46:51 2011 +0200
xpdf303: NULL GfxICCBasedColorSpace if array does not have 2 elements
@@ -21557,7 +23579,7 @@
commit 760e814a6d26db8eba567520aad771002e11357a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 11 22:21:40 2011 +0200
+Date: Sun Sep 11 22:21:40 2011 +0200
xpdf303: increase formDepth limit
@@ -21566,7 +23588,7 @@
commit 59442e5994f3b94d5221cbc90f79fad235fe2611
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 11 22:10:41 2011 +0200
+Date: Sun Sep 11 22:10:41 2011 +0200
xpdf303: Remove flags that were never used
@@ -21577,7 +23599,7 @@
commit 41a620ef60507ceda42a14d06d6587ed10016468
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 8 16:18:01 2011 +0200
+Date: Thu Sep 8 16:18:01 2011 +0200
xpdf303: Adapt use of getBlock to our use of getChars
@@ -21588,20 +23610,20 @@
commit 2f7701fe730a648d0a1d181c5b20e4802640dc52
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 8 15:59:27 2011 +0200
+Date: Thu Sep 8 15:59:27 2011 +0200
xpdf303: Adapt xpdf getBlock to our getChars
poppler/JBIG2Stream.cc | 17 ++++++++
- poppler/JBIG2Stream.h | 2 +
- poppler/Stream.cc | 113
+ poppler/JBIG2Stream.h | 2 +
+ poppler/Stream.cc | 113
++++++++++++++++++++++++++++++++++++++++++++-----
- poppler/Stream.h | 55 +++++++++++++-----------
+ poppler/Stream.h | 55 +++++++++++++-----------
4 files changed, 152 insertions(+), 35 deletions(-)
commit 3a1988db40def1655ec638cd521ed40eadc0acca
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 8 15:40:12 2011 +0200
+Date: Thu Sep 8 15:40:12 2011 +0200
xpdf303: empty pages need to call dump to do any setup required by
the OutputDev
@@ -21611,7 +23633,7 @@
commit 4cddaed21592ac491519a81a003035bc4e618705
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 8 15:35:33 2011 +0200
+Date: Thu Sep 8 15:35:33 2011 +0200
xpdf303: Don't clip the other page boxes to the MediaBox at the
intermediate nodes
@@ -21627,7 +23649,7 @@
commit 3538ac89bfea750de8907847d1d5e3515d0b8be7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 8 15:07:21 2011 +0200
+Date: Thu Sep 8 15:07:21 2011 +0200
xpdf303: compile
@@ -21636,7 +23658,7 @@
commit 89d95d0f254a828d28d943b698eeaec51f03686f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 8 12:38:36 2011 +0200
+Date: Thu Sep 8 12:38:36 2011 +0200
xpdf303: Add codeToGID and codeToGIDLen params to
loadOpenTypeCFFFont()
@@ -21650,7 +23672,7 @@
commit d768204e51e6bdbcac4d6b43537297616cbedbf3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 6 21:56:43 2011 +0200
+Date: Tue Sep 6 21:56:43 2011 +0200
xpdf303: Revert b36d150931cd555b84ee996d505e8b91e2afde19
@@ -21658,12 +23680,12 @@
poppler/JBIG2Stream.cc | 91
++++++++++++++++++++++----------------------------
- poppler/JBIG2Stream.h | 1 -
+ poppler/JBIG2Stream.h | 1 -
2 files changed, 40 insertions(+), 52 deletions(-)
commit 2230b8f2128edf4994d8a742f562e1b5acf96b74
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 6 00:05:53 2011 +0200
+Date: Tue Sep 6 00:05:53 2011 +0200
xpdf303: Merge JPXStream changes
@@ -21674,7 +23696,7 @@
commit 35bb53feaa2e469253368f03a9835d73aeb1a240
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 23:20:09 2011 +0200
+Date: Mon Sep 5 23:20:09 2011 +0200
xpdf303: Add BufStream
@@ -21684,7 +23706,7 @@
commit 8a9d92fcf05285c1f06bc153aa79d0200d05bbd9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:57:02 2011 +0200
+Date: Mon Sep 5 22:57:02 2011 +0200
xpdf303: CCITTFaxStream header misc fixes
@@ -21693,7 +23715,7 @@
commit 22d370c0a1f8c016ebc5a6d8320fe55bfd31c8a7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:53:45 2011 +0200
+Date: Mon Sep 5 22:53:45 2011 +0200
xpdf303: DCTStream misc fixes
@@ -21702,7 +23724,7 @@
commit 36d3057546b5a1d717c71b8dcb9773f91e3b5960
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:46:59 2011 +0200
+Date: Mon Sep 5 22:46:59 2011 +0200
xpdf303: Add some {}
@@ -21711,7 +23733,7 @@
commit 308654eb5dfbb783f29bd645f60c79d5b5fe42c9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:45:50 2011 +0200
+Date: Mon Sep 5 22:45:50 2011 +0200
xpdf303: code1 changed to int in CCITTFaxStream::reset
@@ -21720,7 +23742,7 @@
commit f097dc1f9d580eb1cdc8180d3920fe795493cf89
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:43:16 2011 +0200
+Date: Mon Sep 5 22:43:16 2011 +0200
xpdf303: Use 32 bits in CCITTFaxStream::lookBits
@@ -21729,7 +23751,7 @@
commit b5417659042c95891aa549cae396ba4cc6604030
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:40:02 2011 +0200
+Date: Mon Sep 5 22:40:02 2011 +0200
xpdf303: Check against lookBits returning EOF
@@ -21738,7 +23760,7 @@
commit eaf9d31c97a3cc06f4ce94d9190ae1a337634749
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:38:05 2011 +0200
+Date: Mon Sep 5 22:38:05 2011 +0200
xpdf303: Set endOfLine to true if code1 is 1
@@ -21747,7 +23769,7 @@
commit a654a77e26a6c7d76c318636303f8c636a3d2495
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:36:58 2011 +0200
+Date: Mon Sep 5 22:36:58 2011 +0200
xpdf303: Tweaks to CCITTFaxStream::lookChar
@@ -21757,7 +23779,7 @@
commit abdf828449cd543e66f326ba862efcb3ca6d342d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:19:30 2011 +0200
+Date: Mon Sep 5 22:19:30 2011 +0200
xpdf303: Remove cygwin workaround
@@ -21766,7 +23788,7 @@
commit 05ef4227d09381e3a9e8050e447770f44d532386
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:18:33 2011 +0200
+Date: Mon Sep 5 22:18:33 2011 +0200
xpdf303: Return false if getLine fails
@@ -21775,7 +23797,7 @@
commit c2d6158bd56328754d77ab8f1bf84d46e6ede773
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:14:39 2011 +0200
+Date: Mon Sep 5 22:14:39 2011 +0200
xpdf303: Return NULL if size < 0
@@ -21784,7 +23806,7 @@
commit 04947e1dca858b890302a5a1005b84b34255d670
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 22:11:24 2011 +0200
+Date: Mon Sep 5 22:11:24 2011 +0200
xpdf303: Add -rawdates and print Form information
@@ -21793,7 +23815,7 @@
commit 9529e776e53e71069ba4215cdb8b84592d37b555
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 21:19:58 2011 +0200
+Date: Mon Sep 5 21:19:58 2011 +0200
xpdf303: Other fixes in PostScriptFunction
@@ -21802,7 +23824,7 @@
commit 071f983f461ba0b872dd93d7f1a24d325312799d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 21:19:13 2011 +0200
+Date: Mon Sep 5 21:19:13 2011 +0200
xpdf303: Fixed a bug in the PostScript-type function parser
@@ -21814,7 +23836,7 @@
commit da0eff1aaa31c2bf357a64b6275645100c9629d4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 21:12:02 2011 +0200
+Date: Mon Sep 5 21:12:02 2011 +0200
xpdf303: Fixes in StitchingFunction
@@ -21823,7 +23845,7 @@
commit b655316706ec394fa6c8ad076d9d9d96ac8ed563
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 21:05:55 2011 +0200
+Date: Mon Sep 5 21:05:55 2011 +0200
xpdf303: Rework LinkURI decoding
@@ -21832,17 +23854,17 @@
commit abad9b4e44d81a206bccff8a109ceb9a7effa2ad
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 21:00:31 2011 +0200
+Date: Mon Sep 5 21:00:31 2011 +0200
xpdf303: Cache the last transform for PostScript-type functions
poppler/Function.cc | 37 ++++++++++++++++++++++++++++++++++---
- poppler/Function.h | 2 ++
+ poppler/Function.h | 2 ++
2 files changed, 36 insertions(+), 3 deletions(-)
commit e1c6b4c6e6df0854b040c9af9ef2d3f6789e24b2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 21:02:31 2011 +0200
+Date: Mon Sep 5 21:02:31 2011 +0200
xpdf303: Only call getNum if isNum
@@ -21851,7 +23873,7 @@
commit e5661e1a08c38d4c8d69976a8c1c02c1102bc88c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 20:49:13 2011 +0200
+Date: Mon Sep 5 20:49:13 2011 +0200
Optimize SampledFunction
@@ -21860,23 +23882,23 @@
poppler/Function.cc | 87
++++++++++++++++++++++++++++++++++++++++++++---------
- poppler/Function.h | 4 ++-
+ poppler/Function.h | 4 ++-
2 files changed, 75 insertions(+), 16 deletions(-)
commit b36d150931cd555b84ee996d505e8b91e2afde19
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:52:05 2011 +0200
+Date: Mon Sep 5 20:52:05 2011 +0200
xpdf303: Take xpdf way of handling bug 6500
poppler/JBIG2Stream.cc | 91
++++++++++++++++++++++++++++----------------------
- poppler/JBIG2Stream.h | 1 +
+ poppler/JBIG2Stream.h | 1 +
2 files changed, 52 insertions(+), 40 deletions(-)
commit 065565a67c7826b64d89fac9719049d0a57da721
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:39:50 2011 +0200
+Date: Mon Sep 5 20:39:50 2011 +0200
xpdf303: Merge ¿speed? improvements in JBIG2Stream::readGenericBitmap
@@ -21886,7 +23908,7 @@
commit 28adb3884dafcf1d36aae1ec05855b10b22aa4ae
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:26:57 2011 +0200
+Date: Mon Sep 5 20:26:57 2011 +0200
xpdf303: Change bpp calculation
@@ -21895,7 +23917,7 @@
commit c163a82f45d869b7c35a1a7141ab237507671f82
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:25:04 2011 +0200
+Date: Mon Sep 5 20:25:04 2011 +0200
xpdf303: Change symCodeLen calculation
@@ -21904,7 +23926,7 @@
commit 1d1a985101c26f90bde8340dcfae3d6a1e0a08ba
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:20:03 2011 +0200
+Date: Mon Sep 5 20:20:03 2011 +0200
xpdf303: symCodeLen calculation fix
@@ -21913,7 +23935,7 @@
commit 5c0274572c65972434293a30f3ba5afd3905005f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 20:07:54 2011 +0200
+Date: Mon Sep 5 20:07:54 2011 +0200
xpdf303: add line accessor
@@ -21922,7 +23944,7 @@
commit 7b77a264b5c21ba693677b1249a2122743e4e395
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:46:16 2011 +0200
+Date: Mon Sep 5 19:46:16 2011 +0200
xpdf303: segments with unspecified length
@@ -21931,7 +23953,7 @@
commit 23066e8e8309babd61ade9f50ef7d82c9e275055
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:41:16 2011 +0200
+Date: Mon Sep 5 19:41:16 2011 +0200
xpdf303: More EOF detection
@@ -21940,7 +23962,7 @@
commit bc6eded798d6e5dc7a58f88afbe4ab2904698db5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:38:29 2011 +0200
+Date: Mon Sep 5 19:38:29 2011 +0200
xpdf303: Comment++
@@ -21949,7 +23971,7 @@
commit adb98856a745340b4ffb34ffd2ed701600cfc82f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:38:02 2011 +0200
+Date: Mon Sep 5 19:38:02 2011 +0200
xpdf303: Exit loop in case of EOF
@@ -21958,7 +23980,7 @@
commit 112154567ebcab63959294533b00075d6ca6ea65
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:33:27 2011 +0200
+Date: Mon Sep 5 19:33:27 2011 +0200
xpdf303: Initialize to NULL
@@ -21967,7 +23989,7 @@
commit b9ecfdf4cb27a19e65817af51c048e8030825035
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 5 19:27:36 2011 +0200
+Date: Mon Sep 5 19:27:36 2011 +0200
xpdf303: Delay memory allocation up to when it is really needed
@@ -21978,7 +24000,7 @@
commit 7af7b4b2d1941ee9dcd575535d4fc31f29026d8d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 5 19:05:31 2011 +0200
+Date: Mon Sep 5 19:05:31 2011 +0200
xpdf303: Rework initialization of appearance state
@@ -21992,7 +24014,7 @@
commit f7d307b818bca9553a05b5d43deb429abbf04824
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 4 13:56:35 2011 +0200
+Date: Sun Sep 4 13:56:35 2011 +0200
xpdf303: Rewrote the code that handles annotation transforms
@@ -22004,7 +24026,7 @@
commit 4609f9feeca22620c6e143962a3717784a843a68
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 4 13:09:50 2011 +0200
+Date: Sun Sep 4 13:09:50 2011 +0200
xpdf303: Implement rotation in the form field appearance regeneration
@@ -22013,7 +24035,7 @@
commit ca7d77a27e2f3a692842968f08dcb9fa5379bf0f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 4 11:53:40 2011 +0200
+Date: Sun Sep 4 11:53:40 2011 +0200
Create forms with a PDFDoc instead of XRef too
@@ -22024,25 +24046,25 @@
commit ec52e46e309a0307fdf12113a1b7d41a760f9d6c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 4 11:32:38 2011 +0200
+Date: Sun Sep 4 11:32:38 2011 +0200
xpdf303: Create annots with a doc instead of xref + catalog
glib/poppler-action.cc | 2 +-
- glib/poppler-annot.cc | 4 +-
- poppler/Annot.cc | 364
+ glib/poppler-annot.cc | 4 +-
+ poppler/Annot.cc | 364
+++++++++++++++++++++++++------------------------
- poppler/Annot.h | 128 ++++++++---------
- poppler/Catalog.cc | 9 +-
- poppler/Form.cc | 22 +--
- poppler/Form.h | 11 +-
+ poppler/Annot.h | 128 ++++++++---------
+ poppler/Catalog.cc | 9 +-
+ poppler/Form.cc | 22 +--
+ poppler/Form.h | 11 +-
poppler/PSOutputDev.cc | 2 +-
- poppler/Page.cc | 2 +-
+ poppler/Page.cc | 2 +-
9 files changed, 274 insertions(+), 270 deletions(-)
commit ce5e620f07e984927610866467705bb526f9ad8d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 11:05:42 2011 +0200
+Date: Sat Sep 3 11:05:42 2011 +0200
xpdf303: Handle the case where sid < 0
@@ -22051,7 +24073,7 @@
commit 9d77f999de973f3c547245bca0568f8984faa5d7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 11:02:55 2011 +0200
+Date: Sat Sep 3 11:02:55 2011 +0200
xpdf303: Initialize nFDs in FoFiType1C::parse()
@@ -22060,7 +24082,7 @@
commit d9594c95713ac79b46e313ecf2875196ea076ef4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 11:01:28 2011 +0200
+Date: Sat Sep 3 11:01:28 2011 +0200
xpdf303: Check whether fdSelect is NULL before using it
@@ -22069,7 +24091,7 @@
commit 4e4a8ec52c5662e21036f219636a39fc97a32353
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 10:52:14 2011 +0200
+Date: Sat Sep 3 10:52:14 2011 +0200
xpdf303: Add writePSString() helper function to FoFiType1C
@@ -22080,7 +24102,7 @@
commit ff03811db1ef833df4bab12fe3bf3a8c1534c174
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 10:40:15 2011 +0200
+Date: Sat Sep 3 10:40:15 2011 +0200
xpdf303: More checks in GooString
@@ -22089,7 +24111,7 @@
commit 0029efbe2a8a97ff34353f8028ac649b2fd07013
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 3 10:32:14 2011 +0200
+Date: Sat Sep 3 10:32:14 2011 +0200
xpdf303: Use a double instead of an int with a cast
@@ -22098,7 +24120,7 @@
commit 419ee8c30ba0df02e9f0281b321fbe38387e5a21
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 2 18:44:04 2011 +0200
+Date: Fri Sep 2 18:44:04 2011 +0200
xpdf303: Add more formats to GooString
@@ -22109,7 +24131,7 @@
commit 738a6954da01fd3fc8c1cd5baa49fc7b8c959169
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 2 18:24:04 2011 +0200
+Date: Fri Sep 2 18:24:04 2011 +0200
xpdf303: Add getGlyphName() to FoFiType1C
@@ -22119,7 +24141,7 @@
commit 39b77a193996b0916690a246f4a9874dad596b2f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 2 18:17:51 2011 +0200
+Date: Fri Sep 2 18:17:51 2011 +0200
xpdf303: Improvements in FoFiType1 parser
@@ -22129,7 +24151,7 @@
commit 44dbb28a07125f92a0835aea7ad3403310bc451d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 2 18:08:39 2011 +0200
+Date: Fri Sep 2 18:08:39 2011 +0200
xpdf303: Handle PFB headers in Type 1 font files
@@ -22139,22 +24161,22 @@
commit 9531a52b227a994ab8e0d66aeaff2b21358ca73e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 2 18:01:35 2011 +0200
+Date: Fri Sep 2 18:01:35 2011 +0200
xpdf303: New signature of methods convertToCIDType0() and
convertToType0()
- fofi/FoFiTrueType.cc | 8 ++---
- fofi/FoFiTrueType.h | 4 +--
- fofi/FoFiType1C.cc | 84
+ fofi/FoFiTrueType.cc | 8 ++---
+ fofi/FoFiTrueType.h | 4 +--
+ fofi/FoFiType1C.cc | 84
+++++++++++++++++++++++++++++++++++---------------
- fofi/FoFiType1C.h | 19 +++++++++---
+ fofi/FoFiType1C.h | 19 +++++++++---
poppler/PSOutputDev.cc | 13 ++++++--
5 files changed, 91 insertions(+), 37 deletions(-)
commit 830d2b40770333489a08f23a3b16a372770a8d19
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 23:23:57 2011 +0200
+Date: Thu Sep 1 23:23:57 2011 +0200
xpdf303: Use openFile
@@ -22164,7 +24186,7 @@
commit ddf9d6e35b40b902519cbaa8cb664ba6dfdfd510
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 23:21:26 2011 +0200
+Date: Thu Sep 1 23:21:26 2011 +0200
xpdf303: openFile + minor fixes for openTempFile in Windows
@@ -22175,7 +24197,7 @@
commit 68e8fa9ff4f13b6703148b3eb6ea628418211243
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 23:17:59 2011 +0200
+Date: Thu Sep 1 23:17:59 2011 +0200
xpdf303: make gcc happy
@@ -22184,7 +24206,7 @@
commit 876021b1aa16ad38767a91e1be31c392f368fde2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 19:07:01 2011 +0200
+Date: Thu Sep 1 19:07:01 2011 +0200
xpdf303: Add getFontMatrix()
@@ -22199,7 +24221,7 @@
commit 1369862ed61ef8b0f81c52fce36f6c1602d82ddb
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 18:27:51 2011 +0200
+Date: Thu Sep 1 18:27:51 2011 +0200
xpdf303: Ignore entries that have an invalid tag too
@@ -22208,7 +24230,7 @@
commit 0fe7cc82e84dc2a3b79248b111656e5e7df9fdc2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 18:21:33 2011 +0200
+Date: Thu Sep 1 18:21:33 2011 +0200
xpdf303: Update cmap, name, post and os2 tables in FoFiTrueType
@@ -22217,7 +24239,7 @@
commit 0feebf5f3c9da8d7a1154456a00492a623340cec
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 18:16:59 2011 +0200
+Date: Thu Sep 1 18:16:59 2011 +0200
xpdf303: Ignore any bogus entries in the table directory
@@ -22231,11 +24253,11 @@
commit 68c6ebc78b89eec94a9c3538fe6e27561a21b680
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 17:49:46 2011 +0200
+Date: Thu Sep 1 17:49:46 2011 +0200
xpdf303: codeToGID items can be < 0 now
- fofi/FoFiTrueType.cc | 12 ++++++++++--
+ fofi/FoFiTrueType.cc | 12 ++++++++++--
poppler/PSOutputDev.cc | 2 +-
splash/SplashFTFont.cc | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
@@ -22242,7 +24264,7 @@
commit 19204ed5cd5cb64809f1a1f51dd5ffdef2b9417a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 17:28:39 2011 +0200
+Date: Thu Sep 1 17:28:39 2011 +0200
xpdf303: CMap::getCID signature change
@@ -22253,7 +24275,7 @@
commit 9c74bef77e7e1d7a8464dff43cae16bb1206665e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 17:04:04 2011 +0200
+Date: Thu Sep 1 17:04:04 2011 +0200
xpdf303: Use splashDist instead of splashSqrt
@@ -22262,7 +24284,7 @@
commit 0568d0dc3c42b68b715226e5ce0ff98d73a94ac7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 17:01:30 2011 +0200
+Date: Thu Sep 1 17:01:30 2011 +0200
xpdf303: Do the multiplication the other way around
@@ -22273,7 +24295,7 @@
commit 3c0da502aa1d5b1acae01cf1e43fb96f5ecc11da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 17:00:31 2011 +0200
+Date: Thu Sep 1 17:00:31 2011 +0200
xpdf303: Use splashCheckDet isntead of splashAbs
@@ -22282,7 +24304,7 @@
commit 2b4303c66f8de9a267413465898897fd6b0ebb17
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:51:53 2011 +0200
+Date: Thu Sep 1 16:51:53 2011 +0200
xpdf303: Bigger fileKey
@@ -22291,7 +24313,7 @@
commit 53060857e31a01413936fbe33b7032a0a325b384
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:50:08 2011 +0200
+Date: Thu Sep 1 16:50:08 2011 +0200
xpdf303: Merge JArithmeticDecoder.*
@@ -22302,7 +24324,7 @@
commit 0722960b4cf4ce40b6bd278ac7287d64a1d70bf2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:48:31 2011 +0200
+Date: Thu Sep 1 16:48:31 2011 +0200
xpdf303: Do not crash if imgStr->getLine() is NULL
@@ -22311,7 +24333,7 @@
commit f848edab849910b8291c7974e484ef5d02b2234c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:42:30 2011 +0200
+Date: Thu Sep 1 16:42:30 2011 +0200
xpdf303: Do not extract the million tiles of a pattern
@@ -22321,7 +24343,7 @@
commit 01adb7ef6a524d7313a45e7c5f441da4fd0250bd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:31:50 2011 +0200
+Date: Thu Sep 1 16:31:50 2011 +0200
xpdf303: Assembler for some functions
@@ -22331,7 +24353,7 @@
commit 4f87a3163f133565e8774ef416e67d05f906723d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:25:19 2011 +0200
+Date: Thu Sep 1 16:25:19 2011 +0200
xpdf303: Add splashAvg
@@ -22340,7 +24362,7 @@
commit 64cf42f89939763d105be4948a20e9ecb81a64c1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:23:08 2011 +0200
+Date: Thu Sep 1 16:23:08 2011 +0200
xpdf303: Add getters to SplashClip
@@ -22349,7 +24371,7 @@
commit 28c6a55742f55a719ef63b8e0eff7c242653cf36
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:17:56 2011 +0200
+Date: Thu Sep 1 16:17:56 2011 +0200
xpdf303: unneeded forward declare
@@ -22358,70 +24380,70 @@
commit 38ebe8c568aafbe5f248f9e0a654f46829e0b659
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 16:13:53 2011 +0200
+Date: Thu Sep 1 16:13:53 2011 +0200
xpdf303: Page functions do not need Catalog * anymore
- glib/poppler-document.cc | 2 +-
- glib/poppler-page.cc | 11 ++++------
- poppler/FontInfo.cc | 2 +-
- poppler/OutputDev.h | 4 ++--
- poppler/PDFDoc.cc | 8 +++----
- poppler/PSOutputDev.cc | 6 +++---
- poppler/PSOutputDev.h | 2 +-
- poppler/Page.cc | 36
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-page.cc | 11 ++++------
+ poppler/FontInfo.cc | 2 +-
+ poppler/OutputDev.h | 4 ++--
+ poppler/PDFDoc.cc | 8 +++----
+ poppler/PSOutputDev.cc | 6 +++---
+ poppler/PSOutputDev.h | 2 +-
+ poppler/Page.cc | 36
++++++++++++++++----------------
- poppler/Page.h | 16 +++++++-------
- poppler/TextOutputDev.cc | 2 +-
- poppler/TextOutputDev.h | 2 +-
+ poppler/Page.h | 16 +++++++-------
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/TextOutputDev.h | 2 +-
qt4/src/poppler-link-extractor-private.h | 2 +-
- qt4/src/poppler-link-extractor.cc | 4 ++--
- qt4/src/poppler-page.cc | 4 ++--
- utils/HtmlOutputDev.cc | 9 ++++----
- utils/HtmlOutputDev.h | 7 +++----
- utils/pdftohtml.cc | 2 +-
+ qt4/src/poppler-link-extractor.cc | 4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
+ utils/HtmlOutputDev.cc | 9 ++++----
+ utils/HtmlOutputDev.h | 7 +++----
+ utils/pdftohtml.cc | 2 +-
17 files changed, 58 insertions(+), 61 deletions(-)
commit 7d794f6411499fb8f26778bf2b54cb9734d004af
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 15:47:32 2011 +0200
+Date: Thu Sep 1 15:47:32 2011 +0200
xpdf303: API rework, Gfx wants a PDFDoc instead of an XRef
- cpp/poppler-page-renderer.cpp | 2 +-
- glib/poppler-document.cc | 2 +-
- glib/poppler-page.cc | 2 --
- poppler/CairoFontEngine.cc | 28 ++++++++++++----------------
- poppler/CairoFontEngine.h | 13 ++++++-------
- poppler/CairoOutputDev.cc | 12 +++++-------
- poppler/CairoOutputDev.h | 6 +++---
- poppler/Catalog.cc | 8 +++++---
- poppler/Catalog.h | 4 +++-
- poppler/Gfx.cc | 15 +++++++++------
- poppler/Gfx.h | 6 ++++--
- poppler/PDFDoc.cc | 6 +++---
- poppler/PSOutputDev.cc | 29 +++++++++++++++--------------
- poppler/PSOutputDev.h | 9 ++++-----
- poppler/Page.cc | 8 +++++---
- poppler/Page.h | 4 +++-
- poppler/PreScanOutputDev.cc | 6 +++---
- poppler/PreScanOutputDev.h | 4 ++--
- poppler/SplashOutputDev.cc | 13 +++++++------
- poppler/SplashOutputDev.h | 5 +++--
- qt4/src/poppler-private.h | 2 +-
+ cpp/poppler-page-renderer.cpp | 2 +-
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-page.cc | 2 --
+ poppler/CairoFontEngine.cc | 28 ++++++++++++----------------
+ poppler/CairoFontEngine.h | 13 ++++++-------
+ poppler/CairoOutputDev.cc | 12 +++++-------
+ poppler/CairoOutputDev.h | 6 +++---
+ poppler/Catalog.cc | 8 +++++---
+ poppler/Catalog.h | 4 +++-
+ poppler/Gfx.cc | 15 +++++++++------
+ poppler/Gfx.h | 6 ++++--
+ poppler/PDFDoc.cc | 6 +++---
+ poppler/PSOutputDev.cc | 29 +++++++++++++++--------------
+ poppler/PSOutputDev.h | 9 ++++-----
+ poppler/Page.cc | 8 +++++---
+ poppler/Page.h | 4 +++-
+ poppler/PreScanOutputDev.cc | 6 +++---
+ poppler/PreScanOutputDev.h | 4 ++--
+ poppler/SplashOutputDev.cc | 13 +++++++------
+ poppler/SplashOutputDev.h | 5 +++--
+ qt4/src/poppler-private.h | 2 +-
qt4/src/poppler-ps-converter.cc | 2 --
- test/gtk-test.cc | 2 +-
- test/pdf-inspector.cc | 2 +-
- test/perf-test.cc | 2 +-
- utils/pdftocairo.cc | 2 +-
- utils/pdftohtml.cc | 6 +++---
- utils/pdftoppm.cc | 2 +-
- utils/pdftops.cc | 4 ++--
+ test/gtk-test.cc | 2 +-
+ test/pdf-inspector.cc | 2 +-
+ test/perf-test.cc | 2 +-
+ utils/pdftocairo.cc | 2 +-
+ utils/pdftohtml.cc | 6 +++---
+ utils/pdftoppm.cc | 2 +-
+ utils/pdftops.cc | 4 ++--
29 files changed, 105 insertions(+), 101 deletions(-)
commit 52fb80a7b3f98eb8322a7ba84e2900f044b3a18a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 13:27:01 2011 +0200
+Date: Thu Sep 1 13:27:01 2011 +0200
xpdf303: compile++
@@ -22430,18 +24452,18 @@
commit 37ca8dc4215693ec657d165ebdb6c315a0ae92c9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 1 12:34:32 2011 +0200
+Date: Thu Sep 1 12:34:32 2011 +0200
xpdf303: Use int instead of Gushort for gid/cid maps
- fofi/FoFiTrueType.cc | 18 +++++++++---------
- fofi/FoFiTrueType.h | 14 +++++++-------
- fofi/FoFiType1C.cc | 8 ++++----
- fofi/FoFiType1C.h | 2 +-
+ fofi/FoFiTrueType.cc | 18 +++++++++---------
+ fofi/FoFiTrueType.h | 14 +++++++-------
+ fofi/FoFiType1C.cc | 8 ++++----
+ fofi/FoFiType1C.h | 2 +-
poppler/CairoFontEngine.cc | 22 +++++++++++-----------
poppler/CairoFontEngine.h | 8 ++++----
- poppler/GfxFont.cc | 22 +++++++++++-----------
- poppler/GfxFont.h | 10 +++++-----
+ poppler/GfxFont.cc | 22 +++++++++++-----------
+ poppler/GfxFont.h | 10 +++++-----
poppler/PSOutputDev.cc | 14 +++++++-------
poppler/SplashOutputDev.cc | 6 +++---
splash/SplashFTFontEngine.cc | 6 +++---
@@ -22454,7 +24476,7 @@
commit df942e25bff9b014bde0ff69c8a01fa3c1963015
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 01:08:10 2011 +0200
+Date: Thu Sep 1 01:08:10 2011 +0200
xpdf303: More parsing flexibility
@@ -22463,7 +24485,7 @@
commit 5305dfc5702e8004e5ae35697c6aebd0b1a5c96e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 01:05:02 2011 +0200
+Date: Thu Sep 1 01:05:02 2011 +0200
xpdf303: Make sure codes are inside the range
@@ -22472,7 +24494,7 @@
commit 45212483572c68abd612b5c62b21cbb545e10143
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 01:01:13 2011 +0200
+Date: Thu Sep 1 01:01:13 2011 +0200
xpdf303: change mapLen growing stragegy
@@ -22481,7 +24503,7 @@
commit 75d70f190e97f69047cdbe97a872a936788392d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 01:00:23 2011 +0200
+Date: Thu Sep 1 01:00:23 2011 +0200
xpdf303: Limit code to 0xffffff
@@ -22490,7 +24512,7 @@
commit b4180a187f9246b6390df112e5536ead9ef9bcbe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 00:59:09 2011 +0200
+Date: Thu Sep 1 00:59:09 2011 +0200
xpdf303: Use parseHex instead of sscanf
@@ -22499,7 +24521,7 @@
commit 121f648f233adcdc631c7e29d67b60baa922e29a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 00:28:40 2011 +0200
+Date: Thu Sep 1 00:28:40 2011 +0200
Add helper parseHex function
@@ -22508,7 +24530,7 @@
commit be0436ace671070bab4304efee607f40c959bc55
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 00:26:57 2011 +0200
+Date: Thu Sep 1 00:26:57 2011 +0200
xpdf303: CharCodeToUnicode::makeIdentityMapping & friends
@@ -22518,7 +24540,7 @@
commit 5dd94447b14db1894f06ad0590187dae7575e33a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 00:15:59 2011 +0200
+Date: Thu Sep 1 00:15:59 2011 +0200
xpdf303: Remove unused constructor
@@ -22528,7 +24550,7 @@
commit d00d56e4a46e8534378534de0d94ce0551d75d84
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 1 00:11:49 2011 +0200
+Date: Thu Sep 1 00:11:49 2011 +0200
xpdf303: Speedup SplashScreen
@@ -22537,12 +24559,12 @@
splash/SplashScreen.cc | 89
+++++++++++++++++---------------------------------
- splash/SplashScreen.h | 14 ++++++--
+ splash/SplashScreen.h | 14 ++++++--
2 files changed, 42 insertions(+), 61 deletions(-)
commit 5e8debf96ab1bb9db31a0332a482d08c181d52ea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 23:56:52 2011 +0200
+Date: Wed Aug 31 23:56:52 2011 +0200
xpdf303: Add splashCheckDet helper
@@ -22551,7 +24573,7 @@
commit 4cef5a52b33b1afba28d890bbe48000b734ac357
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 21:09:50 2011 +0200
+Date: Wed Aug 31 21:09:50 2011 +0200
xpdf303: Protect against NULL from lexer->getStream()
@@ -22560,7 +24582,7 @@
commit 2547ec60db6d954e5c8318e30fcc54f70bcfa95c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 21:05:11 2011 +0200
+Date: Wed Aug 31 21:05:11 2011 +0200
xpdf303: Add GBool force = gFalse to SplashPath::close
@@ -22570,7 +24592,7 @@
commit 9370f9640a24c7b944f3da7c10e070a960bdd8f9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 21:01:32 2011 +0200
+Date: Wed Aug 31 21:01:32 2011 +0200
xpdf303: Add guards to the header
@@ -22579,18 +24601,18 @@
commit ab9dea663a4df5af8f54c1ff5149254adfd72ce9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 20:34:17 2011 +0200
+Date: Wed Aug 31 20:34:17 2011 +0200
xpdf303: Add SplashBitmap::writeAlphaPGMFile and
SplashBitmap::takeData
splash/SplashBitmap.cc | 22 ++++++++++++++++++++++
- splash/SplashBitmap.h | 6 ++++++
+ splash/SplashBitmap.h | 6 ++++++
2 files changed, 28 insertions(+)
commit 6558d735c65a3dca9b9e16de5588c8b8c482f04f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 20:30:27 2011 +0200
+Date: Wed Aug 31 20:30:27 2011 +0200
xpdf303: Write faster
@@ -22599,7 +24621,7 @@
commit a9b26d9c35fccc7b46a96acdb2064a9976bd49bd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 20:29:58 2011 +0200
+Date: Wed Aug 31 20:29:58 2011 +0200
xpdf303: Only free data if there is data to free
@@ -22608,7 +24630,7 @@
commit 8f6e0285d7e80d8c1a8defaad9d0f87a2e054151
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 20:20:47 2011 +0200
+Date: Wed Aug 31 20:20:47 2011 +0200
xpdf303: PDFDocEncoding changes
@@ -22620,7 +24642,7 @@
commit 9c8f30fb4a2a0dd2cf359610e33749e1682921c7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 20:17:38 2011 +0200
+Date: Wed Aug 31 20:17:38 2011 +0200
xpdf303: comment changes
@@ -22629,17 +24651,17 @@
commit b78046057657b44c5cc9353d9e3dde356eb7fcbd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:32:03 2011 +0200
+Date: Wed Aug 31 19:32:03 2011 +0200
xpdf303: Introduce unicodeTypeNum and unicodeTypeAlphaNum
poppler/UnicodeTypeTable.cc | 11 +++++++++++
- poppler/UnicodeTypeTable.h | 4 ++++
+ poppler/UnicodeTypeTable.h | 4 ++++
2 files changed, 15 insertions(+)
commit 0ec4b390ddb7fa7d028b8f0515ecd3e61c488c9f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:30:55 2011 +0200
+Date: Wed Aug 31 19:30:55 2011 +0200
xpdf303: UnicodeTypeTable tables changes
@@ -22648,31 +24670,31 @@
commit f331c009f94703d6007fce9570ee19c6e4822339
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:20:12 2011 +0200
+Date: Wed Aug 31 19:20:12 2011 +0200
xpdf303: Remove warning() from Error.h
poppler/CairoOutputDev.cc | 6 +++---
- poppler/Error.cc | 7 -------
- poppler/Error.h | 1 -
+ poppler/Error.cc | 7 -------
+ poppler/Error.h | 1 -
3 files changed, 3 insertions(+), 11 deletions(-)
commit 53f94df2ce21793914ccc153ba6b2fe5cbeb8371
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:17:13 2011 +0200
+Date: Wed Aug 31 19:17:13 2011 +0200
Port to setErrorCallback
cpp/poppler-document.cpp | 2 +-
cpp/poppler-private.cpp | 6 ++----
- cpp/poppler-private.h | 3 ++-
+ cpp/poppler-private.h | 3 ++-
qt4/src/poppler-private.cc | 8 +++-----
- test/perf-test.cc | 4 ++--
+ test/perf-test.cc | 4 ++--
5 files changed, 10 insertions(+), 13 deletions(-)
commit 95a52f06a98f49f7c8f2b92634b75af96b4eee1d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:07:22 2011 +0200
+Date: Wed Aug 31 19:07:22 2011 +0200
xpdf303: Forgot this when doing the char * -> const char *
@@ -22681,78 +24703,78 @@
commit 00549400f155d8e36b4ac718603fc945858fe50d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 31 19:04:14 2011 +0200
+Date: Wed Aug 31 19:04:14 2011 +0200
xpdf303: error() changes, new param and formatting
- fofi/FoFiBase.cc | 8 +--
- fofi/FoFiTrueType.cc | 2 +-
- fofi/FoFiType1.cc | 4 +-
- goo/JpegWriter.cc | 2 +-
- goo/PNGWriter.cc | 16 ++---
- poppler/Annot.cc | 40 +++++------
+ fofi/FoFiBase.cc | 8 +--
+ fofi/FoFiTrueType.cc | 2 +-
+ fofi/FoFiType1.cc | 4 +-
+ goo/JpegWriter.cc | 2 +-
+ goo/PNGWriter.cc | 16 ++---
+ poppler/Annot.cc | 40 +++++------
poppler/ArthurOutputDev.cc | 16 ++---
- poppler/CMap.cc | 26 +++----
- poppler/CachedFile.cc | 2 +-
+ poppler/CMap.cc | 26 +++----
+ poppler/CachedFile.cc | 2 +-
poppler/CairoFontEngine.cc | 10 +--
- poppler/Catalog.cc | 50 ++++++-------
+ poppler/Catalog.cc | 50 ++++++-------
poppler/CharCodeToUnicode.cc | 54 +++++++-------
poppler/CurlCachedFile.cc | 2 +-
- poppler/DCTStream.cc | 2 +-
- poppler/Decrypt.cc | 2 +-
- poppler/Error.cc | 55 ++++++++++-----
- poppler/Error.h | 23 +++++-
- poppler/FileSpec.cc | 8 +--
- poppler/Form.cc | 44 ++++++------
- poppler/Function.cc | 107 ++++++++++++++--------------
- poppler/Gfx.cc | 161
+ poppler/DCTStream.cc | 2 +-
+ poppler/Decrypt.cc | 2 +-
+ poppler/Error.cc | 55 ++++++++++-----
+ poppler/Error.h | 23 +++++-
+ poppler/FileSpec.cc | 8 +--
+ poppler/Form.cc | 44 ++++++------
+ poppler/Function.cc | 107 ++++++++++++++--------------
+ poppler/Gfx.cc | 161
+++++++++++++++++++++---------------------
- poppler/GfxFont.cc | 102 ++++++++++++++-------------
- poppler/GfxState.cc | 128 ++++++++++++++++-----------------
- poppler/GfxState.h | 8 +--
+ poppler/GfxFont.cc | 102 ++++++++++++++-------------
+ poppler/GfxState.cc | 128 ++++++++++++++++-----------------
+ poppler/GfxState.h | 8 +--
poppler/GlobalParams.cc | 38 +++++-----
poppler/GlobalParamsWin.cc | 4 +-
- poppler/Hints.cc | 22 +++---
+ poppler/Hints.cc | 22 +++---
poppler/JBIG2Stream.cc | 88 +++++++++++------------
poppler/JPEG2000Stream.cc | 10 +--
- poppler/JPXStream.cc | 164
+ poppler/JPXStream.cc | 164
++++++++++++++++++++++---------------------
- poppler/Lexer.cc | 24 +++----
+ poppler/Lexer.cc | 24 +++----
poppler/Linearization.cc | 20 +++---
- poppler/Link.cc | 77 ++++++++++----------
- poppler/Movie.cc | 2 +-
- poppler/Object.h | 8 +--
+ poppler/Link.cc | 77 ++++++++++----------
+ poppler/Movie.cc | 2 +-
+ poppler/Object.h | 8 +--
poppler/OptionalContent.cc | 14 ++--
- poppler/PDFDoc.cc | 43 ++++++------
+ poppler/PDFDoc.cc | 43 ++++++------
poppler/PDFDocFactory.cc | 2 +-
poppler/PSOutputDev.cc | 45 ++++++------
- poppler/Page.cc | 12 ++--
- poppler/Parser.cc | 10 +--
- poppler/Rendition.cc | 6 +-
+ poppler/Page.cc | 12 ++--
+ poppler/Parser.cc | 10 +--
+ poppler/Rendition.cc | 6 +-
poppler/SecurityHandler.cc | 12 ++--
poppler/SplashOutputDev.cc | 28 ++++----
- poppler/Stream.cc | 116 ++++++++++++++++--------------
+ poppler/Stream.cc | 116 ++++++++++++++++--------------
poppler/TextOutputDev.cc | 2 +-
- poppler/UnicodeMap.cc | 15 ++--
- poppler/XRef.cc | 32 ++++-----
- splash/Splash.cc | 2 +-
+ poppler/UnicodeMap.cc | 15 ++--
+ poppler/XRef.cc | 32 ++++-----
+ splash/Splash.cc | 2 +-
splash/SplashBitmap.cc | 6 +-
- test/perf-test.cc | 4 +-
+ test/perf-test.cc | 4 +-
utils/HtmlOutputDev.cc | 18 ++---
utils/ImageOutputDev.cc | 10 +--
- utils/pdfextract.cc | 4 +-
- utils/pdfimages.cc | 2 +-
- utils/pdfinfo.cc | 6 +-
- utils/pdfmerge.cc | 6 +-
- utils/pdftocairo.cc | 6 +-
- utils/pdftohtml.cc | 6 +-
- utils/pdftops.cc | 6 +-
- utils/pdftotext.cc | 12 ++--
+ utils/pdfextract.cc | 4 +-
+ utils/pdfimages.cc | 2 +-
+ utils/pdfinfo.cc | 6 +-
+ utils/pdfmerge.cc | 6 +-
+ utils/pdftocairo.cc | 6 +-
+ utils/pdftohtml.cc | 6 +-
+ utils/pdftops.cc | 6 +-
+ utils/pdftotext.cc | 12 ++--
61 files changed, 912 insertions(+), 842 deletions(-)
commit cd0764921064bfd455e9df52dc9bda6fbd2c2db2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Aug 31 17:23:28 2011 +0200
+Date: Wed Aug 31 17:23:28 2011 +0200
xpdf303: Always define at least 256 glyphs for Type 0 fonts
@@ -22762,7 +24784,7 @@
commit 4d4318e258fb68704b1a51a14fa89134606e2aa7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Aug 31 17:07:25 2011 +0200
+Date: Wed Aug 31 17:07:25 2011 +0200
xpdf303: Different growing strategy for vmtxTab in FoFiTrueType
@@ -22771,7 +24793,7 @@
commit c8c7fcef9bc8f802be2d376c9d2099971f159317
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Aug 31 17:05:16 2011 +0200
+Date: Wed Aug 31 17:05:16 2011 +0200
xpdf303: Fix memory leak in FoFiTrueType
@@ -22780,7 +24802,7 @@
commit 655b1a97db5449c009e5b63fc7c12233e6fae450
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Aug 31 16:54:05 2011 +0200
+Date: Wed Aug 31 16:54:05 2011 +0200
xpdf303: Check for an invalid loca format field in the head table
in FoFiTrueType
@@ -22790,7 +24812,7 @@
commit 9710ab96f1cf26394cc473952a3331d60c149451
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Aug 31 16:49:54 2011 +0200
+Date: Wed Aug 31 16:49:54 2011 +0200
Fix the build
@@ -22799,7 +24821,7 @@
commit 36b733a3165fd26aa8c25ba57faa5d2277aa31ec
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 30 16:31:52 2011 +0200
+Date: Tue Aug 30 16:31:52 2011 +0200
xpdf303: Handle bogus loca table entries in FoFiTrueType
@@ -22811,7 +24833,7 @@
commit a288bdb417582f07a5a0cb13d5218946a1d0ccc8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 21:55:43 2011 +0200
+Date: Tue Aug 30 21:55:43 2011 +0200
xpdf303: Increase max keyLength to 32
@@ -22820,7 +24842,7 @@
commit 12e0acd9d393df76e297bb3fde323092c428be21
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 21:03:05 2011 +0200
+Date: Tue Aug 30 21:03:05 2011 +0200
xpdf303: GfxXXXpath different growing strategy
@@ -22829,7 +24851,7 @@
commit 7c5e496715f56498fb1aa08371d2b8d4d0e73d25
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:59:36 2011 +0200
+Date: Tue Aug 30 20:59:36 2011 +0200
xpdf303: No need for 4 Guint when 1 is enough
@@ -22838,17 +24860,17 @@
commit e7e8082901e108130d5c98cc7648f143978c9562
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:50:17 2011 +0200
+Date: Tue Aug 30 20:50:17 2011 +0200
xpdf303: GooList::copy, GooList::reverse and GooList::put
goo/GooList.cc | 22 ++++++++++++++++++++++
- goo/GooList.h | 10 ++++++++++
+ goo/GooList.h | 10 ++++++++++
2 files changed, 32 insertions(+)
commit 8a119cf205467c20269e7beffde9497ffd277c15
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:48:40 2011 +0200
+Date: Tue Aug 30 20:48:40 2011 +0200
xpdf303: Inserting with a negative i means prepending
@@ -22857,7 +24879,7 @@
commit 95142a8e63e476324e368785001a23d4f1d462b9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:47:12 2011 +0200
+Date: Tue Aug 30 20:47:12 2011 +0200
xpdf303: If size is 0 reserve 8 anyway
@@ -22866,7 +24888,7 @@
commit bd1076da03f76fb62998a9409d366412f4aa5d13
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:45:36 2011 +0200
+Date: Tue Aug 30 20:45:36 2011 +0200
xpdf303: Complain for gmalloc and grealloc < 0
@@ -22875,7 +24897,7 @@
commit 5a42b3693a9e501a27d790d4aeafcb68f63cb950
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:38:39 2011 +0200
+Date: Tue Aug 30 20:38:39 2011 +0200
xpdf303: Honor the deleteKeys setting
@@ -22884,7 +24906,7 @@
commit d584b54eff52c47f983947b2aff0967dfed0ccf9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 20:36:03 2011 +0200
+Date: Tue Aug 30 20:36:03 2011 +0200
xpdf303: set to NULL on failure
@@ -22893,7 +24915,7 @@
commit bf2cb5c9c47b4a61192101f0a48771657228e383
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 30 19:08:40 2011 +0930
+Date: Tue Aug 30 19:08:40 2011 +0930
Fix compile error with libpng >= 1.5.0
@@ -22905,35 +24927,35 @@
commit 6364c50ffb4053cc30cecbefff7a3142cab8c50b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 18:27:09 2011 +0200
+Date: Tue Aug 30 18:27:09 2011 +0200
xpdf303: Support for aes256 et all in Decrypt/SecurityHandler
- poppler/Decrypt.cc | 488
+ poppler/Decrypt.cc | 488
+++++++++++++++++++++++++++++++++++++++------
- poppler/Decrypt.h | 19 +-
- poppler/PDFDoc.cc | 2 +-
+ poppler/Decrypt.h | 19 +-
+ poppler/PDFDoc.cc | 2 +-
poppler/SecurityHandler.cc | 238 ++++++++++++----------
- poppler/SecurityHandler.h | 7 +-
- poppler/Stream.h | 3 +-
+ poppler/SecurityHandler.h | 7 +-
+ poppler/Stream.h | 3 +-
6 files changed, 595 insertions(+), 162 deletions(-)
commit 39ce4575f96953b499d09074e847d492d18379fa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 17:39:30 2011 +0200
+Date: Tue Aug 30 17:39:30 2011 +0200
xpdf303: Add FoFiIdentifier
- CMakeLists.txt | 2 +
+ CMakeLists.txt | 2 +
fofi/FoFiIdentifier.cc | 630
+++++++++++++++++++++++++++++++++++++++++++++++++
- fofi/FoFiIdentifier.h | 42 ++++
- fofi/Makefile.am | 2 +
+ fofi/FoFiIdentifier.h | 42 ++++
+ fofi/Makefile.am | 2 +
4 files changed, 676 insertions(+)
commit 33e7d54b4a29d297108ef3dc6008190625125ec8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 17:36:22 2011 +0200
+Date: Tue Aug 30 17:36:22 2011 +0200
xpdf303: Also check against INT_MAX in FoFiBase
@@ -22942,7 +24964,7 @@
commit fb1f56f091e5329b30279916b182f64134f3b2e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 17:34:50 2011 +0200
+Date: Tue Aug 30 17:34:50 2011 +0200
xpdf303: Introduce FoFiBase::getU32LE
@@ -22952,7 +24974,7 @@
commit a79bc3359586cbc2c235d20dfa934dab1f475561
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 30 16:59:08 2011 +0200
+Date: Tue Aug 30 16:59:08 2011 +0200
xpdf303: Check for a zero-entry cmap table in FoFiTrueType
@@ -22961,21 +24983,21 @@
commit efce014e39d0d13157b21a10ff8d483b5cfc561a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 17:02:16 2011 +0200
+Date: Tue Aug 30 17:02:16 2011 +0200
xpdf303: upddate xpdfCopyright
poppler/poppler-config.h.cmake | 4 ++--
- poppler/poppler-config.h.in | 4 ++--
+ poppler/poppler-config.h.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 2eb388ccc6c7526e66da804d9d800cf29a027914
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 16:50:39 2011 +0200
+Date: Tue Aug 30 16:50:39 2011 +0200
xpdf303: Merge README
- README | 2 +-
+ README | 2 +-
README-XPDF | 153
+++++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 101 insertions(+), 54 deletions(-)
@@ -22982,7 +25004,7 @@
commit 331b0f1c16c4f636fc616569bab030969aa848f2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 30 16:42:33 2011 +0200
+Date: Tue Aug 30 16:42:33 2011 +0200
xpdf303: Check for entries in the table directory with bogus tags
in FoFiTrueType
@@ -22996,22 +25018,22 @@
commit faaba717046ba87ef5ded614e2bcab6260a9f7c2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 16:36:24 2011 +0200
+Date: Tue Aug 30 16:36:24 2011 +0200
xpdf303: FixedPoint improvements
- goo/FixedPoint.cc | 51
+ goo/FixedPoint.cc | 51
++++++++++++++++++++++++++++++++------------------
- goo/FixedPoint.h | 15 +++++++++++++--
- splash/Splash.cc | 12 ++++++++++++
+ goo/FixedPoint.h | 15 +++++++++++++--
+ splash/Splash.cc | 12 ++++++++++++
splash/SplashFTFont.cc | 16 ++++++++--------
- splash/SplashMath.h | 8 +++++---
- splash/SplashXPath.cc | 9 +++++++++
+ splash/SplashMath.h | 8 +++++---
+ splash/SplashXPath.cc | 9 +++++++++
6 files changed, 80 insertions(+), 31 deletions(-)
commit 73efc96eef6bd32a7c058b7dda8101f4f23c454f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 30 16:31:52 2011 +0200
+Date: Tue Aug 30 16:31:52 2011 +0200
xpdf303: Handle bogus loca table entries in FoFiTrueType
@@ -23022,7 +25044,7 @@
commit 1df3489392a77e2b75adbafcc2fa10de829c172e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 30 16:21:40 2011 +0200
+Date: Tue Aug 30 16:21:40 2011 +0200
xpdf303: Use std::sort (with functors) in place of qsort
@@ -23030,23 +25052,23 @@
SplashXPathScanner.cc since they depend on other changes not yet
merged.
- fofi/FoFiTrueType.cc | 55
+ fofi/FoFiTrueType.cc | 55
+++++++++++++++++++++++---------------------------
- poppler/GfxFont.cc | 24 ++++++++++++++--------
+ poppler/GfxFont.cc | 24 ++++++++++++++--------
splash/SplashScreen.cc | 12 +++++++----
- splash/SplashXPath.cc | 44 ++++++++++++++++++----------------------
+ splash/SplashXPath.cc | 44 ++++++++++++++++++----------------------
4 files changed, 69 insertions(+), 66 deletions(-)
commit f298e7f844105f2d9a36144e59be86c341e37507
Merge: 2a6bd7a 0ca5453
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 16:21:58 2011 +0200
+Date: Tue Aug 30 16:21:58 2011 +0200
Merge branch 'master' into xpdf303merge
commit 0ca5453fea9e5342188f772acd6f31af1778f236
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 16:20:17 2011 +0200
+Date: Tue Aug 30 16:20:17 2011 +0200
Compile when defining USE_FIXEDPOINT
@@ -23055,7 +25077,7 @@
commit bd7a53bc2f27fc3979f8de306e2dcaca53d4570a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 16:20:08 2011 +0200
+Date: Tue Aug 30 16:20:08 2011 +0200
match function definition
@@ -23064,7 +25086,7 @@
commit 2a6bd7aae37f73a94bf1a84f699f310177661611
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 15:13:17 2011 +0200
+Date: Tue Aug 30 15:13:17 2011 +0200
xpdf303: Expand latin1UnicodeMapRanges and ascii7UnicodeMapRanges
@@ -23073,7 +25095,7 @@
commit 4d31785409e464d0e96dcf11167ecdffd64026d1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 15:09:01 2011 +0200
+Date: Tue Aug 30 15:09:01 2011 +0200
xpdf303: More entries for nameToUnicodeTab
@@ -23083,112 +25105,112 @@
commit 2658030836f3a15dadadd7f1989dfaa858bf876f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 14:49:23 2011 +0200
+Date: Tue Aug 30 14:49:23 2011 +0200
xpdf303: char * -> const char *
cmake/modules/PopplerMacros.cmake | 2 +-
- configure.ac | 2 +-
- cpp/poppler-private.cpp | 2 +-
- cpp/poppler-private.h | 2 +-
- fofi/FoFiBase.h | 2 +-
- fofi/FoFiEncodings.cc | 6 ++---
- fofi/FoFiEncodings.h | 6 ++---
- fofi/FoFiTrueType.cc | 10 ++++-----
- fofi/FoFiTrueType.h | 4 ++--
- fofi/FoFiType1.cc | 4 ++--
- fofi/FoFiType1.h | 2 +-
- fofi/FoFiType1C.cc | 14 ++++++------
- fofi/FoFiType1C.h | 6 ++---
- goo/GooHash.cc | 16 +++++++-------
- goo/GooHash.h | 12 +++++-----
- goo/GooString.cc | 22 +++++++++----------
- goo/GooString.h | 16 +++++++-------
- goo/gfile.cc | 4 ++--
- goo/gfile.h | 4 ++--
- goo/gmem.cc | 2 +-
- goo/gmem.h | 2 +-
- poppler/Annot.cc | 8 +++----
- poppler/Annot.h | 6 ++---
- poppler/ArthurOutputDev.cc | 6 ++---
- poppler/BuiltinFont.cc | 6 ++---
- poppler/BuiltinFont.h | 10 ++++-----
- poppler/DCTStream.cc | 2 +-
- poppler/DCTStream.h | 2 +-
- poppler/Dict.cc | 14 ++++++------
- poppler/Dict.h | 14 ++++++------
- poppler/Error.cc | 10 ++++-----
- poppler/Error.h | 6 ++---
- poppler/FileSpec.cc | 2 +-
- poppler/FlateStream.cc | 2 +-
- poppler/FlateStream.h | 2 +-
- poppler/FontEncodingTables.cc | 14 ++++++------
- poppler/FontEncodingTables.h | 14 ++++++------
- poppler/FontInfo.cc | 2 +-
- poppler/Form.cc | 6 ++---
- poppler/Form.h | 4 ++--
- poppler/Gfx.cc | 2 +-
- poppler/Gfx.h | 2 +-
- poppler/GfxFont.cc | 46
+ configure.ac | 2 +-
+ cpp/poppler-private.cpp | 2 +-
+ cpp/poppler-private.h | 2 +-
+ fofi/FoFiBase.h | 2 +-
+ fofi/FoFiEncodings.cc | 6 ++---
+ fofi/FoFiEncodings.h | 6 ++---
+ fofi/FoFiTrueType.cc | 10 ++++-----
+ fofi/FoFiTrueType.h | 4 ++--
+ fofi/FoFiType1.cc | 4 ++--
+ fofi/FoFiType1.h | 2 +-
+ fofi/FoFiType1C.cc | 14 ++++++------
+ fofi/FoFiType1C.h | 6 ++---
+ goo/GooHash.cc | 16 +++++++-------
+ goo/GooHash.h | 12 +++++-----
+ goo/GooString.cc | 22 +++++++++----------
+ goo/GooString.h | 16 +++++++-------
+ goo/gfile.cc | 4 ++--
+ goo/gfile.h | 4 ++--
+ goo/gmem.cc | 2 +-
+ goo/gmem.h | 2 +-
+ poppler/Annot.cc | 8 +++----
+ poppler/Annot.h | 6 ++---
+ poppler/ArthurOutputDev.cc | 6 ++---
+ poppler/BuiltinFont.cc | 6 ++---
+ poppler/BuiltinFont.h | 10 ++++-----
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h | 2 +-
+ poppler/Dict.cc | 14 ++++++------
+ poppler/Dict.h | 14 ++++++------
+ poppler/Error.cc | 10 ++++-----
+ poppler/Error.h | 6 ++---
+ poppler/FileSpec.cc | 2 +-
+ poppler/FlateStream.cc | 2 +-
+ poppler/FlateStream.h | 2 +-
+ poppler/FontEncodingTables.cc | 14 ++++++------
+ poppler/FontEncodingTables.h | 14 ++++++------
+ poppler/FontInfo.cc | 2 +-
+ poppler/Form.cc | 6 ++---
+ poppler/Form.h | 4 ++--
+ poppler/Gfx.cc | 2 +-
+ poppler/Gfx.h | 2 +-
+ poppler/GfxFont.cc | 46
+++++++++++++++++++--------------------
- poppler/GfxFont.h | 8 +++----
- poppler/GfxState.cc | 6 ++---
- poppler/GfxState.h | 2 +-
- poppler/GlobalParams.cc | 21 +++++++++---------
- poppler/GlobalParams.h | 8 +++----
- poppler/GlobalParamsWin.cc | 6 ++---
- poppler/JBIG2Stream.cc | 2 +-
- poppler/JBIG2Stream.h | 2 +-
- poppler/JPEG2000Stream.cc | 2 +-
- poppler/JPEG2000Stream.h | 2 +-
- poppler/JPXStream.h | 2 +-
- poppler/NameToCharCode.cc | 8 +++----
- poppler/NameToCharCode.h | 6 ++---
- poppler/NameToUnicodeTable.h | 2 +-
- poppler/Object.cc | 4 ++--
- poppler/Object.h | 28 ++++++++++++------------
- poppler/PDFDoc.cc | 2 +-
- poppler/PSOutputDev.cc | 24 ++++++++++----------
- poppler/PSOutputDev.h | 8 +++----
- poppler/Page.cc | 2 +-
- poppler/Page.h | 2 +-
- poppler/SplashOutputDev.cc | 6 ++---
- poppler/Stream.cc | 16 +++++++-------
- poppler/Stream.h | 28 ++++++++++++------------
- poppler/TextOutputDev.cc | 2 +-
- poppler/TextOutputDev.h | 2 +-
- poppler/UnicodeMap.cc | 4 ++--
- poppler/UnicodeMap.h | 4 ++--
- poppler/UnicodeTypeTable.cc | 4 ++--
- qt4/src/poppler-private.cc | 2 +-
+ poppler/GfxFont.h | 8 +++----
+ poppler/GfxState.cc | 6 ++---
+ poppler/GfxState.h | 2 +-
+ poppler/GlobalParams.cc | 21 +++++++++---------
+ poppler/GlobalParams.h | 8 +++----
+ poppler/GlobalParamsWin.cc | 6 ++---
+ poppler/JBIG2Stream.cc | 2 +-
+ poppler/JBIG2Stream.h | 2 +-
+ poppler/JPEG2000Stream.cc | 2 +-
+ poppler/JPEG2000Stream.h | 2 +-
+ poppler/JPXStream.h | 2 +-
+ poppler/NameToCharCode.cc | 8 +++----
+ poppler/NameToCharCode.h | 6 ++---
+ poppler/NameToUnicodeTable.h | 2 +-
+ poppler/Object.cc | 4 ++--
+ poppler/Object.h | 28 ++++++++++++------------
+ poppler/PDFDoc.cc | 2 +-
+ poppler/PSOutputDev.cc | 24 ++++++++++----------
+ poppler/PSOutputDev.h | 8 +++----
+ poppler/Page.cc | 2 +-
+ poppler/Page.h | 2 +-
+ poppler/SplashOutputDev.cc | 6 ++---
+ poppler/Stream.cc | 16 +++++++-------
+ poppler/Stream.h | 28 ++++++++++++------------
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/TextOutputDev.h | 2 +-
+ poppler/UnicodeMap.cc | 4 ++--
+ poppler/UnicodeMap.h | 4 ++--
+ poppler/UnicodeTypeTable.cc | 4 ++--
+ qt4/src/poppler-private.cc | 2 +-
qt4/src/poppler-ps-converter.cc | 2 +-
- splash/SplashFTFontEngine.cc | 8 +++----
- splash/SplashFTFontEngine.h | 6 ++---
- splash/SplashFTFontFile.cc | 6 ++---
- splash/SplashFTFontFile.h | 2 +-
- splash/SplashFontEngine.cc | 6 ++---
- splash/SplashFontEngine.h | 6 ++---
- splash/SplashT1FontEngine.cc | 6 ++---
- splash/SplashT1FontEngine.h | 4 ++--
- splash/SplashT1FontFile.cc | 10 ++++-----
- splash/SplashT1FontFile.h | 6 ++---
- test/pdf-operators.c | 4 ++--
- test/perf-test.cc | 4 ++--
- utils/HtmlFonts.cc | 4 ++--
- utils/HtmlOutputDev.cc | 12 +++++-----
- utils/HtmlOutputDev.h | 4 ++--
- utils/parseargs.cc | 4 ++--
- utils/parseargs.h | 6 ++---
- utils/pdffonts.cc | 2 +-
- utils/pdfinfo.cc | 12 +++++-----
- utils/pdftocairo.cc | 4 ++--
- utils/pdftohtml.cc | 10 ++++-----
- utils/pdftotext.cc | 12 +++++-----
+ splash/SplashFTFontEngine.cc | 8 +++----
+ splash/SplashFTFontEngine.h | 6 ++---
+ splash/SplashFTFontFile.cc | 6 ++---
+ splash/SplashFTFontFile.h | 2 +-
+ splash/SplashFontEngine.cc | 6 ++---
+ splash/SplashFontEngine.h | 6 ++---
+ splash/SplashT1FontEngine.cc | 6 ++---
+ splash/SplashT1FontEngine.h | 4 ++--
+ splash/SplashT1FontFile.cc | 10 ++++-----
+ splash/SplashT1FontFile.h | 6 ++---
+ test/pdf-operators.c | 4 ++--
+ test/perf-test.cc | 4 ++--
+ utils/HtmlFonts.cc | 4 ++--
+ utils/HtmlOutputDev.cc | 12 +++++-----
+ utils/HtmlOutputDev.h | 4 ++--
+ utils/parseargs.cc | 4 ++--
+ utils/parseargs.h | 6 ++---
+ utils/pdffonts.cc | 2 +-
+ utils/pdfinfo.cc | 12 +++++-----
+ utils/pdftocairo.cc | 4 ++--
+ utils/pdftohtml.cc | 10 ++++-----
+ utils/pdftotext.cc | 12 +++++-----
96 files changed, 337 insertions(+), 338 deletions(-)
commit c899d26e0f7a61db99925179330c28df015a676b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 30 00:31:00 2011 +0200
+Date: Tue Aug 30 00:31:00 2011 +0200
Add COPYING3 from xpdf3.03
@@ -23198,25 +25220,25 @@
commit 508517a35cb3bc5195682a9cd89fb50a801eddc2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 29 23:55:42 2011 +0200
+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 +-
+ 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 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
10 files changed, 42 insertions(+), 10 deletions(-)
commit 1431564f3363a63a8669c8dd15970db814f4969f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Aug 29 22:22:02 2011 +0200
+Date: Mon Aug 29 22:22:02 2011 +0200
Add pdfextract and pdfmerge
@@ -23231,7 +25253,7 @@
commit 8ca2f41089bc6402baf9b24428af04314c037b54
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Aug 29 22:20:52 2011 +0200
+Date: Mon Aug 29 22:20:52 2011 +0200
Rework writing of PDF files
@@ -23246,7 +25268,7 @@
commit 33da7e270431e8e4c500e7573b3ca0dddd9f237e
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Sun Aug 28 22:07:38 2011 +0200
+Date: Sun Aug 28 22:07:38 2011 +0200
Fix building static-linked pdftocairo
@@ -23255,7 +25277,7 @@
commit 91fafce028ca6620c0eb22e370fb4c6fd3404e3c
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 23 21:02:02 2011 +0930
+Date: Tue Aug 23 21:02:02 2011 +0930
cairo: align strokes when Stroke Adjust is true and line width <= 1
@@ -23280,7 +25302,7 @@
commit cfc67afe80b963ba662018674cadf3085466bb9f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 23 20:46:24 2011 +0930
+Date: Tue Aug 23 20:46:24 2011 +0930
cairo: fix stroking of very thin lines
@@ -23306,7 +25328,7 @@
commit 7a7c932e09796b944dda69df1b339c889ee1d63a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 25 00:23:40 2011 +0200
+Date: Thu Aug 25 00:23:40 2011 +0200
Add a way to get the fully qualified name
@@ -23316,7 +25338,7 @@
commit e001871d927f9cc86b4327d64e4c66ad00172ad0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 24 23:44:18 2011 +0200
+Date: Wed Aug 24 23:44:18 2011 +0200
Clarify ownership
@@ -23325,7 +25347,7 @@
commit 87c48fdc175be4d852b953778f915ea93cd50194
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Aug 24 19:53:48 2011 +0930
+Date: Wed Aug 24 19:53:48 2011 +0930
cairo: fix unique id mime data
@@ -23337,7 +25359,7 @@
commit 08a2ba6f1603246651f0d5e697b88d38363d7df2
Author: Pino Toscano <pino at kde.org>
-Date: Tue Aug 23 20:20:32 2011 +0200
+Date: Tue Aug 23 20:20:32 2011 +0200
pdftocairo/cmake: need to link to freetype
@@ -23346,7 +25368,7 @@
commit 82496b18dc4aff66cc29f2b6607c8f894afe8b49
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 22 16:42:28 2011 +0200
+Date: Mon Aug 22 16:42:28 2011 +0200
Update Adrian (C)
@@ -23355,7 +25377,7 @@
commit 2576e3a6d9746e2272c620a775e11295932eb5f2
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Aug 22 21:41:36 2011 +0930
+Date: Mon Aug 22 21:41:36 2011 +0930
update SEE ALSO section of man pages
@@ -23374,7 +25396,7 @@
commit 23ec5c8d394beb632ee45f6308215646cd1a0195
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Aug 22 21:26:24 2011 +0930
+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
@@ -23385,12 +25407,12 @@
poppler/CairoOutputDev.cc | 12 ++++++++----
poppler/CairoOutputDev.h | 1 +
- poppler/GfxFont.h | 3 +++
+ poppler/GfxFont.h | 3 +++
3 files changed, 12 insertions(+), 4 deletions(-)
commit 3a574f13fa22b7c31eda0d0437f4094a5a39ff34
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Aug 19 23:23:24 2011 +0930
+Date: Fri Aug 19 23:23:24 2011 +0930
cairo: fix stroke patterns
@@ -23409,7 +25431,7 @@
commit eb740dac838d2a1e32899327ca6d25c3dca641df
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 22 13:41:56 2011 +0200
+Date: Mon Aug 22 13:41:56 2011 +0200
glib-demo: Add text attributes information to text demo
@@ -23419,7 +25441,7 @@
commit cda4aefaa136ae07778de3b1593808a5aaa2db5b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 22 13:40:49 2011 +0200
+Date: Mon Aug 22 13:40:49 2011 +0200
glib-demo: Add pgd_pixbuf_new_for_color() to utils
@@ -23432,7 +25454,7 @@
commit 2a11b2963a548186654722a393db1e19d57828f1
Author: danigm <danigm at wadobo.com>
-Date: Mon Aug 22 12:51:50 2011 +0200
+Date: Mon Aug 22 12:51:50 2011 +0200
glib: Add poppler_page_get_text_attributes()
@@ -23443,16 +25465,16 @@
whether text is undrlined and foreground color for a range of text.
Fixes bug #33269.
- glib/poppler-page.cc | 202
+ glib/poppler-page.cc | 202
++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 33 ++++++
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 7 ++
+ glib/poppler-page.h | 33 ++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 7 ++
4 files changed, 243 insertions(+)
commit 15f99157cf3900bf20cf619e204ae53085af497d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 22 12:43:12 2011 +0200
+Date: Mon Aug 22 12:43:12 2011 +0200
textoutputdev: Add TextFontInfo::matches()
@@ -23464,7 +25486,7 @@
commit 5b554b39fca634c8ba58915c14522cb2920fe280
Author: Pino Toscano <pino at kde.org>
-Date: Mon Aug 22 13:16:23 2011 +0200
+Date: Mon Aug 22 13:16:23 2011 +0200
pdftocairo/cmake: link to lcms library if available
@@ -23473,7 +25495,7 @@
commit f7cd236fea8740ef05635d1fd7917a778cc373f0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 22 00:00:32 2011 +0200
+Date: Mon Aug 22 00:00:32 2011 +0200
Ship HtmlUtils.h
@@ -23482,7 +25504,7 @@
commit a128a858c50287cfba74c69996276ea44370dc26
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 21 23:52:06 2011 +0200
+Date: Sun Aug 21 23:52:06 2011 +0200
Update Adrian's (C)
@@ -23492,7 +25514,7 @@
commit b78134314107d8344360c3313478115ed291630d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 21 23:46:09 2011 +0200
+Date: Sun Aug 21 23:46:09 2011 +0200
Fix copyright
@@ -23503,7 +25525,7 @@
commit ade53277546cef4ba19d982518c0cd83a4bb9c12
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 21 23:42:53 2011 +0200
+Date: Sun Aug 21 23:42:53 2011 +0200
Move HAVE_STDINT_H use to a private header
@@ -23510,17 +25532,17 @@
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 ++++++++++++++++++++++++++++++
+ 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 +
+ utils/pdftocairo.cc | 1 +
6 files changed, 34 insertions(+), 18 deletions(-)
commit 6166c3a37a4d6307d4f23ee272ea07c95bbba74a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 21 23:31:30 2011 +0200
+Date: Sun Aug 21 23:31:30 2011 +0200
Silence silly gcc
@@ -23529,7 +25551,7 @@
commit eb5b228c4c24152e632c931b63c64ffb1e10d45d
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 20 21:13:18 2011 +0930
+Date: Sat Aug 20 21:13:18 2011 +0930
pdftocairo: fix writing to stdout for ps/pdf/svg
@@ -23538,7 +25560,7 @@
commit 1beac5896a301be68de22240017fef11e7d27d40
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Aug 13 00:23:23 2011 +0930
+Date: Sat Aug 13 00:23:23 2011 +0930
Add poppler version to PSOutputDev ouput
@@ -23547,7 +25569,7 @@
commit b35fd3651fd3dbaa876fc64b8c5cfe77ae67335f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Aug 5 23:01:51 2011 +0930
+Date: Fri Aug 5 23:01:51 2011 +0930
cairo: use cairo_show_text_glyphs() when printing
@@ -23560,7 +25582,7 @@
commit 51ade078bc1fa737e20120ae4cb3bf693a219823
Author: Stefan Thomas <thomas at txtbear.com>
-Date: Thu Jul 15 16:24:55 2010 +0100
+Date: Thu Jul 15 16:24:55 2010 +0100
pdftocairo: Added to CMake build system.
@@ -23569,11 +25591,11 @@
commit 5a8745cdf428e22641937977eedfc1d605f6ff07
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Aug 12 23:57:01 2011 +0930
+Date: Fri Aug 12 23:57:01 2011 +0930
Add pdftocairo man page
- utils/Makefile.am | 5 +-
+ utils/Makefile.am | 5 +-
utils/pdftocairo.1 | 254
+++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+), 1 deletion(-)
@@ -23580,13 +25602,13 @@
commit b67a12b2b26692e2ccec7ff2e6df18fee05be535
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Aug 11 21:34:11 2011 +0930
+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/.gitignore | 2 +-
+ utils/Makefile.am | 20 +-
utils/pdftocairo.cc | 970
++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 989 insertions(+), 3 deletions(-)
@@ -23593,7 +25615,7 @@
commit 4f2d774826bf7bb7b3825e02c5ca4c2928643950
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Aug 11 21:32:53 2011 +0930
+Date: Thu Aug 11 21:32:53 2011 +0930
png: add support for embedding ICC profile
@@ -23603,7 +25625,7 @@
commit 1091f47310bf0fc71bac5dd4ec81dad50b2f2537
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Aug 10 18:48:15 2011 +0930
+Date: Wed Aug 10 18:48:15 2011 +0930
png: Add additional pixel formats
@@ -23617,7 +25639,7 @@
commit c6f26915db568f12892d48005746ad2922c19000
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Aug 10 18:45:24 2011 +0930
+Date: Wed Aug 10 18:45:24 2011 +0930
png: use PNG_RESOLUTION_METER instead of PNG_RESOLUTION_UNKNOWN to
set resolution
@@ -23630,12 +25652,12 @@
commit 2667d2a5b34e1bbf322aea42876e7e81aa06dc29
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Aug 9 22:05:53 2011 +0930
+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 ++++++++++++++++++
+ configure.ac | 1 +
+ goo/gtypes.h | 18 ++++++++++++++++++
poppler/CairoOutputDev.cc | 2 --
poppler/CairoRescaleBox.cc | 2 --
4 files changed, 19 insertions(+), 4 deletions(-)
@@ -23642,7 +25664,7 @@
commit c043f298e68bdfffcb7505ec354ec7487b5bd7b2
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Jul 8 21:13:36 2011 +0930
+Date: Fri Jul 8 21:13:36 2011 +0930
cairo: assume printer pixel size is 1/600" when stroking 0 width lines
@@ -23653,7 +25675,7 @@
commit 961adf0b767be78d3556b7315de3761d3d46b107
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Aug 18 17:44:35 2011 +0930
+Date: Thu Aug 18 17:44:35 2011 +0930
cairo: set mime data for soft masked images
@@ -23664,7 +25686,7 @@
commit 86271e4810f714d4ba7a2a6651a9b1d04f653262
Author: Joshua Richardson <jric at chegg.com>
-Date: Thu Aug 18 18:48:40 2011 +0200
+Date: Thu Aug 18 18:48:40 2011 +0200
pdftohtml: Support text rotation
@@ -23671,17 +25693,17 @@
Includes a few other fixlets.
See bug 38586 for more info
- utils/HtmlFonts.cc | 64 ++++++++++---------
- utils/HtmlFonts.h | 10 ++-
+ utils/HtmlFonts.cc | 64 ++++++++++---------
+ utils/HtmlFonts.h | 10 ++-
utils/HtmlOutputDev.cc | 170
++++++++++++++++++++++++++++++++++---------------
- utils/HtmlOutputDev.h | 8 ++-
- utils/HtmlUtils.h | 51 +++++++++++++++
+ utils/HtmlOutputDev.h | 8 ++-
+ utils/HtmlUtils.h | 51 +++++++++++++++
5 files changed, 218 insertions(+), 85 deletions(-)
commit 56248b84e2185483dd54704c13838e8f78029d49
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 18 12:40:51 2011 +0200
+Date: Thu Aug 18 12:40:51 2011 +0200
Only declare overprint if we are going to use it
@@ -23690,12 +25712,12 @@
commit a1093aae9f64cb6768164551d50cafaef52876c1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 18 12:30:29 2011 +0200
+Date: Thu Aug 18 12:30:29 2011 +0200
Fix Adrian's (C)
poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 3 ++-
+ poppler/PSOutputDev.h | 3 ++-
poppler/PreScanOutputDev.cc | 1 +
poppler/PreScanOutputDev.h | 1 +
poppler/SplashOutputDev.cc | 1 +
@@ -23704,7 +25726,7 @@
commit 7741b24d05f50c134cf15361d52f5df7ae3c3115
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 14 22:06:22 2011 +0930
+Date: Sun Aug 14 22:06:22 2011 +0930
ps: Avoid using /PatternType if only one instance of the pattern
is used
@@ -23716,44 +25738,44 @@
commit a60e61ac64634dc59c80d8e6b0288c1269fc0154
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Aug 14 21:55:24 2011 +0930
+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/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 +-
+ 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 at kde.org>
-Date: Mon Aug 15 13:17:24 2011 +0200
+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 +-
+ 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 +++--
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 5 +++--
10 files changed, 49 insertions(+), 11 deletions(-)
commit 378fc06c574b85b5c003ca842aa743f0ffe5587e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 1 22:14:12 2011 +0200
+Date: Mon Aug 1 22:14:12 2011 +0200
Only assume the OC is not visible if it exists and is set to no
@@ -23765,7 +25787,7 @@
commit 861a7bfb9431609e1e148240447f23c8e83b9d0f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Fri Jul 29 00:30:58 2011 +0200
+Date: Fri Jul 29 00:30:58 2011 +0200
Implement overprint in Splash
@@ -23772,31 +25794,31 @@
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 +
+ 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/Splash.cc | 86 +++++++++----
+ splash/Splash.h | 9 +-
splash/SplashBitmap.cc | 64 +++++++++-
- splash/SplashBitmap.h | 1 +
+ 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 +++++-
+ 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 at bbr.jp>
-Date: Thu Jul 28 12:43:57 2011 +0200
+Date: Thu Jul 28 12:43:57 2011 +0200
Parse the "Medium" modifier when asking fontconfig for a font
@@ -23805,7 +25827,7 @@
commit 0a677dd8dc9c55936530ea1fee901cab831c52af
Author: Koji Otani <sho at bbr.jp>
-Date: Thu Jul 28 12:42:16 2011 +0200
+Date: Thu Jul 28 12:42:16 2011 +0200
Improve selection of CJK fonts
@@ -23819,7 +25841,7 @@
commit e78aff6796a5d5a0a4f2fe8c7ceb33c506e2c8f5
Author: William Bader <williambader at hotmail.com>
-Date: Tue Jul 26 00:10:34 2011 +0200
+Date: Tue Jul 26 00:10:34 2011 +0200
make -level1sep write gray instead of cmyk
@@ -23832,7 +25854,7 @@
commit ea31309487aab6ed407a086dff1f350b6e4bdbc9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 26 00:09:27 2011 +0200
+Date: Tue Jul 26 00:09:27 2011 +0200
Update (C)
@@ -23841,7 +25863,7 @@
commit a945641497946a825dc880f94200ea1d5409332b
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jul 23 08:44:06 2011 +0200
+Date: Sat Jul 23 08:44:06 2011 +0200
Handle missing startxref properly
@@ -23852,7 +25874,7 @@
commit 2c1b25ef2592367f4c18e204ab5d102f15cf272f
Author: William Bader <williambader at hotmail.com>
-Date: Mon Jul 25 23:43:27 2011 +0200
+Date: Mon Jul 25 23:43:27 2011 +0200
Fix a bad memory access
@@ -23865,7 +25887,7 @@
commit 300900afa2140141748a7571270be5d850274072
Author: Daniel Glöckner <daniel-gl at gmx.net>
-Date: Sat Jul 23 19:49:15 2011 +0200
+Date: Sat Jul 23 19:49:15 2011 +0200
Fix numerical overflow in libopenjpeg JPXStream::doLookChar()
@@ -23877,7 +25899,7 @@
commit ec6ea621b066a3b332a8099341664889d2ff3743
Author: Axel Struebing <axel.struebing at freenet.de>
-Date: Thu Jul 21 23:12:36 2011 +0200
+Date: Thu Jul 21 23:12:36 2011 +0200
Fix calculation of startXRefPos
@@ -23890,7 +25912,7 @@
commit ce97cfcd6373c98fb8c63e9b3ef6c51738f22a50
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 20 00:24:52 2011 +0200
+Date: Wed Jul 20 00:24:52 2011 +0200
Render dots for 0 length dashed lines
@@ -23901,7 +25923,7 @@
commit 42c1b1c4af6b07f488d1b2b02a4700f19b0ab0ef
Author: Tomas Hoger <thoger at redhat.com>
-Date: Wed Jul 20 00:23:15 2011 +0200
+Date: Wed Jul 20 00:23:15 2011 +0200
Fix crash on truncated JPEG/DCT stream
@@ -23912,7 +25934,7 @@
commit 091b570c63694e475c24bb8805638ac70c654892
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 20 00:19:43 2011 +0200
+Date: Wed Jul 20 00:19:43 2011 +0200
Make sure the dict is a page dict
@@ -23923,7 +25945,7 @@
commit ac566c887ffae9d384587f7587609642aef7a016
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 20 00:17:49 2011 +0200
+Date: Wed Jul 20 00:17:49 2011 +0200
Do not crash if can not get page 0 for some reason
@@ -23932,7 +25954,7 @@
commit 6ad95e7b8b9766aa19f01f06f02eb430e4a4a899
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 11 15:04:49 2011 +0100
+Date: Mon Jul 11 15:04:49 2011 +0100
Complete the list of preprocessor defines that we never define
@@ -23939,12 +25961,12 @@
When using any of the two sanctioned build systems
poppler/poppler-config.h.cmake | 6 ++++--
- poppler/poppler-config.h.in | 6 ++++--
+ poppler/poppler-config.h.in | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
commit edcc84ef0137a733cf3fab79b919af309d87325c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 11 15:00:39 2011 +0100
+Date: Mon Jul 11 15:00:39 2011 +0100
Harmonize all SPLASH_CMYK to use #if
@@ -23953,7 +25975,7 @@
commit a8fca630d592941c033ca6a380bf46b6e733a748
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 11 14:57:33 2011 +0100
+Date: Mon Jul 11 14:57:33 2011 +0100
Sanitize headers a big
@@ -23962,34 +25984,34 @@
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 +-
+ 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
+ poppler/poppler-config.h.in | 63
++++++++++++++++++++++++++++++++++++++++++
- splash/SplashFTFont.h | 4 ++-
- splash/SplashMath.h | 4 ++-
+ splash/SplashFTFont.h | 4 ++-
+ splash/SplashMath.h | 4 ++-
15 files changed, 153 insertions(+), 17 deletions(-)
commit 214322f3c66a9aad4e2a46f6e305a3dacaa4f8b1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 10 01:20:21 2011 +0100
+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/GfxFont.cc | 3 +++
poppler/GlobalParams.cc | 3 +++
poppler/TextOutputDev.cc | 3 +++
poppler/TextOutputDev.h | 3 +++
@@ -23999,7 +26021,7 @@
commit 37cc1344672f480d4062aafbd2f3245ca1392279
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 10 01:15:44 2011 +0100
+Date: Sun Jul 10 01:15:44 2011 +0100
Fix header
@@ -24011,26 +26033,26 @@
commit 230ab66f52a992557464e325d18f88573ec52423
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 10 01:06:41 2011 +0100
+Date: Sun Jul 10 01:06:41 2011 +0100
make files easier to include by themselves
- fofi/FoFiTrueType.h | 2 ++
- splash/Splash.h | 3 ++-
+ 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 at kde.org>
-Date: Sun Jul 10 00:55:25 2011 +0100
+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/Annot.h | 4 +++-
+ poppler/Catalog.h | 2 ++
poppler/CharCodeToUnicode.h | 4 +++-
poppler/CompactFontTables.h | 16 ++++++++++++++++
- poppler/FontInfo.h | 6 +++++-
+ poppler/FontInfo.h | 6 +++++-
poppler/GfxState_helpers.h | 4 +++-
poppler/NameToUnicodeTable.h | 18 ++++++++++++++++++
7 files changed, 50 insertions(+), 4 deletions(-)
@@ -24037,7 +26059,7 @@
commit 6b62fb7e9bd7de7f79b9b9a6fe36a5f5da099133
Author: William Bader <williambader at hotmail.com>
-Date: Mon Jun 27 19:38:52 2011 +0100
+Date: Mon Jun 27 19:38:52 2011 +0100
Remove unused variable
@@ -24046,7 +26068,7 @@
commit 4bc6c5bd3a001bb4eb9f61488e3d4f356638e391
Author: Adrian Bunk <bunk at stusta.de>
-Date: Tue Jul 5 15:21:06 2011 +0300
+Date: Tue Jul 5 15:21:06 2011 +0300
.gitignore tests additions
@@ -24062,7 +26084,7 @@
commit 00076bc308ae320244c47777fe351c1c2bef2da8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 24 22:51:55 2011 +0100
+Date: Fri Jun 24 22:51:55 2011 +0100
Forgot William's (C) here
@@ -24072,7 +26094,7 @@
commit 7e244fde4ec03da08d81af3402b21646c803bd31
Author: William Bader <williambader at hotmail.com>
-Date: Fri Jun 24 22:39:13 2011 +0100
+Date: Fri Jun 24 22:39:13 2011 +0100
patch to make -level2sep and -level3sep write gray instead of cmyk
@@ -24079,13 +26101,13 @@
If they are only gray of course :D
poppler/PSOutputDev.cc | 34 ++++++++++++++++++++++++++++++----
- poppler/Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
- poppler/Stream.h | 29 +++++++++++++++++++++++++++++
+ poppler/Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h | 29 +++++++++++++++++++++++++++++
3 files changed, 102 insertions(+), 4 deletions(-)
commit abba8140a9972197faaca96ec590af7dc9408fb0
Author: William Bader <williambader at hotmail.com>
-Date: Fri Jun 24 22:38:33 2011 +0100
+Date: Fri Jun 24 22:38:33 2011 +0100
patch to make -level2sep and -level3sep write cmyk instead of rgb
@@ -24095,7 +26117,7 @@
commit 706007431325b1e8c9bf4cba35c89511b10ebf0c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 20 23:30:50 2011 +0100
+Date: Mon Jun 20 23:30:50 2011 +0100
(C) for Jim
@@ -24104,7 +26126,7 @@
commit e23384fbb3542941d2cf59ce6560913255ca2b01
Author: Jim Meyering <meyering at redhat.com>
-Date: Mon Jun 20 11:09:01 2011 +0200
+Date: Mon Jun 20 11:09:01 2011 +0200
don't gmalloc(-1) upon ftell failure
@@ -24115,7 +26137,7 @@
commit c5601bde9d8f3f56e558a6f63e563c9d337810eb
Author: Steven Murdoch <Steven.Murdoch at cl.cam.ac.uk>
-Date: Mon Jun 20 23:25:43 2011 +0100
+Date: Mon Jun 20 23:25:43 2011 +0100
Fix encoding of PDF document metadata in output of pdftohtml
@@ -24136,19 +26158,19 @@
commit d4af1c4ef46abf1f11b7215c7b144ce7bb7912eb
Author: Joshua Richardson <joshuarbox-junk1 at yahoo.com>
-Date: Sat Jun 18 13:39:54 2011 +0100
+Date: Sat Jun 18 13:39:54 2011 +0100
Fix vertical spacing issues in pdftohtml output.
Bug 38019
- utils/HtmlFonts.cc | 3 ++-
+ utils/HtmlFonts.cc | 3 ++-
utils/HtmlOutputDev.cc | 21 +++++++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
commit 589933ef105b60e8d48854cce15a7548c2850116
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 13 21:24:39 2011 +0100
+Date: Mon Jun 13 21:24:39 2011 +0100
Forgot my (C)
@@ -24157,7 +26179,7 @@
commit f5d2ddd13d27078355dee63207671885bf9b0926
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 13 18:57:29 2011 +0100
+Date: Mon Jun 13 18:57:29 2011 +0100
We need to include config.h here
@@ -24168,7 +26190,7 @@
commit 147ae4bf76a85768c9ed729ca10ee3dae93b8876
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 8 23:36:14 2011 +0100
+Date: Wed Jun 8 23:36:14 2011 +0100
Do not crash if link does not have an action
@@ -24177,7 +26199,7 @@
commit 5d9489bf566b700ef38e5e33665a2648b535e1e7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 4 21:46:10 2011 +0100
+Date: Sat Jun 4 21:46:10 2011 +0100
forgot to update the C
@@ -24186,7 +26208,7 @@
commit 7b123bf2b11ac81f24a966186a06de739d3c8f02
Author: Steven Murdoch <Steven.Murdoch at cl.cam.ac.uk>
-Date: Sat Jun 4 20:22:52 2011 +0100
+Date: Sat Jun 4 20:22:52 2011 +0100
Fix pdftotext -htmlmeta to correctly output U+2019 in PDF metadata
@@ -24214,7 +26236,7 @@
commit db2ae1bdbb7fcb64ba4c91dfc574d9f970bebdf6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 4 13:23:11 2011 +0100
+Date: Sat Jun 4 13:23:11 2011 +0100
Make sure catDict is a dict
@@ -24223,7 +26245,7 @@
commit 58915affbdf1b5780f25d172a582c69fb2413230
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 4 13:20:02 2011 +0100
+Date: Sat Jun 4 13:20:02 2011 +0100
Make sure catDict is a dict before using it
@@ -24234,7 +26256,7 @@
commit 4ebc7e364409fe303e7a5729b568913e3c92e7d4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 4 13:19:34 2011 +0100
+Date: Sat Jun 4 13:19:34 2011 +0100
We need to free catDict on failure
@@ -24243,7 +26265,7 @@
commit 335a7fc6d98f5facc1ff098a91ac968387473cb3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 31 23:18:26 2011 +0100
+Date: Tue May 31 23:18:26 2011 +0100
Make parse() private
@@ -24252,7 +26274,7 @@
commit 311d69ef2222409859817737c44b8e741289d897
Author: Axel Strübing <axel.struebing at freenet.de>
-Date: Sun May 29 16:12:29 2011 +0100
+Date: Sun May 29 16:12:29 2011 +0100
Needs to be freed
@@ -24263,7 +26285,7 @@
commit 66c7d0199b45bc7c81c88a9989c9515398d30d43
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 28 17:32:02 2011 +0100
+Date: Sat May 28 17:32:02 2011 +0100
No need to check for NULL
@@ -24275,7 +26297,7 @@
commit 450934619a1c5b2a58f65649f567274af8d24ea7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 28 12:37:08 2011 +0100
+Date: Sat May 28 12:37:08 2011 +0100
Parse that as unicode
@@ -24286,35 +26308,35 @@
commit 04dfb2c984b3c9949466e2b70e26b58029c5a7d3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat May 7 12:55:34 2011 +0200
+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
+ 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/Catalog.h | 55 +-------------
+ poppler/FileSpec.cc | 128
+++++++++++++++++++++++++++++++++
- poppler/FileSpec.h | 51 ++++++++++++-
+ 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 ++--
+ 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 at kde.org>
-Date: Wed May 25 16:46:15 2011 +0200
+Date: Wed May 25 16:46:15 2011 +0200
[qt4] Page needs to be a friend of EmbeddedFile, too
@@ -24323,18 +26345,18 @@
commit 74853614d617486b7b62e9c08be39a6e58bc7d9b
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 25 16:40:49 2011 +0200
+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 +-
+ 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 at kde.org>
-Date: Wed May 25 16:39:09 2011 +0200
+Date: Wed May 25 16:39:09 2011 +0200
[qt4] one more usage of the new EmbeddedFile ctor
@@ -24345,7 +26367,7 @@
commit a264e5385b2d0fee5126b3d0e57d42d34cafa45d
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 25 16:12:02 2011 +0200
+Date: Wed May 25 16:12:02 2011 +0200
[qt4] create EmbeddedFile by EmbeddedFileData only
@@ -24354,25 +26376,25 @@
- 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 ++
+ 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 at kde.org>
-Date: Wed May 25 15:55:48 2011 +0200
+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 +------
+ qt4/src/poppler-embeddedfile.cc | 7 +------
2 files changed, 38 insertions(+), 6 deletions(-)
commit a7242b78b3c9a64cf38ac150e6a914d7abce3355
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 7 11:10:11 2011 +0100
+Date: Sat May 7 11:10:11 2011 +0100
Do not free a shallow copy of an object we'll free later
@@ -24386,19 +26408,19 @@
commit 4db2452b3d345d9531987998e6b5532a59137e1d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 6 14:57:51 2011 +0200
+Date: Fri May 6 14:57:51 2011 +0200
glib: Add poppler_document_get_n_attachments()
- glib/poppler-document.cc | 34
+ glib/poppler-document.cc | 34
++++++++++++++++++++++++----------
- glib/poppler-document.h | 1 +
- glib/reference/poppler-sections.txt | 1 +
+ 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 at gnome.org>
-Date: Fri May 6 14:49:05 2011 +0200
+Date: Fri May 6 14:49:05 2011 +0200
glib: Update gtk-doc.make
@@ -24408,7 +26430,7 @@
commit 9a77bd7706a08d9aeabe600e3500c14493ac8519
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 6 14:48:38 2011 +0200
+Date: Fri May 6 14:48:38 2011 +0200
glib-demo: Add missing permission flags to info demo
@@ -24417,7 +26439,7 @@
commit 091c155f8a7bc79da84cd21877be389de1f2b1a3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 6 14:47:36 2011 +0200
+Date: Fri May 6 14:47:36 2011 +0200
glib: Add missing permissions flags to PopplerPermissions
@@ -24427,31 +26449,31 @@
commit 632d6a40ce3a5d3d8e10bf7e93e8eb578beae907
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 3 21:54:59 2011 +0100
+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 +-
+ 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 at kde.org>
-Date: Tue May 3 21:42:45 2011 +0100
+Date: Tue May 3 21:42:45 2011 +0100
remove unused vars
- poppler/Annot.cc | 9 ++-------
+ poppler/Annot.cc | 9 ++-------
poppler/ArthurOutputDev.cc | 12 ++----------
2 files changed, 4 insertions(+), 17 deletions(-)
commit ad131763640b2e27dde75c42b514386284b6a60d
Author: Pino Toscano <pino at kde.org>
-Date: Wed Apr 27 22:36:13 2011 +0200
+Date: Wed Apr 27 22:36:13 2011 +0200
[qt4/tests] turn some assignments to bool into QVERIFY checks
@@ -24460,7 +26482,7 @@
commit be08dd69d9dd4fcb22400f2f0aea331222e88e4a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 27 20:45:36 2011 +0100
+Date: Wed Apr 27 20:45:36 2011 +0100
update copyright years
(cherry picked from commit 2fbd493197309de5700f71f09967c9d23add88d3)
@@ -24471,7 +26493,7 @@
commit 39bcce0c8ed378aafb1019ffd1ae40330f6bb63f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 27 19:39:01 2011 +0100
+Date: Wed Apr 27 19:39:01 2011 +0100
Remove more variables that are set but then unused
@@ -24482,7 +26504,7 @@
commit 6656cf657b62d626910a02dfae9b6a1eb77772dd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 27 08:46:37 2011 +0100
+Date: Wed Apr 27 08:46:37 2011 +0100
Remove unused vars
@@ -24491,18 +26513,18 @@
commit ce55510f4dd10dfec2fc5b1c211c4a546c6ebc98
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 27 08:42:34 2011 +0100
+Date: Wed Apr 27 08:42:34 2011 +0100
Remove unused vars
- splash/Splash.cc | 5 ++---
+ splash/Splash.cc | 5 ++---
splash/SplashFTFontEngine.cc | 4 +---
- splash/SplashXPath.cc | 6 ++----
+ splash/SplashXPath.cc | 6 ++----
3 files changed, 5 insertions(+), 10 deletions(-)
commit 49d199fd1ea14383638739d95d019adb33b17768
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 27 08:38:17 2011 +0100
+Date: Wed Apr 27 08:38:17 2011 +0100
Fix page_transition::operator=
@@ -24511,7 +26533,7 @@
commit 807c1df2bf79c7c6378390b41dc230d80533ae3f
Author: Tom Gleason <tom at buildadam.com>
-Date: Tue Apr 26 17:06:07 2011 +0100
+Date: Tue Apr 26 17:06:07 2011 +0100
bbox coordinates are relative to MediaBox size, not CropBox size
@@ -24520,7 +26542,7 @@
commit 813f41367a681702ae7a155d5c2f3195124a9096
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 3 20:40:15 2011 +0200
+Date: Sun Apr 3 20:40:15 2011 +0200
forms: fix mem leak in case of error
@@ -24529,7 +26551,7 @@
commit 722baf8baf42e2c7a49e1560aae5235677d1ddee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 3 20:17:57 2011 +0200
+Date: Sun Apr 3 20:17:57 2011 +0200
forms: check form field is actually terminal before creating the
widget
@@ -24539,7 +26561,7 @@
commit 5f6f7fc569d1c891956a3c37b3e328504635ab33
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 3 15:06:45 2011 +0100
+Date: Sun Apr 3 15:06:45 2011 +0100
Properly initialize pageObjectNum to 0
@@ -24550,7 +26572,7 @@
commit d6786edc2549164214342a50782b72c2fd904b63
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 3 13:11:18 2011 +0200
+Date: Sun Apr 3 13:11:18 2011 +0200
forms: Remove unused parameter
@@ -24560,7 +26582,7 @@
commit 62692ff381f3b7907b330bfc2019416ed058ea46
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 3 13:01:42 2011 +0200
+Date: Sun Apr 3 13:01:42 2011 +0200
forms: rework the way form fields tree is built
@@ -24580,7 +26602,7 @@
commit a6802301d9c3ab8bf68bd8821f562f8ecced8491
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 28 17:42:37 2011 +0200
+Date: Mon Mar 28 17:42:37 2011 +0200
forms: Add debug methods to print the forms tree
@@ -24591,7 +26613,7 @@
commit 46f87da04700cdd1afa634f9c554e376f6f6f752
Author: José Aliste <jaliste at src.gnome.org>
-Date: Thu Mar 31 08:09:41 2011 -0400
+Date: Thu Mar 31 08:09:41 2011 -0400
Fix a memleak in AnnotScreen::initialize
@@ -24600,7 +26622,7 @@
commit b64178eaa5dd01f914649d6faa870fa140ddaf9b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 30 15:17:54 2011 +0200
+Date: Wed Mar 30 15:17:54 2011 +0200
glib: docs: Add PopplerActionJavascript to poppler-sections.txt
@@ -24609,7 +26631,7 @@
commit 3d777181ddee8f7ab2cc9e4684879cb5b52b065c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 30 15:16:04 2011 +0200
+Date: Wed Mar 30 15:16:04 2011 +0200
glib: Use Javascript instead of JavaScript for consistency
@@ -24618,7 +26640,7 @@
commit c4774fecfe3d523f32d5980f50e31daa798c9692
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 30 15:08:59 2011 +0200
+Date: Wed Mar 30 15:08:59 2011 +0200
glib-demo: show javascript actions in actions view
@@ -24627,17 +26649,17 @@
commit 68bbbe1a3f68d242b35027ae41f5751b02a2a700
Author: José Aliste <jaliste at src.gnome.org>
-Date: Tue Mar 29 04:56:37 2011 -0400
+Date: Tue Mar 29 04:56:37 2011 -0400
glib: add JavaScript actions
glib/poppler-action.cc | 24 ++++++++++++++++++++++++
- glib/poppler-action.h | 14 +++++++++++++-
+ glib/poppler-action.h | 14 +++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
commit 3dd934088a06f246718382601030c9b093d04160
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 30 00:03:58 2011 +0100
+Date: Wed Mar 30 00:03:58 2011 +0100
Need to create the globalParams
@@ -24646,7 +26668,7 @@
commit ce0d4278a32b3ba19c2002ed0c481c58b1854d59
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:47:33 2011 +0100
+Date: Tue Mar 29 23:47:33 2011 +0100
Long gone
@@ -24655,21 +26677,21 @@
commit 12337026533aa59bb66022ce8a119f37aafd4fad
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:40:57 2011 +0100
+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 +-
+ 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 +-
+ qt4/src/Makefile.am | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
commit a6e613b01698c6b38deff5248fcf7c0b17d041c3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:40:38 2011 +0100
+Date: Tue Mar 29 23:40:38 2011 +0100
more typos
@@ -24678,7 +26700,7 @@
commit e3ee037ede67212836be158b935deb7ea974b7f7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:38:24 2011 +0100
+Date: Tue Mar 29 23:38:24 2011 +0100
typo
@@ -24687,7 +26709,7 @@
commit 8bcd94964f0af17a3f5b6edf71127df3daa00b1a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:30:30 2011 +0100
+Date: Tue Mar 29 23:30:30 2011 +0100
typo
@@ -24696,19 +26718,19 @@
commit a05b9dacbe5dbd4337fdbb3e7d7d364ad5fbaeab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 23:28:49 2011 +0100
+Date: Tue Mar 29 23:28:49 2011 +0100
0.17.0 version number
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Tue Mar 29 23:28:41 2011 +0100
+Date: Tue Mar 29 23:28:41 2011 +0100
0.17.0 news
@@ -24718,7 +26740,7 @@
commit a55cc5d9c67ede1d96f6e5a58179ddd9f563c53f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 29 22:51:40 2011 +0100
+Date: Tue Mar 29 22:51:40 2011 +0100
Update years
@@ -24728,7 +26750,7 @@
commit d96efb6c1af621be78e998ba1a228022c3c076fc
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 11:13:03 2011 +0200
+Date: Tue Mar 29 11:13:03 2011 +0200
fix comment
@@ -24737,7 +26759,7 @@
commit 74ec81d66d4d5bc45cccc4aa8794df1c517f2d74
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 11:07:36 2011 +0200
+Date: Tue Mar 29 11:07:36 2011 +0200
viewer preferences: read PrintScaling and Duplex
@@ -24747,7 +26769,7 @@
commit b41bcd484dd7a93a339270926c57caa524059d8f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 10:58:46 2011 +0200
+Date: Tue Mar 29 10:58:46 2011 +0200
free the viewerPreferences Object
@@ -24756,7 +26778,7 @@
commit 1dd88d0b6b7cbfda76e81902a351c89457a061a8
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 09:58:10 2011 +0200
+Date: Tue Mar 29 09:58:10 2011 +0200
read the ViewerPreferences dict once, and construct ViewerPreferences
on demand
@@ -24770,7 +26792,7 @@
commit f10b0b8c88a7df83ada09f32b6cb6fd930fcb748
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 09:57:46 2011 +0200
+Date: Tue Mar 29 09:57:46 2011 +0200
assume the prefDict is not null
@@ -24779,7 +26801,7 @@
commit d4a5ea45057cad531a8979cf9861ac05cdd56613
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 29 09:54:22 2011 +0200
+Date: Tue Mar 29 09:54:22 2011 +0200
fix variable name for DisplayDocTitle
@@ -24788,7 +26810,7 @@
commit cf84a05ae524aa9b266463cc23cccc3860ff1ba3
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 28 23:18:02 2011 +0200
+Date: Mon Mar 28 23:18:02 2011 +0200
viewer preferences: read NonFullScreenPageMode and Direction
@@ -24798,7 +26820,7 @@
commit 460253a6705a227ff7c36e9c31cceb93cce4d78b
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 28 22:37:54 2011 +0200
+Date: Mon Mar 28 22:37:54 2011 +0200
read some boolean viewer preferences
@@ -24816,7 +26838,7 @@
commit 9fa9ac3546674120532bb512b82af6471cbebf01
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 28 19:58:16 2011 +0200
+Date: Mon Mar 28 19:58:16 2011 +0200
add skeleton for ViewerPreferences
@@ -24825,10 +26847,10 @@
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 ++
+ 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(+)
@@ -24835,7 +26857,7 @@
commit c6081f0bf00d7dcdfa1d09e91e4c9a1fe5a54ad6
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 28 19:55:00 2011 +0200
+Date: Mon Mar 28 19:55:00 2011 +0200
delete the temporary buffers created by pdfDocEncodingToUTF16()
@@ -24844,7 +26866,7 @@
commit d94d5056d5570e2f5cb578736eba12317ea63fa4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 28 18:20:31 2011 +0200
+Date: Mon Mar 28 18:20:31 2011 +0200
glib-demo: show the activation action of form fields if there's one
@@ -24853,22 +26875,22 @@
commit ba0f36b76d0c2fd4ef39f3013fc125a53747c03f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 28 18:17:52 2011 +0200
+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.cc | 34
++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h | 1 +
- glib/poppler-private.h | 1 +
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-form-field.h | 1 +
+ glib/poppler-private.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
4 files changed, 37 insertions(+)
commit ae5b9cf884ce38dde409c3e5b0f6c46f7d6327d2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 28 17:43:53 2011 +0200
+Date: Mon Mar 28 17:43:53 2011 +0200
Revert "Patch for embedding videos in to the pdf"
@@ -24886,7 +26908,7 @@
commit b7edd4c93539585652961ecf2db9c4462415c8bc
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 27 12:31:19 2011 +0200
+Date: Sun Mar 27 12:31:19 2011 +0200
annot: Always create appearance streams when NeedAppearances is true
@@ -24897,21 +26919,21 @@
commit e9350899e77c28452c48b56349ad7758b3fd47ba
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 24 20:09:18 2011 +0000
+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.cc | 248
++++++++++++++++++++++++++++++++++++++++++---
- poppler/GfxState.h | 22 +++-
+ poppler/GfxState.h | 22 +++-
poppler/SplashOutputDev.cc | 43 ++------
3 files changed, 265 insertions(+), 48 deletions(-)
commit 7b08795a9541e9fa01836b4c7fd63f6fe295ad80
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 24 12:16:07 2011 +0100
+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
@@ -24921,7 +26943,7 @@
commit f1102fccd2899bc7f97414b1e2a295c59f03da22
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 24 12:15:30 2011 +0100
+Date: Thu Mar 24 12:15:30 2011 +0100
glib-demo: Fix a crash when a choice form field has no items selected
@@ -24930,7 +26952,7 @@
commit b3971ee6bca6b14b75f046c831a31ac1e5e3241e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 22 22:08:27 2011 +0000
+Date: Tue Mar 22 22:08:27 2011 +0000
kill this TODO, n is too small
@@ -24939,45 +26961,45 @@
commit 1064d75817401fe24f728c189b450e9e906beb56
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 22 20:43:05 2011 +0000
+Date: Tue Mar 22 20:43:05 2011 +0000
kill unmaintained abiword backend
- CMakeLists.txt | 16 -
- configure.ac | 16 -
+ 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 --------
+ 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 at alfa.de>
-Date: Mon Mar 21 21:34:46 2011 +0000
+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/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 ++
+ poppler/SplashOutputDev.h | 12 ++
10 files changed, 334 insertions(+), 22 deletions(-)
commit 66575c990f379871e4b796befc899de178332670
Author: Srinivas Adicherla <srinivas.adicherla at gmail.com>
-Date: Thu Mar 17 20:14:05 2011 +0000
+Date: Thu Mar 17 20:14:05 2011 +0000
Patch for embedding videos in to the pdf
@@ -24990,7 +27012,7 @@
commit ec1917968d2f1c7a00772a0829b3fcc6957d8f3c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 14 00:13:26 2011 +0000
+Date: Mon Mar 14 00:13:26 2011 +0000
Only build gtk-test if we have to build gtk-test
@@ -24999,27 +27021,27 @@
commit 1acbb01e72a22f70f00dc058ff206e3bc05bc0ab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 13 14:49:48 2011 +0000
+Date: Sun Mar 13 14:49:48 2011 +0000
(C) years
- poppler/CachedFile.cc | 2 +-
+ poppler/CachedFile.cc | 2 +-
poppler/CurlCachedFile.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit bc8aeb269aa92406081f749064ceff75bb3145e7
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Mar 12 23:17:59 2011 +0100
+Date: Sat Mar 12 23:17:59 2011 +0100
Check response code of libcurl call
- poppler/CachedFile.cc | 8 +++++++-
+ poppler/CachedFile.cc | 8 +++++++-
poppler/CurlCachedFile.cc | 12 +++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
commit 0268cedee5b460835a4747d0ea41bbe12269310d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 12 15:24:30 2011 +0100
+Date: Sat Mar 12 15:24:30 2011 +0100
cairo: Fix typo
@@ -25028,7 +27050,7 @@
commit 5aa369e68e5c9f14efc888c7b26da06aa8bd2a78
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 12 13:47:34 2011 +0000
+Date: Sat Mar 12 13:47:34 2011 +0000
Remove unused variable
@@ -25037,17 +27059,17 @@
commit c0dffbe28f91b30b36310ab0b9a9b948610550ae
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 12 12:15:58 2011 +0100
+Date: Sat Mar 12 12:15:58 2011 +0100
update copyright years
cpp/poppler-document-private.h | 2 +-
- cpp/poppler-document.cpp | 2 +-
+ cpp/poppler-document.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit b8fab173ffdd1e62a34b530228d08bc5ec6725ac
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 12 12:13:05 2011 +0100
+Date: Sat Mar 12 12:13:05 2011 +0100
[cpp] init the globalParams early in the document loading
@@ -25055,13 +27077,13 @@
make document_private inherit from it
cpp/poppler-document-private.h | 17 +++++++++-----
- cpp/poppler-document.cpp | 52
+ cpp/poppler-document.cpp | 52
+++++++++++++++++++++++-------------------
2 files changed, 39 insertions(+), 30 deletions(-)
commit a97a54cb22def2a9fc381fb81842dad9e5c3931f
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 12 12:12:11 2011 +0100
+Date: Sat Mar 12 12:12:11 2011 +0100
forms: delete tmp_str after being converted to GooString
@@ -25070,7 +27092,7 @@
commit 9671fe07f8c9ade956742cb141b99518c3b12bad
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 11 00:05:52 2011 +0000
+Date: Fri Mar 11 00:05:52 2011 +0000
getForm can return NULL, do not crash if that happens
@@ -25079,17 +27101,17 @@
commit bd32672899f5ca4509ec9311de8092d14bec8ab1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 10 23:33:15 2011 +0000
+Date: Thu Mar 10 23:33:15 2011 +0000
update copyright years
- poppler/Catalog.cc | 2 +-
+ poppler/Catalog.cc | 2 +-
qt4/src/poppler-form.cc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit 841f3bbca37015ec2c58d7b85a73cef5681294f8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 10 23:30:51 2011 +0000
+Date: Thu Mar 10 23:30:51 2011 +0000
Do not infinite loop
@@ -25098,7 +27120,7 @@
commit f2fcafdc2b982d9bbed3c01bc7d45c8bd0603f19
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 10 23:27:41 2011 +0000
+Date: Thu Mar 10 23:27:41 2011 +0000
Create the globalParams before the pdfdoc
@@ -25108,7 +27130,7 @@
commit f956b03604b195623ab034a06942a39547adf905
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 10 00:01:18 2011 +0000
+Date: Thu Mar 10 00:01:18 2011 +0000
compile
@@ -25117,7 +27139,7 @@
commit f0ec3bedc5490aa35e54563019fcf2c3f8b7647d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 20:54:15 2011 +0100
+Date: Wed Mar 9 20:54:15 2011 +0100
forms: Remove unused method FormWidget::updateField()
@@ -25127,7 +27149,7 @@
commit 93c25e100ae2564b9a866b95bed16d2fac619bd7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 20:49:32 2011 +0100
+Date: Wed Mar 9 20:49:32 2011 +0100
forms: Rename FormField::createActivationAction() to
FormField::getActivationAction()
@@ -25135,14 +27157,14 @@
And use the existing action from the AnnotWidget instead of creating a
new one.
- poppler/Form.cc | 11 ++---------
- poppler/Form.h | 2 +-
+ 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 at gnome.org>
-Date: Wed Mar 9 20:19:24 2011 +0100
+Date: Wed Mar 9 20:19:24 2011 +0100
annots: Check whether we need to create an appearance stream in
AnnotWidget::draw()
@@ -25157,7 +27179,7 @@
commit f3b00ef51ceef6d9b7a1aa7e0f19249abf8ca6f3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 18:19:12 2011 +0100
+Date: Wed Mar 9 18:19:12 2011 +0100
annots: Add Annot::setAppearanceState() and use it from FormWidget
@@ -25172,7 +27194,7 @@
commit d59561212253302d4dcb23392bb8306b8e5c68d1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 17:35:28 2011 +0100
+Date: Wed Mar 9 17:35:28 2011 +0100
forms: Make FormWidget use a real widget annotation instead of
duplicating code
@@ -25183,8 +27205,8 @@
of duplicating it.
poppler/Annot.cc | 42 +++++++++++++--------
- poppler/Annot.h | 2 +-
- poppler/Catalog.cc | 2 +-
+ poppler/Annot.h | 2 +-
+ poppler/Catalog.cc | 2 +-
poppler/Form.cc | 107
+++++++++++++++++++++++++----------------------------
poppler/Form.h | 23 ++++++------
@@ -25192,7 +27214,7 @@
commit 2dd7e1ba09d4501adf9d10ab4cb8ee003cace74a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 10:25:00 2011 +0100
+Date: Wed Mar 9 10:25:00 2011 +0100
forms: Move modified flag from FormWidget to FormField
@@ -25202,7 +27224,7 @@
commit b04f03be7e43e309af5f164ef71788e7b8915841
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 9 10:17:57 2011 +0100
+Date: Wed Mar 9 10:17:57 2011 +0100
forms: Move field names handling from FormWidget to FormField
@@ -25213,7 +27235,7 @@
commit abe1e0d5a37bcdb4376901306d3adccfb33ff3b4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 8 21:39:00 2011 +0100
+Date: Tue Mar 8 21:39:00 2011 +0100
annots: Make sure no border is drawn for invalid border arrays
@@ -25225,7 +27247,7 @@
commit 14d145371e86ccb92f09b1ca750ced52171b2885
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 8 20:14:57 2011 +0100
+Date: Tue Mar 8 20:14:57 2011 +0100
forms: Remove loadDefaults method
@@ -25240,7 +27262,7 @@
commit 0585d7820455c93fe5b732b7a9a20d423df47075
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 8 15:36:45 2011 +0100
+Date: Tue Mar 8 15:36:45 2011 +0100
forms: Handle field values (V entry) by field objects
@@ -25255,7 +27277,7 @@
commit dc100eb9080fb58164fc94c86bfb1728cecd21c3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 7 20:14:27 2011 +0100
+Date: Mon Mar 7 20:14:27 2011 +0100
annots: Use the field object to get MaxLen instead of parsing the
field dict
@@ -25265,7 +27287,7 @@
commit 7149634f184dc3f07f2a70c296aac207ef24952c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 7 19:55:45 2011 +0100
+Date: Mon Mar 7 19:55:45 2011 +0100
forms: Parse the default resources dictionary in Form
@@ -25280,7 +27302,7 @@
commit 2e73f17975811177c0b3c16b8bd97c7eb912bc44
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 7 18:41:48 2011 +0100
+Date: Mon Mar 7 18:41:48 2011 +0100
forms: Parse field variable text entries (DA, Q) in FormField()
@@ -25294,7 +27316,7 @@
commit 8677a34911563a712b2dcf0b6e411cee0bad9c44
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 7 18:24:07 2011 +0100
+Date: Mon Mar 7 18:24:07 2011 +0100
forms: Parse default variable text entries (DA, Q) on Form
construction
@@ -25311,7 +27333,7 @@
commit 41420bfd88685d9b1ac44dc7444ea3abee92097c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 7 09:18:25 2011 +0100
+Date: Mon Mar 7 09:18:25 2011 +0100
annots: Only parse the dash array for dashed borders
@@ -25320,7 +27342,7 @@
commit c198a3f83d8508ddaf84564871d9202ffba8096c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 17:52:01 2011 +0100
+Date: Sun Mar 6 17:52:01 2011 +0100
annots: Use the field object to get the top index of a form field
choice
@@ -25333,7 +27355,7 @@
commit 5cf803ec181dbf1112f67b4f4a9c77b88d102e3b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 17:47:18 2011 +0100
+Date: Sun Mar 6 17:47:18 2011 +0100
forms: Add FormFieldChoice::getTopIndex()
@@ -25343,7 +27365,7 @@
commit 1248f59e2045749ece1f5a5e579b866b8330a752
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 17:41:33 2011 +0100
+Date: Sun Mar 6 17:41:33 2011 +0100
annots: Draw widget background using the existing appearance
characteristics
@@ -25355,7 +27377,7 @@
commit dc249ad4529997001ae1f96dcfd7351766ca8e8d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 17:34:33 2011 +0100
+Date: Sun Mar 6 17:34:33 2011 +0100
annots: Factor out generateFieldAppearance()
@@ -25369,7 +27391,7 @@
commit f98b3540db731026e0febf1f010548f0f0ef9142
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 15:57:22 2011 +0100
+Date: Sun Mar 6 15:57:22 2011 +0100
annots: Move code to draw the border of an AnnotWidget to a new method
@@ -25383,7 +27405,7 @@
commit 9854f3173f994bbe3f57d33bd1d0e045833859c2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 6 15:56:06 2011 +0100
+Date: Sun Mar 6 15:56:06 2011 +0100
annots: Add AnnotColor::adjustColor() to be able to adjust an
existing AnnotColor
@@ -25394,7 +27416,7 @@
commit 2bf82f27bd9c8f97e5484ea97be661f65221163d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 5 15:30:01 2011 +0100
+Date: Sat Mar 5 15:30:01 2011 +0100
annots: Remove unused class AnnotBorderStyle
@@ -25404,7 +27426,7 @@
commit 128dcaf282f418d8c45cea4df6ad4d3167b3e39c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 5 13:12:49 2011 +0100
+Date: Sat Mar 5 13:12:49 2011 +0100
annots: Add AnnotBorder::parseDashArray() to parse dash arrays
@@ -25417,49 +27439,49 @@
commit ec2643d311e0ce55f0ff5309c0c420140d053a50
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 1 19:50:55 2011 +0000
+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 +-
+ 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 ++--
+ 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 at kde.org>
-Date: Tue Mar 1 19:42:22 2011 +0000
+Date: Tue Mar 1 19:42:22 2011 +0000
Fix years
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit c804db4d8261274b013f8c340abfc921c77bb3cf
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 19:22:31 2011 +0100
+Date: Tue Mar 1 19:22:31 2011 +0100
move the fontconfig.h inclusion from GlobalParams.h to GlobalParams.cc
@@ -25472,7 +27494,7 @@
commit 2d77c7f9c41f1121354413bcdc3beded35a247f9
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 16:51:04 2011 +0100
+Date: Tue Mar 1 16:51:04 2011 +0100
create the GooString on stack, not in heap
@@ -25482,7 +27504,7 @@
commit 5dc2ef0e27ac48c81739cdfe8e8070ebbc410c87
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 16:39:36 2011 +0100
+Date: Tue Mar 1 16:39:36 2011 +0100
annots: avoid temporary GooString's just for comparisons, just
use strcmp
@@ -25496,7 +27518,7 @@
commit 535e48ab764ee4e377451ddd032044b51b842c4a
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 16:07:34 2011 +0100
+Date: Tue Mar 1 16:07:34 2011 +0100
[qt4] ignore "Widget" annotations
@@ -25508,7 +27530,7 @@
commit f0e5c36e7f1c5d0f0f51e3a6a6acd6c423f86df7
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 16:02:54 2011 +0100
+Date: Tue Mar 1 16:02:54 2011 +0100
annots: avoid a temporary GooString just for comparisons, just
use strcmp
@@ -25522,7 +27544,7 @@
commit 58a3b83a8fbd8b13eb98c4f677f4ed19b6ae44cd
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 1 15:35:45 2011 +0100
+Date: Tue Mar 1 15:35:45 2011 +0100
fix appendAnnot() invocation on annotations reading
@@ -25537,7 +27559,7 @@
commit 664865a2ddca9c20ac36a41aef52ebf12eab838d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 1 10:56:40 2011 +0100
+Date: Tue Mar 1 10:56:40 2011 +0100
Merge Link and AnnotLink code
@@ -25549,37 +27571,37 @@
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
+ 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 +--
+ 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 +-
+ 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 at kde.org>
-Date: Sun Feb 27 21:53:32 2011 +0100
+Date: Sun Feb 27 21:53:32 2011 +0100
small fixes to the pdftohtml manpage
@@ -25593,7 +27615,7 @@
commit e927384897595f1bda5f7e41b552602f9cc8ed95
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 16:39:59 2011 +0100
+Date: Sun Feb 27 16:39:59 2011 +0100
[qt4] fix caption of push button fields
@@ -25607,7 +27629,7 @@
commit 5b24ee2c934feea1b7d46c8ec423d1c547258be2
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 16:24:22 2011 +0100
+Date: Sun Feb 27 16:24:22 2011 +0100
annots: 'CA', 'RC' and 'AC' are strings, not names
@@ -25616,7 +27638,7 @@
commit e64f6cb23e9a564b3f80daea9abcfe8bb29189eb
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 15:22:32 2011 +0100
+Date: Sun Feb 27 15:22:32 2011 +0100
make getOnStr() return the GooString* instead of its char*
@@ -25624,14 +27646,14 @@
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 +-
+ 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 at kde.org>
-Date: Sun Feb 27 14:39:52 2011 +0100
+Date: Sun Feb 27 14:39:52 2011 +0100
[qt4] directly use the dict
@@ -25640,7 +27662,7 @@
commit 071966e48577c515b17a424baeae85ae4fc80a20
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 14:21:11 2011 +0100
+Date: Sun Feb 27 14:21:11 2011 +0100
[qt4] move textAlignment() as a private function
@@ -25650,7 +27672,7 @@
commit adc236771f11eeb4197064747836e8ed3fbfeba9
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 14:13:50 2011 +0100
+Date: Sun Feb 27 14:13:50 2011 +0100
[qt4] use FormWidget::getAlternateUiName()
@@ -25661,7 +27683,7 @@
commit 9f111483cf6196dedf3cee380c3e5224776203ea
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 14:12:16 2011 +0100
+Date: Sun Feb 27 14:12:16 2011 +0100
forms: read the TU field as alternateUiName
@@ -25671,7 +27693,7 @@
commit cfaadaa9e4a857fcea3b5a2cadacd352de6c469d
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 14:07:35 2011 +0100
+Date: Sun Feb 27 14:07:35 2011 +0100
[qt4] use FormWidget::getPartialName()
@@ -25682,7 +27704,7 @@
commit 2478896a0c1f6e5842f3d8b172e4cc7e6bd58cd8
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 13:24:09 2011 +0100
+Date: Sun Feb 27 13:24:09 2011 +0100
[qt4] use the new FormWidget::createActivationAction()
@@ -25691,7 +27713,7 @@
commit 1dcb683a5c2dd6a1de654e90a4394f65d63dc296
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 27 13:22:48 2011 +0100
+Date: Sun Feb 27 13:22:48 2011 +0100
add FormWidget::createActivationAction()
@@ -25703,30 +27725,30 @@
commit bd4cc73e438a7d4d4a10c50c69e65b5bdc63ddf2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 27 11:04:45 2011 +0000
+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/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 at kde.org>
-Date: Sun Feb 27 10:55:22 2011 +0000
+Date: Sun Feb 27 10:55:22 2011 +0000
Add 2011 years
- poppler/Annot.cc | 2 +-
+ poppler/Annot.cc | 2 +-
poppler/CairoFontEngine.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit b297fb9de0779ac84d5b7ef68c792afefe598320
Author: William Bader <williambader at hotmail.com>
-Date: Sun Feb 27 01:48:55 2011 +0000
+Date: Sun Feb 27 01:48:55 2011 +0000
access the pixels directly
@@ -25737,7 +27759,7 @@
commit de77e26759f1c33698abe248ad29b75c329a043c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 27 01:39:23 2011 +0000
+Date: Sun Feb 27 01:39:23 2011 +0000
Fix crash in some pdf
@@ -25749,7 +27771,7 @@
commit 4f82a2e08cb2c930956c6b38030fa7b015a0de5a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 27 01:38:33 2011 +0000
+Date: Sun Feb 27 01:38:33 2011 +0000
Implement GfxDeviceCMYKColorSpace::getRGBLine
@@ -25759,7 +27781,7 @@
commit 4980b99214281dcab8f82b5b618aadc24de371f4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 26 14:00:33 2011 +0100
+Date: Sat Feb 26 14:00:33 2011 +0100
annots: Don't assume y1 > y3 for quad points of a highlight annotation
@@ -25770,7 +27792,7 @@
commit e6ae0f8609cd66e9e124af59adefdff9d610dcd4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 26 13:23:47 2011 +0100
+Date: Sat Feb 26 13:23:47 2011 +0100
cairo: Handle font type fontCIDType2OT when creating freetype font
@@ -25781,7 +27803,7 @@
commit 22eb01d305ea2560d26417ca8df9c0465d4e9a82
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 26 12:17:49 2011 +0100
+Date: Sat Feb 26 12:17:49 2011 +0100
cairo: Fix a crash when rendering a document with inline images
@@ -25791,19 +27813,19 @@
commit a6599dd1fda37186b876b5b2de80be1731dd5946
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 26 11:59:03 2011 +0100
+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 +++---
+ glib/poppler-media.cc | 2 +-
+ glib/poppler-page.cc | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
commit 89c66f236c85ac5a53ae12b01cdebc30e27b78d3
Author: Peter Ward <peteraward at gmail.com>
-Date: Sat Feb 26 11:39:58 2011 +0100
+Date: Sat Feb 26 11:39:58 2011 +0100
glib: Add missing "out" annotation to poppler_page_get_size()
@@ -25812,7 +27834,7 @@
commit 7a68199b342eb3f33733f7d7446ede8f94130fba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 26 11:09:27 2011 +0100
+Date: Sat Feb 26 11:09:27 2011 +0100
cairo: Check if cairo version is == 1.11.2 to use mesh gradients api
@@ -25824,7 +27846,7 @@
commit 97e7ab1a4eea2160f3f0847d10f6c16f2d66ef11
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Feb 25 20:33:39 2011 +0000
+Date: Fri Feb 25 20:33:39 2011 +0000
Do not ask freetype for a font of size 0x0
@@ -25835,7 +27857,7 @@
commit 3590a2d38082fc705040cdb31bf0b22ff12dd3e4
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Feb 24 18:47:35 2011 +0000
+Date: Thu Feb 24 18:47:35 2011 +0000
Fix rendering of some substituted fonts
@@ -25846,7 +27868,7 @@
commit 384753f1f9f780687bdead99a6548ef8598b898a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 21 19:19:48 2011 +0000
+Date: Mon Feb 21 19:19:48 2011 +0000
Use gfree since we allocate with gmalloc
@@ -25857,7 +27879,7 @@
commit d775420c3c6cb5a29ff74712d3fc210fcb4b4627
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 19 11:19:57 2011 +0000
+Date: Sat Feb 19 11:19:57 2011 +0000
Do not delete textOut twice when using -bbox
@@ -25866,7 +27888,7 @@
commit e1a56d73b066e7152ccf6ccf36206def7956cb00
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 16 00:06:45 2011 +0000
+Date: Wed Feb 16 00:06:45 2011 +0000
Lots of rendering improvements by Thomas and Andrea
@@ -25885,36 +27907,36 @@
Followup Bug 32349 & Poppler: More shading fun ;-)
thread for more info
- poppler/Function.cc | 122 +--------
- poppler/Function.h | 3 +-
- poppler/GfxState.cc | 634
+ poppler/Function.cc | 122 +--------
+ poppler/Function.h | 3 +-
+ poppler/GfxState.cc | 634
+++++++++++++++++++++++++++++++++++++++------
- poppler/GfxState.h | 90 +++++--
+ poppler/GfxState.h | 90 +++++--
poppler/SplashOutputDev.cc | 253 +++++++++++++++---
poppler/SplashOutputDev.h | 67 ++++-
- splash/Splash.cc | 126 ++++++---
- splash/SplashPattern.h | 7 +-
+ splash/Splash.cc | 126 ++++++---
+ splash/SplashPattern.h | 7 +-
8 files changed, 1006 insertions(+), 296 deletions(-)
commit 675b3505f963a0110dac7f865654232cbb865ef5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 13 16:21:52 2011 +0100
+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/CMakeLists.txt | 20 +--
+ test/Makefile.am | 29 ++--
test/gtk-cairo-test.cc | 190 -----------------------
test/gtk-splash-test.cc | 311 -------------------------------------
- test/gtk-test.cc | 397
+ test/gtk-test.cc | 397
++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 412 insertions(+), 535 deletions(-)
commit 728c022cdc1ea12aa54077d44276f9d7714930d4
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 13 13:25:51 2011 +0100
+Date: Sun Feb 13 13:25:51 2011 +0100
remove more references to the qt3 frontend
@@ -25925,22 +27947,22 @@
commit 15e5b3f16015361754fdc14da4a0dde5af887568
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 13 13:23:06 2011 +0100
+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 -
+ 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, 28 deletions(-)
commit 50aa15a0bd7100fc9b9243de1d6e6f4b59df1488
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 13 13:07:19 2011 +0100
+Date: Sun Feb 13 13:07:19 2011 +0100
remove GDK API here too
@@ -25951,7 +27973,7 @@
commit f410cd11268254b9d0422201c9860d775f73fdd8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 13 12:55:37 2011 +0100
+Date: Sun Feb 13 12:55:37 2011 +0100
gtk-splash-test: Don't use GDK deprecated API
@@ -25960,18 +27982,18 @@
commit a0568e449061d6b6af5485e340cd6f9d3e54ef7c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 13 12:27:22 2011 +0100
+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 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-glib.pc.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 149b7fec472beda9d1538e0f26607c9498d504c2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 13 11:51:57 2011 +0100
+Date: Sun Feb 13 11:51:57 2011 +0100
glib: Remove deprecated GDK API
@@ -25978,25 +28000,25 @@
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
+ 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 ------
+ glib/poppler-page.h | 34 ------
7 files changed, 4 insertions(+), 407 deletions(-)
commit a5482d64472a81206dd8d0c5bb80007f6d5bb893
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 13 11:40:23 2011 +0100
+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/CMakeLists.txt | 8 -
+ glib/Makefile.am | 14 -
glib/test-poppler-glib.cc | 657
----------------------------------------------
3 files changed, 679 deletions(-)
@@ -26003,7 +28025,7 @@
commit cab0cf028a192772dcb5c3f4aefa0a421e73e9e7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Feb 11 19:42:34 2011 +0000
+Date: Fri Feb 11 19:42:34 2011 +0000
Do not infinite loop in some broken files
@@ -26012,7 +28034,7 @@
commit 1125cc8ccf386d8e0a0679aa73614bc2cb8037b0
Author: William Bader <williambader at hotmail.com>
-Date: Tue Feb 8 20:27:16 2011 +0000
+Date: Tue Feb 8 20:27:16 2011 +0000
Allow setting the rasterization resolution
@@ -26021,13 +28043,13 @@
poppler/GlobalParams.cc | 15 +++++++++++++++
poppler/GlobalParams.h | 3 +++
poppler/PSOutputDev.cc | 7 ++++++-
- utils/pdftops.1 | 6 ++++++
- utils/pdftops.cc | 6 ++++++
+ utils/pdftops.1 | 6 ++++++
+ utils/pdftops.cc | 6 ++++++
5 files changed, 36 insertions(+), 1 deletion(-)
commit 96e169b0eca31891f3cd564365d4a2a5c6e2a2c0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 8 19:58:31 2011 +0000
+Date: Tue Feb 8 19:58:31 2011 +0000
Make really sure the uMap static pointer is valid
@@ -26041,7 +28063,7 @@
commit c3470145f95791167c19a438934a923eab8a93cf
Author: William Bader <williambader at hotmail.com>
-Date: Tue Feb 8 19:54:48 2011 +0000
+Date: Tue Feb 8 19:54:48 2011 +0000
Add PS level1 non standard binary output option
@@ -26051,13 +28073,13 @@
poppler/GlobalParams.h | 5 +-
poppler/PSOutputDev.cc | 227
++++++++++++++++++++++++++++++++++--------------
- utils/pdftops.1 | 7 ++
- utils/pdftops.cc | 8 +-
+ utils/pdftops.1 | 7 ++
+ utils/pdftops.cc | 8 +-
5 files changed, 198 insertions(+), 67 deletions(-)
commit 37077aa475d2dee81f87daa05297b201eeb99c87
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 7 19:48:28 2011 +0000
+Date: Mon Feb 7 19:48:28 2011 +0000
Make sure tx is inside the bitmap
@@ -26070,7 +28092,7 @@
commit 5aa854f70c8f563efe56dafa8bd6b3cdd5c95451
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 6 13:24:35 2011 +0100
+Date: Sun Feb 6 13:24:35 2011 +0100
cairo: Use the new cairo unique id to set the surface id when printing
@@ -26085,7 +28107,7 @@
commit fe7b8aa4fc78aacf3226d019db74146ceaebd63c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 2 22:35:40 2011 +0000
+Date: Wed Feb 2 22:35:40 2011 +0000
Workaround bug when converting pdf to ps with level1
@@ -26098,7 +28120,7 @@
commit 5984ad081cd609f3146e0da5e22097ef073eb519
Author: William Bader <williambader at hotmail.com>
-Date: Sun Jan 30 17:02:02 2011 +0000
+Date: Sun Jan 30 17:02:02 2011 +0000
Increase precision
@@ -26110,7 +28132,7 @@
commit c60d5afbeb986c1b335357202c5f551a3c146a76
Author: Jim Meyering <meyering at redhat.com>
-Date: Mon Jan 24 15:51:20 2011 +0100
+Date: Mon Jan 24 15:51:20 2011 +0100
demo: don't use an uninitialized local variable
@@ -26122,7 +28144,7 @@
commit a3bdc56e2f086444419eddfcda5d2010a9a6b5c0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jan 29 11:23:33 2011 +0100
+Date: Sat Jan 29 11:23:33 2011 +0100
glib-demo: Add a tooltip with current selected character in text demo
@@ -26136,7 +28158,7 @@
commit bf2d86c8db430595fb3c55edd3f6c8d289bdaeb5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 28 20:34:08 2011 +0000
+Date: Fri Jan 28 20:34:08 2011 +0000
Make sure uMap is still valid before using it
@@ -26147,7 +28169,7 @@
commit e6fb20d7b3bf8ea8aedc1bcd910e035059835b5f
Author: Axel Strübing <axel.struebing at freenet.de>
-Date: Fri Jan 28 19:20:15 2011 +0000
+Date: Fri Jan 28 19:20:15 2011 +0000
Extract text of a pdf correctly
@@ -26160,7 +28182,7 @@
commit 4829d36a3b005585db8c8115f7ee81a4e2384780
Author: Simon Kellner <kellner at kit.edu>
-Date: Wed Jan 26 22:59:49 2011 +0000
+Date: Wed Jan 26 22:59:49 2011 +0000
fix labelToIndex on multiple prefixes
@@ -26175,7 +28197,7 @@
commit e57c75fbd95ef8399b0785500f6893465bc808c3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Jan 24 19:48:09 2011 +1030
+Date: Mon Jan 24 19:48:09 2011 +1030
cairo: Implement Type 4,5,6,7 shadings using cairo mesh gradients
@@ -26184,13 +28206,13 @@
poppler/CairoOutputDev.cc | 139
++++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 12 ++++
- poppler/Gfx.cc | 10 +++-
- poppler/OutputDev.h | 2 +
+ poppler/Gfx.cc | 10 +++-
+ poppler/OutputDev.h | 2 +
4 files changed, 161 insertions(+), 2 deletions(-)
commit 5081356fcc69012e9df95dbf1e3c36e7c1e751c4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 25 20:26:25 2011 +0000
+Date: Tue Jan 25 20:26:25 2011 +0000
Fix leak in SplashOutputDev::axialShadedFill
@@ -26199,7 +28221,7 @@
commit 19dc283c3af597deab297341a37495c06988948b
Author: Thomas Klausner <wiz at danbala.tuwien.ac.at>
-Date: Mon Jan 24 19:05:08 2011 +0000
+Date: Mon Jan 24 19:05:08 2011 +0000
Include zlib header since we use things defined there
@@ -26208,7 +28230,7 @@
commit 5056e33e01ce0f7db1a5401b7b38d30e84eedf69
Author: Sam Liao <phyomh at gmail.com>
-Date: Mon Jan 17 13:07:22 2011 +0800
+Date: Mon Jan 17 13:07:22 2011 +0800
Poppler: Fix line selection, dont check y for Line selection
@@ -26224,7 +28246,7 @@
commit 88812e716c1a0c87a504118d47eb4cc6f52962fa
Author: Andreas Hartmetz <ahartmetz at gmail.com>
-Date: Fri Jan 21 23:33:47 2011 +0000
+Date: Fri Jan 21 23:33:47 2011 +0000
Add Hinting API to ArthurOutputDev
@@ -26234,7 +28256,7 @@
commit dc5ec4668bdfe3b6ba41f0a2e551bbc07f8839ba
Author: Andreas Hartmetz <ahartmetz at gmail.com>
-Date: Fri Jan 21 23:32:50 2011 +0000
+Date: Fri Jan 21 23:32:50 2011 +0000
support slight hinting in Splash backend
@@ -26242,9 +28264,9 @@
poppler/SplashOutputDev.cc | 6 +++++-
poppler/SplashOutputDev.h | 4 +++-
qt4/src/poppler-private.h | 3 ++-
- qt4/src/poppler-qt4.h | 4 +++-
+ qt4/src/poppler-qt4.h | 4 +++-
splash/SplashFTFont.cc | 27 ++++++++++++++++++---------
- splash/SplashFTFont.h | 2 ++
+ splash/SplashFTFont.h | 2 ++
splash/SplashFTFontEngine.cc | 10 +++++++---
splash/SplashFTFontEngine.h | 6 ++++--
splash/SplashFontEngine.cc | 4 +++-
@@ -26253,7 +28275,7 @@
commit 0c5b1bef9f3f98001cee20061b1eaf20b965c5a9
Author: William Bader <williambader at hotmail.com>
-Date: Fri Jan 21 19:01:45 2011 +0000
+Date: Fri Jan 21 19:01:45 2011 +0000
Fix rendering for some pdf with -level1sep
@@ -26261,12 +28283,12 @@
poppler/PSOutputDev.cc | 207
++++++++++++++++++++++++++++++++++++++-----------
- poppler/PSOutputDev.h | 13 +++-
+ poppler/PSOutputDev.h | 13 +++-
2 files changed, 170 insertions(+), 50 deletions(-)
commit 6cb8965fb8bce6da2a4460e86f592c1ea3a84a5c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 21 18:43:21 2011 +0000
+Date: Fri Jan 21 18:43:21 2011 +0000
fix (C) years
@@ -26278,7 +28300,7 @@
commit 24f9c8924b2135da616386d0fa691fe790b4e7a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 21 08:43:34 2011 +0000
+Date: Fri Jan 21 08:43:34 2011 +0000
Access the correct variable
@@ -26289,7 +28311,7 @@
commit 07a8808c22445c421f3064da7e5227dcbf40358b
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 17 21:34:23 2011 +0100
+Date: Mon Jan 17 21:34:23 2011 +0100
fix unicodeToQString() to correctly decode the Unicode sequence
@@ -26305,7 +28327,7 @@
commit ed367c08d788c88c49de770019bf826cfebb3e2c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:25:02 2011 +0000
+Date: Sun Jan 16 17:25:02 2011 +0000
Don't need this either
@@ -26314,7 +28336,7 @@
commit 76ab657dc81ed0af7d9f2efaca2e68d570063001
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:22:56 2011 +0000
+Date: Sun Jan 16 17:22:56 2011 +0000
And this is the last bit of qt3 cleaning?
@@ -26323,7 +28345,7 @@
commit 9a02856c2762e65b8f03e443e728e05e5a86f65b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:21:00 2011 +0000
+Date: Sun Jan 16 17:21:00 2011 +0000
Another qt3 unused file
@@ -26332,7 +28354,7 @@
commit 26da7a52d31eb677ab6399de2c07140aa272b35e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:17:59 2011 +0000
+Date: Sun Jan 16 17:17:59 2011 +0000
Yet more qt3 cleaning
@@ -26341,12 +28363,12 @@
commit 8dc9c693abb0033247a338d0f7d1f3f7a57c1a55
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:14:34 2011 +0000
+Date: Sun Jan 16 17:14:34 2011 +0000
Some more qt3 thigs i forgot to kill
- CMakeLists.txt | 5 -
- Makefile.am | 1 -
+ CMakeLists.txt | 5 -
+ Makefile.am | 1 -
cmake/modules/FindQt3.cmake | 319
--------------------------------------------
3 files changed, 325 deletions(-)
@@ -26353,38 +28375,38 @@
commit d82f98a274bfa008c218e265a080c4af7ce95131
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 16 17:13:06 2011 +0000
+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
+ 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-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-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 ------------
+ qt/poppler-private.cc | 147 ---------------
+ qt/poppler-private.h | 102 ----------
+ qt/poppler-qt.h | 311 ------------------------------
+ qt/test-poppler-qt.cpp | 122 ------------
21 files changed, 2340 deletions(-)
commit 301352e5585d4ab6e7b609b4ab79b4d8b8656092
Author: Daiki Ueno <ueno at unixuser.org>
-Date: Sun Jan 9 18:48:50 2011 +0000
+Date: Sun Jan 9 18:48:50 2011 +0000
Do not crash in case jpeg_create_decompress fails
@@ -26396,7 +28418,7 @@
commit 17baf0498485720b4ea5952bb46287f533139d0a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 8 13:03:31 2011 +0000
+Date: Sat Jan 8 13:03:31 2011 +0000
Remove declaration of function without implementation
@@ -26405,7 +28427,7 @@
commit a9e280508f5d669c8b6e1a6bb888b9369d868ab3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jan 8 10:39:41 2011 +0100
+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
@@ -26415,7 +28437,7 @@
commit 5d62d18941810ef7d668eafa8b001085133fb169
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jan 8 10:33:32 2011 +0100
+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
@@ -26425,7 +28447,7 @@
commit 1324ae13f1fc2fa28951c2c7f7d63d4756537229
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 6 01:15:30 2011 +0100
+Date: Thu Jan 6 01:15:30 2011 +0100
[cpp/apidox] advertize the 'pnm' image format
@@ -26434,7 +28456,7 @@
commit b192363960c26111167b1b08db9910e5f39dcf8b
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 6 01:09:09 2011 +0100
+Date: Thu Jan 6 01:09:09 2011 +0100
[cpp] Add PNM (PBM/PGM/PPM) exporting to 'image'.
@@ -26453,7 +28475,7 @@
commit bebc530cbde7898759e1bd3629d2836ce0fb1d08
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Dec 31 12:11:40 2010 +1030
+Date: Fri Dec 31 12:11:40 2010 +1030
cairo: Don't set JPX mime data if the stream specifies a colorspace
@@ -26469,7 +28491,7 @@
commit 1399b9ab14b19f25583c75af2b36f63a6a01129a
Author: Pino Toscano <pino at kde.org>
-Date: Wed Dec 29 15:56:45 2010 +0100
+Date: Wed Dec 29 15:56:45 2010 +0100
[cpp] add TIFF output to 'image'
@@ -26478,30 +28500,30 @@
commit 1c7937dbc3c577ffc12cacc8de33d320e2f30ce9
Author: William Bader <williambader at hotmail.com>
-Date: Wed Dec 29 14:47:06 2010 +0000
+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
+ 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 +++
+ 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 +++-
+ 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 at hotmail.com>
-Date: Tue Dec 28 11:53:54 2010 +0000
+Date: Tue Dec 28 11:53:54 2010 +0000
Add -singlefile option to pdftoppm
@@ -26513,7 +28535,7 @@
commit ff58ee66c27da09a370a3000ab55eb1a24921852
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 27 20:07:21 2010 +0000
+Date: Mon Dec 27 20:07:21 2010 +0000
bump soname just in case the getPage change is not BC
@@ -26523,7 +28545,7 @@
commit 453df02e195a96d0210f297c21c8ffba646659da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 27 19:51:13 2010 +0000
+Date: Mon Dec 27 19:51:13 2010 +0000
Make distcheck work
@@ -26532,7 +28554,7 @@
commit 6a34cec72c1a1b6576858a7836aae4a902fb5ed7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 27 19:29:52 2010 +0000
+Date: Mon Dec 27 19:29:52 2010 +0000
increase core soname
@@ -26542,19 +28564,19 @@
commit 8c11e9d68dceb609d04b3b383d22c307b5981d86
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 27 19:23:29 2010 +0000
+Date: Mon Dec 27 19:23:29 2010 +0000
0.16.0 project version increase
CMakeLists.txt | 4 ++--
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
commit 8c1fd83c6061279af00c1172fe41cee61f19d917
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 27 19:22:22 2010 +0000
+Date: Mon Dec 27 19:22:22 2010 +0000
0.16.0 NEWS
@@ -26563,7 +28585,7 @@
commit 0294d6e50691a3e40fad0d6e4fa9056944a91efd
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Thu Dec 23 15:56:32 2010 +0000
+Date: Thu Dec 23 15:56:32 2010 +0000
Be more correct when drawing radial shadings
@@ -26574,7 +28596,7 @@
commit 3aa08e378927889b35b6fa858d6da568250ba6ec
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 19 22:36:47 2010 +0000
+Date: Sun Dec 19 22:36:47 2010 +0000
Seems to work with this version, so enable it
@@ -26583,7 +28605,7 @@
commit 93cf184b7573980bf2e56342e64f9b99c5d0b415
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 19 14:16:25 2010 +0000
+Date: Sun Dec 19 14:16:25 2010 +0000
Fix last commit
@@ -26594,7 +28616,7 @@
commit ebb580d756a8321de87814f05ab572564732c15e
Author: Philip Lorenz <lorenzph+freedesktop at gmail.com>
-Date: Sun Dec 19 14:08:31 2010 +0000
+Date: Sun Dec 19 14:08:31 2010 +0000
Windows fixes
@@ -26603,7 +28625,7 @@
commit 88a4154420e016d93c5ce05b5b8e09b6bddcadc9
Author: Philip Lorenz <lorenzph+freedesktop at gmail.com>
-Date: Sun Dec 19 13:03:01 2010 +0000
+Date: Sun Dec 19 13:03:01 2010 +0000
build on newer MSVC
@@ -26612,7 +28634,7 @@
commit 18cd9f6aeb48266c551952c395eb9cd662bc27f5
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sat Dec 18 17:59:54 2010 +0000
+Date: Sat Dec 18 17:59:54 2010 +0000
compile in windows
@@ -26621,7 +28643,7 @@
commit 471102ef68b439dfa13e20e3b0f2e143f8d0dc85
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 17 00:36:36 2010 +0000
+Date: Fri Dec 17 00:36:36 2010 +0000
Remove -resolution
@@ -26633,7 +28655,7 @@
commit edf6c47feb5b7658e585bcce196e465245e1dc98
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 16 22:56:40 2010 +0000
+Date: Thu Dec 16 22:56:40 2010 +0000
kill useless code
@@ -26642,17 +28664,17 @@
commit 185a2f81485e19f96393a431be5523a277747b94
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 16 22:56:15 2010 +0000
+Date: Thu Dec 16 22:56:15 2010 +0000
static-ify some vars
utils/HtmlOutputDev.cc | 9 ---------
- utils/pdftohtml.cc | 8 ++++----
+ utils/pdftohtml.cc | 8 ++++----
2 files changed, 4 insertions(+), 13 deletions(-)
commit e4dfc548c57b690db9122d1db3342ed0a785c8bb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 14 19:45:46 2010 +0000
+Date: Tue Dec 14 19:45:46 2010 +0000
We need this to make the define really be defined
@@ -26661,7 +28683,7 @@
commit 06da4b46c442778c67b788b747f04b386b5247ac
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Dec 14 09:06:57 2010 +1030
+Date: Tue Dec 14 09:06:57 2010 +1030
cairo: Use A1 instead of A8 for imagemask
@@ -26672,14 +28694,14 @@
where a 65K PDF printed to PDF using poppler-cairo turns into an 8MB
PDF.
- CMakeLists.txt | 2 ++
- configure.ac | 1 +
+ CMakeLists.txt | 2 ++
+ configure.ac | 1 +
poppler/CairoOutputDev.cc | 25 ++++++++++++++++++-------
3 files changed, 21 insertions(+), 7 deletions(-)
commit 6ef457dc818e7e241e5d2e264bc2d78b132ae638
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 13 14:08:29 2010 +0000
+Date: Mon Dec 13 14:08:29 2010 +0000
Move -fno-exceptions -fno-check-new to default flags
@@ -26688,12 +28710,12 @@
while ago
cmake/modules/PopplerMacros.cmake | 2 +-
- configure.ac | 2 +-
+ configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 86e469600b58ae05cb6ede1b4017fbdac99cc556
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 13 14:04:00 2010 +0000
+Date: Mon Dec 13 14:04:00 2010 +0000
More gcc flags movement
@@ -26701,22 +28723,22 @@
Move -fno-common to default options since it makes sense to use it
cmake/modules/PopplerMacros.cmake | 4 ++--
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 2b74241d8b1fd1ec9fab4f6f673bbaaa1cb3d949
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 13 13:56:52 2010 +0000
+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 +-
+ configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 7313e0a4de6f2146c1dcb3d235f18a3c844d12d5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 12 23:28:18 2010 +0000
+Date: Sun Dec 12 23:28:18 2010 +0000
Do not return 99 (or 1) with -h, -v and -printenc
@@ -26732,7 +28754,7 @@
commit 669cbfc9fd78a22d4f14b0af43143e1f5dc28cd5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 11 19:04:22 2010 +0000
+Date: Sat Dec 11 19:04:22 2010 +0000
Fix the preliminary bbox/clip calculation
@@ -26744,7 +28766,7 @@
commit 2984002a64acca7014edeadd900dd52cdf7d9eac
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 11 18:57:52 2010 +0000
+Date: Sat Dec 11 18:57:52 2010 +0000
Remove the * we just need to increase the pointer
@@ -26755,7 +28777,7 @@
commit 9b45fa072198da4a5032004ac943cf2227aa97ea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 10 12:05:58 2010 +0000
+Date: Fri Dec 10 12:05:58 2010 +0000
Make PreScanOutputDev be less agressive when deciding to rasterize
@@ -26762,12 +28784,12 @@
BUG 30107
poppler/PreScanOutputDev.cc | 14 +++++++++++++-
- poppler/PreScanOutputDev.h | 4 ++++
+ poppler/PreScanOutputDev.h | 4 ++++
2 files changed, 17 insertions(+), 1 deletion(-)
commit f96f6a06cdc33b4654669ac74d5abd0d546a127d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 5 12:06:21 2010 +0000
+Date: Sun Dec 5 12:06:21 2010 +0000
Adapt the zlib-base FlateStream code to API changes
@@ -26774,26 +28796,26 @@
Bug 32065
poppler/FlateStream.cc | 9 ++++++---
- poppler/FlateStream.h | 9 +++++++++
+ poppler/FlateStream.h | 9 +++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
commit 7b1f83990a1f68306daf5f7dbeabcd38f4382e3b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 29 22:27:46 2010 +0000
+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 +-
+ 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 at kde.org>
-Date: Mon Nov 29 21:33:31 2010 +0000
+Date: Mon Nov 29 21:33:31 2010 +0000
Add some more isNum before calling getNum
@@ -26802,7 +28824,7 @@
commit 62ec4f591c258e702ee79b519919a931517220bf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 29 20:50:43 2010 +0000
+Date: Mon Nov 29 20:50:43 2010 +0000
pass fetchOriginatorNums in some more calls
@@ -26815,7 +28837,7 @@
commit d2a0e2ca723142478858f7edfb7c98807d554578
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Nov 25 10:36:38 2010 +0000
+Date: Thu Nov 25 10:36:38 2010 +0000
Skip over loops in Pages tree
@@ -26824,7 +28846,7 @@
commit 7abd371364e6e4aaef932f26b0664f7f9d760c42
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 28 13:57:50 2010 +0000
+Date: Sun Nov 28 13:57:50 2010 +0000
this var is not about xobjects only anymroe
@@ -26834,7 +28856,7 @@
commit 1ac14df61d711097837e44d80a9332f0a854b95e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Nov 28 13:49:41 2010 +0000
+Date: Sun Nov 28 13:49:41 2010 +0000
find fonts inside patterns
@@ -26846,7 +28868,7 @@
commit d30dd8c6f6491beac9750447126930168394cd9f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 28 13:25:39 2010 +0000
+Date: Sun Nov 28 13:25:39 2010 +0000
Use sets instead of arrays
@@ -26856,7 +28878,7 @@
commit 4c20bf14c0b1d7f1d5e530ded890186487da32b5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 28 12:50:24 2010 +0000
+Date: Sun Nov 28 12:50:24 2010 +0000
Use FontInfoScanner
@@ -26869,7 +28891,7 @@
commit d915f3d5a9e9e2e5dcd6be4cf8fac1b5849a13e9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 24 21:51:46 2010 +0000
+Date: Wed Nov 24 21:51:46 2010 +0000
protect against null ref here
@@ -26878,7 +28900,7 @@
commit cf32faaa16d763561fb9dfc4469345e4b3ba2369
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 24 21:48:54 2010 +0000
+Date: Wed Nov 24 21:48:54 2010 +0000
Protect against NULL values here
@@ -26887,7 +28909,7 @@
commit 46a6cc5952c59504863baed3ad2870093c462f12
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 24 19:42:59 2010 +0000
+Date: Wed Nov 24 19:42:59 2010 +0000
Check the objects are numbers before using them
@@ -26898,7 +28920,7 @@
commit 52e25cca7e75a8b8eac95a3cec258f1cd9f8ecaa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 23 20:31:14 2010 +0000
+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
@@ -26912,7 +28934,7 @@
commit c6127898b13311197971b1c6b1b306b91e28cf0e
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Nov 22 13:08:48 2010 +0000
+Date: Mon Nov 22 13:08:48 2010 +0000
Use gmallocn_checkoverflow when parsing Hints table
@@ -26923,7 +28945,7 @@
commit 6a17cc89eda52f08cbacbf9bfaaeda22cf041e82
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Nov 22 19:20:56 2010 +0000
+Date: Mon Nov 22 19:20:56 2010 +0000
Improve rendering of radial shadings
@@ -26935,7 +28957,7 @@
commit 9093adede4f9ad6fb2962dcefcb09c1d8c357715
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 21 23:49:12 2010 +0000
+Date: Sun Nov 21 23:49:12 2010 +0000
pedantic ;
@@ -26944,7 +28966,7 @@
commit 61445f5af749510fb647059af01abf1faf664195
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 22:19:35 2010 +0000
+Date: Sat Nov 20 22:19:35 2010 +0000
forgot to upadte year here
@@ -26953,7 +28975,7 @@
commit 3628837febb21bcd1b54f3fb737628ea59e5d95d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 22:15:08 2010 +0000
+Date: Sat Nov 20 22:15:08 2010 +0000
And now generalize the previous fix
@@ -26971,7 +28993,7 @@
commit b0555189a7fbd7f6a899e582783b9e0df44d5d6a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 21:32:24 2010 +0000
+Date: Sat Nov 20 21:32:24 2010 +0000
Protect against more loops when parsing
@@ -26986,7 +29008,7 @@
commit 555fa897b275ca7195f22a727b049c8c4f2d74cd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 19:14:38 2010 +0000
+Date: Sat Nov 20 19:14:38 2010 +0000
Detect loops in FormField creation
@@ -26997,7 +29019,7 @@
commit 1802ddef374cb1451975480b2427e5d23ee2c737
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 18:58:17 2010 +0000
+Date: Sat Nov 20 18:58:17 2010 +0000
Forgot to port this away from GooVector :-S
@@ -27007,7 +29029,7 @@
commit 32e53c5436b8c3654e7043f1d86596a79511a4cf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 18:54:59 2010 +0000
+Date: Sat Nov 20 18:54:59 2010 +0000
fix spacing
@@ -27016,7 +29038,7 @@
commit 1cb3d5d94a1d89ccded96d977bcabfbe438fb81f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 18:08:45 2010 +0000
+Date: Sat Nov 20 18:08:45 2010 +0000
fix the memset
@@ -27027,7 +29049,7 @@
commit 22e8cebaa15adb4b19c9556cdca43cc3e77832b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 20 17:20:34 2010 +0000
+Date: Sat Nov 20 17:20:34 2010 +0000
Ensure the obj are num before reading them
@@ -27036,7 +29058,7 @@
commit 08b2db36db4e011ebe36d2d945cb1a0498f1c5fb
Author: Pino Toscano <pino at kde.org>
-Date: Sat Nov 20 14:00:36 2010 +0100
+Date: Sat Nov 20 14:00:36 2010 +0100
add my copyright here
@@ -27045,7 +29067,7 @@
commit 91aa4b02aa93ffe3828479194067de42d52be465
Author: Pino Toscano <pino at kde.org>
-Date: Sat Nov 20 13:13:46 2010 +0100
+Date: Sat Nov 20 13:13:46 2010 +0100
[cpp] include <ios> for std::hex() and std::left()
@@ -27055,7 +29077,7 @@
commit 1c924412923cb01f2cb95b0943cb7bbaf7e8cfb6
Author: Pino Toscano <pino at kde.org>
-Date: Sat Nov 20 13:02:36 2010 +0100
+Date: Sat Nov 20 13:02:36 2010 +0100
[cpp] include <iterator> for std::back_inserter()
@@ -27064,7 +29086,7 @@
commit 95b551025a34f3a7bcff2852eac6d186bc8a7cb0
Author: Pino Toscano <pino at kde.org>
-Date: Sat Nov 20 12:54:21 2010 +0100
+Date: Sat Nov 20 12:54:21 2010 +0100
use a std::vector<char> instead of a var-length-array of char's
@@ -27073,7 +29095,7 @@
commit 4faaff893515c80cb69b02e431a0f8483274a497
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 19 23:53:35 2010 +0000
+Date: Fri Nov 19 23:53:35 2010 +0000
[win32] Simplify strtok_r implementation
@@ -27085,7 +29107,7 @@
commit 255f84927a649d980f047fe755c9c308535a3779
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Nov 19 23:45:33 2010 +0000
+Date: Fri Nov 19 23:45:33 2010 +0000
Correct parsing of linearization table
@@ -27096,21 +29118,21 @@
commit 9d05138f0b7d15945f546564036bc67815593db0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 14 16:05:28 2010 +0000
+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 +-
+ 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 at kde.org>
-Date: Sun Nov 14 15:41:56 2010 +0000
+Date: Sun Nov 14 15:41:56 2010 +0000
This does actually work now :D
@@ -27119,7 +29141,7 @@
commit d772364b8a5858cbd98e256547d319260fa9d084
Author: Pino Toscano <pino at kde.org>
-Date: Thu Nov 11 21:52:25 2010 +0100
+Date: Thu Nov 11 21:52:25 2010 +0100
[Qt4] New function setDebugErrorFunction().
@@ -27130,12 +29152,12 @@
Base on an idea of Albert, added closure and polish by me.
qt4/src/poppler-private.cc | 20 +++++++++++++++++++-
- qt4/src/poppler-qt4.h | 24 ++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 24 ++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
commit ce929cf33f4b6b6421f9d327b4bb792816d47aac
Author: Jakob Voss <jakob.voss at gbv.de>
-Date: Wed Nov 10 23:41:44 2010 +0000
+Date: Wed Nov 10 23:41:44 2010 +0000
Add -p flag to pdfimages
@@ -27143,13 +29165,13 @@
utils/ImageOutputDev.cc | 25 ++++++++++++++++++-------
utils/ImageOutputDev.h | 19 +++++++++++++++----
- utils/pdfimages.1 | 3 +++
- utils/pdfimages.cc | 6 +++++-
+ utils/pdfimages.1 | 3 +++
+ utils/pdfimages.cc | 6 +++++-
4 files changed, 41 insertions(+), 12 deletions(-)
commit 6296c28968613aadb7ea084092945a54005eca9b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 10 23:28:45 2010 +0000
+Date: Wed Nov 10 23:28:45 2010 +0000
Kill GooVector
@@ -27158,32 +29180,32 @@
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
+ 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 +-
+ 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 at hiberis.nl>
-Date: Wed Nov 10 22:50:36 2010 +0000
+Date: Wed Nov 10 22:50:36 2010 +0000
Linearization improvements
@@ -27191,47 +29213,47 @@
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
+ 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 +-
+ 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 +-
+ 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 at kde.org>
-Date: Mon Nov 8 01:54:03 2010 +0100
+Date: Mon Nov 8 01:54:03 2010 +0100
[cpp/apidox] add the minimum version of 'image'
@@ -27240,7 +29262,7 @@
commit f559e77cb7d76c5fe6a79be9086667a29613c912
Author: Pino Toscano <pino at kde.org>
-Date: Mon Nov 8 01:52:48 2010 +0100
+Date: Mon Nov 8 01:52:48 2010 +0100
[cpp] add image::bytes_per_row()
@@ -27250,7 +29272,7 @@
commit 14dea4d74698d5d7d994e687f8176652d790dba7
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 22:57:31 2010 +0100
+Date: Sun Nov 7 22:57:31 2010 +0100
[arthur] use the untransformed line width, not the transformed one
@@ -27262,7 +29284,7 @@
commit f077e82af0724be88d28c896a3c208f1d50ccff9
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 21:50:48 2010 +0100
+Date: Sun Nov 7 21:50:48 2010 +0100
[qt4] New Page::renderToPainter()
@@ -27276,13 +29298,13 @@
qt4/src/poppler-page.cc | 62
+++++++++++++++++++++++++++++++---------------
- qt4/src/poppler-qt4.h | 65
+ qt4/src/poppler-qt4.h | 65
++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 107 insertions(+), 20 deletions(-)
commit df02d1fc9e65422121e5e8f493c13229552ec0e7
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 19:47:56 2010 +0100
+Date: Sun Nov 7 19:47:56 2010 +0100
[arthur] remove unused 'm_image' attribute
@@ -27292,7 +29314,7 @@
commit b29582cd0d542a3e70dbca3fb75770daa4cc91ca
Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Sun Nov 7 19:44:11 2010 +0100
+Date: Sun Nov 7 19:44:11 2010 +0100
[arthur] small fixes and memory leaks
@@ -27306,7 +29328,7 @@
commit 970f075569bf9be5e5ddc3a9ad1fabec5435dfaf
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 16:31:02 2010 +0100
+Date: Sun Nov 7 16:31:02 2010 +0100
[cpp/tests] add a simple poppler-render test
@@ -27314,7 +29336,7 @@
quite minimal at the moment.
cpp/tests/CMakeLists.txt | 3 ++
- cpp/tests/Makefile.am | 9 +++-
+ cpp/tests/Makefile.am | 9 +++-
cpp/tests/poppler-render.cpp | 113
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 124 insertions(+), 1 deletion(-)
@@ -27321,7 +29343,7 @@
commit bfe4139c742cb0a669f5504df7e22e3e57243d9a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 16:23:26 2010 +0100
+Date: Sun Nov 7 16:23:26 2010 +0100
[cpp] Add page_renderer, to render pages over images.
@@ -27331,8 +29353,8 @@
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/CMakeLists.txt | 2 +
+ cpp/Makefile.am | 2 +
cpp/poppler-page-renderer.cpp | 212
++++++++++++++++++++++++++++++++++++++++++
cpp/poppler-page-renderer.h | 66 +++++++++++++
@@ -27340,7 +29362,7 @@
commit 91e3f7b4ea42a5821fd78e1edf55e95250c9bc68
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 7 16:19:34 2010 +0100
+Date: Sun Nov 7 16:19:34 2010 +0100
[cpp] add an internal way to get a 'page_private' of a 'page'
@@ -27353,7 +29375,7 @@
commit fa7c41cb9c52ecd3d7c574455b1258a3021b8c75
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 4 20:55:34 2010 +0000
+Date: Thu Nov 4 20:55:34 2010 +0000
Improvements to the splash backend
@@ -27362,19 +29384,19 @@
Feuersänger <cfeuersaenger at 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/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.cc | 395
++++++++++++++++++++++++++++++++++++++++++++-
- splash/Splash.h | 11 +-
- splash/SplashBitmap.cc | 4 +-
- splash/SplashBitmap.h | 3 +
+ 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(-)
@@ -27381,7 +29403,7 @@
commit 0aa040163741ab8ba093a742e556bba2a5ab7edf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 3 20:40:24 2010 +0000
+Date: Wed Nov 3 20:40:24 2010 +0000
Do not add sibling children as parents
@@ -27392,7 +29414,7 @@
commit c2ff94b1600b8a5841a5e4627f014560ac460f1a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 3 00:02:02 2010 +0000
+Date: Wed Nov 3 00:02:02 2010 +0000
Do not loop forever in broken documents
@@ -27400,12 +29422,12 @@
are wrong
poppler/Function.cc | 22 +++++++++++++++++++---
- poppler/Function.h | 6 ++++--
+ poppler/Function.h | 6 ++++--
2 files changed, 23 insertions(+), 5 deletions(-)
commit cad66a7d25abdb6aa15f3aa94a35737b119b2659
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 2 19:14:34 2010 +0000
+Date: Tue Nov 2 19:14:34 2010 +0000
Fix crash in broken documents
@@ -27418,7 +29440,7 @@
commit 7e5f31c1c41193c6e49355970e6d027b91d45825
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 2 00:32:01 2010 +0000
+Date: Tue Nov 2 00:32:01 2010 +0000
make some more fields private
@@ -27427,7 +29449,7 @@
commit 6751eb48dc49890f7ad8b732b3fc29a2db746ec4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 2 00:26:08 2010 +0000
+Date: Tue Nov 2 00:26:08 2010 +0000
Make the destructor private
@@ -27438,7 +29460,7 @@
commit b718e821d5f21ea5b0c44c6c2b59769c9b94892a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 28 08:46:09 2010 +0100
+Date: Thu Oct 28 08:46:09 2010 +0100
Revert fdfffc9c68314d3f64dee7e0ef8617105e3198dd
@@ -27449,7 +29471,7 @@
commit 15b9aeac5a20c544db1aebe00113ebc2f7ba52c7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 28 00:37:29 2010 +0100
+Date: Thu Oct 28 00:37:29 2010 +0100
if reallocn fails, free p
@@ -27458,7 +29480,7 @@
commit 561c0567a5741d7c49903c51c8020187dccaa0d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 27 22:43:51 2010 +0100
+Date: Wed Oct 27 22:43:51 2010 +0100
fix comment
@@ -27467,7 +29489,7 @@
commit 4ef38cc99a879202e717447a422272cf85eeccfc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 27 22:36:07 2010 +0100
+Date: Wed Oct 27 22:36:07 2010 +0100
Fix memory leaks that can happen with broken documents
@@ -27476,7 +29498,7 @@
commit fdfffc9c68314d3f64dee7e0ef8617105e3198dd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 27 20:40:19 2010 +0100
+Date: Wed Oct 27 20:40:19 2010 +0100
Fix memory leak
@@ -27485,7 +29507,7 @@
commit 90d479d9d5c947175e60ab689f440ae9c24f0b2b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 27 20:39:48 2010 +0100
+Date: Wed Oct 27 20:39:48 2010 +0100
Do not crash if bitmap->alpha == NULL
@@ -27496,7 +29518,7 @@
commit 6ad36277971ec46d4a4ef0c45625e60f8c5f1247
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Oct 25 18:59:49 2010 +0100
+Date: Mon Oct 25 18:59:49 2010 +0100
Initialze movie to NULL on broken pdf files
@@ -27505,7 +29527,7 @@
commit 2d0b6e2956a81164bca6adc9aacad0e620480957
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 24 00:23:21 2010 +0100
+Date: Sun Oct 24 00:23:21 2010 +0100
Here the chars to read is the increment size not the initialSize
@@ -27516,7 +29538,7 @@
commit dcb02d2100136b6035485be3be214ce3d9f1c102
Author: Vincent Torri <vtorri at univ-evry.fr>
-Date: Sat Oct 23 23:45:05 2010 +0100
+Date: Sat Oct 23 23:45:05 2010 +0100
remove -ansi flag for cywin and mingw
@@ -27525,7 +29547,7 @@
commit 17cdc81224c72f7b58de61734c9ead337ff7b42b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 23:37:59 2010 +0100
+Date: Sat Oct 23 23:37:59 2010 +0100
update my C year
@@ -27534,7 +29556,7 @@
commit e09ddce7e21bbd62b384d9d59fbd1e0f14f7d05f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 23:33:00 2010 +0100
+Date: Sat Oct 23 23:33:00 2010 +0100
Fix crash in malformed documents
@@ -27543,7 +29565,7 @@
commit 906e4e15421d8f3f0a825ca767e5eac3169853d6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 23:12:44 2010 +0100
+Date: Sat Oct 23 23:12:44 2010 +0100
Do not leak attrs1
@@ -27552,7 +29574,7 @@
commit ec32bb45a57a8a839156c946fcde1270aa6019d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 23:00:03 2010 +0100
+Date: Sat Oct 23 23:00:03 2010 +0100
Do not crash if n is 0
@@ -27561,7 +29583,7 @@
commit 9edf7e4fefb37989af9a2558aaa83d7cd4694ec6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 22:59:50 2010 +0100
+Date: Sat Oct 23 22:59:50 2010 +0100
add unlikely marker
@@ -27570,7 +29592,7 @@
commit c46e863b7b94dc2f83a7d89f4afb8fe3bc8ec35c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 22:55:49 2010 +0100
+Date: Sat Oct 23 22:55:49 2010 +0100
Do not divide by 0 in rc4InitKey
@@ -27579,7 +29601,7 @@
commit bcb13ed5828e2a855efd5e38b2acd15ca37a9991
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 23 22:40:17 2010 +0100
+Date: Sat Oct 23 22:40:17 2010 +0100
Check obj2 is a num before reading it
@@ -27588,25 +29610,25 @@
commit c64a49307782299cb7a950a66419f9d59707f38b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 20 22:29:29 2010 +0100
+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 +-
+ 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 at hero.com>
-Date: Sun Oct 17 14:24:16 2010 +0100
+Date: Sun Oct 17 14:24:16 2010 +0100
Add -bbox option to pdftotext
- utils/pdftotext.1 | 4 ++
+ utils/pdftotext.1 | 4 ++
utils/pdftotext.cc | 125
++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 103 insertions(+), 26 deletions(-)
@@ -27613,7 +29635,7 @@
commit 71ec4c7a6715a40d536d1e4b911dae48d1bba7b9
Author: Pino Toscano <pino at kde.org>
-Date: Sun Oct 17 14:57:43 2010 +0200
+Date: Sun Oct 17 14:57:43 2010 +0200
[CMake] update MacroOptionalFindPackage.cmake from KDE SVN
@@ -27626,7 +29648,7 @@
commit ab0049d8be5dfe1989c4aa33c2732915c62fecb2
Author: Pino Toscano <pino at kde.org>
-Date: Sun Oct 17 14:29:22 2010 +0200
+Date: Sun Oct 17 14:29:22 2010 +0200
[CMake] Cairo package: make the version check really working
@@ -27635,7 +29657,7 @@
commit 1cea33717c92631ee9c417d9f89e32b03695c75a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Oct 17 13:55:58 2010 +0200
+Date: Sun Oct 17 13:55:58 2010 +0200
[CMake] Bump cairo dependency to 1.10
@@ -27646,7 +29668,7 @@
commit d6f49aa2da15cd2e9cf775d6b1d2d04a005c8cdd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 14:22:57 2010 +0200
+Date: Sun Oct 17 14:22:57 2010 +0200
[cairo] Fix a crash when redering documents with invalid type 3 fonts
@@ -27655,7 +29677,7 @@
commit e2fad550c3cbf86541730582151e1bb6470ed9c1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 13:47:33 2010 +0200
+Date: Sun Oct 17 13:47:33 2010 +0200
[glib-demo] Use poppler_page_get_selected_region() in selections demo
@@ -27665,7 +29687,7 @@
commit 88013458e141de58ed801480707ae0dfe92b9aa2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 13:46:26 2010 +0200
+Date: Sun Oct 17 13:46:26 2010 +0200
[glib] Add poppler_page_get_selected_region()
@@ -27672,25 +29694,25 @@
that returns a cairo_region_t, and deprecate
poppler_page_get_selection_region().
- glib/poppler-page.cc | 81
+ glib/poppler-page.cc | 81
+++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 4 ++
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-page.h | 4 ++
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 86 insertions(+)
commit fc9b85894754d175af916eaf6cb127efd601df7e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 12:54:18 2010 +0200
+Date: Sun Oct 17 12:54:18 2010 +0200
[configure] Bump cairo dependency to 1.10
- configure.ac | 2 +-
+ configure.ac | 2 +-
poppler/CairoOutputDev.cc | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
commit dd14ef6b211ac1c8a4f16bb6094dbfd6a09cbef9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 17 12:46:55 2010 +0100
+Date: Sun Oct 17 12:46:55 2010 +0100
Improve dict lookup speed for big dicts
@@ -27703,7 +29725,7 @@
commit bb38a0c71434413f2728109c73278de1b8a58571
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 12:52:01 2010 +0200
+Date: Sun Oct 17 12:52:01 2010 +0200
[glib-demo] Make glib demo program installable
@@ -27715,7 +29737,7 @@
commit d26d0fab2ddfff853f6681a3518813a2d65a4112
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 12:36:46 2010 +0200
+Date: Sun Oct 17 12:36:46 2010 +0200
[glib-demo] Use printing options in print demo
@@ -27725,7 +29747,7 @@
commit 4a71dcdd350d0c0515ca349f0b875b33289d25ee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 17 12:31:41 2010 +0200
+Date: Sun Oct 17 12:31:41 2010 +0200
[glib] Add poppler_page_render_for_printing_with_options()
@@ -27735,26 +29757,26 @@
- Print document and markup
- Print document and stamps
- glib/poppler-page.cc | 77
+ glib/poppler-page.cc | 77
++++++++++++++++++++++++++++++++-----
- glib/poppler-page.h | 3 ++
- glib/poppler.h | 19 +++++++++
- glib/reference/poppler-sections.txt | 4 ++
+ 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 at kde.org>
-Date: Sat Oct 16 15:09:05 2010 +0100
+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 ++++++++++
+ qt4/src/poppler-qt4.h | 10 ++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
commit 4bd25223c4d15dfa91965a6e86eaa444a5a81f71
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 16 15:08:05 2010 +0100
+Date: Sat Oct 16 15:08:05 2010 +0100
Do not omit this character
@@ -27765,20 +29787,20 @@
commit b604a008a2a379a21e5fdfa0799886f80d893a08
Author: Christian Feuersänger <cfeuersaenger at googlemail.com>
-Date: Thu Oct 14 23:56:36 2010 +0100
+Date: Thu Oct 14 23:56:36 2010 +0100
Improve rendering of Shading Type 6 and 7
poppler/Gfx.cc | 214
+++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Gfx.h | 9 ++-
- poppler/GfxState.cc | 96 ++++++++++++++++++++++-
+ poppler/Gfx.h | 9 ++-
+ poppler/GfxState.cc | 96 ++++++++++++++++++++++-
poppler/GfxState.h | 127 ++++++++++++++++++++++++++++++-
4 files changed, 398 insertions(+), 48 deletions(-)
commit c6bb63b31c268e4e842532e6839b15edb31cf25c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 14 23:33:13 2010 +0100
+Date: Thu Oct 14 23:33:13 2010 +0100
Only clip boxes to mediabox if we are at the page level
@@ -27789,7 +29811,7 @@
commit 4a248b3f523209ec16ace587229412653b2276d0
Author: Pino Toscano <pino at kde.org>
-Date: Thu Oct 14 18:32:05 2010 +0200
+Date: Thu Oct 14 18:32:05 2010 +0200
[cpp] make it compile also when there are no image formats available
@@ -27800,7 +29822,7 @@
commit de1501d87549269f9214c9e3fba4cbf39960826e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 13 19:18:36 2010 +0100
+Date: Wed Oct 13 19:18:36 2010 +0100
remove windows eol
@@ -27809,7 +29831,7 @@
commit 12e68b49feef10b654944dd71eab0852cfeceb89
Author: Pino Toscano <pino at kde.org>
-Date: Sun Oct 10 23:04:57 2010 +0200
+Date: Sun Oct 10 23:04:57 2010 +0200
[cpp] Add a new 'image' class.
@@ -27821,17 +29843,17 @@
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/CMakeLists.txt | 2 +
+ cpp/Makefile.am | 3 +
+ cpp/poppler-image-private.h | 48 +++++
+ cpp/poppler-image.cpp | 431
++++++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-image.h | 70 +++++++
+ cpp/poppler-image.h | 70 +++++++
5 files changed, 554 insertions(+)
commit db31687ba476e272b72625a8a78b50780522ee7d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Oct 9 10:33:06 2010 +0200
+Date: Sat Oct 9 10:33:06 2010 +0200
[glib] docs: Document poppler_annot_markup_get_date()
@@ -27840,7 +29862,7 @@
commit a7cf8d322a4a687c9810a577cc92ff6b9725ecdc
Author: Fernando Herrera <fherrera at onirica.com>
-Date: Thu Oct 7 17:28:31 2010 +0200
+Date: Thu Oct 7 17:28:31 2010 +0200
[glib] Fix introspection annotations for poppler_document_get_page*()
@@ -27852,7 +29874,7 @@
commit d690bea929553d1a4392d42d949843e9467ba8cb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 5 22:18:22 2010 +0100
+Date: Tue Oct 5 22:18:22 2010 +0100
Make sure obj is a num before reading it
@@ -27865,7 +29887,7 @@
commit b17be2bc32cf71bac0473bf4ac16359e3027b4fc
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 3 12:14:11 2010 +0200
+Date: Sun Oct 3 12:14:11 2010 +0200
[annots] Fix a crash when drawing square/circle annots without
a border
@@ -27878,7 +29900,7 @@
commit e3d3944c1988343704e3ba3a5d60609719466afb
Author: Tomas Hoger <thoger at redhat.com>
-Date: Wed Sep 29 20:03:45 2010 +0100
+Date: Wed Sep 29 20:03:45 2010 +0100
Fix uninitialized uses on DCTScanInfo
@@ -27887,7 +29909,7 @@
commit f380647f09d88339c936184bbe86c70c0d47de4b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 29 20:02:10 2010 +0100
+Date: Wed Sep 29 20:02:10 2010 +0100
Free names
@@ -27896,7 +29918,7 @@
commit aa0fd32a8501473832bce1b8b804dd3f9a45735b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 27 22:39:09 2010 +0100
+Date: Mon Sep 27 22:39:09 2010 +0100
Consider render value when colorizing text
@@ -27904,9 +29926,9 @@
poppler/CairoOutputDev.cc | 18 +++---------------
poppler/CairoOutputDev.h | 2 --
- poppler/Gfx.cc | 21 +++++++++++++++++----
+ poppler/Gfx.cc | 21 +++++++++++++++++----
poppler/PSOutputDev.cc | 26 ++++++++++----------------
- poppler/PSOutputDev.h | 3 +--
+ poppler/PSOutputDev.h | 3 +--
poppler/SplashOutputDev.cc | 18 +++---------------
poppler/SplashOutputDev.h | 4 +---
7 files changed, 35 insertions(+), 57 deletions(-)
@@ -27913,7 +29935,7 @@
commit cf710b999b510203e9348ea9f04360be1fe957b8
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 24 00:50:37 2010 +0200
+Date: Fri Sep 24 00:50:37 2010 +0200
[Qt4] enable the generation of the QCH file
@@ -27924,13 +29946,13 @@
commit be6d933071c9ab043f01f374a884472c4ce3007e
Author: Pino Toscano <pino at kde.org>
-Date: Thu Sep 23 15:55:45 2010 +0200
+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 ++++--
+ cpp/Doxyfile | 155 ++++--
qt4/src/Doxyfile | 1469
+++++++++++++++++++++++++++++++++---------------------
2 files changed, 1018 insertions(+), 606 deletions(-)
@@ -27937,19 +29959,19 @@
commit 721da3d542ab9b234b058f3c14ea9303d748107e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Sep 23 14:09:11 2010 +0200
+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/demo/info.cc | 8 ++++++--
glib/poppler-document.cc | 33 ++++++++++++++-------------------
2 files changed, 20 insertions(+), 21 deletions(-)
commit 4ffc0ed73397e4e58f04c3577b093a3fd39c22bd
Author: Pino Toscano <pino at kde.org>
-Date: Thu Sep 23 02:21:12 2010 +0200
+Date: Thu Sep 23 02:21:12 2010 +0200
[cpp] small clarification in document::load_from_data() apidox
@@ -27958,7 +29980,7 @@
commit 9491dc4a10706109d0f2b4d15f21b9a1db51d8c9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Sep 23 02:18:07 2010 +0200
+Date: Thu Sep 23 02:18:07 2010 +0200
[cpp] add document::load_from_raw_data()
@@ -27970,14 +29992,14 @@
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.cpp | 53
++++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-document.h | 4 ++++
+ cpp/poppler-document.h | 4 ++++
3 files changed, 62 insertions(+)
commit a3c1f2d5ea1de969e9aaaa84ee38866938b4ce0c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 22 20:14:27 2010 +0100
+Date: Wed Sep 22 20:14:27 2010 +0100
fix copyright
@@ -27987,19 +30009,19 @@
commit 1aad013e353a9e59bdab8a1b4ce93f2ad7aaf4f2
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 22 17:07:38 2010 +0200
+Date: Wed Sep 22 17:07:38 2010 +0200
update copyrights
- cpp/poppler-document.h | 2 +-
+ cpp/poppler-document.h | 2 +-
cpp/poppler-page-transition.cpp | 2 +-
- cpp/poppler-private.cpp | 2 +-
- cpp/poppler-rectangle.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 at kde.org>
-Date: Wed Sep 22 17:07:13 2010 +0200
+Date: Wed Sep 22 17:07:13 2010 +0200
[cpp/tests] poppler-dump: show the PDF IDs, if available
@@ -28008,7 +30030,7 @@
commit e39fde1b62544b90e73a2fc3609a260991db3a47
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 22 16:52:08 2010 +0200
+Date: Wed Sep 22 16:52:08 2010 +0200
[cpp] add document::get_pdf_id()
@@ -28020,7 +30042,7 @@
commit 299a1849a148fa0a7b3171c45ec68b9901aa93bb
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 22 16:36:30 2010 +0200
+Date: Wed Sep 22 16:36:30 2010 +0200
[Qt4] add Document::getPdfId()
@@ -28029,7 +30051,7 @@
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/src/poppler-qt4.h | 14 +++++++++++++
qt4/tests/check_metadata.cpp | 50
++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 80 insertions(+)
@@ -28036,7 +30058,7 @@
commit dd9bcdb720ac1bf8a022635bcbb3b56e4b75bb15
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 22 16:29:46 2010 +0200
+Date: Wed Sep 22 16:29:46 2010 +0200
Make the internal get_id() not fail because of null bytes in the ID.
@@ -28053,7 +30075,7 @@
commit 9554cbc3cb4fc0cd7ad2295f5d27a18e030c6aee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Sep 22 12:54:25 2010 +0200
+Date: Wed Sep 22 12:54:25 2010 +0200
[glib-demo] Show form field names in forms demo
@@ -28062,7 +30084,7 @@
commit 257634b26b682628dba5ee5f94cb0bad030bcb4f
Author: Mark Riedesel <mark at klowner.com>
-Date: Wed Sep 22 12:52:49 2010 +0200
+Date: Wed Sep 22 12:52:49 2010 +0200
[glib] Add methods to get mapping, partial an fully qualified form
field names
@@ -28069,15 +30091,15 @@
See bug #28780.
- glib/poppler-form-field.cc | 68
+ glib/poppler-form-field.cc | 68
+++++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h | 3 ++
- glib/reference/poppler-sections.txt | 3 ++
+ glib/poppler-form-field.h | 3 ++
+ glib/reference/poppler-sections.txt | 3 ++
3 files changed, 74 insertions(+)
commit 6db98abc59c154dcb18d69fc37e44ce804c3ccc9
Author: Mark Riedesel <mark at klowner.com>
-Date: Wed Sep 22 12:41:16 2010 +0200
+Date: Wed Sep 22 12:41:16 2010 +0200
Add getLabel method to FormWidget
@@ -28090,7 +30112,7 @@
commit bcdca66fd57439735e0b9aa182ab7cfce29e9ed0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Sep 21 11:49:37 2010 +0200
+Date: Tue Sep 21 11:49:37 2010 +0200
[glib] Fix minimum value of creation and modification date properties
@@ -28101,7 +30123,7 @@
commit d2578bd66129466b2dd114b6407c147598e09d2b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:19:27 2010 +0100
+Date: Tue Sep 21 19:19:27 2010 +0100
Avoid loops in Form::fieldLookup
@@ -28114,7 +30136,7 @@
commit 2fe825deac055be82b220d0127169cb3d61387a8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:15:25 2010 +0100
+Date: Tue Sep 21 19:15:25 2010 +0100
Make sure obj1 is a num before reading it
@@ -28126,7 +30148,7 @@
commit 473de6f88a055bb03470b4af5fa584be8cb5fda4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:11:42 2010 +0100
+Date: Tue Sep 21 19:11:42 2010 +0100
Fix memory leak if obj2 is not a dict
@@ -28137,7 +30159,7 @@
commit 9706e28657ff7ea52aa69d9efb3f91d0cfaee70b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:09:37 2010 +0100
+Date: Tue Sep 21 19:09:37 2010 +0100
Fix crash when idx is out of range
@@ -28148,7 +30170,7 @@
commit 26a5817ffec9f05ac63db6c5cd5b1f0871d271c7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:08:54 2010 +0100
+Date: Tue Sep 21 19:08:54 2010 +0100
Fix crash when idx is out of range
@@ -28160,7 +30182,7 @@
commit dfdf3602bde47d1be7788a44722c258bfa0c6d6e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:07:12 2010 +0100
+Date: Tue Sep 21 19:07:12 2010 +0100
Give a value to color.c[i]
@@ -28174,7 +30196,7 @@
commit 01c85c08305bae16242f5979ab107fa5bb5f5100
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:04:37 2010 +0100
+Date: Tue Sep 21 19:04:37 2010 +0100
Forgot my (C) here
@@ -28183,7 +30205,7 @@
commit bf2055088a3a2d3bb3d3c37d464954ec1a25771f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:03:19 2010 +0100
+Date: Tue Sep 21 19:03:19 2010 +0100
Properly initialize stack
@@ -28195,7 +30217,7 @@
commit e853106b58d6b4b0467dbd6436c9bb1cfbd372cf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 19:01:36 2010 +0100
+Date: Tue Sep 21 19:01:36 2010 +0100
Properly initialize parser
@@ -28207,7 +30229,7 @@
commit 3422638b2a39cbdd33a114a7d7debc0a5f688501
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 18:58:43 2010 +0100
+Date: Tue Sep 21 18:58:43 2010 +0100
Fix crash in broken pdf (parser->getStream() is 0)
@@ -28218,7 +30240,7 @@
commit a2dab0238a69240dad08eca2083110b52ce488b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 18:55:51 2010 +0100
+Date: Tue Sep 21 18:55:51 2010 +0100
Initialize properly charactersRead
@@ -28230,7 +30252,7 @@
commit 39d140bfc0b8239bdd96d6a55842034ae5c05473
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 18:54:31 2010 +0100
+Date: Tue Sep 21 18:54:31 2010 +0100
Fix crash in broken pdf (code < 0)
@@ -28241,7 +30263,7 @@
commit c6a091512745771894b54a71613fd6b5ca1adcb3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 21 18:50:25 2010 +0100
+Date: Tue Sep 21 18:50:25 2010 +0100
Fix memory leak
@@ -28252,7 +30274,7 @@
commit 9b6ddb68b80ef19cd2615900bd24da76374003d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 20 19:47:47 2010 +0100
+Date: Mon Sep 20 19:47:47 2010 +0100
Fix copyright
@@ -28262,29 +30284,29 @@
commit fa3abc23656204eedd022ee1c73d9e5af758cdac
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 22:20:09 2010 +0200
+Date: Fri Sep 17 22:20:09 2010 +0200
[cpp] More bits of API documentation.
- cpp/poppler-global.cpp | 124
+ cpp/poppler-global.cpp | 124
++++++++++++++++++++++++++++++++++++++++
cpp/poppler-page-transition.cpp | 32 +++++++++++
- cpp/poppler-rectangle.cpp | 19 ++++++
+ cpp/poppler-rectangle.cpp | 19 ++++++
3 files changed, 175 insertions(+)
commit c5f7b5becc9993c05b67a470d5a1e431806b98d6
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 20:26:37 2010 +0200
+Date: Fri Sep 17 20:26:37 2010 +0200
update copyrights
- qt4/src/poppler-private.cc | 2 +-
+ qt4/src/poppler-private.cc | 2 +-
qt4/tests/check_strings.cpp | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
commit ae517042570327b860c1db6b68f9697d5c104657
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 19:39:10 2010 +0200
+Date: Fri Sep 17 19:39:10 2010 +0200
[cpp] improve a bit the Unicode* -> ustring conversion
@@ -28295,7 +30317,7 @@
commit f4c6ef88f01f6763943a3e6e006e52dbea0b149c
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 16:07:05 2010 +0200
+Date: Fri Sep 17 16:07:05 2010 +0200
[Qt4/tests] check_strings: add a new test case for
QStringToUnicodeGooString
@@ -28307,7 +30329,7 @@
commit ffd227b7669895325d752009d5185973cf86ce5b
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 14:25:57 2010 +0200
+Date: Fri Sep 17 14:25:57 2010 +0200
[Qt4] optimize UnicodeParsedString using less memory from QString
@@ -28326,7 +30348,7 @@
commit 6180890008f2b1814f092f50b8f75376399905ba
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 13:23:25 2010 +0200
+Date: Fri Sep 17 13:23:25 2010 +0200
[Qt4/tests] check_strings: add a test case for UnicodeParsedString
@@ -28338,7 +30360,7 @@
commit c5f78d7d3953d62a746c6f5a90085ea020fe5ec7
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 12:54:32 2010 +0200
+Date: Fri Sep 17 12:54:32 2010 +0200
[Qt4/tests] check_string: use a pool of GooString
@@ -28351,7 +30373,7 @@
commit 0cd5a256bdf7778c0c720941a611ad8ab56fa2e9
Author: Pino Toscano <pino at kde.org>
-Date: Fri Sep 17 00:27:53 2010 +0200
+Date: Fri Sep 17 00:27:53 2010 +0200
[Qt4/tests] first version of a unit test for strings
@@ -28365,8 +30387,8 @@
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/CMakeLists.txt | 3 ++
+ qt4/tests/Makefile.am | 7 ++-
qt4/tests/check_strings.cpp | 101
++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+), 1 deletion(-)
@@ -28373,7 +30395,7 @@
commit c6e8b21c9829672e6ca42e6cdc0ca631a06af73f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 17 13:44:38 2010 +0200
+Date: Fri Sep 17 13:44:38 2010 +0200
[glib] docs: Document PopplerDocument properties
@@ -28383,7 +30405,7 @@
commit d4a6c17255821925906c17b79b88eebed9edfee1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 17 13:04:33 2010 +0200
+Date: Fri Sep 17 13:04:33 2010 +0200
[glib] Add accessor for all PopplerDocument properties
@@ -28390,16 +30412,16 @@
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/demo/info.cc | 8 +-
+ glib/poppler-document.cc | 532
+++++++++++++++++++++++++++++-------
- glib/poppler-document.h | 74 +++--
- glib/reference/poppler-sections.txt | 16 ++
+ 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 at gnome.org>
-Date: Fri Sep 17 10:38:14 2010 +0200
+Date: Fri Sep 17 10:38:14 2010 +0200
[glib-demo] Show permanent/update ID in document info demo
@@ -28408,19 +30430,19 @@
commit bfaf8f3cc62f28c6255d42680b9464ab9973737e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 17 10:37:32 2010 +0200
+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.cc | 52
+++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 3 +++
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-document.h | 3 +++
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 56 insertions(+)
commit b15641677447b2e89853a667fc34bcca1383a97a
Author: srinivas adicherla <srinivas.adicherla at gmail.com>
-Date: Fri Sep 17 10:36:22 2010 +0200
+Date: Fri Sep 17 10:36:22 2010 +0200
Add a method to get the PDF file identifier
@@ -28431,7 +30453,7 @@
commit 3b4a901a4431814590449b6cd5ea418f4d6c1172
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 16 23:23:03 2010 +0100
+Date: Thu Sep 16 23:23:03 2010 +0100
Add -s option
@@ -28440,45 +30462,45 @@
OSSD CDAC Mumbai by Leena Chourey (leenac at cdacmumbai.in) and Onkar
Potdar (onkar at cdacmumbai.in)
- utils/HtmlFonts.cc | 11 +++++--
- utils/HtmlFonts.h | 18 +++++++++--
+ utils/HtmlFonts.cc | 11 +++++--
+ utils/HtmlFonts.h | 18 +++++++++--
utils/HtmlOutputDev.cc | 84
+++++++++++++++++++++++++++++++-------------------
- utils/pdftohtml.1 | 3 ++
- utils/pdftohtml.cc | 15 +++++++--
+ utils/pdftohtml.1 | 3 ++
+ utils/pdftohtml.cc | 15 +++++++--
5 files changed, 93 insertions(+), 38 deletions(-)
commit 2792330f6caeeb42e2996271456b562489215c4c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 15 22:42:09 2010 +0100
+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 +-
+ 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 +-
+ qt4/src/Makefile.am | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
commit 1cf56c732b63d0a310bc45b8e4b3f3f357a42cb1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 15 20:56:42 2010 +0100
+Date: Wed Sep 15 20:56:42 2010 +0100
0.15.0 in the versions
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Wed Sep 15 20:56:34 2010 +0100
+Date: Wed Sep 15 20:56:34 2010 +0100
0.15.0 NEWS
@@ -28488,7 +30510,7 @@
commit c01a17745c04aef3e6f2225679c867a03e731e83
Author: Pino Toscano <pino at kde.org>
-Date: Thu Sep 16 20:55:56 2010 +0200
+Date: Thu Sep 16 20:55:56 2010 +0200
[CMake] disable the GObject introspection system
@@ -28500,7 +30522,7 @@
commit 9be7d3143b12f291409f88f3d725a239934b205e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 15 19:19:30 2010 +0100
+Date: Wed Sep 15 19:19:30 2010 +0100
update copyright
@@ -28509,7 +30531,7 @@
commit b9333529bba43a71655fdbf1919ba515f7df9ca3
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 15 17:23:54 2010 +0200
+Date: Wed Sep 15 17:23:54 2010 +0200
[cpp/tests] poppler-dump: convert out_ustring() to an
operator<<(std::ostream&)
@@ -28522,7 +30544,7 @@
commit a44f711b4412332875337e9fb7509f18db806ddc
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 15 16:44:30 2010 +0200
+Date: Wed Sep 15 16:44:30 2010 +0200
[cpp/tests] poppler-dump: add a "--show-text <physical|raw>" option
@@ -28533,7 +30555,7 @@
commit 0094c9372b5b439af2564d83d6fb7439f4bdba88
Author: Pino Toscano <pino at kde.org>
-Date: Wed Sep 15 13:19:13 2010 +0200
+Date: Wed Sep 15 13:19:13 2010 +0200
[cpp] add a new page::text() for specifying a layout mode
@@ -28549,7 +30571,7 @@
commit 4ec3e7784cdba5c0720b1992ba500e97a7e0ed2b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Sep 15 11:24:07 2010 +0200
+Date: Wed Sep 15 11:24:07 2010 +0200
Set initial state of optional content groups based on BaseState field
@@ -28560,7 +30582,7 @@
commit f49aa86812ed8ad91d41c675bc670b3d88d3444a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 13 14:37:10 2010 +0200
+Date: Mon Sep 13 14:37:10 2010 +0200
[glib] doc: Document PopplerPage:label property
@@ -28569,7 +30591,7 @@
commit f41fe7ae6e374100574c49d1bb7a3ddc646786c8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 13 14:36:43 2010 +0200
+Date: Mon Sep 13 14:36:43 2010 +0200
[glib] doc: Add poppler_page_get_label to poppler-sections.txt
@@ -28578,7 +30600,7 @@
commit 91b8246766a8e5d9cca385b5854667d7967a9d71
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 13 14:22:56 2010 +0200
+Date: Mon Sep 13 14:22:56 2010 +0200
[glib-demo] Use poppler_page_get_label() instead of g_object_get()
@@ -28587,7 +30609,7 @@
commit b82412ef86091f4d249c818cebf00e4c59bae311
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 13 14:22:03 2010 +0200
+Date: Mon Sep 13 14:22:03 2010 +0200
[glib] Add poppler_page_get_label()
@@ -28599,18 +30621,18 @@
commit ff88abf61f4bf90ad276a8593be1818d39c8ecac
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 13 10:05:45 2010 +0200
+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-page.cc | 2 ++
glib/poppler-private.h | 3 +++
3 files changed, 7 insertions(+)
commit 53324502898ae5fbbb21a4fb819e4a84acdc1a64
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 12 11:42:03 2010 +0200
+Date: Sun Sep 12 11:42:03 2010 +0200
[glib] Fix a crash when building layer actions
@@ -28622,7 +30644,7 @@
commit dfc6ea7877635212aa7c5f7ade07af4aa9467e96
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 12 11:36:58 2010 +0200
+Date: Sun Sep 12 11:36:58 2010 +0200
[glib] Fix layers array generation when it contains multiple arrays
@@ -28633,7 +30655,7 @@
commit 7574912b6c0ff0421c69b6e8c6835957d5126d7d
Author: Jonathan Liu <net147 at gmail.com>
-Date: Thu Sep 9 20:34:03 2010 +0100
+Date: Thu Sep 9 20:34:03 2010 +0100
Fix checking whether _WIN32 is defined
@@ -28640,12 +30662,12 @@
Bug 29329
poppler/StdinCachedFile.cc | 2 +-
- utils/pdftoppm.cc | 2 +-
+ utils/pdftoppm.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 2fc83068c32e09fa3de03a157a420490431ea706
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 5 14:26:27 2010 +0100
+Date: Sun Sep 5 14:26:27 2010 +0100
Increase the number of cached glyphs for small sizes
@@ -28658,7 +30680,7 @@
commit 0d96f74f31171c58a55e4ac36d492ce36dd5e7c5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 5 12:31:57 2010 +0100
+Date: Sun Sep 5 12:31:57 2010 +0100
Use std::sort instead of qsort
@@ -28666,8 +30688,8 @@
Passes regression tests
Based on Paweł Wiejacha patches
- poppler/GfxFont.cc | 17 +++++++---------
- splash/SplashXPath.cc | 48
+ poppler/GfxFont.cc | 17 +++++++---------
+ splash/SplashXPath.cc | 48
++++++++++++++++++++++++++++----------------
splash/SplashXPathScanner.cc | 10 +++++----
3 files changed, 44 insertions(+), 31 deletions(-)
@@ -28674,7 +30696,7 @@
commit 3b4816b2b8caa0e2baafbe4c0eb1e45e452d01ce
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 1 20:43:35 2010 +0100
+Date: Wed Sep 1 20:43:35 2010 +0100
forgot the file
@@ -28683,17 +30705,17 @@
commit b0db93c71a83946aa3e02bae6b396223dcca19d1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 1 20:43:14 2010 +0100
+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 ++++-
+ qt4/src/poppler-qt4.h | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
commit a86f9d90be99a36c41c6932fb4d9a202c4ff6d05
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 1 20:20:48 2010 +0100
+Date: Wed Sep 1 20:20:48 2010 +0100
Clarify the ownership
@@ -28702,20 +30724,20 @@
commit 33ad3a17ac26879fcd6a7fad2023dd219bc5919f
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Wed Sep 1 20:19:54 2010 +0100
+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/src/poppler-qt4.h | 19 +++++++++++++++++++
qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 7 ++++++-
+ qt4/tests/Makefile.am | 7 ++++++-
5 files changed, 55 insertions(+), 6 deletions(-)
commit 46e89248b3c5b1789baa3bd9bfa012570720ddb5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 1 19:54:02 2010 +0100
+Date: Wed Sep 1 19:54:02 2010 +0100
quadding is not a GBool but an int
@@ -28725,7 +30747,7 @@
commit ae79fc504c5424be2fa21dbc5498ced4db6e5dd3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 31 22:14:57 2010 +0100
+Date: Tue Aug 31 22:14:57 2010 +0100
Make GBool a bool instead of an int
@@ -28732,20 +30754,17 @@
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(-)
+ 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 => parseargs.cc} | 0
+ 6 files changed, 8 insertions(+), 7 deletions(-)
commit d3f32f2c4f9f46620c0287c44bef686f340461f3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 31 18:51:17 2010 +0100
+Date: Tue Aug 31 18:51:17 2010 +0100
Read from the correct variable
@@ -28756,7 +30775,7 @@
commit 681bb38eafc720b309172ed7c650439c559663a0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 26 23:55:58 2010 +0100
+Date: Thu Aug 26 23:55:58 2010 +0100
Make declaration match what there is in the .cc file
@@ -28765,7 +30784,7 @@
commit c91e869304fc263c52f21ee484a57a6f1900f6b2
Author: Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
-Date: Thu Aug 26 19:40:46 2010 +0100
+Date: Thu Aug 26 19:40:46 2010 +0100
Add -r option to pdftohtml
@@ -28777,7 +30796,7 @@
commit 9b4be586640b4ad344b1b3ed4c9cda8351257f0c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 25 19:26:30 2010 +0100
+Date: Wed Aug 25 19:26:30 2010 +0100
Use 3 not nComps
@@ -28786,7 +30805,7 @@
commit 218f67c527fb41babf2703ba068d072f8326e37b
Author: Paweł Wiejacha <pawel.wiejacha at gmail.com>
-Date: Tue Aug 24 23:47:06 2010 +0100
+Date: Tue Aug 24 23:47:06 2010 +0100
Make SplashOutputDev::imageSrc faster
@@ -28797,7 +30816,7 @@
commit 868f4a1f22051b7978f47a0614f23fd66dbb7ca8
Author: Paweł Wiejacha <pawel.wiejacha at gmail.com>
-Date: Tue Aug 24 23:35:21 2010 +0100
+Date: Tue Aug 24 23:35:21 2010 +0100
Make GfxICCBasedColorSpace::getRGBLine faster
@@ -28804,12 +30823,12 @@
By calling doTransform less
poppler/GfxState.cc | 15 +++++++--------
- poppler/GfxState.h | 4 +++-
+ poppler/GfxState.h | 4 +++-
2 files changed, 10 insertions(+), 9 deletions(-)
commit 46e37c54c6365cf37dc1e223a3c146e7b96a56af
Author: Paweł Wiejacha <pawel.wiejacha at gmail.com>
-Date: Tue Aug 24 21:23:34 2010 +0100
+Date: Tue Aug 24 21:23:34 2010 +0100
Do not call pow three times when one is enough
@@ -28818,13 +30837,13 @@
commit 8591c804598576556c6d24a66b6648de8ed1c4eb
Author: Mike Slegeir <tehpola at yahoo.com>
-Date: Sun Aug 22 22:01:03 2010 +0100
+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.1 | 8 +-
utils/pdftohtml.cc | 210
++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 158 insertions(+), 60 deletions(-)
@@ -28831,7 +30850,7 @@
commit 7fc3c21a8c5d6cf8517100427b182887a9569ed0
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Fri Aug 20 20:24:31 2010 +0100
+Date: Fri Aug 20 20:24:31 2010 +0100
Fix failure to parse PDF with damaged internal structure
@@ -28845,7 +30864,7 @@
commit bedf48d4397ae412a6d28fc8fea16cc23a29f07c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 17 22:02:59 2010 +0100
+Date: Tue Aug 17 22:02:59 2010 +0100
use memset instead of a for
@@ -28854,23 +30873,23 @@
commit 03ca5b4a5c9964d9c0e9913eb2061692848c4b95
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 10 19:55:31 2010 +0100
+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 +-
+ 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 at gmail.com>
-Date: Tue Aug 10 19:42:40 2010 +0100
+Date: Tue Aug 10 19:42:40 2010 +0100
Tell windows we are writing/reading binary data
@@ -28877,12 +30896,12 @@
Bug #29329
poppler/StdinCachedFile.cc | 9 +++++++++
- utils/pdftoppm.cc | 9 +++++++++
+ utils/pdftoppm.cc | 9 +++++++++
2 files changed, 18 insertions(+)
commit bdd617f2177a7836f6b6686fde892664513a32a7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 3 13:05:26 2010 +0200
+Date: Tue Aug 3 13:05:26 2010 +0200
[glib] Fix a crash when a layer doesn't have a name
@@ -28893,7 +30912,7 @@
commit e9f0646ca664cc27825f7e084f8419fe0de1fcfc
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 3 13:02:52 2010 +0200
+Date: Tue Aug 3 13:02:52 2010 +0200
Catalog page array might contain NULL for some pages in invalid
documents
@@ -28906,7 +30925,7 @@
commit 842209782ca3ba8c1c783cccf565372a18b3fda5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 30 19:29:12 2010 +0100
+Date: Fri Jul 30 19:29:12 2010 +0100
Do not crash when using pdftops in some files
@@ -28918,7 +30937,7 @@
commit 0dd7c80b7baf2622eb4780a867c4dc6291773f3b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 26 23:58:26 2010 +0100
+Date: Mon Jul 26 23:58:26 2010 +0100
Do not overwrite the rgb values
@@ -28930,7 +30949,7 @@
commit 627edf88c8f5c073a68bd05990df56e1af547292
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 25 13:56:03 2010 +0200
+Date: Sun Jul 25 13:56:03 2010 +0200
[annots] Fix a crash when adding a new annotation and annots object
is an array
@@ -28944,7 +30963,7 @@
commit 5d86f9b600b1e10de93bcaf1b925fadbc2a47522
Author: mpsuzuki <mpsuzuki at hiroshima-u.ac.jp>
-Date: Sat Jul 24 15:12:05 2010 +0100
+Date: Sat Jul 24 15:12:05 2010 +0100
reindent correctly
@@ -28953,7 +30972,7 @@
commit d0a6f9abdab88ec43004b6766337db304cbf6a25
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jul 22 21:28:55 2010 +0200
+Date: Thu Jul 22 21:28:55 2010 +0200
[CMake] improve the way include dirs and cflags for gdk and gtk
are set
@@ -28961,13 +30980,13 @@
correctly include_directories() for the include dirs, while add the
cflags which are not include dirs as definitions
- glib/CMakeLists.txt | 5 +++--
+ glib/CMakeLists.txt | 5 +++--
glib/demo/CMakeLists.txt | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
commit 02d85dd2cc154dbb6caa04a349532033d833edd1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 20 13:53:56 2010 +0200
+Date: Tue Jul 20 13:53:56 2010 +0200
[glib-demo] Add support for adding annots in annot demo
@@ -28977,7 +30996,7 @@
commit 969cb850f5c2bc31de82c591b2b3210b5cfabf5f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 20 13:53:29 2010 +0200
+Date: Tue Jul 20 13:53:29 2010 +0200
[glib] docs: Add new symbols to poppler-sections.txt
@@ -28986,30 +31005,30 @@
commit 251959438b6257fe71ed58e79eec60cda68a66cf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 20 13:53:00 2010 +0200
+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 ++
+ glib/poppler-page.cc | 19 +++++++++++++++++++
+ glib/poppler-page.h | 2 ++
3 files changed, 25 insertions(+), 3 deletions(-)
commit 78a4f6976e708f2cc23aac49fbff0faf00e74bc3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 20 13:51:16 2010 +0200
+Date: Tue Jul 20 13:51:16 2010 +0200
[glib] annots: Add several setter methods
- glib/poppler-annot.cc | 278
+ glib/poppler-annot.cc | 278
++++++++++++++++++++++++++++++++++++++++++++-----
- glib/poppler-annot.h | 26 +++++
+ glib/poppler-annot.h | 26 +++++
glib/poppler-private.h | 6 ++
3 files changed, 285 insertions(+), 25 deletions(-)
commit fee488c9db60ab691ce9ff5eef284be2af897aee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 18 11:26:59 2010 +0200
+Date: Sun Jul 18 11:26:59 2010 +0200
[annots] Add AnnotMarkup::setOpacity
@@ -29019,7 +31038,7 @@
commit d15a355ede2d8510c4df847ea0b92b5357b29914
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 18 09:57:35 2010 +0200
+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
@@ -29031,25 +31050,25 @@
commit 49ffb46db3118db874d2d9830bb034762d625c61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 19 16:31:54 2010 +0100
+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
+ CMakeLists.txt | 1 -
+ config.h.cmake | 3 ---
+ configure.ac | 4 ---
+ goo/gmem.cc | 56
++++++++++++------------------------------
- goo/gmem.h | 38 +++++++++-------------------
+ goo/gmem.h | 38 +++++++++-------------------
poppler/poppler-config.h.cmake | 5 ----
- poppler/poppler-config.h.in | 5 ----
+ poppler/poppler-config.h.in | 5 ----
7 files changed, 27 insertions(+), 85 deletions(-)
commit dd2e9399868e3dbf2fa4ede050f8d74d29ebbbb4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 19 16:31:43 2010 +0100
+Date: Mon Jul 19 16:31:43 2010 +0100
add uninstalled.pc to ignore
@@ -29058,7 +31077,7 @@
commit d1033006aae381a0f075e02d54638a1af997caf3
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 17 21:46:14 2010 +0200
+Date: Sat Jul 17 21:46:14 2010 +0200
add FindGObjectIntrospection.cmake and
GObjectIntrospectionMacros.cmake to the dist
@@ -29068,7 +31087,7 @@
commit ce8d03950736cc35d035a44a7d88e5f2a9defa74
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 17 21:39:08 2010 +0200
+Date: Sat Jul 17 21:39:08 2010 +0200
[CMake/glib] add support for gobject-introspection
@@ -29083,16 +31102,16 @@
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 +++++++++++++++++
+ CMakeLists.txt | 5 +-
+ cmake/modules/FindGObjectIntrospection.cmake | 61 +++++++++++++++++
cmake/modules/GObjectIntrospectionMacros.cmake | 94
++++++++++++++++++++++++++
- glib/CMakeLists.txt | 36 ++++++++++
+ glib/CMakeLists.txt | 36 ++++++++++
4 files changed, 194 insertions(+), 2 deletions(-)
commit 78bf43d8e11aa52db9862af118c597e117d31083
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 17 20:28:58 2010 +0200
+Date: Sat Jul 17 20:28:58 2010 +0200
[CMake] properly use the glib2 include dirs
@@ -29106,7 +31125,7 @@
commit 6f3082d677bc62aa3f8124132e3e337c01be2629
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 17 19:28:09 2010 +0200
+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
@@ -29116,7 +31135,7 @@
commit 2a252dd9b05857bbd10dee235e873886fc74ec17
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 17 14:57:38 2010 +0200
+Date: Sat Jul 17 14:57:38 2010 +0200
[CMake] add stub message and TODO for the gobject-introspection
support
@@ -29126,7 +31145,7 @@
commit 8a3d1794a8ef5d525bb454755fec018e3fcb3816
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 16 14:00:32 2010 +0100
+Date: Fri Jul 16 14:00:32 2010 +0100
update
@@ -29135,7 +31154,7 @@
commit 31ac578942b82cbd16b064abca586ccb89dfa7ce
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 15 15:05:10 2010 +0200
+Date: Thu Jul 15 15:05:10 2010 +0200
Rework ChangeLog generation to fix make distcheck
@@ -29144,7 +31163,7 @@
commit 5da5825ecab63089a19aac694826271019a94e6d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 15 15:03:20 2010 +0200
+Date: Thu Jul 15 15:03:20 2010 +0200
[glib] docs: Add version.xml to content_files var
@@ -29153,7 +31172,7 @@
commit fe69b474ae63c9d5d2538db9e51e666dd6ea9fb3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 15 10:51:21 2010 +0100
+Date: Thu Jul 15 10:51:21 2010 +0100
Fix padding of names
@@ -29166,24 +31185,24 @@
commit e265ae2d8a46df00ab1bbd863f01f652068d265f
Author: Brian Cameron <brian.cameron at oracle.com>
-Date: Wed Jul 14 20:26:25 2010 +0100
+Date: Wed Jul 14 20:26:25 2010 +0100
Add uninstalled .pc file for poppler when using autoconf
- Makefile.am | 9 ++++++++-
- configure.ac | 9 ++++++++-
+ Makefile.am | 9 ++++++++-
+ configure.ac | 9 ++++++++-
poppler-cairo-uninstalled.pc.in | 6 ++++++
- poppler-cpp-uninstalled.pc.in | 7 +++++++
+ 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-qt-uninstalled.pc.in | 7 +++++++
+ poppler-qt4-uninstalled.pc.in | 7 +++++++
poppler-splash-uninstalled.pc.in | 7 +++++++
- poppler-uninstalled.pc.in | 6 ++++++
+ poppler-uninstalled.pc.in | 6 ++++++
9 files changed, 63 insertions(+), 2 deletions(-)
commit 552ab99e60fe4068be8e4e415924e4be289e47cd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 13 10:18:01 2010 +0200
+Date: Tue Jul 13 10:18:01 2010 +0200
Handle ColorTransform in DCT streams when using libjpeg
@@ -29195,7 +31214,7 @@
commit 8a6697f89625106f3c373dbc7b4dc521e22502f7
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Jul 3 16:42:04 2010 +0200
+Date: Sat Jul 3 16:42:04 2010 +0200
Only define findModifier() when used
@@ -29206,7 +31225,7 @@
commit b1fdb87a4ebb5079c731256cce1870de8c54c65d
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jul 2 10:53:20 2010 +0200
+Date: Fri Jul 2 10:53:20 2010 +0200
Fix compile warnings on auto imports for mingw compiler
@@ -29221,7 +31240,7 @@
commit 9e577110134eb1e093e697b7504efca759000086
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jul 2 10:51:24 2010 +0200
+Date: Fri Jul 2 10:51:24 2010 +0200
Check for declaration of gettimeofday()
@@ -29238,7 +31257,7 @@
commit 58c8430ac584f3ba5e97aceb148e6287bfc45f95
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 30 15:06:44 2010 +0200
+Date: Wed Jun 30 15:06:44 2010 +0200
Set -ansi compiler flag early in configure.ac
@@ -29255,7 +31274,7 @@
commit e3663a855a9c86f0a3988a7a50fa40d37d0ea069
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jul 2 14:45:15 2010 +0200
+Date: Fri Jul 2 14:45:15 2010 +0200
Use MAX_PATH instead of _MAX_PATH everywhere
@@ -29264,14 +31283,14 @@
in ansi mode. MAX_PATH is in the Windows api and thus always available
when windows.h is included.
- goo/gfile.cc | 4 ++--
+ goo/gfile.cc | 4 ++--
poppler/GlobalParams.cc | 2 +-
- poppler/PDFDoc.cc | 4 ++--
+ poppler/PDFDoc.cc | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
commit 7227c407d23a37f5d95e6c01cb7411be2f82ca85
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jun 30 16:15:06 2010 +0200
+Date: Wed Jun 30 16:15:06 2010 +0200
Check for _WIN32 instead of _MSC_VER
@@ -29281,7 +31300,7 @@
commit 34e727e011529be312313a1f4d4fa1ba9c545888
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jun 29 16:43:31 2010 +0200
+Date: Tue Jun 29 16:43:31 2010 +0200
Fix cross compiling for Windows with autotools
@@ -29295,7 +31314,7 @@
commit 1bc2f4501ea4e56ca99ae4d94d6cf34cf33c2c7a
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jun 29 15:34:22 2010 +0200
+Date: Tue Jun 29 15:34:22 2010 +0200
define poppler_qt4_EXPORTS when building with autotools
@@ -29306,7 +31325,7 @@
commit 5825114a26cc6eece2e556063f640dda53ea1e11
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 11 12:24:20 2010 +0100
+Date: Sun Jul 11 12:24:20 2010 +0100
Compile++
@@ -29315,7 +31334,7 @@
commit 5e4d8eeea0b9dba68420c164975418c76a53be85
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 10 15:54:28 2010 +0200
+Date: Sat Jul 10 15:54:28 2010 +0200
[pdf-inspector] Do not render for printing
@@ -29324,7 +31343,7 @@
commit e6824972a213a888ca0185b7ae0a75fc23f75797
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 10 15:52:15 2010 +0200
+Date: Sat Jul 10 15:52:15 2010 +0200
[annots] Use a transparency group for markup annots without AP and
opacity != 1
@@ -29335,12 +31354,12 @@
+++++++++++++++++++++++++------------------------------
poppler/Annot.h | 3 +
poppler/Gfx.cc | 9 +-
- poppler/Gfx.h | 2 +-
+ poppler/Gfx.h | 2 +-
4 files changed, 165 insertions(+), 195 deletions(-)
commit 70ce0b6ea1a0d61f5048d2ae49c639d74a643b29
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 9 17:04:00 2010 +0200
+Date: Fri Jul 9 17:04:00 2010 +0200
[annots] Clamp QuadPoints coords to annot rectangle instead of
ignore points
@@ -29353,7 +31372,7 @@
commit 8a9e561bfe64f71e9f38c43e5c6be7e5069b2349
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jul 2 21:07:53 2010 +0200
+Date: Fri Jul 2 21:07:53 2010 +0200
Nicer autogen.sh output
@@ -29362,7 +31381,7 @@
commit ce4d328294cea73f4b7368691dc1fed6bd45d569
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Jul 2 20:51:47 2010 +0200
+Date: Fri Jul 2 20:51:47 2010 +0200
Add option for autogen.sh to skip configure
@@ -29378,17 +31397,17 @@
commit d7ee87c5d0a35c8d4fcc88bde4b8496c49f397c6
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Jul 6 15:16:08 2010 +0100
+Date: Tue Jul 6 15:16:08 2010 +0100
warnings-=2
- poppler/GfxFont.cc | 3 ++-
+ poppler/GfxFont.cc | 3 ++-
utils/HtmlOutputDev.cc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
commit 1e7f457ca1617fd8c958feef8dd7e694476dedd9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 9 12:29:14 2010 +0200
+Date: Fri Jul 9 12:29:14 2010 +0200
[cairo] Use ceil to convert double to int in tilingPatternFill()
@@ -29399,7 +31418,7 @@
commit 91a7605eb51144f2e7dea69aa9454fff47c49bd2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 9 11:42:56 2010 +0200
+Date: Fri Jul 9 11:42:56 2010 +0200
[glib] Fix build when GDK is enabled
@@ -29408,7 +31427,7 @@
commit 09e3e0e9c5134688c4ed2af5cd3a12aa2986474c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 8 18:56:38 2010 +0200
+Date: Thu Jul 8 18:56:38 2010 +0200
[glib] Fix poppler_page_find_tex() when called more than once
@@ -29419,7 +31438,7 @@
commit 25427bdecb219ffe6f0592d2ac36de60c247bfd9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 8 17:46:22 2010 +0200
+Date: Thu Jul 8 17:46:22 2010 +0200
Fix build when compiling without glib frontend
@@ -29428,12 +31447,12 @@
commit 550684731356a66753ec19f5a8ca4b572db6d2d5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 8 17:16:02 2010 +0200
+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/Makefile.am | 2 +
+ glib/demo/main.c | 4 +-
glib/demo/selections.c | 687
+++++++++++++++++++++++++++++++++++++++++++++++++
glib/demo/selections.h | 31 +++
@@ -29441,7 +31460,7 @@
commit b257428150e2c13dcc24fd8f75e4ee2c679ab414
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 8 14:45:29 2010 +0200
+Date: Thu Jul 8 14:45:29 2010 +0200
[glib] Add poppler_page_get_selected_text()
@@ -29459,16 +31478,16 @@
anymore
before calling the method.
- glib/demo/text.c | 9 +-------
- glib/poppler-page.cc | 43
+ glib/demo/text.c | 9 +-------
+ glib/poppler-page.cc | 43
+++++++++++++++++++++++++++----------
- glib/poppler-page.h | 3 ++-
- glib/reference/poppler-sections.txt | 1 +
+ 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 at gnome.org>
-Date: Wed Jul 7 11:55:47 2010 +0200
+Date: Wed Jul 7 11:55:47 2010 +0200
[cairo] Fix warning on signed/unsigned comparison
@@ -29478,19 +31497,19 @@
commit 092aa901b9ec35a48bc1fb229ad16a3b00eef5f2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 5 11:16:49 2010 +0200
+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 ++--
+ glib/poppler-media.cc | 4 ++--
+ glib/poppler-page.cc | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
commit 6c4e14fd90d5ef2d6670a980ab2476b6fab58df7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 5 10:49:59 2010 +0200
+Date: Mon Jul 5 10:49:59 2010 +0200
[glib] docs: fix POPPLER_CHECK_VERSION() docs
@@ -29499,7 +31518,7 @@
commit ed324a867ecf1f616c4b2dc575f01d5cf1b67c38
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 2 18:28:45 2010 +0200
+Date: Fri Jul 2 18:28:45 2010 +0200
[glib] Rename instrospection files as 0.16 instead of 0.14
@@ -29508,7 +31527,7 @@
commit a55f567ff1ea0858eda13a024ed765a016f3bff0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 2 18:23:03 2010 +0200
+Date: Fri Jul 2 18:23:03 2010 +0200
[glib] docs: Remove unneeded empty line in doc comment
@@ -29517,24 +31536,24 @@
commit f16015303422280eaa21c3144eca0f1a330dce8a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 2 18:19:13 2010 +0200
+Date: Fri Jul 2 18:19:13 2010 +0200
[glib] docs: Add GObject introspection annotations
- glib/poppler-annot.cc | 45
+ glib/poppler-annot.cc | 45
++++++++++++++++++++--------------------
- glib/poppler-document.cc | 8 +++----
- glib/poppler-page.cc | 23 +++++++++++++-------
+ 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 at gnome.org>
-Date: Wed Jun 30 09:35:29 2010 +0200
+Date: Wed Jun 30 09:35:29 2010 +0200
[glib] Add GObject introspection support
- configure.ac | 5 +++
+ configure.ac | 5 +++
glib/Makefile.am | 29 +++++++++++++++++
m4/introspection.m4 | 94
+++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -29542,7 +31561,7 @@
commit 3160950a7d7161457405c9084c31af230329b3f0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 2 12:47:04 2010 +0200
+Date: Fri Jul 2 12:47:04 2010 +0200
[glib] docs: Add index of deprecated symbols
@@ -29551,7 +31570,7 @@
commit 593db7acf6edce1267f69d12310bf4098ff24c97
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 2 12:44:39 2010 +0200
+Date: Fri Jul 2 12:44:39 2010 +0200
[glib] docs: deprecate GDK API
@@ -29560,25 +31579,25 @@
commit 6facefb3fa8f97a9d330545308fb2d89c7f57fa0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 18:01:45 2010 +0200
+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/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 at gnome.org>
-Date: Thu Jul 1 17:25:03 2010 +0200
+Date: Thu Jul 1 17:25:03 2010 +0200
[glib] docs: document PopplerMediaSaveFunc
@@ -29587,7 +31606,7 @@
commit 5cc0a51f88580c65ac2d5c6ff02b8cf14697b70c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 17:20:13 2010 +0200
+Date: Thu Jul 1 17:20:13 2010 +0200
[glib] Use the same name for parameter in function prototype
@@ -29597,7 +31616,7 @@
commit 6793fd8fd2d33d3d58c6556b5dbe6d0497e56646
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 15:49:49 2010 +0200
+Date: Thu Jul 1 15:49:49 2010 +0200
[glib] docs: document some enums in poppler-action
@@ -29607,7 +31626,7 @@
commit 8e139696dbe19f54ad54364a711b929146f11080
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 15:02:58 2010 +0200
+Date: Thu Jul 1 15:02:58 2010 +0200
[glib] docs: mark structures in poppler-private.h as private
@@ -29616,7 +31635,7 @@
commit ccae7e574047d66c638003cc36fa1edeef4d35ed
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 14:59:50 2010 +0200
+Date: Thu Jul 1 14:59:50 2010 +0200
[glib] docs: document PopplerDocument enums
@@ -29626,7 +31645,7 @@
commit 4fbff172693c38cdc4ae8070a55ceb706aa213cd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 14:26:53 2010 +0200
+Date: Thu Jul 1 14:26:53 2010 +0200
[glib] docs: document PopplerFontInfo
@@ -29636,7 +31655,7 @@
commit 465dd4897ff603a6fd96503cf4746fc808b0f827
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 12:59:39 2010 +0200
+Date: Thu Jul 1 12:59:39 2010 +0200
[glib] docs: document some enums
@@ -29646,7 +31665,7 @@
commit de3d599ea9e948867cfe395f42ed659670110c4c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 12:31:10 2010 +0200
+Date: Thu Jul 1 12:31:10 2010 +0200
[glib] docs: document boxed types defined in poppler-page
@@ -29657,7 +31676,7 @@
commit 34c52190e1dbf4d3effa44b4408faa1fbae0d12d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 1 09:33:08 2010 +0200
+Date: Thu Jul 1 09:33:08 2010 +0200
[glib] Remove splash header file
@@ -29666,7 +31685,7 @@
commit 6910545a487f206ccd059bb295d2312228dbf2ba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 19:03:04 2010 +0200
+Date: Wed Jun 30 19:03:04 2010 +0200
[glib] docs: Remove invalid symbol from poppler-sections.txt
@@ -29675,7 +31694,7 @@
commit 65ea3b636cb5a38660e526a483a4d95f5acdf8db
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 19:02:32 2010 +0200
+Date: Wed Jun 30 19:02:32 2010 +0200
[glib] docs: fix typo
@@ -29684,7 +31703,7 @@
commit 689bfec40b5b3030c2819cb4aac42c3ab6279278
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 19:01:47 2010 +0200
+Date: Wed Jun 30 19:01:47 2010 +0200
[glib] docs: Add missing doc for parameter
@@ -29693,7 +31712,7 @@
commit 0b3d77627f255a4bf3da6ee875ad8d9eb931c96e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 19:00:59 2010 +0200
+Date: Wed Jun 30 19:00:59 2010 +0200
[glib] Use the same name for parameter in function prototype
@@ -29702,18 +31721,18 @@
commit 19e1944c00ac2da6b18b015721fc3a8d1898a23a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 18:01:52 2010 +0200
+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/poppler-media.cc | 6 ++++++
+ glib/poppler-movie.cc | 6 ++++++
glib/reference/poppler-docs.sgml | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
commit ca48bee07e6b4a20ea7b40b472a335e75feb4739
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 17:56:50 2010 +0200
+Date: Wed Jun 30 17:56:50 2010 +0200
[glib] docs: Add missing types to poppler.types
@@ -29722,7 +31741,7 @@
commit 613ccf81317a007ed5017ee788466613a6699bb5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 17:54:22 2010 +0200
+Date: Wed Jun 30 17:54:22 2010 +0200
[glib] docs: rework poppler-sections.txt
@@ -29737,7 +31756,7 @@
commit b37556a32b79f8711ed7eca24abf19511872a70a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 12:01:44 2010 +0200
+Date: Wed Jun 30 12:01:44 2010 +0200
[glib] docs: Add index of symbols
@@ -29746,32 +31765,32 @@
commit 7f5fa4e19b4e324a396d64261b9125c1a557ac84
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 12:00:35 2010 +0200
+Date: Wed Jun 30 12:00:35 2010 +0200
[glib] docs: Add version information
- configure.ac | 1 +
- glib/reference/Makefile.am | 2 +-
+ configure.ac | 1 +
+ glib/reference/Makefile.am | 2 +-
glib/reference/poppler-docs.sgml | 7 ++++++-
- glib/reference/version.xml.in | 1 +
+ glib/reference/version.xml.in | 1 +
4 files changed, 9 insertions(+), 2 deletions(-)
commit 848d5e158fa9eadd19a658db314ba3fff9d026e8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 30 11:30:41 2010 +0200
+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 +
+ 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 ----
@@ -29781,19 +31800,19 @@
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-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/poppler.sgml | 285 ----------------
glib/reference/tmpl/stamp-poppler-enums.sgml | 22 --
- gtk-doc.make | 78 +++--
- m4/gtk-doc.m4 | 2 +-
+ gtk-doc.make | 78 +++--
+ m4/gtk-doc.m4 | 2 +-
25 files changed, 171 insertions(+), 2777 deletions(-)
commit 16e15ac845206217086e2adac9f220e75c0c630d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 29 21:44:02 2010 +0100
+Date: Tue Jun 29 21:44:02 2010 +0100
bitmap can be null at this stage, check it isn't
@@ -29802,7 +31821,7 @@
commit 38e5d28a184d0ca8df71a7ea910ce85d7a225e4e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 21 20:38:00 2010 +0100
+Date: Mon Jun 21 20:38:00 2010 +0100
more pow 0.5 -> sqrt
@@ -29811,7 +31830,7 @@
commit 58a53ca0a4e8434e8478f8fe121067dcf05c017d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 21 19:24:20 2010 +0100
+Date: Mon Jun 21 19:24:20 2010 +0100
sqrt is much faster than pow 0.5
@@ -29820,29 +31839,29 @@
commit bf86a9fc464aca57ebec207a213dcc2cc6031940
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 21 19:20:47 2010 +0100
+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/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
+ 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 at gnome.org>
-Date: Mon Jun 21 17:19:22 2010 +0200
+Date: Mon Jun 21 17:19:22 2010 +0200
Reduce pow operations in GfxCalRGBColorSpace::getXYZ()
@@ -29854,7 +31873,7 @@
commit 9365c05c1f66b3000febf32c45cef2ffe79e041a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 19 10:36:39 2010 +0200
+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
@@ -29866,7 +31885,7 @@
commit d9504c0a288c84b68a516f715505d6bc94b911f5
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 18 23:59:04 2010 +0200
+Date: Fri Jun 18 23:59:04 2010 +0200
[autotools] link the 'cpp' tests against libpoppler as well
@@ -29878,18 +31897,18 @@
commit 62975737bcaa6e0a2ecab981aa3e0c8f2ff10571
Author: Brian Cameron <brian.cameron at oracle.com>
-Date: Fri Jun 18 19:22:17 2010 +0100
+Date: Fri Jun 18 19:22:17 2010 +0100
Compile with Sun Studio
- goo/ImgWriter.h | 3 ++-
- goo/JpegWriter.h | 3 ++-
+ 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 at kde.org>
-Date: Thu Jun 17 23:01:21 2010 +0100
+Date: Thu Jun 17 23:01:21 2010 +0100
Optimize Splash::compositeBackground
@@ -29903,7 +31922,7 @@
commit f323e5e4cdcc20075ee7c722f7adc088c0772249
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 17 22:59:37 2010 +0100
+Date: Thu Jun 17 22:59:37 2010 +0100
Check the objects are num before reading them
@@ -29914,7 +31933,7 @@
commit 35e87d2062b1d82db0d765de5a6187122a0fa99c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 16 11:52:25 2010 +0200
+Date: Wed Jun 16 11:52:25 2010 +0200
[gib-demo] Add demo for poppler_page_get_text_layout()
@@ -29924,7 +31943,7 @@
commit ddcea568b3a7334e062d6214f43d0a2c2ec95be4
Author: Daniel Garcia <danigm at yaco.es>
-Date: Tue Jun 15 16:57:32 2010 +0200
+Date: Tue Jun 15 16:57:32 2010 +0200
[glib] Add poppler_page_get_text_layout()
@@ -29941,7 +31960,7 @@
commit 6e9fe8832c37b560ac4d0b0e32d618bde70ee117
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 16 00:22:59 2010 +0200
+Date: Wed Jun 16 00:22:59 2010 +0200
[Qt4] and support 'Print' named action here too...
@@ -29950,7 +31969,7 @@
commit 53c003f36af5d77f50fe238eaec4c5f7c3a485c7
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 16 00:18:13 2010 +0200
+Date: Wed Jun 16 00:18:13 2010 +0200
[CMake] install the new goo/GooLikely.h
@@ -29959,7 +31978,7 @@
commit 2ba752aabc8dad4bb35a351697b1590795c54ca4
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 16 00:06:30 2010 +0200
+Date: Wed Jun 16 00:06:30 2010 +0200
update copyrights
@@ -29969,7 +31988,7 @@
commit 38bf54bbad40288be763c6a1a89d90477c9ef89d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 15 23:05:43 2010 +0100
+Date: Tue Jun 15 23:05:43 2010 +0100
move the declaration of likely/unlikely to an own file in goo/
@@ -29981,7 +32000,7 @@
commit 9838edf8c7497858e3bac2743784a3259f61cfdd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 15 22:54:34 2010 +0100
+Date: Tue Jun 15 22:54:34 2010 +0100
Protect us against negative y coordinates
@@ -29992,7 +32011,7 @@
commit 8b32c3e9826d4462fd9d16fab4200ebb23251046
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jun 15 23:55:01 2010 +0200
+Date: Tue Jun 15 23:55:01 2010 +0200
[Qt4/apidox] ok, now the *proper* version for 'Print'...
@@ -30001,7 +32020,7 @@
commit b54e5ac49f69bd1c906e517edcb436e042199cd5
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jun 15 23:53:50 2010 +0200
+Date: Tue Jun 15 23:53:50 2010 +0200
[Qt4/apidox] add the proper version for the new 'Print'
@@ -30010,7 +32029,7 @@
commit 71ad18c3b6b73e23d71600d07ce00bdfaf0bef60
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jun 15 23:51:01 2010 +0200
+Date: Tue Jun 15 23:51:01 2010 +0200
[Qt4] recognize the 'Print' named action here too
@@ -30019,7 +32038,7 @@
commit 96f60f2748ba76de0d296a9838dbd7181f506e36
Author: Guillermo Amaral <gamaral at kdab.com>
-Date: Tue Jun 15 23:47:46 2010 +0200
+Date: Tue Jun 15 23:47:46 2010 +0200
[Qt4] recognize 'Print' as name in named actions
@@ -30029,17 +32048,17 @@
commit 25494311c5b8eb88d43df420ec91a1aedad20d05
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 17:44:23 2010 +0200
+Date: Tue Jun 15 17:44:23 2010 +0200
[glib] Add some G_UNLIKELY()
glib/poppler-document.cc | 12 ++++++------
- glib/poppler-page.cc | 17 ++++++++++-------
+ glib/poppler-page.cc | 17 ++++++++++-------
2 files changed, 16 insertions(+), 13 deletions(-)
commit 52f133fb962256edb577b7f639c5c13221c6365d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 14:20:49 2010 +0200
+Date: Tue Jun 15 14:20:49 2010 +0200
[glib] Use g_slice for actions and destinations
@@ -30048,7 +32067,7 @@
commit f035c94d8b5b34c0c3bb47b8cfc2f9c720a4fc71
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 14:01:07 2010 +0200
+Date: Tue Jun 15 14:01:07 2010 +0200
[glib] Use g_slice_dup in _copy() function for iterators
@@ -30057,7 +32076,7 @@
commit c84f69681828c7e3b969f666f9b84f1531976c6f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 13:57:18 2010 +0200
+Date: Tue Jun 15 13:57:18 2010 +0200
[glib] Use g_slice for mappings and PopplerRectangle
@@ -30067,7 +32086,7 @@
commit e12b9ab105f3b56b47ded871693b939ed421c853
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 13:49:27 2010 +0200
+Date: Tue Jun 15 13:49:27 2010 +0200
[glib] Use poppler_image_mapping_free() instead of g_free()
@@ -30076,7 +32095,7 @@
commit fb791a15f7472042fb2174e6f5df6924dd4eeb9b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 13:37:52 2010 +0200
+Date: Tue Jun 15 13:37:52 2010 +0200
[glib] Remove poppler_mapping_free and use poppler_link_mapping_free
instead
@@ -30086,7 +32105,7 @@
commit 6186d7220e545eb89597626933a10acd0cd25173
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 13:16:59 2010 +0200
+Date: Tue Jun 15 13:16:59 2010 +0200
[glib] Use _new() methods instead of g_new() to create boxed structs
@@ -30095,7 +32114,7 @@
commit 44639cb7b10ab6d66122ae2b6b7f3e5745f933bd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 15 10:39:00 2010 +0200
+Date: Tue Jun 15 10:39:00 2010 +0200
[glib-demo] Use poppler_rectangle_free() instead of g_free()
@@ -30104,7 +32123,7 @@
commit 3ca304f3837af27ae49541a5f441d8729264a945
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 14 19:16:41 2010 +0100
+Date: Mon Jun 14 19:16:41 2010 +0100
Add more caching to ObjectStreams
@@ -30117,7 +32136,7 @@
commit cc2e5f190e19ee8169f67df2541302a2816873d3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 14 18:17:01 2010 +0200
+Date: Mon Jun 14 18:17:01 2010 +0200
[glib-demo] Support password protected documents
@@ -30127,18 +32146,18 @@
commit 34b2dbb6bbaf0189c92eea6b7924999ab2b6ad11
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 14 17:41:51 2010 +0200
+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 +-------------------------------
+ glib/demo/main.c | 32 +-------------------------------
2 files changed, 1 insertion(+), 36 deletions(-)
commit a52670a46c0561025d8b86cd2865603f0720c695
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 13 15:31:15 2010 +0100
+Date: Sun Jun 13 15:31:15 2010 +0100
do not distribute these two files
@@ -30150,7 +32169,7 @@
commit eb0206ba8458f1dba004ac7bef856dcbb2ccbba5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 9 18:56:16 2010 +0100
+Date: Wed Jun 9 18:56:16 2010 +0100
we need to ship these two files
@@ -30161,7 +32180,7 @@
commit 7dfdf1ee293b7d36a049a90d8a17462ed0e50f2c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 8 21:54:52 2010 +0100
+Date: Tue Jun 8 21:54:52 2010 +0100
Typo--
@@ -30170,7 +32189,7 @@
commit 57cc04ee1a122794b338c0d9818dbdaea46a42d6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 8 21:49:40 2010 +0100
+Date: Tue Jun 8 21:49:40 2010 +0100
Add cropbox to the manpage
@@ -30179,30 +32198,30 @@
commit f9e6cb9647981f7afbb20261b3ccedaf003657d2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 8 20:43:11 2010 +0100
+Date: Tue Jun 8 20:43:11 2010 +0100
0.14.0
CMakeLists.txt | 4 ++--
- NEWS | 18 ++++++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ 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 at kde.org>
-Date: Tue Jun 8 20:29:58 2010 +0100
+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 +-
+ qt4/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit c1629be8011f3bddbf619246090640d62136d521
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 8 20:23:00 2010 +0100
+Date: Tue Jun 8 20:23:00 2010 +0100
Increase soname as _PopplerActionMovie struct grew
@@ -30212,7 +32231,7 @@
commit 5ef45b1e72aed88ece0905b1204edee641f3c8fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 8 19:35:20 2010 +0100
+Date: Tue Jun 8 19:35:20 2010 +0100
Do not exit when trying to allocate memory for the XRef fails
@@ -30223,7 +32242,7 @@
commit e7a5e9f70ee1283a2ca6734552d905279c97989b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 4 08:46:33 2010 +0100
+Date: Fri Jun 4 08:46:33 2010 +0100
a bit of docu
@@ -30232,7 +32251,7 @@
commit 9ff4dab2558f7c2700fd7fcaccacdad9619dbdda
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 4 08:44:34 2010 +0100
+Date: Fri Jun 4 08:44:34 2010 +0100
Add support for unsigned integer numbers
@@ -30243,15 +32262,15 @@
in a
32 bit unsigned integer
- poppler/Lexer.cc | 32 +++++++++++++++++++++++++-------
- poppler/Object.cc | 5 ++++-
- poppler/Object.h | 14 +++++++++++---
+ 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 at kde.org>
-Date: Tue Jun 1 21:40:07 2010 +0100
+Date: Tue Jun 1 21:40:07 2010 +0100
If the document is not encrypted it is ok to print
@@ -30260,7 +32279,7 @@
commit b15c793a8a58b17a7fe7b32c1037726e1e0e1bf0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 1 20:57:16 2010 +0100
+Date: Tue Jun 1 20:57:16 2010 +0100
Check it is a stream, not that it is not none
@@ -30273,7 +32292,7 @@
commit a72c68117ba05f3934e2df227cdcaf53a375f0ce
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 18:11:02 2010 +0200
+Date: Fri May 28 18:11:02 2010 +0200
[cpp apidox] add a start of API documentation for the 'page' class
@@ -30283,7 +32302,7 @@
commit acf7729e8e270e1b4b2a552272dc280ae6d7b352
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 17:38:35 2010 +0200
+Date: Fri May 28 17:38:35 2010 +0200
[cpp] fix the font_iterator current page status
@@ -30292,7 +32311,7 @@
commit 4e017ff24a01cbbf1b39eedc3d7697f8b180fdd9
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 17:15:28 2010 +0200
+Date: Fri May 28 17:15:28 2010 +0200
[cpp apidox] add API documentation for the 'font_info' and
'font_iterator' classes
@@ -30303,7 +32322,7 @@
commit 2ff840b62e41e2fc98e9fcff7330f40216de58a5
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 14:34:37 2010 +0200
+Date: Fri May 28 14:34:37 2010 +0200
[cpp] move the actual convert_date(const char*) implementation in
the detail
@@ -30315,12 +32334,12 @@
cpp/poppler-embedded-file.cpp | 4 ++--
cpp/poppler-global.cpp | 23 ++---------------------
cpp/poppler-private.cpp | 25 +++++++++++++++++++++++++
- cpp/poppler-private.h | 2 ++
+ cpp/poppler-private.h | 2 ++
5 files changed, 32 insertions(+), 24 deletions(-)
commit 8112e9111313eaded4cd2e89d0e67efb0f3e29db
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 13:13:50 2010 +0200
+Date: Fri May 28 13:13:50 2010 +0200
[cpp] add a time_type typedef
@@ -30332,12 +32351,12 @@
cpp/poppler-embedded-file.cpp | 4 ++--
cpp/poppler-embedded-file.h | 4 ++--
cpp/poppler-global.cpp | 4 ++--
- cpp/poppler-global.h | 4 +++-
+ cpp/poppler-global.h | 4 +++-
6 files changed, 14 insertions(+), 12 deletions(-)
commit bc5bdb43b12437e00aaddc27a74b9ac4b6498446
Author: Pino Toscano <pino at kde.org>
-Date: Fri May 28 13:01:53 2010 +0200
+Date: Fri May 28 13:01:53 2010 +0200
use the proper type for iterating on a GooVector
@@ -30346,7 +32365,7 @@
commit 87128ab0dfec6be1a034361512ee41301b078831
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Thu May 27 17:31:00 2010 +0200
+Date: Thu May 27 17:31:00 2010 +0200
[CMake] Do not force -O2, preserve compiler flags instead.
@@ -30355,19 +32374,19 @@
commit 241c338facb45641ef1a271c904355a014bbf28d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 27 20:37:55 2010 +0100
+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 ++++
+ goo/JpegWriter.cc | 15 +++++++++++++--
+ goo/JpegWriter.h | 4 ++++
splash/SplashBitmap.cc | 18 +++++++++---------
- splash/SplashBitmap.h | 4 ++++
+ splash/SplashBitmap.h | 4 ++++
4 files changed, 30 insertions(+), 11 deletions(-)
commit 9eda6e8aaae412a9882141d1b5b8c7bf0c823c68
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 25 23:44:30 2010 +0100
+Date: Tue May 25 23:44:30 2010 +0100
Do not follow loops blindly
@@ -30379,7 +32398,7 @@
commit bbee6e0c8c9b181f8d19c167c867d74a765685fb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 25 23:13:38 2010 +0100
+Date: Tue May 25 23:13:38 2010 +0100
update copyright
@@ -30388,7 +32407,7 @@
commit 80b72b9f2fd70395580205b8b176e0576e132cf5
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed May 26 13:07:57 2010 +0200
+Date: Wed May 26 13:07:57 2010 +0200
[autotools] sync autotool build with cmake build
@@ -30399,7 +32418,7 @@
commit 30ea3ab8a1eecafb3366aef193910098fdb7ccc8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 25 23:07:56 2010 +0100
+Date: Tue May 25 23:07:56 2010 +0100
Fix crash when parsing pdf in bug 28170
@@ -30410,14 +32429,14 @@
commit b5a9021037c4e6cbbfd622433f3de693d1f47671
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 25 20:00:57 2010 +0100
+Date: Tue May 25 20:00:57 2010 +0100
0.13.4
- CMakeLists.txt | 2 +-
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ 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 +++
@@ -30426,16 +32445,16 @@
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-page.sgml | 13 +++++++++++++
glib/reference/tmpl/poppler-private.sgml | 3 +++
- glib/reference/tmpl/poppler.sgml | 6 ++++++
+ glib/reference/tmpl/poppler.sgml | 6 ++++++
glib/reference/tmpl/stamp-poppler-enums.sgml | 3 +++
- qt4/src/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
17 files changed, 103 insertions(+), 4 deletions(-)
commit 57ab0ebe993d79fe551bba58e0a70d55d32828f8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 12 20:49:31 2010 +0100
+Date: Wed May 12 20:49:31 2010 +0100
better copyright
@@ -30444,22 +32463,22 @@
commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 12 20:47:25 2010 +0100
+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 +
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
poppler/poppler-config.h.cmake | 4 +
- poppler/strtok_r.cpp | 189
+ poppler/strtok_r.cpp | 189
+++++++++++++++++++++++++++++++++++++++++
4 files changed, 195 insertions(+)
commit 9e9b5e0d87a7450bd2223538673321ecec720c36
Author: Marek Kasik <mkasik at redhat.com>
-Date: Tue May 11 12:06:17 2010 +0200
+Date: Tue May 11 12:06:17 2010 +0200
Better check of overlapping of table cells when selecting text
@@ -30471,7 +32490,7 @@
commit a3e40b460b7690ef73ccf143b10da07e91d9ee7f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon May 10 17:41:04 2010 +0200
+Date: Mon May 10 17:41:04 2010 +0200
[annots] Adjust bbox for line annots when y1 = y2
@@ -30485,7 +32504,7 @@
commit e30d24c506a9ff742f8af5d6c71273abeddaa265
Author: Pino Toscano <pino at kde.org>
-Date: Tue May 4 15:19:26 2010 +0200
+Date: Tue May 4 15:19:26 2010 +0200
[cpp] ustring::{from,to}_utf8(): fix in/out buffer sizes
@@ -30494,7 +32513,7 @@
commit aaa19a673020e12dbfceb4d25ade0ece7875fd83
Author: Pino Toscano <pino at kde.org>
-Date: Tue May 4 12:07:43 2010 +0200
+Date: Tue May 4 12:07:43 2010 +0200
[cpp] make the pkg-config files really working
@@ -30504,42 +32523,42 @@
commit 8f963ccde41ef1faa719254fccc5bdfe75e9fa87
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun May 2 18:42:10 2010 +0200
+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 ++++
+ poppler/poppler-config.h.in | 4 ++++
2 files changed, 8 insertions(+)
commit c9d8df51c96e50ad72f7954baba2254259fc894c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 1 19:52:51 2010 +0100
+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 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 9ce71fb35fdd66c55872956432160a5c76a62080
Author: Jakub Wilk <ubanus at users.sf.net>
-Date: Sat May 1 19:50:54 2010 +0100
+Date: Sat May 1 19:50:54 2010 +0100
Use strtok_r instead strtok
strtok is not thread safe
- fofi/FoFiType1.cc | 8 +++++---
+ fofi/FoFiType1.cc | 8 +++++---
poppler/CharCodeToUnicode.cc | 6 ++++--
poppler/GlobalParams.cc | 6 ++++--
- poppler/PDFDoc.cc | 4 +++-
- poppler/UnicodeMap.cc | 21 ++++++++++++++++++---
+ poppler/PDFDoc.cc | 4 +++-
+ poppler/UnicodeMap.cc | 21 ++++++++++++++++++---
5 files changed, 34 insertions(+), 11 deletions(-)
commit 6b2983f89e87792a393880dab6dc1fedb748db2c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 30 14:48:50 2010 +0200
+Date: Fri Apr 30 14:48:50 2010 +0200
[cairo] Set device offset and matrix to smask depending on the
group target
@@ -30551,7 +32570,7 @@
commit ac32021704178721ee007a6b6831283e323e500f
Author: Pino Toscano <pino at kde.org>
-Date: Fri Apr 30 01:14:14 2010 +0200
+Date: Fri Apr 30 01:14:14 2010 +0200
demote the #warning to a simple FIXME comment
@@ -30560,7 +32579,7 @@
commit 8c1bc17552c989c15f318d9d109607a9a594ca6b
Author: Pino Toscano <pino at kde.org>
-Date: Fri Apr 30 01:12:19 2010 +0200
+Date: Fri Apr 30 01:12:19 2010 +0200
MSVC: define fmax() and fmin()
@@ -30569,12 +32588,12 @@
Thanks to Patrick Spendrin for the hint!
poppler/poppler-config.h.cmake | 5 +++++
- poppler/poppler-config.h.in | 5 +++++
+ poppler/poppler-config.h.in | 5 +++++
2 files changed, 10 insertions(+)
commit 71063d51a45835b0267a7e3f823ef49689cfd06f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 29 20:28:07 2010 +0200
+Date: Thu Apr 29 20:28:07 2010 +0200
Make sure we are drawing text before calling endTextObject()
@@ -30585,7 +32604,7 @@
commit e909219d8e92994bd52976f9676015fa6ca9fc91
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 29 18:34:22 2010 +0200
+Date: Thu Apr 29 18:34:22 2010 +0200
Set textHaveCSPattern=false again before filling the pattern in
opEndText()
@@ -30598,7 +32617,7 @@
commit 29572d6ac7829b60efce2d8e489473c55e370f26
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 27 23:39:23 2010 +0100
+Date: Tue Apr 27 23:39:23 2010 +0100
fabs for doubles
@@ -30607,7 +32626,7 @@
commit 4905e2bd764ea601e3bf9c5195c740e5bf186af5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 27 23:34:34 2010 +0100
+Date: Tue Apr 27 23:34:34 2010 +0100
fix include
@@ -30616,7 +32635,7 @@
commit f9f0e4b747a1527bd6354897cdba7954d58651de
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 27 14:26:23 2010 +0200
+Date: Tue Apr 27 14:26:23 2010 +0200
Fix first color stop offset of linear gradients
@@ -30627,7 +32646,7 @@
commit 5b822011029f3721fbafd4a7bf01b9d6fee35d25
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 24 18:18:08 2010 +0200
+Date: Sat Apr 24 18:18:08 2010 +0200
include standard float.h instead of unportable values.h
@@ -30636,20 +32655,20 @@
commit dee7cb8691528293bb5b8f266970cdb6771e301b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 24 15:39:23 2010 +0100
+Date: Sat Apr 24 15:39:23 2010 +0100
0.13.3
CMakeLists.txt | 2 +-
- NEWS | 31 +++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Sat Apr 24 13:07:02 2010 +0100
+Date: Sat Apr 24 13:07:02 2010 +0100
minor cleanups
@@ -30659,7 +32678,7 @@
commit e501eabb2f0775444a2bf64005a3a3f1ffa281b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 24 13:06:12 2010 +0100
+Date: Sat Apr 24 13:06:12 2010 +0100
Do not assume the parameter will have more than 5 chars
@@ -30668,7 +32687,7 @@
commit 6cc4d571339214e9eeeb682ba48fb220cef905f9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 24 13:04:05 2010 +0100
+Date: Sat Apr 24 13:04:05 2010 +0100
Fix end() to return the correct last valid value
@@ -30677,7 +32696,7 @@
commit 4ed53e30e735b79c46eab9d54883531c6e187b17
Author: William Bader <williambader at hotmail.com>
-Date: Fri Apr 23 22:52:24 2010 +0100
+Date: Fri Apr 23 22:52:24 2010 +0100
Silence some Illegal entry in bfrange block in ToUnicode CMap
@@ -30688,7 +32707,7 @@
commit 16a004784043e2a8587c0c3c6d23889df8a80470
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 22 19:39:01 2010 +0100
+Date: Thu Apr 22 19:39:01 2010 +0100
Avoid the usage of std::
@@ -30697,7 +32716,7 @@
commit a7dcb2b4ffee57b7f78529cbaeaab647ab93de86
Author: Pino Toscano <pino at kde.org>
-Date: Thu Apr 22 13:31:41 2010 +0200
+Date: Thu Apr 22 13:31:41 2010 +0200
Windows: include config.h in GlobalParamsWin.cc only if not included
already
@@ -30713,7 +32732,7 @@
commit fba076e17af24a9c9883504282316bba119a908c
Author: Pino Toscano <pino at kde.org>
-Date: Thu Apr 22 13:24:04 2010 +0200
+Date: Thu Apr 22 13:24:04 2010 +0200
avoid accidental max() macro replacement with some compilers (eg MSVC)
@@ -30726,22 +32745,22 @@
commit ccf238b32e236f69c0507a5421ac2649dfa8d865
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Apr 21 19:21:37 2010 +0100
+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.cc | 137
++++++++++++++++++++++-----------------------
- poppler/Gfx.h | 4 +-
+ poppler/Gfx.h | 4 +-
poppler/SplashOutputDev.cc | 41 ++++++++++++--
- poppler/SplashOutputDev.h | 3 +-
+ poppler/SplashOutputDev.h | 3 +-
4 files changed, 106 insertions(+), 79 deletions(-)
commit 8e86dfb328d94939ecf390d34af533b831b2837b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 21 19:19:53 2010 +0100
+Date: Wed Apr 21 19:19:53 2010 +0100
Add copyright
@@ -30751,7 +32770,7 @@
commit 6f9f3d33ff8058e28243ba45b8547e21ad0d088a
Author: Andre Klapper <a9016009 at gmx.de>
-Date: Wed Apr 21 19:57:15 2010 +0200
+Date: Wed Apr 21 19:57:15 2010 +0200
[glib-demo] Compile with -DGSEAL_ENABLE
@@ -30764,7 +32783,7 @@
commit 6b14c18d60cae130869f9a5c7688dfe880602224
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Apr 21 19:56:49 2010 +0200
+Date: Wed Apr 21 19:56:49 2010 +0200
[cairo] Make sure we always use a new path in doPath()
@@ -30777,7 +32796,7 @@
commit 4f71d64c69500ed78daf4d797c8af6cfbd3d970e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Apr 21 11:44:49 2010 +0200
+Date: Wed Apr 21 11:44:49 2010 +0200
[cairo] Fix pattern size when bbox is not at 0,0
@@ -30786,7 +32805,7 @@
commit 9c5612f6e013a8698eff6531ec388a7e6c1fb89a
Author: Marek Kasik <mkasik at redhat.com>
-Date: Fri Feb 12 14:31:01 2010 +0100
+Date: Fri Feb 12 14:31:01 2010 +0100
Distinguish between columns and tables when selecting text
@@ -30811,7 +32830,7 @@
commit db014ffb357e760d9397544c5a8fe747cdb497ab
Author: Brian Ewins <brian.ewins at gmail.com>
-Date: Mon Nov 23 08:58:19 2009 +0000
+Date: Mon Nov 23 08:58:19 2009 +0000
Select top right to bottom left in RTL mode
@@ -30825,7 +32844,7 @@
commit b1d43fa052d9160c4f319a67415ecf3ebf2cf9b3
Author: Brian Ewins <brian.ewins at gmail.com>
-Date: Sun Nov 22 09:47:40 2009 +0000
+Date: Sun Nov 22 09:47:40 2009 +0000
Make pdftotext newlines match copy and paste
@@ -30840,7 +32859,7 @@
commit f83b677a8eb44d65698b77edb13a5c7de3a72c0f
Author: Brian Ewins <brian.ewins at gmail.com>
-Date: Thu Nov 12 02:50:29 2009 +0000
+Date: Thu Nov 12 02:50:29 2009 +0000
Use a reading-order sort to order blocks
@@ -30857,7 +32876,7 @@
commit a2191a4d45e0abaec97c19aacae37c4c5824bd36
Author: Brian Ewins <brian.ewins at gmail.com>
-Date: Mon Nov 9 06:24:51 2009 +0000
+Date: Mon Nov 9 06:24:51 2009 +0000
Separate flow construction from reading order
@@ -30875,7 +32894,7 @@
commit 345ed51af9b9e7ea53af42727b91ed68dcc52370
Author: Brian Ewins <brian.ewins at gmail.com>
-Date: Thu Oct 29 01:46:29 2009 +0000
+Date: Thu Oct 29 01:46:29 2009 +0000
Fix bug 3188, text selection across table cells
@@ -30895,7 +32914,7 @@
commit 12d83931ae1b899b70c7ea5c01f03f123b1bb9a8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 18 17:53:48 2010 +0200
+Date: Sun Apr 18 17:53:48 2010 +0200
[cairo] Check pattern status after setting matrix when rendering
images
@@ -30908,7 +32927,7 @@
commit ff6d501a2fc887fd49a985161f756d6d6b8e6c0d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 18 17:51:42 2010 +0200
+Date: Sun Apr 18 17:51:42 2010 +0200
[cairo] Fix a crash when rendering 0x0 images
@@ -30919,7 +32938,7 @@
commit 84cd2186861436fbaa7c29aa691e69fcd543a1c2
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Apr 13 23:42:28 2010 +0200
+Date: Tue Apr 13 23:42:28 2010 +0200
Properly initialize variable
@@ -30928,7 +32947,7 @@
commit 24f244f486f332b0bd76c6525c5d9d03168a76e6
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Apr 13 23:54:28 2010 +0200
+Date: Tue Apr 13 23:54:28 2010 +0200
pdftops: require output filename when reading from stdin
@@ -30937,7 +32956,7 @@
commit 955f9f53ff225f6794a494fdd0f0fe5ee1a41d88
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Apr 13 23:47:40 2010 +0200
+Date: Tue Apr 13 23:47:40 2010 +0200
pdftotext: require output filename when reading from stdin
@@ -30946,7 +32965,7 @@
commit 31388aa8b5117619878431b7fed2d033000af541
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Apr 13 23:27:20 2010 +0200
+Date: Tue Apr 13 23:27:20 2010 +0200
pdftohtml: require output filename when reading from stdin
@@ -30955,7 +32974,7 @@
commit a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 14 19:21:33 2010 +0100
+Date: Wed Apr 14 19:21:33 2010 +0100
update XOPEN_SOURCE to 600 in non standard compile options
@@ -30962,22 +32981,22 @@
it seems helps compiling on some BSD
cmake/modules/PopplerMacros.cmake | 2 +-
- configure.ac | 2 +-
+ configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 4cce1f14e964edf1bf2d9fb8286ee002a67dc212
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 13 21:57:16 2010 +0100
+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 ++
+ test/perf-test.cc | 2 ++
2 files changed, 4 insertions(+)
commit 55c76069c52f9f51c6b8c60fe1aa8de499012ea8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Apr 12 19:32:46 2010 +0200
+Date: Mon Apr 12 19:32:46 2010 +0200
[glib] Use existing cairo api when rendering to a pixbuf
@@ -30989,7 +33008,7 @@
commit 51aefe1423a068e8c119c21a8791d265aecbeaf5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 9 12:50:00 2010 +0200
+Date: Fri Apr 9 12:50:00 2010 +0200
[cairo] Implement colorizing image masks with pattern colorspace
@@ -30998,7 +33017,7 @@
commit bd8f44289770175a17ac45e4788b0d374cc93d5a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 9 12:02:38 2010 +0200
+Date: Fri Apr 9 12:02:38 2010 +0200
Partially revert "[cairo] Do not change device offset of mask surface"
@@ -31011,7 +33030,7 @@
commit bcb405c43fb7140f5d601d00de4d30913a0050ef
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 8 12:02:48 2010 +0200
+Date: Thu Apr 8 12:02:48 2010 +0200
Pages were always created without forms by Catalog
@@ -31022,7 +33041,7 @@
commit d46581c574b3088a82555cbc3b76e95e2571b9c0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 7 20:25:23 2010 +0100
+Date: Wed Apr 7 20:25:23 2010 +0100
Fix destructor
@@ -31032,7 +33051,7 @@
commit ab14433f8b3d7c67f279cece65dfdd40c6675ac0
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 15:33:33 2010 +0100
+Date: Thu Mar 25 15:33:33 2010 +0100
Parse Form on demand
@@ -31042,7 +33061,7 @@
commit c72a2c7f70b13a7b7b531b3c983d9a9bc104bac7
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 17:33:11 2010 +0100
+Date: Thu Mar 25 17:33:11 2010 +0100
Parse Names on demand
@@ -31053,7 +33072,7 @@
commit 32053360c93607cf9bdc092257cefad5d4df9ec5
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 16:32:22 2010 +0100
+Date: Thu Mar 25 16:32:22 2010 +0100
Parse Dests on demand
@@ -31063,7 +33082,7 @@
commit da0f8e69eecb944e128474f62829f729eeabd189
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 16:48:07 2010 +0100
+Date: Thu Mar 25 16:48:07 2010 +0100
Parse Outline on demand in PDFDoc
@@ -31073,7 +33092,7 @@
commit d7a69c8cad112cb6616d0192d8a4028fdaee2f73
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 16:05:02 2010 +0100
+Date: Thu Mar 25 16:05:02 2010 +0100
Parse Outline on demand
@@ -31083,7 +33102,7 @@
commit c149e027fa76824221a78fe6d3bf9bfe953491d4
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 15:51:51 2010 +0100
+Date: Thu Mar 25 15:51:51 2010 +0100
Parse StructTreeRoot on demand
@@ -31093,7 +33112,7 @@
commit 3c6effe44d6d97f175c2ee7f3913d8c4ba34d612
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 14:55:22 2010 +0100
+Date: Thu Mar 25 14:55:22 2010 +0100
Parse Metadata on demand
@@ -31102,7 +33121,7 @@
commit 749d67ea2346a3453ef41dc37ba59d419ad900b0
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Mar 25 15:09:58 2010 +0100
+Date: Thu Mar 25 15:09:58 2010 +0100
Parse PageLabelInfo on demand
@@ -31112,7 +33131,7 @@
commit 78f7d106714fa489a66c39410163a6902ba24856
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Mar 27 14:43:57 2010 +0100
+Date: Sat Mar 27 14:43:57 2010 +0100
Parse PageMode and PageLayout on demand
@@ -31123,7 +33142,7 @@
commit f5dd5be64d09186ee289632c1a61979d15edd605
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Apr 7 19:48:39 2010 +0200
+Date: Wed Apr 7 19:48:39 2010 +0200
Fix saving update docs that have a compressed xref table
@@ -31141,7 +33160,7 @@
commit 3f302fdd78cd78873bf5376af84e83741a8daadb
Author: Pino Toscano <pino at kde.org>
-Date: Tue Apr 6 23:58:46 2010 +0200
+Date: Tue Apr 6 23:58:46 2010 +0200
use a GooVector<bool> instead of a non-standard variable-length-array
@@ -31150,7 +33169,7 @@
commit 425a62b5fa8e4e69bfc1c64ed126b5baac06d78a
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Apr 6 10:57:30 2010 +0200
+Date: Tue Apr 6 10:57:30 2010 +0200
pdfutils: fix deleting fileName
@@ -31160,7 +33179,7 @@
commit 198c9d61ba93ba62ea2da44a23cd948d43556c3e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 6 22:00:14 2010 +0100
+Date: Tue Apr 6 22:00:14 2010 +0100
Use the topleft of the Rect of text annots to draw
@@ -31171,7 +33190,7 @@
commit 1422802f029483ad3e62a3a13e66b2d3990ac58f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 6 12:32:12 2010 +0200
+Date: Tue Apr 6 12:32:12 2010 +0200
[cairo] Use current fill_opacity when drawing soft masked images
@@ -31182,7 +33201,7 @@
commit c152d30f879e6cde45de58bb9249035e127e84e7
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Apr 5 18:55:29 2010 +0200
+Date: Mon Apr 5 18:55:29 2010 +0200
delete fileName in utils
@@ -31193,11 +33212,11 @@
commit f091c83414ab32a4ecf1fa2bd15f13a3cf113a86
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Apr 5 20:12:01 2010 +0100
+Date: Mon Apr 5 20:12:01 2010 +0100
add some docu
- poppler/CachedFile.h | 30 ++++++++++++++++++++++++++++++
+ poppler/CachedFile.h | 30 ++++++++++++++++++++++++++++++
poppler/CurlPDFDocBuilder.h | 2 ++
poppler/LocalPDFDocBuilder.h | 2 ++
poppler/PDFDocBuilder.h | 9 +++++++++
@@ -31207,25 +33226,25 @@
commit fc071d800cb4329a3ccf898d7bf16b4db7323ad8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 5 19:11:26 2010 +0100
+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 +++--
+ 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 at kde.org>
-Date: Mon Apr 5 16:55:02 2010 +0100
+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/CachedFile.cc | 18 ++++++++++--------
+ poppler/CachedFile.h | 8 +++++---
poppler/CurlCachedFile.cc | 9 +++++----
poppler/CurlCachedFile.h | 3 ++-
poppler/CurlPDFDocBuilder.cc | 9 +++++----
@@ -31239,19 +33258,19 @@
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 ++--
+ 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 at kde.org>
-Date: Mon Apr 5 16:50:58 2010 +0100
+Date: Mon Apr 5 16:50:58 2010 +0100
forgot my (C)
@@ -31260,7 +33279,7 @@
commit ed723c8ac4a21a50d7d236cdcf7a635defd8dffb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 5 16:50:15 2010 +0100
+Date: Mon Apr 5 16:50:15 2010 +0100
The copy constructor of GooString never worked, so do not use it
@@ -31269,7 +33288,7 @@
commit a28be8e4009b86fdfd92da928def194225a736c6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 5 16:49:06 2010 +0100
+Date: Mon Apr 5 16:49:06 2010 +0100
Add some const correctnes to GooString
@@ -31279,7 +33298,7 @@
commit 46aee9e4d225b88a3dfd4afbe57259f337bb15d3
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Apr 5 14:36:09 2010 +0200
+Date: Mon Apr 5 14:36:09 2010 +0200
Use PDFDocFactory in utils
@@ -31295,12 +33314,12 @@
commit d487a90688c4431075c9e4db040b3b02625e208f
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Apr 5 14:35:52 2010 +0200
+Date: Mon Apr 5 14:35:52 2010 +0200
Add PDFDocFactory
- CMakeLists.txt | 2 ++
- poppler/Makefile.am | 2 ++
+ CMakeLists.txt | 2 ++
+ poppler/Makefile.am | 2 ++
poppler/PDFDocFactory.cc | 71
++++++++++++++++++++++++++++++++++++++++++++++++
poppler/PDFDocFactory.h | 42 ++++++++++++++++++++++++++++
@@ -31308,28 +33327,28 @@
commit 869135920831fb0d15db734f3dcd7a67146cc241
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Feb 24 15:24:26 2010 +0100
+Date: Wed Feb 24 15:24:26 2010 +0100
Add CurlPDFDocBuilder
- CMakeLists.txt | 2 ++
+ CMakeLists.txt | 2 ++
poppler/CurlPDFDocBuilder.cc | 46
++++++++++++++++++++++++++++++++++++++++++++
poppler/CurlPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++
- poppler/Makefile.am | 6 ++++--
+ poppler/Makefile.am | 6 ++++--
4 files changed, 82 insertions(+), 2 deletions(-)
commit ec5c6117a64f9cb03560091c4d7948d4287b6975
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Feb 25 11:23:28 2010 +0100
+Date: Thu Feb 25 11:23:28 2010 +0100
Add LocalPDFDocBuilder and StdinPDFDocBuilder
- CMakeLists.txt | 4 ++++
+ CMakeLists.txt | 4 ++++
poppler/LocalPDFDocBuilder.cc | 45
+++++++++++++++++++++++++++++++++++++++++++
poppler/LocalPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++
- poppler/Makefile.am | 4 ++++
+ poppler/Makefile.am | 4 ++++
poppler/StdinPDFDocBuilder.cc | 42
++++++++++++++++++++++++++++++++++++++++
poppler/StdinPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++
@@ -31337,18 +33356,18 @@
commit 919b735d1c0b99bf72280aff8db87ba503954498
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Apr 4 11:05:35 2010 +0200
+Date: Sun Apr 4 11:05:35 2010 +0200
Add PDFDocBuilder
- CMakeLists.txt | 1 +
- poppler/Makefile.am | 1 +
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
poppler/PDFDocBuilder.h | 32 ++++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
commit 1ab07faf05661d6d92186974c4b1c279b6178747
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Apr 4 11:29:53 2010 +0200
+Date: Sun Apr 4 11:29:53 2010 +0200
Add PDFDoc::ErrorPDFDoc
@@ -31358,7 +33377,7 @@
commit efc7e5efeddd8f70b7c74573d3194aba0a7d4631
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Apr 4 11:17:37 2010 +0200
+Date: Sun Apr 4 11:17:37 2010 +0200
Cleanup PDFDoc
@@ -31368,27 +33387,27 @@
commit 08a3435e67ebf21beac2fefcbd21ad65f9293fd1
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Feb 23 02:29:26 2010 +0100
+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
+ CMakeLists.txt | 18 ++++++++
+ config.h.cmake | 6 +++
+ configure.ac | 16 +++++++
+ poppler/CurlCachedFile.cc | 95
++++++++++++++++++++++++++++++++++++++++++
- poppler/CurlCachedFile.h | 39 +++++++++++++++++
- poppler/Makefile.am | 20 +++++++++
+ poppler/CurlCachedFile.h | 39 +++++++++++++++++
+ poppler/Makefile.am | 20 +++++++++
poppler/poppler-config.h.cmake | 5 +++
- poppler/poppler-config.h.in | 5 +++
- utils/pdfinfo.cc | 16 ++++++-
+ poppler/poppler-config.h.in | 5 +++
+ utils/pdfinfo.cc | 16 ++++++-
9 files changed, 219 insertions(+), 1 deletion(-)
commit a87abf6ad9fb66d35a70c9412adc5d8ba2889b96
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Feb 24 14:46:59 2010 +0100
+Date: Wed Feb 24 14:46:59 2010 +0100
Use cached files to read from stdin in pdfinfo
@@ -31399,12 +33418,12 @@
commit 958b04b14baf03c07492fa1cbd225d9968b9efc1
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Feb 23 02:02:10 2010 +0100
+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 ++
+ CMakeLists.txt | 2 ++
+ poppler/Makefile.am | 2 ++
poppler/StdinCachedFile.cc | 37 +++++++++++++++++++++++++++++++++++++
poppler/StdinCachedFile.h | 26 ++++++++++++++++++++++++++
4 files changed, 67 insertions(+)
@@ -31411,7 +33430,7 @@
commit 9539f75bd06150a3868209c5b04a75f5253722cc
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Apr 3 15:08:20 2010 +0200
+Date: Sat Apr 3 15:08:20 2010 +0200
Add support for cached files
@@ -31426,7 +33445,7 @@
commit 8c6aefb8aa8929b9c47791d3062ed3ac8512626f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Apr 4 16:08:12 2010 +0200
+Date: Sun Apr 4 16:08:12 2010 +0200
[lexer] Correctly parse numbers with '+' sign
@@ -31437,7 +33456,7 @@
commit ab5044e451e3714d385295f0b4ce9a15c8f2562c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 4 12:32:42 2010 +0100
+Date: Sun Apr 4 12:32:42 2010 +0100
Add the -o[dd] and -e[ven] options to pdftoppm
@@ -31451,7 +33470,7 @@
commit 0e371fb628a7e7d0cc1656e6405af4c97dbebf5d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 4 12:30:34 2010 +0100
+Date: Sun Apr 4 12:30:34 2010 +0100
Fix my roll optimization
@@ -31462,7 +33481,7 @@
commit a32f6f9ebaed3e4827b9dc6cb37e307c2798f521
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 28 18:43:14 2010 +0200
+Date: Sun Mar 28 18:43:14 2010 +0200
[cairo] Do not change device offset of mask surface
@@ -31475,7 +33494,7 @@
commit efa5d9544d29252e3df36cc4e65c3d880b3c5172
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 27 22:11:49 2010 +0000
+Date: Sat Mar 27 22:11:49 2010 +0000
remove empty section
@@ -31484,20 +33503,20 @@
commit 5722df7a5387e43ec73f659ca58d2d07b9c4be3b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 27 22:04:43 2010 +0000
+Date: Sat Mar 27 22:04:43 2010 +0000
poppler 0.13.2
CMakeLists.txt | 2 +-
- NEWS | 39 +++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Sat Mar 27 22:00:58 2010 +0000
+Date: Sat Mar 27 22:00:58 2010 +0000
gtk-doc changes
@@ -31505,16 +33524,16 @@
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 ++++++++++
+ glib/reference/tmpl/poppler.sgml | 10 ++++++++++
5 files changed, 31 insertions(+), 13 deletions(-)
commit ed0354be4eac615b80e7a868984cc527853788b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 27 21:44:59 2010 +0000
+Date: Sat Mar 27 21:44:59 2010 +0000
some forgotten copyrights
- qt/poppler-page.cc | 2 +-
+ qt/poppler-page.cc | 2 +-
qt4/src/poppler-document.cc | 2 +-
qt4/src/poppler-movie.cc | 3 ++-
qt4/src/poppler-page.cc | 2 +-
@@ -31522,7 +33541,7 @@
commit 2aedeedf9ef2e2d3eb17bc36d728e68c2f7af762
Author: Hib Eris <hib at hiberis.nl>
-Date: Sat Mar 27 14:38:27 2010 +0000
+Date: Sat Mar 27 14:38:27 2010 +0000
Correctly initialize actualText
@@ -31531,11 +33550,11 @@
commit b53f9b203598555d6d706c3804aba013b8566921
Author: Jan Engelhardt <jengelh at medozas.de>
-Date: Sat Mar 27 13:23:42 2010 +0000
+Date: Sat Mar 27 13:23:42 2010 +0000
make qt3 detection use pkgconfig
- m4/qt.m4 | 101
+ m4/qt.m4 | 101
+++++----------------------------------------------------
qt/Makefile.am | 4 +--
2 files changed, 10 insertions(+), 95 deletions(-)
@@ -31542,7 +33561,7 @@
commit 320d4cee46e108498440179d8f9eab22cd5383d9
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 24 21:51:58 2010 +0100
+Date: Wed Mar 24 21:51:58 2010 +0100
Revert "no more needed"
@@ -31554,7 +33573,7 @@
commit af21b5ab366bfdda203c26a77f4ae6ed0e70f64e
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 23 00:13:21 2010 +0100
+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
@@ -31562,7 +33581,7 @@
this way each bit (GLIB, GDK, and GTK) can be enabled/disabled
independently from the others
- CMakeLists.txt | 4 +++-
+ CMakeLists.txt | 4 +++-
cmake/modules/FindGDK.cmake | 14 +-------------
cmake/modules/FindGLIB.cmake | 14 +-------------
cmake/modules/FindGTK.cmake | 14 +-------------
@@ -31570,7 +33589,7 @@
commit 9b93ed5ce6712ec4cdf58148628e95685c289ef5
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 23 00:02:27 2010 +0100
+Date: Tue Mar 23 00:02:27 2010 +0100
[CMake] copy FindGTK.cmake as FindGLIB.cmake and FindGDK.cmake
@@ -31582,7 +33601,7 @@
commit 0ec21cae0b4623644c3efca1d2836a9f38f25737
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 22:11:04 2010 +0100
+Date: Mon Mar 22 22:11:04 2010 +0100
[Qt] add the unhandled cases for 'actionOCGState'
@@ -31591,17 +33610,17 @@
commit 5211e09595135b8e6c68efd1b8b689b518092b84
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 22:07:44 2010 +0100
+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 +
+ CMakeLists.txt | 1 +
cpp/tests/CMakeLists.txt | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 22:00:55 2010 +0100
+Date: Mon Mar 22 22:00:55 2010 +0100
no more needed
@@ -31610,7 +33629,7 @@
commit a07ef8f703ab896f89ed211a5780e4a669b04fc7
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 22:00:15 2010 +0100
+Date: Mon Mar 22 22:00:15 2010 +0100
[CMake] revert addition of "-Wl,--no-add-needed" to the link flags,
if available
@@ -31622,7 +33641,7 @@
commit 86debcc9bba28a7c86f01ca9e63bde5fcd541846
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 21:49:22 2010 +0100
+Date: Mon Mar 22 21:49:22 2010 +0100
[CMake] add "-ansi" to the CXXFLAGS only on Linux
@@ -31632,13 +33651,13 @@
commit 0819acd52a2ce74f0e176626d7b2233e10232d53
Merge: c4ddbe8 92738eb
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 22 21:43:01 2010 +0100
+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 at kde.org>
-Date: Mon Mar 22 20:28:15 2010 +0000
+Date: Mon Mar 22 20:28:15 2010 +0000
Add a search overload that takes doubles
@@ -31646,12 +33665,12 @@
infinitely because of double->float conversion
qt4/src/poppler-page.cc | 22 +++++++++++++++-------
- qt4/src/poppler-qt4.h | 16 ++++++++++++++--
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 9 deletions(-)
commit 0a895f14c8125c5de7b97e8e799459c431eb51cb
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Mon Mar 22 19:03:54 2010 +0000
+Date: Mon Mar 22 19:03:54 2010 +0000
correctly initialize the grayscale softmask color
@@ -31662,7 +33681,7 @@
commit c4ddbe89df9e48343a9606728b7c182080d87ece
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sat Mar 20 21:55:17 2010 +0100
+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
@@ -31674,7 +33693,7 @@
commit 97da1f9d060493d9fb54a20e980c3f6e2b82c97e
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 20 17:51:07 2010 +0100
+Date: Sat Mar 20 17:51:07 2010 +0100
[CMake] check whether a link flag is supported before adding it to
the link flags
@@ -31687,7 +33706,7 @@
commit 223bce6d14e632f457a81b2ec091fe16369d2eb6
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 20 14:08:58 2010 +0100
+Date: Sat Mar 20 14:08:58 2010 +0100
[CMake] with GCC, pass --as-needed and --no-add-needed to the linker
@@ -31702,7 +33721,7 @@
commit fc761f0d385708daaef1b95968532795b04f11b0
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 20 14:05:59 2010 +0100
+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
@@ -31712,7 +33731,7 @@
commit a210440b05d14efc53224a10e8b3ac7d508043b5
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 20 14:04:02 2010 +0100
+Date: Sat Mar 20 14:04:02 2010 +0100
[CMake] poppler-glib uses the freetype API, so it must explicitly
link to it
@@ -31722,7 +33741,7 @@
commit f5d352666b92cee0390470d7b892ec8dcbf046a5
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 20 14:03:19 2010 +0100
+Date: Sat Mar 20 14:03:19 2010 +0100
[CMake] pdftoabw uses the libxml2 API, so it must explicitly link
to it
@@ -31732,7 +33751,7 @@
commit 3fc2c4affe825f4aabcee161ec794338bd359403
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 13:52:52 2010 +0100
+Date: Thu Mar 18 13:52:52 2010 +0100
[glib] Use g_slice_new/free instead of g_new/free to alloc/free
iterators
@@ -31742,7 +33761,7 @@
commit 7bd6a8558646983669ce699f83d5ed42d7fce476
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 13:34:03 2010 +0100
+Date: Thu Mar 18 13:34:03 2010 +0100
[glib] Move find_annot_movie_for_action() from page to action
@@ -31750,13 +33769,13 @@
glib/poppler-action.cc | 93
++++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.cc | 79 ------------------------------------------
+ glib/poppler-page.cc | 79 ------------------------------------------
glib/poppler-private.h | 2 --
3 files changed, 82 insertions(+), 92 deletions(-)
commit e5e3d310aa488638431dd85ac3383a12056674bf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 12:20:26 2010 +0100
+Date: Thu Mar 18 12:20:26 2010 +0100
Update copyright header
@@ -31766,7 +33785,7 @@
commit c76870178a031e437de3f9ed7baa64efb96955d6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 12:13:36 2010 +0100
+Date: Thu Mar 18 12:13:36 2010 +0100
[glib-demo] OCG State Actions demo
@@ -31776,19 +33795,19 @@
commit 456e42f91dfbf73b71a5dbdde13d7ccdb5637d79
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 12:12:51 2010 +0100
+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 +
+ glib/poppler-action.h | 25 +++++++++-
+ glib/poppler.h | 1 +
3 files changed, 150 insertions(+), 1 deletion(-)
commit 4b109899e0732bbf65cacd875829e869e61eda48
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 12:10:19 2010 +0100
+Date: Thu Mar 18 12:10:19 2010 +0100
[glib] Make get_layer_rbgroup() and get_layers() doc funcs public
for internal use
@@ -31799,7 +33818,7 @@
commit 38a55f6118debf994ce1fc41e987b0e3766047ba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 18 12:08:30 2010 +0100
+Date: Thu Mar 18 12:08:30 2010 +0100
Add support for Set-OCG-State actions
@@ -31812,7 +33831,7 @@
commit bf398e53b0823d0a6272679858b67c5ffd704425
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 23:06:44 2010 +0100
+Date: Wed Mar 17 23:06:44 2010 +0100
[CMake] fix pkg-config executable variable name
@@ -31821,7 +33840,7 @@
commit ab1a37666704d6b15c19b694ee191327847c23da
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 23:04:01 2010 +0100
+Date: Wed Mar 17 23:04:01 2010 +0100
[CMake] proper way of looking for pkg-config
@@ -31830,7 +33849,7 @@
commit 7f07a7dcea031f99a9a6d7c424184a2e69ee0062
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 22:58:08 2010 +0100
+Date: Wed Mar 17 22:58:08 2010 +0100
[CMake] update FindFontconfig.cmake with a more recent version
@@ -31841,7 +33860,7 @@
commit beee143ffbdc699ab19f10a01e5747200ea1927a
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 18:36:32 2010 +0100
+Date: Wed Mar 17 18:36:32 2010 +0100
[CMake] set the LINK_INTERFACE_LIBRARIES for the poppler and
poppler-cpp libraries
@@ -31855,7 +33874,7 @@
commit 5ab791cb2a029edcde84b00a47165adfe4d98a98
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 16:39:38 2010 +0100
+Date: Wed Mar 17 16:39:38 2010 +0100
[CMake] small cleanups in FindGTK.cmake
@@ -31868,7 +33887,7 @@
commit fcbc76d82e3059c8288fbdc8da117ac9b38a70f2
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 16:36:41 2010 +0100
+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
@@ -31878,7 +33897,7 @@
commit 5b8135e0899aa3578045eca40940a3495c48d895
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 16:27:40 2010 +0100
+Date: Wed Mar 17 16:27:40 2010 +0100
[CMake] link poppler-glib to the gdk2 libraries, if gdk2 was found
@@ -31887,7 +33906,7 @@
commit 3dc4979d72048e81ae3b2d60dab11e791ac95696
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 16:26:04 2010 +0100
+Date: Wed Mar 17 16:26:04 2010 +0100
[CMake] switch gdk2 search to use the new pkg_check_modules() way
@@ -31896,7 +33915,7 @@
commit 0ef3d899cb8dea75c97ae1038cac5006f97bc0d2
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 16:05:07 2010 +0100
+Date: Wed Mar 17 16:05:07 2010 +0100
[CMake] switch glib2 search to use the new pkg_check_modules() way
@@ -31905,7 +33924,7 @@
commit d2dc83cb8de481e44ea584eee77881978af920fa
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 15:56:16 2010 +0100
+Date: Wed Mar 17 15:56:16 2010 +0100
[CMake] rename GLIB_VERSION to GLIB_REQUIRED
@@ -31912,13 +33931,13 @@
this way it matches autotools, and it is going to not conflict with
my next changes
- CMakeLists.txt | 4 ++--
+ CMakeLists.txt | 4 ++--
cmake/modules/FindGTK.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 34accfe27305cae18e09243ab2a607287b86fa47
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 13:55:09 2010 +0100
+Date: Wed Mar 17 13:55:09 2010 +0100
[CMake] set all the definitions for poppler-glib in a single place
@@ -31927,7 +33946,7 @@
commit 3d93daf50c61019ca70f42e7ccf33897800b262a
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 17 13:49:22 2010 +0100
+Date: Wed Mar 17 13:49:22 2010 +0100
[CMake] no need to check for BUILD_GTK_TESTS for single tests
@@ -31939,7 +33958,7 @@
commit 946a11345d01d39538d22114e50aa3e179059883
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 20:24:25 2010 +0100
+Date: Mon Mar 15 20:24:25 2010 +0100
[build] Update cmake files
@@ -31949,7 +33968,7 @@
commit 922c0fe392ba439453edb5b2e88b74f0caa586b3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 20:08:23 2010 +0100
+Date: Mon Mar 15 20:08:23 2010 +0100
[glib-demo] Rendition actions demo
@@ -31959,31 +33978,31 @@
commit 163b3f79d67543bc37b64875e30dcc9b7053e1d5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 20:08:00 2010 +0100
+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 +++++++++++++-
+ glib/poppler-action.h | 14 +++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
commit d9b1e40751beddf48a8694b20bfcc4b4cb41060a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 20:06:45 2010 +0100
+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/Makefile.am | 2 +
+ glib/poppler-media.cc | 302
+++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-media.h | 53 +++++++++
+ glib/poppler-media.h | 53 +++++++++
glib/poppler-private.h | 2 +
- glib/poppler.h | 2 +
+ glib/poppler.h | 2 +
5 files changed, 361 insertions(+)
commit 0224b81c4729a98a56b7a68054422ea655018d6a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 17:54:03 2010 +0100
+Date: Mon Mar 15 17:54:03 2010 +0100
[glib-demo] Add page number to annots demo
@@ -31992,7 +34011,7 @@
commit 0153b892c63e4fccd0819150cf7b4213857a11c5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 17:49:51 2010 +0100
+Date: Mon Mar 15 17:49:51 2010 +0100
[glib] Add poppler_annot_get_page_index() to get the page associated
to annot
@@ -32003,7 +34022,7 @@
commit b47337ea91696fea8f42a68a6fa160681ab284b2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 17:49:17 2010 +0100
+Date: Mon Mar 15 17:49:17 2010 +0100
[annots] Checks screen annots associated with a rendition action
have a valid page ref
@@ -32013,7 +34032,7 @@
commit 9417fd793ec8d806822669aa614193073e7dfe50
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 16:52:30 2010 +0100
+Date: Mon Mar 15 16:52:30 2010 +0100
[annots] Save page index of the page associated with the annot
@@ -32023,7 +34042,7 @@
commit 36b76a5d01b74c6381433b6f6f7ffb9f02696a60
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 14:12:11 2010 +0100
+Date: Mon Mar 15 14:12:11 2010 +0100
Rework LinkRendition to follow the spec
@@ -32034,7 +34053,7 @@
commit 7b5885ee7d2026df9a6e87327b6d02f37d79b8b2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 12:25:12 2010 +0100
+Date: Mon Mar 15 12:25:12 2010 +0100
[glib-demo] Annot screen demo
@@ -32043,23 +34062,23 @@
commit bdb76c7cb89bcb6fb139b0ef348d96b7780d57ed
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 12:24:19 2010 +0100
+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.cc | 75
++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 8 ++++++
- glib/poppler-page.cc | 3 ++
+ glib/poppler-annot.h | 8 ++++++
+ glib/poppler-page.cc | 3 ++
glib/poppler-private.h | 1 +
- glib/poppler.h | 1 +
+ glib/poppler.h | 1 +
5 files changed, 88 insertions(+)
commit 54892b1375e360113432b07c6ba058f861d21fe8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 12:21:30 2010 +0100
+Date: Mon Mar 15 12:21:30 2010 +0100
[annots] Save the action already parsed in AnnotScreen
@@ -32069,7 +34088,7 @@
commit 5a84a2d749478f19631dbfad2be06ec4ea85038c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 11:16:17 2010 +0100
+Date: Mon Mar 15 11:16:17 2010 +0100
[glib-demo] Annot and links movie demo
@@ -32076,12 +34095,12 @@
glib/demo/annots.c | 20 ++++++++++
glib/demo/utils.c | 115
++++++++++++++++++++++++++++++++++++++++++++++++++++-
- glib/demo/utils.h | 3 ++
+ glib/demo/utils.h | 3 ++
3 files changed, 137 insertions(+), 1 deletion(-)
commit 2cf5ee4f62089df099f78cd4d39a4eb7589d1b47
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 11:04:17 2010 +0100
+Date: Mon Mar 15 11:04:17 2010 +0100
[glib] Add support for movie actions
@@ -32088,8 +34107,8 @@
Based on patch by Hugo Mercier.
glib/poppler-action.cc | 35 ++++++++++++++++++----
- glib/poppler-action.h | 15 ++++++++--
- glib/poppler-page.cc | 81
+ glib/poppler-action.h | 15 ++++++++--
+ glib/poppler-page.cc | 81
+++++++++++++++++++++++++++++++++++++++++++++++++-
glib/poppler-private.h | 2 ++
4 files changed, 125 insertions(+), 8 deletions(-)
@@ -32096,56 +34115,56 @@
commit 132b6f072fefd231d42f31626f1b5009c4e8319e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 10:56:23 2010 +0100
+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.cc | 97
++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 10 ++++++
- glib/poppler-page.cc | 3 ++
+ glib/poppler-annot.h | 10 ++++++
+ glib/poppler-page.cc | 3 ++
glib/poppler-private.h | 1 +
- glib/poppler.h | 1 +
+ glib/poppler.h | 1 +
5 files changed, 112 insertions(+)
commit aecad2bb12be44825d273e364ec6a0444dac5605
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 15 10:48:03 2010 +0100
+Date: Mon Mar 15 10:48:03 2010 +0100
[glib] Add PopplerMovie class
- glib/Makefile.am | 2 +
- glib/poppler-movie.cc | 140
+ glib/Makefile.am | 2 +
+ glib/poppler-movie.cc | 140
+++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-movie.h | 42 +++++++++++++++
+ glib/poppler-movie.h | 42 +++++++++++++++
glib/poppler-private.h | 2 +
- glib/poppler.h | 2 +
+ glib/poppler.h | 2 +
5 files changed, 188 insertions(+)
commit 5b3234a16e0d465bff2b5e277cb64b4f4b0a8dbd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 14 16:10:26 2010 +0100
+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/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/Movie.h | 138 +++------------
+ poppler/Rendition.cc | 400
+++++++++++++++++++++++++++++++++++++++++++
- poppler/Rendition.h | 157 +++++++++++++++++
+ poppler/Rendition.h | 157 +++++++++++++++++
qt4/src/poppler-movie.cc | 9 +-
9 files changed, 657 insertions(+), 519 deletions(-)
commit f9c163730478e3b6d8a1e73dbae6c52c28ae1e84
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 8 14:49:12 2010 +0100
+Date: Mon Mar 8 14:49:12 2010 +0100
[Qt4] include Object.h and Annot.h, now needed
@@ -32154,7 +34173,7 @@
commit a00532f509c19c5455e0db5068db95dd4583e8dd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 8 14:22:53 2010 +0100
+Date: Mon Mar 8 14:22:53 2010 +0100
Check for Null instead of None to know whether a dict entry is present
@@ -32165,7 +34184,7 @@
commit b51e66c9a7e2f7f39ae1edf8bda02a7bc1ad4ebd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 8 14:15:22 2010 +0100
+Date: Mon Mar 8 14:15:22 2010 +0100
[annots] Create appearance stream for Movie Annotations when not
defined
@@ -32179,7 +34198,7 @@
commit fae59411852e5c2c45825c5ea963318f1ed5dc6a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 8 14:07:09 2010 +0100
+Date: Mon Mar 8 14:07:09 2010 +0100
Fix handling of poster in Movie
@@ -32192,7 +34211,7 @@
commit a451f83d101bf265a1e7e2a17c0b320895e70f4e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 7 12:22:57 2010 +0100
+Date: Sun Mar 7 12:22:57 2010 +0100
Save width, height (aspect) in Movie object and provide getAspect()
method
@@ -32203,23 +34222,23 @@
commit f88d469f860da17055fc4b98b64aef241fcf0185
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 6 12:33:40 2010 +0100
+Date: Sat Mar 6 12:33:40 2010 +0100
Move Movie objects parsing code from Annot to Movie
- poppler/Annot.cc | 244
+ poppler/Annot.cc | 244
++-------------------------------------------
- poppler/Annot.h | 73 +-------------
- poppler/Link.cc | 4 +-
- poppler/Movie.cc | 255
+ poppler/Annot.h | 73 +-------------
+ poppler/Link.cc | 4 +-
+ poppler/Movie.cc | 255
+++++++++++++++++++++++++++++++++++++++--------
- poppler/Movie.h | 25 +++--
+ poppler/Movie.h | 25 +++--
qt4/src/poppler-movie.cc | 11 +-
6 files changed, 246 insertions(+), 366 deletions(-)
commit ec9138b574c7226ad733880d3d43b86bb72073f4
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 23:17:50 2010 +0100
+Date: Sun Mar 7 23:17:50 2010 +0100
[autotools] add also cpp/tests/CMakeLists.txt to the "dist files"
@@ -32228,7 +34247,7 @@
commit ef3258d6fc57e7a62d951cc826804e50e8e1b526
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 23:14:12 2010 +0100
+Date: Sun Mar 7 23:14:12 2010 +0100
[autotools] fix location of poppler-config.h.cmake
@@ -32237,7 +34256,7 @@
commit fd1d9c882997ff35acd5a458e9dfeba3ad6c8b25
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 22:42:06 2010 +0100
+Date: Sun Mar 7 22:42:06 2010 +0100
[CMake] just enable what needed each time
@@ -32246,7 +34265,7 @@
commit 476bde472a7e694afde96a04ea335fe9582d6fad
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 22:39:45 2010 +0100
+Date: Sun Mar 7 22:39:45 2010 +0100
[CMake] add small description for the zlib option
@@ -32257,7 +34276,7 @@
commit 1267d7e0c36e262984070a3b55fea46e7289a4b4
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 19:34:03 2010 +0100
+Date: Sun Mar 7 19:34:03 2010 +0100
[CMake] add a note about gtk-doc not supported yet
@@ -32266,7 +34285,7 @@
commit 201b18ad0837e84d874b56e1b0469d1b2d45378b
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 19:30:36 2010 +0100
+Date: Sun Mar 7 19:30:36 2010 +0100
[CMake] sync with poppler-config.h.in: add
WITH_FONTCONFIGURATION_{FONTCONFIG,WIN32}
@@ -32276,21 +34295,18 @@
commit 0d0044e8cc2d406f066338102ec73e1b56214cc3
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 19:25:27 2010 +0100
+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(-)
+ CMakeLists.txt | 2 +-
+ poppler-config.h.cmake => poppler/poppler-config.h.cmake | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
commit f785e29a901d2c76204dd26e9585446fdd817ebd
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 18:35:34 2010 +0100
+Date: Sun Mar 7 18:35:34 2010 +0100
[CMake] remove the generated poppler-enums.{c,h} in the clean target
@@ -32301,7 +34317,7 @@
commit 369604603375dbe3516136b6f8f9d0c26e0b744f
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 18:26:45 2010 +0100
+Date: Sun Mar 7 18:26:45 2010 +0100
[CMake] use the --template option of glib-mkenums (like done with
autotools)
@@ -32311,7 +34327,7 @@
commit bbcbb34fec10c90edd5960bdbcc6849bc8f39526
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:34:40 2010 +0100
+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
@@ -32322,7 +34338,7 @@
commit 190fa971c12ca1b3007f6ba349a77a7c15c47490
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:24:25 2010 +0100
+Date: Sun Mar 7 17:24:25 2010 +0100
reorder to match what's in the correspondent .in
@@ -32331,7 +34347,7 @@
commit ff46def8b178420a86a974ec2ce767a538bba8be
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:23:16 2010 +0100
+Date: Sun Mar 7 17:23:16 2010 +0100
[CMake] GDK_FEATURE is no more needed here
@@ -32340,7 +34356,7 @@
commit 1eb8026a3060ef61a88c535177510f7ac7e7fc25
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:19:58 2010 +0100
+Date: Sun Mar 7 17:19:58 2010 +0100
[CMake] set in one place whether to build the glib frontend
@@ -32349,7 +34365,7 @@
commit a1a6f23e2345814e147a72211ce9139555385223
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:09:58 2010 +0100
+Date: Sun Mar 7 17:09:58 2010 +0100
[CMake] correctly set the GLIB_REQ stuff
@@ -32359,17 +34375,17 @@
commit 0f2e5d6925c5938281d9bafc297a43867c4a915b
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 17:03:21 2010 +0100
+Date: Sun Mar 7 17:03:21 2010 +0100
[CMake] move the minimum GLib version to the main CMakeLists.txt
- CMakeLists.txt | 1 +
+ CMakeLists.txt | 1 +
cmake/modules/FindGTK.cmake | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit efdffba45d15b538dbfb294403e99f3a6470b4d9
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 16:58:27 2010 +0100
+Date: Sun Mar 7 16:58:27 2010 +0100
[CMake] align the GDK stuff (GDK_{FEATURE,REQ}) to what done with
autotools
@@ -32380,7 +34396,7 @@
commit cfecc69b7f05920f543ee7e9aafeafaa4c3506fb
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 16:49:14 2010 +0100
+Date: Sun Mar 7 16:49:14 2010 +0100
[CMake] apparently there's not a minimum version requirement for GDK,
so drop the check
@@ -32390,7 +34406,7 @@
commit 8ff1cf03d2607b0f13bbbbf272f2b03d8927bd24
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 16:47:21 2010 +0100
+Date: Sun Mar 7 16:47:21 2010 +0100
[CMake] first look for Cairo, then for GLib/GDK/GTK
@@ -32398,12 +34414,12 @@
also, move the CAIRO_FEATURE to the main CMakeLists.txt
CMakeLists.txt | 19 +++++++++++--------
- glib/CMakeLists.txt | 1 -
+ glib/CMakeLists.txt | 1 -
2 files changed, 11 insertions(+), 9 deletions(-)
commit bcaf62b8e252594530d3050761ba563cf3b1fb6e
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 16:00:03 2010 +0100
+Date: Sun Mar 7 16:00:03 2010 +0100
[CMake] enhance/rewrite a bit the FindCairo module
@@ -32420,20 +34436,20 @@
apply the changes to the rest of the build system (specify the
version needed, use the correct variable for includes)
- CMakeLists.txt | 2 +-
+ CMakeLists.txt | 2 +-
cmake/modules/FindCairo.cmake | 64
+++++++++++++++++++++++++++----------------
- glib/CMakeLists.txt | 2 +-
+ glib/CMakeLists.txt | 2 +-
3 files changed, 43 insertions(+), 25 deletions(-)
commit c96aa0f5fc74ae04f483485b787aaf65f1791991
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 02:01:13 2010 +0100
+Date: Sun Mar 7 02:01:13 2010 +0100
add Patrick's copyright notices
- cpp/poppler-global.h | 1 +
- goo/gtypes.h | 14 ++++++++++++++
+ cpp/poppler-global.h | 1 +
+ goo/gtypes.h | 14 ++++++++++++++
poppler/GlobalParams.cc | 1 +
poppler/SplashOutputDev.cc | 1 +
4 files changed, 17 insertions(+)
@@ -32440,7 +34456,7 @@
commit 3311bedd2eb831ef1fd553f3f50960331cf6885f
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Mar 7 01:56:15 2010 +0100
+Date: Sun Mar 7 01:56:15 2010 +0100
MSVC: disable for the 'ustring' class the warning C4251 (which does
not apply)
@@ -32450,7 +34466,7 @@
commit 9efa18397bd05fbd27c7811fa6e0f34ce94012e0
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Mar 7 01:48:03 2010 +0100
+Date: Sun Mar 7 01:48:03 2010 +0100
MSVC: disable warning C4800, which is of no use for now
@@ -32459,7 +34475,7 @@
commit 3a88d1bf8d2c5a9e8014e0d46e24c9ec06556469
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Mar 7 01:26:10 2010 +0100
+Date: Sun Mar 7 01:26:10 2010 +0100
MSVC: no isfinite(), so provide it using _finite()
@@ -32468,7 +34484,7 @@
commit 7774912c46f832f25c51b4cfc0e9430b1cd7fa1f
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Mar 7 01:22:31 2010 +0100
+Date: Sun Mar 7 01:22:31 2010 +0100
MSVC: do not force constness here, so the right overload will
be chosen
@@ -32478,7 +34494,7 @@
commit cf07a5d85b402b6956c9605fbdc88bddcb94a3cf
Author: Pino Toscano <pino at kde.org>
-Date: Sun Mar 7 00:49:07 2010 +0100
+Date: Sun Mar 7 00:49:07 2010 +0100
[CMake] show end yes/no message about the GDK usage
@@ -32489,7 +34505,7 @@
commit 42c98f8eabe304d5e3dc8c1ebdd5b0b6c221e696
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 6 17:18:08 2010 +0100
+Date: Sat Mar 6 17:18:08 2010 +0100
[CMake] make the font configuration backend selection take a string
(like with autotools)
@@ -32505,7 +34521,7 @@
commit bda6e7cd089f2970af2e9540b4415633ffcf0ebb
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 6 17:13:30 2010 +0100
+Date: Sat Mar 6 17:13:30 2010 +0100
[CMake] add a show_end_message() macro to show a generic string
as value
@@ -32518,18 +34534,18 @@
commit d313c0f508711b3b7166b84608c43ebf1f07194b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 6 17:08:59 2010 +0100
+Date: Sat Mar 6 17:08:59 2010 +0100
[CMake] rename the show_end_message() macro to
show_end_message_yesno()
- CMakeLists.txt | 26 +++++++++++++-------------
+ CMakeLists.txt | 26 +++++++++++++-------------
cmake/modules/PopplerMacros.cmake | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
commit 0425ff835fa26df5e25e628a6c56f3a180713905
Author: Pino Toscano <pino at kde.org>
-Date: Fri Mar 5 22:21:56 2010 +0100
+Date: Fri Mar 5 22:21:56 2010 +0100
update copyright
@@ -32538,7 +34554,7 @@
commit c5ea135ca58e112110be3ae10d887f3188172765
Author: Pino Toscano <pino at kde.org>
-Date: Fri Mar 5 22:14:57 2010 +0100
+Date: Fri Mar 5 22:14:57 2010 +0100
[arthur] update the miter limit
@@ -32547,7 +34563,7 @@
commit 552f344b3e3df7c796afa6946149b0a5590cc4f7
Author: Pino Toscano <pino at kde.org>
-Date: Fri Mar 5 22:04:39 2010 +0100
+Date: Fri Mar 5 22:04:39 2010 +0100
[arthur] update the line dash style
@@ -32556,7 +34572,7 @@
commit bc42ee05fceef0d0dd2ab0587c184dfc37cf29bf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 5 18:54:32 2010 +0000
+Date: Fri Mar 5 18:54:32 2010 +0000
fix copyright year
@@ -32565,7 +34581,7 @@
commit b21461e91ed671ef29fd3cf4780fda44f82a0679
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 5 15:14:08 2010 +0100
+Date: Fri Mar 5 15:14:08 2010 +0100
[cairo] Close image stream before resetting it again
@@ -32574,7 +34590,7 @@
commit 866bcc7edb47fe11355081045e2d316a4d530649
Author: Pino Toscano <pino at kde.org>
-Date: Thu Mar 4 14:19:50 2010 +0100
+Date: Thu Mar 4 14:19:50 2010 +0100
[Qt4] no need to save&restore on a newly created painter
@@ -32583,7 +34599,7 @@
commit 654698b556eb53eab7c2d55fc6b3fdd9e35173bb
Author: Pino Toscano <pino at kde.org>
-Date: Thu Mar 4 13:16:11 2010 +0100
+Date: Thu Mar 4 13:16:11 2010 +0100
[Qt4] use Arthur unconditionally
@@ -32595,7 +34611,7 @@
commit 41931b6310d2ae81e622db904246f019ceb8410d
Author: Pino Toscano <pino at kde.org>
-Date: Thu Mar 4 13:13:11 2010 +0100
+Date: Thu Mar 4 13:13:11 2010 +0100
[Qt4] compile Arthur unconditionally
@@ -32602,14 +34618,14 @@
as the arthur output dev does not require splash anymore, we can
always compile it with poppler-qt4
- poppler/Makefile.am | 4 ++--
+ poppler/Makefile.am | 4 ++--
qt4/src/CMakeLists.txt | 6 +-----
- qt4/src/Makefile.am | 6 +-----
+ qt4/src/Makefile.am | 6 +-----
3 files changed, 4 insertions(+), 12 deletions(-)
commit 48a29e2bbc9aa9bd0cb2775a2365c0ffdeb6ce87
Author: Pino Toscano <pino at kde.org>
-Date: Thu Mar 4 13:11:43 2010 +0100
+Date: Thu Mar 4 13:11:43 2010 +0100
[Arthur] make ArthurOutputDev compile even with Splash disabled
@@ -32620,7 +34636,7 @@
commit 2013a19b6457753890affad8c4049f2ce4627df7
Author: Pino Toscano <pino at kde.org>
-Date: Thu Mar 4 13:02:43 2010 +0100
+Date: Thu Mar 4 13:02:43 2010 +0100
[CMake/tests] compile gtk-splash-test only if splash is enabled
@@ -32629,38 +34645,38 @@
commit ae740c5cfefbae13f82b750e39fa3dbbdc94858b
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 2 23:22:06 2010 +0100
+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 +-
+ 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 at kde.org>
-Date: Tue Mar 2 23:15:56 2010 +0100
+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 +-
+ cpp/poppler-global.h | 4 ++--
+ cpp/poppler-page.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
commit 690af1bc58de1ebe710c5e599f1cb635e4838fc8
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Mar 2 16:33:04 2010 +0100
+Date: Tue Mar 2 16:33:04 2010 +0100
[cpp] define poppler_cpp_EXPORTS when building with autotools as well
@@ -32671,7 +34687,7 @@
commit 7492a376e7e5ec35534276ac15485123645617b0
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 2 22:16:07 2010 +0100
+Date: Tue Mar 2 22:16:07 2010 +0100
[cpp/tests] use gmtime() when gmtime_r() is not available
@@ -32680,7 +34696,7 @@
commit de013cc14a0621782c53f481ed7e559f241855a3
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 2 22:05:25 2010 +0100
+Date: Tue Mar 2 22:05:25 2010 +0100
[cpp] include config.h _after_ the other includes
@@ -32689,7 +34705,7 @@
commit 388e5d6aebcabbfc90894c86248159c63701cb0a
Author: Hib Eris <hib at hiberis.nl>
-Date: Tue Mar 2 15:51:23 2010 +0100
+Date: Tue Mar 2 15:51:23 2010 +0100
Use ICONV_CONST when necessary
@@ -32698,31 +34714,31 @@
commit aaa58b26733a2f7c778632da4942b588050cf33f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 2 21:53:55 2010 +0100
+Date: Tue Mar 2 21:53:55 2010 +0100
[CMake] properly define ICONV_CONST
- CMakeLists.txt | 1 -
+ CMakeLists.txt | 1 -
cmake/modules/FindIconv.cmake | 3 +++
- config.h.cmake | 2 +-
+ config.h.cmake | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
commit 6304b0d8959fccf96b030c757d78e845d04757e4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 28 15:33:53 2010 +0100
+Date: Sun Feb 28 15:33:53 2010 +0100
poppler 0.13.1
CMakeLists.txt | 2 +-
- NEWS | 33 +++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 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 at kde.org>
-Date: Sun Feb 28 15:33:19 2010 +0100
+Date: Sun Feb 28 15:33:19 2010 +0100
Make sure the private headers end up in the tarball on make dist
@@ -32731,7 +34747,7 @@
commit b488172311c2921ab4c365d71ad8b1ab7f596c71
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 28 14:25:36 2010 +0100
+Date: Sun Feb 28 14:25:36 2010 +0100
Add copyright notices
@@ -32741,7 +34757,7 @@
commit 5453cff5b7cb47cadfdae585a58409117af8c1f1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 28 13:51:22 2010 +0100
+Date: Sun Feb 28 13:51:22 2010 +0100
[cairo] Select filter for images based on scale factor
@@ -32757,7 +34773,7 @@
commit e65456cbd5cae2750426aabeb2d66a10537616f0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 28 13:13:13 2010 +0100
+Date: Sun Feb 28 13:13:13 2010 +0100
[cairo] Refactor scaled size computation into a new method
@@ -32768,7 +34784,7 @@
commit 32aa9ae7d0087298661829265de00e93398272b3
Author: Jan Kümmel <jan+freedesktop at snorc.org>
-Date: Sat Feb 27 17:58:46 2010 +0100
+Date: Sat Feb 27 17:58:46 2010 +0100
[cairo] Omit writing of embedded fonts into tempary files
@@ -32780,7 +34796,7 @@
commit 7ba52a32343ca73730a80b64c136e3f03348e7d9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 27 17:42:46 2010 +0100
+Date: Sat Feb 27 17:42:46 2010 +0100
[cairo] Remove unused 'face' from CairoFreeTypeFont class
@@ -32790,7 +34806,7 @@
commit 7c3140c88c00282e10888143fffe3c402d48fb05
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Feb 27 13:13:47 2010 +0100
+Date: Sat Feb 27 13:13:47 2010 +0100
Don't use '\' character in PostScript names
@@ -32799,7 +34815,7 @@
commit 8e354a15a1861719c00799937ad9f9bb1bb71e9f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Wed Feb 24 18:58:11 2010 +0000
+Date: Wed Feb 24 18:58:11 2010 +0000
Fix remaining part of 26243
@@ -32813,7 +34829,7 @@
commit fcbc571a98775b1daa8f562fc8674fb2d15b6626
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 23 17:02:47 2010 +0100
+Date: Tue Feb 23 17:02:47 2010 +0100
[cpp] make checksum() return an array of data, instead of a string
@@ -32828,7 +34844,7 @@
commit fbefb9bef9f7a099d51919255a98f412d1e1d696
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 23 16:56:47 2010 +0100
+Date: Tue Feb 23 16:56:47 2010 +0100
[cpp apidox] add API documentation for the 'embedded_file' class
@@ -32838,7 +34854,7 @@
commit 6d39cca0a035fc656d3b86ba66dedaccee532fcb
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 23 16:41:56 2010 +0100
+Date: Tue Feb 23 16:41:56 2010 +0100
[cpp apidox] add API documentation for the 'toc' and 'toc_item'
classes
@@ -32849,18 +34865,18 @@
commit 857e4ceb26d959c48c7af6bff53ca1bfe5307236
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 23 15:39:58 2010 +0100
+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 +++++++---
+ cpp/poppler-document.cpp | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
commit 7838b182143086192ac8dcf571da0ce1743619e2
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 23 00:04:09 2010 +0100
+Date: Tue Feb 23 00:04:09 2010 +0100
[cpp] add the directory of the generated html apidox to the ignore
list
@@ -32870,7 +34886,7 @@
commit 71a38a23a9db5cac872c666283b7abcb1462210c
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 23:43:34 2010 +0100
+Date: Mon Feb 22 23:43:34 2010 +0100
[cpp] add page::text() to get the text inside a page region
@@ -32880,7 +34896,7 @@
commit 4c75360233bc67f097551980a46ecce976927220
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 23:05:53 2010 +0100
+Date: Mon Feb 22 23:05:53 2010 +0100
[cpp] add page::search()
@@ -32891,7 +34907,7 @@
commit 8932c53a084083eb42d109dd17bac3ad41ce65b5
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 22:39:36 2010 +0100
+Date: Mon Feb 22 22:39:36 2010 +0100
[cpp] add getters and setters for left/top/right/bottom
@@ -32900,7 +34916,7 @@
commit 8e1ea57f558fa3a1702a17d79b5aaffc486c6a56
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 22:19:51 2010 +0100
+Date: Mon Feb 22 22:19:51 2010 +0100
[cpp] add a global enum for case sensitivity
@@ -32909,7 +34925,7 @@
commit ae41b087de8f0a7d525320dcf1d64ff22fe982b6
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 19:06:21 2010 +0100
+Date: Mon Feb 22 19:06:21 2010 +0100
[cpp apidox] doxygen configuration for poppler-cpp
@@ -32919,7 +34935,7 @@
commit 1a36a7bcc684065478a3ade2c2938f0e3672140a
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 19:05:49 2010 +0100
+Date: Mon Feb 22 19:05:49 2010 +0100
[cpp apidox] very small start of intro page
@@ -32928,7 +34944,7 @@
commit 85e052ab7a4c462143325ecf60eebba35411b790
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 18:53:20 2010 +0100
+Date: Mon Feb 22 18:53:20 2010 +0100
[cpp apidox] start adding API documentation for the global 'poppler'
namespace
@@ -32941,7 +34957,7 @@
commit b01608f91fb6cf6e9c4fb6e6ee3cb57517a766bf
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 18:52:24 2010 +0100
+Date: Mon Feb 22 18:52:24 2010 +0100
[cpp apidox] exclude the 'detail' namespace from apidox extraction
@@ -32953,7 +34969,7 @@
commit f17a7a8cfdeabb3ced3ba8d42c869d892c528e13
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 18:51:30 2010 +0100
+Date: Mon Feb 22 18:51:30 2010 +0100
[cpp apidox] add API documentation for the version functions
@@ -32962,7 +34978,7 @@
commit f6c4bbddc7d04c0b1a6b25c41cbf6d81ae40cc0c
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 18:50:54 2010 +0100
+Date: Mon Feb 22 18:50:54 2010 +0100
[cpp apidox] start adding API documentation for 'document'
@@ -32972,7 +34988,7 @@
commit cbb7519904d9b6395d0128e16a79324e4b8bfcc0
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 22 13:15:11 2010 +0100
+Date: Mon Feb 22 13:15:11 2010 +0100
[CMake] no more need to build system check for the Cairo blend modes
@@ -32980,12 +34996,12 @@
build system
cmake/modules/FindCairo.cmake | 18 ------------------
- config.h.cmake | 3 ---
+ config.h.cmake | 3 ---
2 files changed, 21 deletions(-)
commit 80f47bbf45faf751c661c1d0931e8e1da622b8ca
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Feb 22 12:43:06 2010 +0100
+Date: Mon Feb 22 12:43:06 2010 +0100
[cairo] Use cairo_surface_set_mime_data() when printing
@@ -32999,7 +35015,7 @@
commit d63293af6dbff65f160be0118b1580c03a1aab56
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 27 09:52:23 2009 +0100
+Date: Fri Nov 27 09:52:23 2009 +0100
[cairo] Turn EXTEND_PAD off when printing
@@ -33009,18 +35025,18 @@
commit 880890c14e99a954b365a3a6b59deeffa5304d30
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Feb 22 11:01:05 2010 +0100
+Date: Mon Feb 22 11:01:05 2010 +0100
[cairo] Use CAIRO_VERSION macros to check whether blend modes are
available
- configure.ac | 24 ------------------------
+ configure.ac | 24 ------------------------
poppler/CairoOutputDev.cc | 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
commit 5c300ce00b5c59da767ca1ffec12f96f0ebbe701
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 21 21:20:10 2010 +0100
+Date: Sun Feb 21 21:20:10 2010 +0100
[Qt4/apidox] fix typo
@@ -33029,7 +35045,7 @@
commit 3f89ccf871e2f4a14129ad3e986b8cd19cdf129c
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 21 21:06:31 2010 +0100
+Date: Sun Feb 21 21:06:31 2010 +0100
[CMake] set the CXXFLAGS in a better way
@@ -33039,7 +35055,7 @@
commit a18dab9e53a20a76eb46fa3a868fffdd3c754ce2
Merge: fa09892 f3862f7
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 21 19:56:38 2010 +0100
+Date: Sun Feb 21 19:56:38 2010 +0100
Merge remote branch 'origin/cpp-frontend'
@@ -33069,11 +35085,11 @@
...
Conflicts:
- config.h.cmake
+ config.h.cmake
commit fa0989297e95b6adebed71336ea206d1b279ab24
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 21 16:59:57 2010 +0000
+Date: Sun Feb 21 16:59:57 2010 +0000
Detect the need for nanosleep in solaris
@@ -33085,7 +35101,7 @@
commit d074485aa9d9fac6b715382002f53e3303bbc519
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 20 10:08:33 2010 +0000
+Date: Sat Feb 20 10:08:33 2010 +0000
Do not call getPixel if we know how to access the data
@@ -33096,7 +35112,7 @@
commit d4cafe357bd86feb4b56e5dfbf5b7822e237a2ee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 20 10:07:20 2010 +0000
+Date: Sat Feb 20 10:07:20 2010 +0000
Only call getPixel when really needed
@@ -33107,7 +35123,7 @@
commit c3122cfbe090f3a4045269222f941cd5ce77c171
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 20 10:04:37 2010 +0000
+Date: Sat Feb 20 10:04:37 2010 +0000
Move test code to the header to it can be inlined
@@ -33119,7 +35135,7 @@
commit d987fb9b77e6da454eb898cc6c8baaf747b7ac4f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Feb 19 23:59:03 2010 +0000
+Date: Fri Feb 19 23:59:03 2010 +0000
implement writeImgFile for splashModeXBGR8
@@ -33128,20 +35144,20 @@
commit f9425c0b5b112ac673d0499f79a743afce719593
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Feb 19 20:18:13 2010 +0000
+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
+ configure.ac | 12 ++++---
+ goo/Makefile.am | 7 +++-
+ m4/libpng.m4 | 99
-----------------------------------------------------
- poppler/Makefile.am | 3 ++
+ poppler/Makefile.am | 3 ++
4 files changed, 17 insertions(+), 104 deletions(-)
commit 0cb07d645527f25997f5e1b104a6be92441d8ffa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 18 23:27:20 2010 +0000
+Date: Thu Feb 18 23:27:20 2010 +0000
Only swap w with h if rotation is 90 or 270
@@ -33150,7 +35166,7 @@
commit 35015ed11090d67cab69443e607d4d80ca03c619
Author: Nils Höglund <nils.hoglund at gmail.com>
-Date: Thu Feb 18 23:14:51 2010 +0000
+Date: Thu Feb 18 23:14:51 2010 +0000
Match the number of calls to beginMarkedContent and endMarkedContent
@@ -33159,7 +35175,7 @@
commit ee265760e6ecec93fe26fb8e02848872555daefd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 18 23:13:48 2010 +0000
+Date: Thu Feb 18 23:13:48 2010 +0000
make sure properties exists before using it
@@ -33168,7 +35184,7 @@
commit eab7a55815c06525c7aeba254b66498ab147a958
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 17 21:54:31 2010 +0000
+Date: Wed Feb 17 21:54:31 2010 +0000
if malloc failed return false
@@ -33177,7 +35193,7 @@
commit e2def20a45c1d8307fd62fabb9769121af975abf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 16 23:31:05 2010 +0000
+Date: Tue Feb 16 23:31:05 2010 +0000
Only assume the OC is not visible if it exists and is set to no
@@ -33188,7 +35204,7 @@
commit 5edd175bdd0f7c2fc3aecb72384de4cb0788fc4e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 16 20:57:22 2010 +0000
+Date: Tue Feb 16 20:57:22 2010 +0000
Add and fix copyright years
@@ -33197,17 +35213,17 @@
commit 0f0fba1b04589061449f98b9dcd8a0c4e7ad2d74
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 22:00:51 2010 +0100
+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 ++--
+ configure.ac | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 39b4699020b5cfa1a10e5ef00f0e355e27b21c9f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 21:56:30 2010 +0100
+Date: Tue Feb 16 21:56:30 2010 +0100
[CMake] reflect that poppler-glib needs cairo now
@@ -33216,7 +35232,7 @@
commit 5c66c775bcd686c61ea136bcd8f261fb631c5e71
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 16 20:52:15 2010 +0000
+Date: Tue Feb 16 20:52:15 2010 +0000
We don't need to pass anything to FontConfig
@@ -33228,7 +35244,7 @@
commit 582b5259b3c65ee1bef99dbdfccf00f37269b76f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 16:36:24 2010 +0100
+Date: Tue Feb 16 16:36:24 2010 +0100
[CMake] find the system threads, and define in the config.h if we
have pthreads
@@ -33239,7 +35255,7 @@
commit 1dff9d440556a155fb5ca7bed15fc6a1f77a1c97
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 16:10:44 2010 +0100
+Date: Tue Feb 16 16:10:44 2010 +0100
[CMake] add the HAVE_LIBOPENJPEG and HAVE_OPENJPEG_H defines, to
match autotools' ones
@@ -33250,7 +35266,7 @@
commit 4a0bcaa83e6e6533cd48c63449a08467d51c13ea
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 16:01:53 2010 +0100
+Date: Tue Feb 16 16:01:53 2010 +0100
[CMake] config.h.cmake: change some comments to match autotools' ones
@@ -33259,7 +35275,7 @@
commit 9e38082c3e571d035f0152d65661e5dd97fdd5d8
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 15:58:30 2010 +0100
+Date: Tue Feb 16 15:58:30 2010 +0100
[CMake] add the Win32-specific ENABLE_RELOCATABLE option, matching
autotools' one
@@ -33270,7 +35286,7 @@
commit eb03020893ed591c18817d75d427a1296cb1f233
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 16 15:49:50 2010 +0100
+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
@@ -33280,7 +35296,7 @@
commit ba65b3af047b758094b999b2939065c5127508dd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 10 23:08:04 2010 +0000
+Date: Wed Feb 10 23:08:04 2010 +0000
Wrap #include <jpeglib.h> in extern "C" to fix build
@@ -33291,7 +35307,7 @@
commit d3d2a3ee0a3505f44d1196823716b768d434ba73
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 10 23:16:27 2010 +0100
+Date: Wed Feb 10 23:16:27 2010 +0100
[CMake] fix typo: "MULTITHREAD" -> "MULTITHREADED"
@@ -33300,7 +35316,7 @@
commit 0dae2294cf8a2f312d8e6504be4e1be516b34b1b
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Feb 9 21:44:07 2010 +0000
+Date: Tue Feb 9 21:44:07 2010 +0000
Fix regression in painting. Fixes bug 26243
@@ -33309,7 +35325,7 @@
commit aa9c3acbc73bafb33c8a797701ed0488a4a74263
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jan 28 17:23:18 2010 +0100
+Date: Thu Jan 28 17:23:18 2010 +0100
[cairo] Add clipToStrokePath() method
@@ -33322,7 +35338,7 @@
commit 41a450c8db45fd064798d15c3d8fe5ab536a7b30
Author: David Benjamin <davidben at mit.edu>
-Date: Fri Jan 22 00:26:59 2010 -0500
+Date: Fri Jan 22 00:26:59 2010 -0500
[cairo] Avoid leaving pointers to free'd memory
@@ -33339,7 +35355,7 @@
commit 309228404710debee4337cc53c641dfef64ad86c
Author: David Benjamin <davidben at mit.edu>
-Date: Wed Jan 27 22:41:16 2010 +0000
+Date: Wed Jan 27 22:41:16 2010 +0000
Allow commands to abort the current stream
@@ -33359,12 +35375,12 @@
bug #24575.
poppler/Gfx.cc | 11 +++++++++++
- poppler/Gfx.h | 1 +
+ poppler/Gfx.h | 1 +
2 files changed, 12 insertions(+)
commit 8284008aa8230a92ba08d547864353d3290e9bf9
Author: David Benjamin <davidben at mit.edu>
-Date: Wed Jan 27 22:40:33 2010 +0000
+Date: Wed Jan 27 22:40:33 2010 +0000
Add a stack of stateGuards to Gfx
@@ -33377,12 +35393,12 @@
rendering.
poppler/Gfx.cc | 30 +++++++++++++++++++++++++++++-
- poppler/Gfx.h | 11 +++++++++++
+ poppler/Gfx.h | 11 +++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
commit 4ae84c830f842d100cbb702b32970951a5a5769f
Author: David Benjamin <davidben at mit.edu>
-Date: Wed Jan 27 22:39:20 2010 +0000
+Date: Wed Jan 27 22:39:20 2010 +0000
Maintain the height of the stack in Gfx
@@ -33390,12 +35406,12 @@
information about the current height of the stack.
poppler/Gfx.cc | 4 ++++
- poppler/Gfx.h | 1 +
+ poppler/Gfx.h | 1 +
2 files changed, 5 insertions(+)
commit 120fe6ef673c648ae7b19ad2a7e9aef22ee25810
Author: David Benjamin <davidben at mit.edu>
-Date: Wed Jan 27 22:38:43 2010 +0000
+Date: Wed Jan 27 22:38:43 2010 +0000
Do not use objects just after deleting them
@@ -33407,7 +35423,7 @@
commit 3375fa96c7a7dbbb98f5a7b3df9e840a5f30bc80
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 27 22:32:29 2010 +0000
+Date: Wed Jan 27 22:32:29 2010 +0000
GooVector rewrite, old version had "unknown" origins/license
@@ -33417,7 +35433,7 @@
commit a945fe64e16ac9aa2577c5db05fc7f3fd4955b7b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jan 27 16:15:40 2010 +0100
+Date: Wed Jan 27 16:15:40 2010 +0100
[cairo] Fix downscaling images when document is rotated
@@ -33428,19 +35444,19 @@
commit 428cc965c17f167ea00540beeaeaac5c3e426686
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 26 21:01:32 2010 +0000
+Date: Tue Jan 26 21:01:32 2010 +0000
Add POPPLER_WITH_GDK in cmake build system
Bug 26247
- glib/CMakeLists.txt | 1 +
+ glib/CMakeLists.txt | 1 +
glib/poppler-features.h.cmake | 1 +
2 files changed, 2 insertions(+)
commit 0af1ae75fd4c8031343f668bed5d8ca6588ee652
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jan 26 20:49:17 2010 +0100
+Date: Tue Jan 26 20:49:17 2010 +0100
[cairo] Use the right matrix for the mask in drawMaskedImage()
@@ -33451,7 +35467,7 @@
commit d8ceaff39f5b80624b6bdc703c2a180dfc3d73ee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jan 26 11:57:06 2010 +0100
+Date: Tue Jan 26 11:57:06 2010 +0100
[cairo] Add some more LOG messages
@@ -33460,21 +35476,21 @@
commit 778e764b3cb77526260c3c8b46acf19ad06fc61d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 25 22:40:20 2010 +0000
+Date: Mon Jan 25 22:40:20 2010 +0000
poppler 0.13.0
- CMakeLists.txt | 4 +--
- NEWS | 99
+ CMakeLists.txt | 4 +--
+ NEWS | 99
+++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
5 files changed, 104 insertions(+), 5 deletions(-)
commit 1b5333f2685b8ab85bb1f5b899332c5a0ac99a3d
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 25 02:19:00 2010 +0100
+Date: Mon Jan 25 02:19:00 2010 +0100
[CMake] allow multiple targets with the same name
@@ -33490,7 +35506,7 @@
commit 92e1f46866c063c370ef1d6324f6a6c01aed6680
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 25 02:15:27 2010 +0100
+Date: Mon Jan 25 02:15:27 2010 +0100
[CMake] do not add the fake buildtests target for the MSVC IDE
@@ -33499,7 +35515,7 @@
commit dea5aa37de079196fa916b1db9af782cf25045f9
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Mon Jan 25 00:51:20 2010 +0000
+Date: Mon Jan 25 00:51:20 2010 +0000
Install some more goo files
@@ -33508,7 +35524,7 @@
commit 671a971c45a1e8ce8f6daade82117a9a137034d6
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Mon Jan 25 00:48:31 2010 +0000
+Date: Mon Jan 25 00:48:31 2010 +0000
do not install a private header
@@ -33517,7 +35533,7 @@
commit 54c86e53a143a8f9d196e4bef2a733c6f00f6026
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Mon Jan 25 00:33:07 2010 +0000
+Date: Mon Jan 25 00:33:07 2010 +0000
Only build tests if told to
@@ -33526,7 +35542,7 @@
commit eb082274694aadb80dd16caea65d7f0a1adf8b46
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Mon Jan 25 00:29:55 2010 +0000
+Date: Mon Jan 25 00:29:55 2010 +0000
Only build demos and test if told so. Install poppler-layer.h
@@ -33535,7 +35551,7 @@
commit 73fcc310cd7d6ef435b453485c1c99a33f77212a
Author: Maciej Mrozowski <reavertm at gmail.com>
-Date: Mon Jan 25 00:29:09 2010 +0000
+Date: Mon Jan 25 00:29:09 2010 +0000
install man pages
@@ -33544,13 +35560,13 @@
commit 8672217af4cf88d5506572c2b40fbb0d1d0dbd87
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 25 00:11:50 2010 +0000
+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/Gfx.cc | 14 ++++++++------
poppler/PopplerCache.cc | 12 ++++++------
poppler/PopplerCache.h | 6 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
@@ -33557,7 +35573,7 @@
commit 9567fd8d3d905897d0abacd77885102ae86ba8a9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 20:15:49 2010 +0000
+Date: Sun Jan 24 20:15:49 2010 +0000
ImgWriter is a header too
@@ -33566,11 +35582,11 @@
commit 735e8a690d0bd3ab4bec90bdad975d19ac3d4689
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 19:51:19 2010 +0000
+Date: Sun Jan 24 19:51:19 2010 +0000
noone maintains this either
- msvc/config.h | 62 ----------------------------------
+ msvc/config.h | 62 ----------------------------------
msvc/poppler/poppler-config.h | 77
-------------------------------------------
2 files changed, 139 deletions(-)
@@ -33577,28 +35593,28 @@
commit d485564f0dc86f62b996380bfbd570cf3f543e4f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 19:22:33 2010 +0000
+Date: Sun Jan 24 19:22:33 2010 +0000
remove files noone maintains
README.windows | 63 ------------------------
- makefile.vc | 150
+ makefile.vc | 150
---------------------------------------------------------
2 files changed, 213 deletions(-)
commit 38467f2738c88f060ae1d30332e34da743a888a5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 19:18:44 2010 +0000
+Date: Sun Jan 24 19:18:44 2010 +0000
only compile glib frontend if cairo is found
- CMakeLists.txt | 4 ++--
+ CMakeLists.txt | 4 ++--
glib/CMakeLists.txt | 25 +++++++------------------
2 files changed, 9 insertions(+), 20 deletions(-)
commit cf045acf46307d51fb6d9959451b53681e6cac03
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 19:01:52 2010 +0000
+Date: Sun Jan 24 19:01:52 2010 +0000
compile
@@ -33607,7 +35623,7 @@
commit 0397cf4f193015286464ae70ab202ed400110e30
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 24 19:00:09 2010 +0000
+Date: Sun Jan 24 19:00:09 2010 +0000
Add and fix copyright years
@@ -33614,8 +35630,8 @@
poppler/CairoFontEngine.cc | 1 +
poppler/CairoOutputDev.cc | 2 +-
poppler/CairoOutputDev.h | 2 +-
- poppler/Gfx.cc | 2 +-
- poppler/Gfx.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(-)
@@ -33622,7 +35638,7 @@
commit 9c9f18b6ceea546dfb21ef0aab29ba99733dcb52
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 24 19:27:29 2010 +0100
+Date: Sun Jan 24 19:27:29 2010 +0100
[glib-demo] Remove #ifdef HAVE_CAIRO macros from several demos
@@ -33634,27 +35650,27 @@
commit 4e938c1f81add2162ced0e97b24fe588f15f178d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 24 19:15:06 2010 +0100
+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 +---
+ configure.ac | 74 ++++++++-------
+ glib/Makefile.am | 20 +---
glib/poppler-document.cc | 9 --
- glib/poppler-page.cc | 237
+ glib/poppler-page.cc | 237
+---------------------------------------------
- glib/poppler-page.h | 7 --
+ glib/poppler-page.h | 7 --
glib/poppler-private.h | 14 ---
- glib/poppler.cc | 6 --
+ glib/poppler.cc | 6 --
glib/test-poppler-glib.cc | 6 +-
- poppler-glib.pc.in | 2 +-
+ poppler-glib.pc.in | 2 +-
9 files changed, 51 insertions(+), 324 deletions(-)
commit 59ff9d66fc3b0c9612b1c12fc1ae4dbb8dc85b39
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 24 17:57:48 2010 +0100
+Date: Sun Jan 24 17:57:48 2010 +0100
Use a small object cache in GfxResources to cache GState objects
@@ -33663,12 +35679,12 @@
PDF32000_2008.pdf
poppler/Gfx.cc | 19 +++++++++++++++++--
- poppler/Gfx.h | 2 ++
+ poppler/Gfx.h | 2 ++
2 files changed, 19 insertions(+), 2 deletions(-)
commit 880a4a9a60a10f7aa7d3dc7c2802b31b7ef01e06
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 24 17:56:35 2010 +0100
+Date: Sun Jan 24 17:56:35 2010 +0100
Add a generic cache to store objects by its reference
@@ -33679,7 +35695,7 @@
commit 5ad492df75c0c2394719e85db4c8b43f15b52110
Author: mpsuzuki <mpsuzuki at hiroshima-u.ac.jp>
-Date: Sun Jan 24 13:34:41 2010 +0100
+Date: Sun Jan 24 13:34:41 2010 +0100
[cairo] Fix memory leak
@@ -33688,7 +35704,7 @@
commit 3160464b4b70c714c36234320878acab81b866cc
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Nov 26 13:17:19 2009 +0100
+Date: Thu Nov 26 13:17:19 2009 +0100
[cairo] Use our own implementation to scale down images instead
of cairo
@@ -33699,16 +35715,16 @@
Fixes bug #5589.
poppler/CairoOutputDev.cc | 89 ++++++++++++
- poppler/CairoOutputDev.h | 1 +
+ poppler/CairoOutputDev.h | 1 +
poppler/CairoRescaleBox.cc | 352
+++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoRescaleBox.h | 12 ++
- poppler/Makefile.am | 4 +-
+ poppler/Makefile.am | 4 +-
5 files changed, 457 insertions(+), 1 deletion(-)
commit 6825a219f0bc0ac6fd469fb8a6ebb86df774375f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jan 23 11:24:15 2010 +0100
+Date: Sat Jan 23 11:24:15 2010 +0100
[glib] Use TextOutputDev to get TextPage when we haven't rendered
the page
@@ -33718,7 +35734,7 @@
commit 6c61a457e9a8ec10945bc1e0700c8e4d121faa58
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 20 21:59:05 2010 +0000
+Date: Wed Jan 20 21:59:05 2010 +0000
Fix GfxRadialShading::GfxRadialShading
@@ -33729,7 +35745,7 @@
commit 442894d371879a6bf2adb5a39b9dd0a49e76e4ac
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jan 15 21:28:42 2010 +0100
+Date: Fri Jan 15 21:28:42 2010 +0100
[glib-demo/cmake] compile print.c
@@ -33740,7 +35756,7 @@
commit b64d4bd46b052feb0b143f1348773afbd93e5e33
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 27 11:47:22 2009 +0100
+Date: Fri Nov 27 11:47:22 2009 +0100
[glib-demo] Add print demo
@@ -33753,7 +35769,7 @@
commit ba2c746f358a5785d8cbaaf03d8628ee3754c388
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 27 09:52:50 2009 +0100
+Date: Fri Nov 27 09:52:50 2009 +0100
[glib-demo] Add render for printing option to render demo
@@ -33762,7 +35778,7 @@
commit 9a478008ccb61641f09bd77eaa55033cca266c43
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jan 15 12:03:11 2010 +0100
+Date: Fri Jan 15 12:03:11 2010 +0100
Add FONTCONFIGURATION macros to poppler-config.h
@@ -33774,7 +35790,7 @@
commit 1f80f874d8e132411816302465f04bc59d404d89
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 14 08:43:11 2010 +0000
+Date: Thu Jan 14 08:43:11 2010 +0000
Fix Uncover and Fade to return correct values
@@ -33785,11 +35801,11 @@
commit 350ff407e06a961f2a5b9d203cb8e78ce09313a0
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jan 13 22:20:41 2010 +0000
+Date: Wed Jan 13 22:20:41 2010 +0000
Make poppler (optionally) relocatable on Windows
- configure.ac | 26 ++++++++++++++++++++++
+ configure.ac | 26 ++++++++++++++++++++++
poppler/GlobalParams.cc | 57
+++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
@@ -33796,14 +35812,14 @@
commit 36b67b002db802bfad553720e2114b76b07bb614
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Jan 13 22:17:03 2010 +0000
+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 +-
+ 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 +++++
@@ -33811,7 +35827,7 @@
commit 9c0b20ab8c104c2f5398a5a3b8409ca554f5fa39
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 12 22:55:06 2010 +0000
+Date: Tue Jan 12 22:55:06 2010 +0000
Add the possibility of using float for splash variables instead
of double
@@ -33821,7 +35837,7 @@
CMakeLists.txt | 7 ++++++-
config.h.cmake | 5 ++++-
- configure.ac | 10 +++++++++-
+ configure.ac | 10 +++++++++-
splash/SplashMath.h | 14 ++++++++++++--
splash/SplashTypes.h | 4 +++-
5 files changed, 34 insertions(+), 6 deletions(-)
@@ -33828,7 +35844,7 @@
commit 30e5f76e372114339fa1d37c335e6bbade8b6d8a
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 7 11:18:36 2010 +0100
+Date: Thu Jan 7 11:18:36 2010 +0100
[CMake] followup recent glib/gtk+ version requirements
@@ -33840,7 +35856,7 @@
commit e338643f2cebb1203f7ff0646f87b3dea8318757
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jan 7 11:08:31 2010 +0100
+Date: Thu Jan 7 11:08:31 2010 +0100
[tests] Bump GTK+ requirements to 2.14
@@ -33851,7 +35867,7 @@
commit ce9404b1999f81b3f9e5a89bcd6e715463f89024
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jan 7 11:06:19 2010 +0100
+Date: Thu Jan 7 11:06:19 2010 +0100
Bump glib requirements to 2.18
@@ -33860,7 +35876,7 @@
commit 526c8871cbdfbc119e013ee96887a79f65403790
Author: Hib Eris <hib at hiberis.nl>
-Date: Thu Dec 31 17:52:33 2009 +0100
+Date: Thu Dec 31 17:52:33 2009 +0100
[glib] Use PDFDoc(wchar_t *, ...) on Windows
@@ -33871,7 +35887,7 @@
commit e0c8188136958b853269179079efefdd3488dc22
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 4 18:36:01 2010 +0000
+Date: Mon Jan 4 18:36:01 2010 +0000
Require Qt 4.4
@@ -33878,12 +35894,12 @@
This updates the requirement to real requirement
CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
+ configure.ac | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
commit f9accdb878b23ebd2152dd05d61cfcc71d46cd03
Author: Pino Toscano <pino at kde.org>
-Date: Mon Jan 4 14:13:13 2010 +0100
+Date: Mon Jan 4 14:13:13 2010 +0100
[Qt4/tests] use getPdfVersion() instead of the deprecated pdfVersion()
@@ -33895,24 +35911,24 @@
commit 898e939d8c0ac74cc7ee3f5d42d83083ed31036e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Jan 2 02:33:58 2010 +0100
+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 ++-
+ 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 +++--
+ splash/SplashBitmap.h | 5 +++--
utils/HtmlOutputDev.cc | 4 +++-
- utils/pdftoppm.cc | 9 +++++----
+ utils/pdftoppm.cc | 9 +++++----
9 files changed, 32 insertions(+), 16 deletions(-)
commit df569dc2fb89d7e0780bbf7a687ce2464ff5cb43
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Jan 2 01:19:50 2010 +0100
+Date: Sat Jan 2 01:19:50 2010 +0100
enable AM_SILENT_RULES by default
@@ -33921,7 +35937,7 @@
commit f3862f7d987aae52a1fd2bb0af27d1cd803a5b84
Author: Pino Toscano <pino at kde.org>
-Date: Thu Dec 31 00:20:11 2009 +0100
+Date: Thu Dec 31 00:20:11 2009 +0100
[cpp/tests] poppler-dump: show a string for the font type
@@ -33930,7 +35946,7 @@
commit 9c343c821593ebae51ac47b58ad007a82f198652
Author: Pino Toscano <pino at kde.org>
-Date: Thu Dec 31 00:13:09 2009 +0100
+Date: Thu Dec 31 00:13:09 2009 +0100
[cpp/tests] poppler-dump: show the orientation of the pages
@@ -33939,7 +35955,7 @@
commit bc91fe3824f37cd17a38aac85c817e8ada1b2f43
Author: Pino Toscano <pino at kde.org>
-Date: Wed Dec 30 23:53:31 2009 +0100
+Date: Wed Dec 30 23:53:31 2009 +0100
[cpp/tests] poppler-dump: a bit less output in permissions lines
@@ -33948,7 +35964,7 @@
commit 1199de8f097a78edb831313841ac0ed3f9ec9905
Author: Pino Toscano <pino at kde.org>
-Date: Wed Dec 30 23:50:36 2009 +0100
+Date: Wed Dec 30 23:50:36 2009 +0100
[cpp/tests] poppler-dump: add --show-all to show all the information
@@ -33957,7 +35973,7 @@
commit 9522f830b59942adfc91d5f03c274415a4737ccc
Author: Pino Toscano <pino at kde.org>
-Date: Wed Dec 30 23:38:40 2009 +0100
+Date: Wed Dec 30 23:38:40 2009 +0100
[cpp] use iconv for the utf8 <-> utf16 conversions
@@ -33967,24 +35983,24 @@
commit b156b4031f5daf658f40db8efa2a3016d95b98b5
Author: Pino Toscano <pino at kde.org>
-Date: Wed Dec 30 23:24:23 2009 +0100
+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 +
+ 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
+ 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 at kde.org>
-Date: Wed Dec 30 18:57:09 2009 +0100
+Date: Wed Dec 30 18:57:09 2009 +0100
[cpp] fixup unicode GooString <-> ustring conversions
@@ -33995,19 +36011,19 @@
commit 3b6e3605209d5db453725b9ce4e6e54679d9c5da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 27 15:30:22 2009 +0100
+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/GfxState.cc | 21 ---------------------
poppler/SplashOutputDev.cc | 15 +++++++++++++++
2 files changed, 15 insertions(+), 21 deletions(-)
commit ea44c60645001ffea7d297f8549aaa4f5ce5e16c
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Sun Dec 27 15:27:00 2009 +0100
+Date: Sun Dec 27 15:27:00 2009 +0100
Try to work on streams without Length
@@ -34020,7 +36036,7 @@
commit 283dd326a00c804b6332ee3ca1aaa0d86377b3f3
Author: Pino Toscano <pino at kde.org>
-Date: Sat Dec 19 12:50:10 2009 +0100
+Date: Sat Dec 19 12:50:10 2009 +0100
[cpp] fix installation of poppler-version.h with autotools and
builddir != srcdir
@@ -34030,7 +36046,7 @@
commit df0ccddb7f784b4a8564beda51b3047cb9e3611a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 18 20:23:48 2009 +0000
+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
@@ -34040,7 +36056,7 @@
commit ab88a02f7efefc950a316d7a5edf88dad8f3e4d0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Dec 17 18:24:20 2009 +0100
+Date: Thu Dec 17 18:24:20 2009 +0100
[annots] QuadPoints is required in Text Markup annotations
@@ -34052,7 +36068,7 @@
commit 39dc99431b3ea9e00f6f645dd7169c0319571dc9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Dec 17 18:17:20 2009 +0100
+Date: Thu Dec 17 18:17:20 2009 +0100
[annots] Create appearance stream for Sound Annotations when not
defined
@@ -34066,7 +36082,7 @@
commit e4f5a78a853b88b1586ef59fc8893a321ea23736
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Dec 17 17:39:39 2009 +0100
+Date: Thu Dec 17 17:39:39 2009 +0100
[annots] Add Tag and Graph icons for File Attachment annotations
@@ -34078,7 +36094,7 @@
commit 752b14857cfb0669fd6d7dfef2ea73c13a2369fc
Author: Pino Toscano <pino at kde.org>
-Date: Thu Dec 17 17:16:01 2009 +0100
+Date: Thu Dec 17 17:16:01 2009 +0100
simplify
@@ -34087,7 +36103,7 @@
commit a26e4b7903fabc667d7d16c23ca2c7a535dd05fa
Author: Pino Toscano <pino at kde.org>
-Date: Thu Dec 17 17:09:35 2009 +0100
+Date: Thu Dec 17 17:09:35 2009 +0100
[cpp/tests] add a simple poppler-dump test
@@ -34097,12 +36113,12 @@
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 +
+ 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/Makefile.am | 17 +++
cpp/tests/poppler-dump.cpp | 293
+++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 339 insertions(+)
@@ -34109,7 +36125,7 @@
commit 86c871cc625d00b8ee7f93dc8c0f9ef8462bba5a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Dec 17 17:05:45 2009 +0100
+Date: Thu Dec 17 17:05:45 2009 +0100
[annots] Create appearance stream for Text Markup Annotations when
not defined
@@ -34128,7 +36144,7 @@
commit 904ecd929c6acbbad6d782b950c53c0a80e1f39c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Dec 17 12:49:20 2009 +0100
+Date: Thu Dec 17 12:49:20 2009 +0100
[annots] Fix memory leaks
@@ -34137,7 +36153,7 @@
commit ef7954b86f9b1a762c4f77a48d5f42f8db4bbed7
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 15 02:20:18 2009 +0100
+Date: Tue Dec 15 02:20:18 2009 +0100
[cpp] use the correct index (instead of an uninitialized variable)
@@ -34146,7 +36162,7 @@
commit 2547b5e53e7799cf7299838ae9bd882c21a228ae
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 15 02:14:57 2009 +0100
+Date: Tue Dec 15 02:14:57 2009 +0100
[cpp] properly delete the children of a toc item
@@ -34155,7 +36171,7 @@
commit 771bd3594740fe16bd030dbe73928a8b1d4d113f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 15 02:04:24 2009 +0100
+Date: Tue Dec 15 02:04:24 2009 +0100
[cpp] actually implement toc::root()
@@ -34164,7 +36180,7 @@
commit ca1d2ec4588b2437b58b4448ae2fc5ebd0f130d3
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 15 00:54:29 2009 +0100
+Date: Tue Dec 15 00:54:29 2009 +0100
[cpp] fix the reference to the vector data
@@ -34174,7 +36190,7 @@
commit 16c946e7658b0e9cff701ce1d6bbf7d3828cbe08
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 15 00:35:25 2009 +0100
+Date: Tue Dec 15 00:35:25 2009 +0100
[cpp] fix the reference to the vector data
@@ -34183,7 +36199,7 @@
commit 9bb90c99b65e0e9d9b65c7dbeb5b4d66377ceb21
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 23:43:12 2009 +0100
+Date: Mon Dec 14 23:43:12 2009 +0100
[cpp] add destructor for 'rectangle'
@@ -34192,12 +36208,12 @@
commit 61ccdc9ab3b816174896fcae0899ff34f11eee80
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 23:40:51 2009 +0100
+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/CMakeLists.txt | 1 +
+ cpp/Makefile.am | 1 +
cpp/poppler-rectangle.cpp | 35 +++++++++++++++++++++++++++++++++++
cpp/poppler-rectangle.h | 5 +++++
4 files changed, 42 insertions(+)
@@ -34204,7 +36220,7 @@
commit 69dd51fed3de41f8b799b811ae5ee59c0d5f59c2
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 22:24:07 2009 +0100
+Date: Mon Dec 14 22:24:07 2009 +0100
[cpp] add namespace to namespace functiond to link properly
@@ -34214,7 +36230,7 @@
commit 3923fa4890984d8616d86016f4f4a94e8ef3e992
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 22:23:15 2009 +0100
+Date: Mon Dec 14 22:23:15 2009 +0100
[cpp] add default empty parameters for the passwords of the document
loading functions
@@ -34224,17 +36240,17 @@
commit 1d23cc677e9b0a9f61c53e0ea365537f33abe5bf
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 21:44:56 2009 +0100
+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 +++
+ cpp/poppler-global.h | 3 +++
2 files changed, 26 insertions(+)
commit 82954ea5f8ba880276328765f104690a05adbd9e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Dec 7 12:05:54 2009 +0100
+Date: Mon Dec 7 12:05:54 2009 +0100
[annot] Create appearance stream for Attachment Annotations when
not defined
@@ -34248,7 +36264,7 @@
commit c6195472326c183fcfd8a3e9da1ee7f6fa8b7c3d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 17:09:23 2009 +0100
+Date: Sun Dec 6 17:09:23 2009 +0100
[annots] Use opacity when drawing Markup Annotations
@@ -34272,12 +36288,12 @@
poppler/Annot.cc | 21 +++++++++++++++------
poppler/Gfx.cc | 9 ++++++++-
- poppler/Gfx.h | 2 +-
+ poppler/Gfx.h | 2 +-
3 files changed, 24 insertions(+), 8 deletions(-)
commit a337c1d757d52c1c238229d2f0cd3a41694b0e08
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 16:18:22 2009 +0100
+Date: Mon Dec 14 16:18:22 2009 +0100
[cpp] add document metadata reading
@@ -34287,7 +36303,7 @@
commit 6c4fa513e60dbdd5ab693434f239d82d95756994
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 16:56:22 2009 +0100
+Date: Sun Dec 6 16:56:22 2009 +0100
[annot] Create appearance stream for Geometry Annotations when
not defined
@@ -34301,7 +36317,7 @@
commit eed94b8bd2855dce1fd39b835e3280cbd0ccd1cf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 16:51:37 2009 +0100
+Date: Sun Dec 6 16:51:37 2009 +0100
[annot] Create appearance stream for Line Annotations when not defined
@@ -34314,7 +36330,7 @@
commit 1c7a5f5e89c4c51e31b6de345d4862ef8dcc2bc0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 16:40:14 2009 +0100
+Date: Sun Dec 6 16:40:14 2009 +0100
[annot] Create appearance stream for Text Annotations when not defined
@@ -34328,18 +36344,18 @@
commit c9cb6353ad5279d09615eb2c944b2b053cdf5ccc
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 15:52:25 2009 +0100
+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 ++++
+ cpp/poppler-global.h | 4 ++++
3 files changed, 28 insertions(+)
commit 30e90c7c1b41c62ddc21905e7ccdea4c95547e80
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 15:33:36 2009 +0100
+Date: Mon Dec 14 15:33:36 2009 +0100
[cpp] add is_encrypted and is_linearized for document
@@ -34349,18 +36365,18 @@
commit 93fd588c519958a1f66231c111ea8a6b0a759be1
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 13:19:24 2009 +0100
+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 +++
+ cpp/poppler-document.cpp | 35 ++++++++++++++++++++++++++++++++++-
+ cpp/poppler-document.h | 3 +++
3 files changed, 42 insertions(+), 1 deletion(-)
commit 53996365b159cf84adf2cac56c76b8bda8dfb12e
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 12:57:41 2009 +0100
+Date: Mon Dec 14 12:57:41 2009 +0100
[cpp] use the byte_array typedef
@@ -34370,7 +36386,7 @@
commit e4969c1aaed4a8eb770d8b54920f2476129bbcb7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 16:19:36 2009 +0100
+Date: Sun Dec 6 16:19:36 2009 +0100
[annots] Refactor Annot::setColor to receive an AnnotColor
@@ -34384,28 +36400,28 @@
commit cfb4f5dfabf31de22d68aa0d5796cb7a33d8b462
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 11:06:36 2009 +0100
+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-global.h | 5 ++++-
cpp/poppler-private.cpp | 5 ++---
3 files changed, 9 insertions(+), 13 deletions(-)
commit 2d13ac31671b2007e44a90f45a82cb3adfa9c80c
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 02:30:06 2009 +0100
+Date: Mon Dec 14 02:30:06 2009 +0100
update ignore files
- .gitignore | 1 +
+ .gitignore | 1 +
cpp/.gitignore | 1 +
2 files changed, 2 insertions(+)
commit 01e902e40ca15acf0319e37d39a271d6875bfce9
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 02:02:47 2009 +0100
+Date: Mon Dec 14 02:02:47 2009 +0100
[cpp] add a version header+functions
@@ -34415,9 +36431,9 @@
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 ++++--
+ 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(-)
@@ -34424,18 +36440,18 @@
commit b3f5e5d60bc9109da961940f6216722f9db4a87b
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:56:15 2009 +0100
+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 +++
+ config.h.cmake | 3 +++
2 files changed, 21 insertions(+)
commit f6ba877e0c22538cfe34d32d69814f660de59d2c
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:44:55 2009 +0100
+Date: Mon Dec 14 00:44:55 2009 +0100
[CMake] add configure check for sys/mman.h (as in autotools)
@@ -34445,7 +36461,7 @@
commit e12801320ae030628fc62c073983c06b39ee13d7
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:42:20 2009 +0100
+Date: Mon Dec 14 00:42:20 2009 +0100
minor spello
@@ -34454,7 +36470,7 @@
commit 6428907ebcf33d4391673aadcfa71c3061f6d352
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:41:49 2009 +0100
+Date: Mon Dec 14 00:41:49 2009 +0100
[CMake] add configure check for fcntl.h (as in autotools)
@@ -34464,7 +36480,7 @@
commit 916ab7163249e23bd5ba00922fdcad9caaf92c75
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:34:59 2009 +0100
+Date: Mon Dec 14 00:34:59 2009 +0100
[CMake] oops, those should have been '#cmakedefine' and not '#define'
@@ -34473,7 +36489,7 @@
commit ea655d8c7e24e97ee710110a783ed9c209cf76e3
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:33:51 2009 +0100
+Date: Mon Dec 14 00:33:51 2009 +0100
[CMake] move and rename to match more the autotools output
@@ -34482,7 +36498,7 @@
commit 9f0146c5b2f9326e834104b89791f66b18f85adc
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 14 00:28:04 2009 +0100
+Date: Mon Dec 14 00:28:04 2009 +0100
[CMake] add checks for gmtime_r and localtime_r
@@ -34492,7 +36508,7 @@
commit 9d0cf201e96044dd679c26bea6255d986a6cd246
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 23:45:39 2009 +0100
+Date: Sun Dec 13 23:45:39 2009 +0100
[cpp] add ignore file
@@ -34501,7 +36517,7 @@
commit d783e92b863d8b22de6ca326328115fec63193ed
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 23:42:33 2009 +0100
+Date: Sun Dec 13 23:42:33 2009 +0100
[cpp] don't forget the cmake stuff when packing with the autotools
@@ -34510,13 +36526,13 @@
commit 0105caefe860e7a45fc7d3a1bd1162fe56bcfe6a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 23:40:55 2009 +0100
+Date: Sun Dec 13 23:40:55 2009 +0100
[cpp] add the pkg-config stuff
CMakeLists.txt | 3 +++
- Makefile.am | 7 +++++--
- configure.ac | 3 ++-
+ Makefile.am | 7 +++++--
+ configure.ac | 3 ++-
poppler-cpp.pc.cmake | 9 +++++++++
poppler-cpp.pc.in | 9 +++++++++
5 files changed, 28 insertions(+), 3 deletions(-)
@@ -34523,7 +36539,7 @@
commit d5a74f78df0dca24fd537b30424fd2ebb3efe3e2
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 23:35:06 2009 +0100
+Date: Sun Dec 13 23:35:06 2009 +0100
[cpp] add the (rest of the) CMake build system for it
@@ -34532,18 +36548,18 @@
commit 0e41f937946e4e4c1b660406bd74e4afe8825b5f
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 23:31:46 2009 +0100
+Date: Sun Dec 13 23:31:46 2009 +0100
[cpp] add the autotools buildsystem for it
- Makefile.am | 6 +++++-
- configure.ac | 15 +++++++++++++++
+ Makefile.am | 6 +++++-
+ configure.ac | 15 +++++++++++++++
cpp/Makefile.am | 32 ++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 1 deletion(-)
commit 9727fdc0c682742335e44ddc2f32d60e4c59983a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Dec 13 22:55:28 2009 +0100
+Date: Sun Dec 13 22:55:28 2009 +0100
Start of a pure C++ frontend for Poppler.
@@ -34561,34 +36577,34 @@
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/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 +++++++++
+ 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(+)
commit 62854051f4e47028147cc93a5faac39e2fa2c9fd
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 12 17:22:08 2009 +0100
+Date: Sat Dec 12 17:22:08 2009 +0100
Initialize profileCommands in Gfx constructor
@@ -34597,7 +36613,7 @@
commit 4e6af25a028d16608111634c5467420e31fa399b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Dec 9 19:45:40 2009 +0100
+Date: Wed Dec 9 19:45:40 2009 +0100
[cairo] Update font of TextPage in CairoOutputDev::updateAll()
@@ -34609,20 +36625,20 @@
commit 6798d3e52e36e91bceff3a1a96372e9d9c6f3813
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 6 15:34:36 2009 +0100
+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 +-
+ 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 at freenet.de>
-Date: Sat Dec 5 22:31:29 2009 +0000
+Date: Sat Dec 5 22:31:29 2009 +0000
Add a empty space after null
@@ -34633,7 +36649,7 @@
commit 32103f45d0193b31e95269ea9123b8011d93e994
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 5 10:14:18 2009 +0100
+Date: Sat Dec 5 10:14:18 2009 +0100
[annots] Add isVisible() to check whether annot is visible before
drawing it
@@ -34646,7 +36662,7 @@
commit c14dfc7102341f5e1ed67a05c0738d55befab1ec
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 5 10:07:46 2009 +0100
+Date: Sat Dec 5 10:07:46 2009 +0100
[annots] Do not check if annot is a link in Annot::draw()
@@ -34657,7 +36673,7 @@
commit ddf85d4a51f605eed998c633857b8bb5c74ab590
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 4 14:59:41 2009 +0100
+Date: Fri Dec 4 14:59:41 2009 +0100
Make the code a bit more resilient
@@ -34668,7 +36684,7 @@
commit 78b4afa0a44048b8d40438d400652dbae4cb99b1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 4 14:57:10 2009 +0100
+Date: Fri Dec 4 14:57:10 2009 +0100
Accept Fontname if FontName is not present
@@ -34679,7 +36695,7 @@
commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 4 13:26:42 2009 +0100
+Date: Fri Dec 4 13:26:42 2009 +0100
[annots] Remove redundant flags definition
@@ -34688,7 +36704,7 @@
commit 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Nov 27 15:23:11 2009 +0100
+Date: Fri Nov 27 15:23:11 2009 +0100
[cairo] Revert commit 77c2e154c2cb57300116ecd4295f1e67b06b411f
@@ -34700,7 +36716,7 @@
commit a093b768e64d477ebdd5f6b519d80a6c45706e7e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 22 20:23:49 2009 +0100
+Date: Sun Nov 22 20:23:49 2009 +0100
Add copyrights
@@ -34711,7 +36727,7 @@
commit 77c2e154c2cb57300116ecd4295f1e67b06b411f
Author: David Benjamin <davidben at mit.edu>
-Date: Sun Nov 22 20:19:29 2009 +0100
+Date: Sun Nov 22 20:19:29 2009 +0100
Do not crash on malformed files
@@ -34722,7 +36738,7 @@
commit 1d0cb9b2cfd4d4d9aa9b0ad83ad6408544263a09
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 22 19:59:34 2009 +0100
+Date: Sun Nov 22 19:59:34 2009 +0100
[cairo] Initialize fill_color and stroke_color
@@ -34731,7 +36747,7 @@
commit 32de2ac62fb87570e1a59152f37b86e571a01180
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Sun Nov 22 19:51:54 2009 +0100
+Date: Sun Nov 22 19:51:54 2009 +0100
Improve the reconstruction of the XRef
@@ -34743,7 +36759,7 @@
commit 039c6dffbfbed46a11e207048a3247d6921d6b02
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Sun Nov 22 15:14:20 2009 +0100
+Date: Sun Nov 22 15:14:20 2009 +0100
Correctly initialize fileName
@@ -34752,7 +36768,7 @@
commit b905caf1785ee207cc0480953da69be302d3d4e9
Author: David Benjamin <davidben at mit.edu>
-Date: Sat Nov 21 02:43:21 2009 +0100
+Date: Sat Nov 21 02:43:21 2009 +0100
Be more lenient with /Decode key on images
@@ -34765,7 +36781,7 @@
commit d99e7a88845a5f4b35e2c538c597316b2ad541ca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 20 22:09:44 2009 +0100
+Date: Fri Nov 20 22:09:44 2009 +0100
Check for openjpeg in the C++ part as it uses bool in the header
@@ -34777,7 +36793,7 @@
commit 55261a2dc86241c8d132e590e76e7398b3ca5090
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 18 22:26:01 2009 +0100
+Date: Wed Nov 18 22:26:01 2009 +0100
replace floor with a cast to int for numbers > 0
@@ -34788,7 +36804,7 @@
commit 28df9fb323f14dc632c9502655abf69984b7d67e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 18 21:57:02 2009 +0100
+Date: Wed Nov 18 21:57:02 2009 +0100
Remove unused label
@@ -34797,7 +36813,7 @@
commit 037979a01a6fcafc61360e758dbc4a5eb056825e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 17 19:12:30 2009 +0100
+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
@@ -34809,19 +36825,19 @@
commit 46380d36f004d71dd2c2e7bc82836af248684b51
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 17 20:48:22 2009 +0100
+Date: Tue Nov 17 20:48:22 2009 +0100
i didn't want to commit this
- configure.ac | 60
+ configure.ac | 60
+++++++++++++++++++++++++++--------------------------
- splash/SplashMath.h | 5 ++---
- utils/pdftoppm.cc | 8 -------
+ splash/SplashMath.h | 5 ++---
+ utils/pdftoppm.cc | 8 -------
3 files changed, 33 insertions(+), 40 deletions(-)
commit 1844e0927ae89824f59b2b3378bf5e00a51a251c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 17 20:34:24 2009 +0100
+Date: Tue Nov 17 20:34:24 2009 +0100
do not use setAttribute with doubles
@@ -34828,16 +36844,16 @@
it is evil and locale dependant, we do NOT want that so use
QString::number
- configure.ac | 60 +++++++++++++++----------------
+ configure.ac | 60 +++++++++++++++----------------
qt4/src/poppler-annotation.cc | 82
+++++++++++++++++++++----------------------
- splash/SplashMath.h | 5 +--
- utils/pdftoppm.cc | 8 +++++
+ splash/SplashMath.h | 5 +--
+ utils/pdftoppm.cc | 8 +++++
4 files changed, 81 insertions(+), 74 deletions(-)
commit 572d79f4b8a7bf1717b88dbd2609d8fa9b036dee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 15 20:40:56 2009 +0100
+Date: Sun Nov 15 20:40:56 2009 +0100
Only calculate the matrix when it is really needed
@@ -34845,12 +36861,12 @@
Speeds out rendering on some pdf up to 40%
splash/SplashScreen.cc | 35 +++++++++++++++++++++++++++++++++--
- splash/SplashScreen.h | 16 ++++++++++++++++
+ splash/SplashScreen.h | 16 ++++++++++++++++
2 files changed, 49 insertions(+), 2 deletions(-)
commit 1c3113361fa376093e6fedfbf48feee7dcbc46b7
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Nov 15 19:43:18 2009 +0100
+Date: Sun Nov 15 19:43:18 2009 +0100
Write out fixed-content portion of Type 1 fonts in PSOutputDev
@@ -34863,7 +36879,7 @@
commit 2d30dc605cd984f6c32124af9aa7b877d416d141
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 15 17:31:36 2009 +0100
+Date: Sun Nov 15 17:31:36 2009 +0100
[glib-demo] Show attachment name in FileAttachment annot properties
table
@@ -34873,7 +36889,7 @@
commit 6c8ae140256818401351a331787c83e043fdba09
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 15 17:31:13 2009 +0100
+Date: Sun Nov 15 17:31:13 2009 +0100
[glib] Add poppler_annot_file_attachment_get_name()
@@ -34883,7 +36899,7 @@
commit ecf5173eb288187a1f076fd4b116f1212fa9e203
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 15 17:14:29 2009 +0100
+Date: Sun Nov 15 17:14:29 2009 +0100
[glib-demo] Add properties of FileAttachment annotations
@@ -34893,7 +36909,7 @@
commit 8f4fdd864d79e4fa83951a3eb006ea8287c3a1ba
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 15 17:12:43 2009 +0100
+Date: Sun Nov 15 17:12:43 2009 +0100
[glib-demo] Add pgd_table_add_property_with_custom_widget()
@@ -34905,21 +36921,21 @@
commit 061b85f7a442107cda67e385bd772ec8565a936e
Author: Thomas Viehmann <tv at beamnet.de>
-Date: Sun Nov 15 17:11:43 2009 +0100
+Date: Sun Nov 15 17:11:43 2009 +0100
[glib] Add support for file attachment annotations
- glib/poppler-annot.cc | 69
+ glib/poppler-annot.cc | 69
+++++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-annot.h | 8 ++++++
- glib/poppler-page.cc | 3 +++
+ glib/poppler-annot.h | 8 ++++++
+ glib/poppler-page.cc | 3 +++
glib/poppler-private.h | 1 +
- glib/poppler.h | 49 +++++++++++++++++------------------
+ glib/poppler.h | 49 +++++++++++++++++------------------
5 files changed, 102 insertions(+), 28 deletions(-)
commit 189c45332991bce51e40bcaf65da67d2d644045a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 15 16:42:21 2009 +0100
+Date: Sun Nov 15 16:42:21 2009 +0100
[glib] Remove PopplerDocument from PopplerAttachment
@@ -34934,7 +36950,7 @@
commit e55bfeb1ddc60053c5ee5fef840c409891781ce6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 13 00:55:37 2009 +0100
+Date: Fri Nov 13 00:55:37 2009 +0100
jpeg_start_decompress can fail, check it
@@ -34945,7 +36961,7 @@
commit c59d93061cf71d13916872a20aed37ecfbb3bfa4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Nov 9 18:32:55 2009 +0100
+Date: Mon Nov 9 18:32:55 2009 +0100
[cairo] Do nothing when image mask is 1x1 and the pixel is 0
@@ -34954,7 +36970,7 @@
commit 448f03cfc429d33bfa5527e3dc964ef5da10ee94
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Mon Nov 9 22:52:39 2009 +1030
+Date: Mon Nov 9 22:52:39 2009 +1030
Don't render the color white in type 3 glyphs in the cairo backend
@@ -34970,7 +36986,7 @@
commit 3fead2a3b53681ef95116f18f17f1a9febec6e48
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Nov 9 11:25:24 2009 +0100
+Date: Mon Nov 9 11:25:24 2009 +0100
Transitions dictionary can be a Ref too
@@ -34979,17 +36995,17 @@
commit ac4955d03a532cab1933698aeb667d44300e52d0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Nov 9 11:12:48 2009 +0100
+Date: Mon Nov 9 11:12:48 2009 +0100
[glib-demo] Explicitely add gio as dependency for GTK+ tests
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
glib/demo/main.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
commit 32ea667ec8f18311539123c7b80c7ab4767070cb
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue Aug 11 19:17:52 2009 +0100
+Date: Tue Aug 11 19:17:52 2009 +0100
[cairo] Mark images dirty
@@ -35004,7 +37020,7 @@
commit 10a41150c4067bb3ab85e25dae76e0968a6cd586
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue Aug 11 19:17:06 2009 +0100
+Date: Tue Aug 11 19:17:06 2009 +0100
[cairo] Use colToDbl() to avoid rounding error.
@@ -35013,7 +37029,7 @@
commit c9491319689f04edd57adda7ee85f84f17fd1c47
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue Aug 11 18:07:17 2009 +0100
+Date: Tue Aug 11 18:07:17 2009 +0100
[cairo] Reduce the number of redundant pattern creations
@@ -35023,7 +37039,7 @@
commit ead78d9f703c8b2d556c94be3c47dbae7469eda8
Author: Reece Dunn <msclrhd at gmail.com>
-Date: Thu Nov 5 22:25:14 2009 +0100
+Date: Thu Nov 5 22:25:14 2009 +0100
fontpos is never set to -1, so remove the checks in HtmlOutputDev.
@@ -35032,7 +37048,7 @@
commit 55dd6024a4672a1787e8b1a8276bd78fff94e2cd
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Wed Nov 4 22:07:18 2009 +0100
+Date: Wed Nov 4 22:07:18 2009 +0100
Do not error on files without "Count" and "Kids"
@@ -35045,7 +37061,7 @@
commit 58a1d42aed7352c008d201b8f355f6e4146f71e5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Oct 29 18:38:22 2009 +0100
+Date: Thu Oct 29 18:38:22 2009 +0100
[cairo] Don't render patterns when using CairoImageOutputDev
@@ -35054,7 +37070,7 @@
commit 7670cc48dcf3ffd77e3ffa29056a3e13b2926709
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Wed Oct 28 19:20:41 2009 +0100
+Date: Wed Oct 28 19:20:41 2009 +0100
There are some pdf where Aspect values are reals, use getNum
@@ -35065,7 +37081,7 @@
commit 4fe89e520a04a6ab6d6ec6a8294896b2f427c7da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 25 21:55:55 2009 +0100
+Date: Sun Oct 25 21:55:55 2009 +0100
do not accept negative interval lengths in the page labels tree
@@ -35076,7 +37092,7 @@
commit b174ebd6b323c7a58a19d59c1a9e4ac4e6cba7d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 23 21:57:42 2009 +0200
+Date: Fri Oct 23 21:57:42 2009 +0200
Move the iccColorSpaceCache from a static in GfxState to a member
of Gfx
@@ -35088,16 +37104,16 @@
bug 24686
poppler/Gfx.cc | 49 ++++++++++++++++++----------
- poppler/Gfx.h | 13 ++++++--
+ poppler/Gfx.h | 13 ++++++--
poppler/GfxState.cc | 94
++++++++++++++++++++++++++---------------------------
poppler/GfxState.h | 33 +++++++++----------
- poppler/Page.cc | 4 +--
+ poppler/Page.cc | 4 +--
5 files changed, 107 insertions(+), 86 deletions(-)
commit 4a9bdd30dc353865685e03eb1c1ac6093797695a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 22 21:26:29 2009 +0200
+Date: Thu Oct 22 21:26:29 2009 +0200
initialize len at 0 when reading the font fails
@@ -35108,7 +37124,7 @@
commit c839b706092583f6b12ed3cc634bf5af34b7a2bb
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Oct 20 10:09:13 2009 +0200
+Date: Tue Oct 20 10:09:13 2009 +0200
[glib] Fix CVE-2009-3607
@@ -35117,7 +37133,7 @@
commit 44462e0ca39392e5629020226b901e4026089b46
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Oct 19 23:33:58 2009 +0200
+Date: Mon Oct 19 23:33:58 2009 +0200
fix memory leak
@@ -35126,7 +37142,7 @@
commit d701aaa9eaa62567210070129f5feffe24bf1936
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 18 01:22:16 2009 +0200
+Date: Sun Oct 18 01:22:16 2009 +0200
This include is needed as this file uses Ref
@@ -35135,7 +37151,7 @@
commit d4202536e1b62c326c301d5088fa0e176c523e85
Author: Pino Toscano <pino at kde.org>
-Date: Sat Oct 17 01:35:11 2009 +0200
+Date: Sat Oct 17 01:35:11 2009 +0200
SplashGlyphBitmap is a struct and not a class
@@ -35144,7 +37160,7 @@
commit 654176dee7c9325aa5a24a2de3c070faa16e8a9c
Author: Michael Jansen <kde at michael-jansen.biz>
-Date: Sat Oct 17 01:30:40 2009 +0200
+Date: Sat Oct 17 01:30:40 2009 +0200
CMake: add the possibility to pass LIB_SUFFIX.
@@ -35151,21 +37167,21 @@
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 +-
+ 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-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 +-
+ 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 at kde.org>
-Date: Sat Oct 17 01:21:39 2009 +0200
+Date: Sat Oct 17 01:21:39 2009 +0200
put a space so MSVC won't try to see it as comment
@@ -35174,7 +37190,7 @@
commit f64086ea22a4e8cb3d4e7116db2a9541ac2fb19f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 17 00:48:58 2009 +0200
+Date: Sat Oct 17 00:48:58 2009 +0200
check the document is not locked when printing
@@ -35183,7 +37199,7 @@
commit 85d1015480b7ab3f21cc5f78dc53d4c5efdc6e60
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 17 00:48:27 2009 +0200
+Date: Sat Oct 17 00:48:27 2009 +0200
fix file name comment
@@ -35192,27 +37208,27 @@
commit 270764ad1bf2cfe95aed0b6850d2347361b4268d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 17 00:47:34 2009 +0200
+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-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 ++++++++++++++
+ 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 at kde.org>
-Date: Fri Oct 16 23:17:22 2009 +0200
+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 +++++++
+ 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(-)
@@ -35219,7 +37235,7 @@
commit c2458275e02f56226779b82d73c13defcbbda563
Author: Glenn Ganz <glenn.ganz at uptime.ch>
-Date: Fri Oct 16 20:54:32 2009 +0200
+Date: Fri Oct 16 20:54:32 2009 +0200
fix constructor of DCTStream
@@ -35228,7 +37244,7 @@
commit fd91b79c053bb5cd01a766032b90981dbc5e5dd3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 10 14:53:42 2009 +0200
+Date: Sat Oct 10 14:53:42 2009 +0200
fix compiling with automake
@@ -35237,7 +37253,7 @@
commit c3031b4318af6f85256f2478c8678dedd0d6acd1
Author: Pino Toscano <pino at kde.org>
-Date: Fri Oct 9 16:17:16 2009 +0200
+Date: Fri Oct 9 16:17:16 2009 +0200
cmake: simplify the linking to libpng
@@ -35246,7 +37262,7 @@
commit 96688dd7a091f8fa141fad2b3d05bae04b0b86fb
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Fri Oct 9 16:09:46 2009 +0200
+Date: Fri Oct 9 16:09:46 2009 +0200
MSVC: add _CRT_SECURE_NO_WARNINGS to the define's
@@ -35255,19 +37271,19 @@
commit f346c1f6b55f87ebd6bb0b0932462d5514aa40ff
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 9 00:29:06 2009 +0200
+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 +++++++++++++-------------
+ 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 at kde.org>
-Date: Fri Oct 9 00:15:52 2009 +0200
+Date: Fri Oct 9 00:15:52 2009 +0200
Add virtual destructor to ImgWriter
@@ -35279,17 +37295,17 @@
commit 699dcacced7be05b788c414c231dc2b5c07de06e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 9 00:13:11 2009 +0200
+Date: Fri Oct 9 00:13:11 2009 +0200
Add -Wnon-virtual-dtor flag
cmake/modules/PopplerMacros.cmake | 4 ++--
- configure.ac | 2 +-
+ configure.ac | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit d1e4fca4a8602994b010fae4f4fea5cd4df9276e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 9 00:10:03 2009 +0200
+Date: Fri Oct 9 00:10:03 2009 +0200
build on cmake too
@@ -35298,27 +37314,27 @@
commit d67511c92022121066f43003f01b955962ddcd33
Author: Stefan Thomas <thomas at eload24.com>
-Date: Fri Oct 9 00:09:23 2009 +0200
+Date: Fri Oct 9 00:09:23 2009 +0200
Add -jpeg to pdftoppm
- goo/ImgWriter.h | 28 +++++++++++++++
- goo/JpegWriter.cc | 92
+ goo/ImgWriter.h | 28 +++++++++++++++
+ goo/JpegWriter.cc | 92
++++++++++++++++++++++++++++++++++++++++++++++++++
- goo/JpegWriter.h | 42 +++++++++++++++++++++++
- goo/Makefile.am | 2 ++
- goo/PNGWriter.cc | 5 +--
- goo/PNGWriter.h | 10 +++---
+ 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 +++++++++---
+ 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 at gnome.org>
-Date: Wed Oct 7 17:11:58 2009 +0200
+Date: Wed Oct 7 17:11:58 2009 +0200
[glib-demo] Show some of the annot flags in annots treeview
@@ -35327,7 +37343,7 @@
commit 034907c6582c1f50782ec9c58a29b140c6fc0688
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 6 00:52:10 2009 +0200
+Date: Tue Oct 6 00:52:10 2009 +0200
Forgot to update the year here
@@ -35336,18 +37352,18 @@
commit fef89acebf5312324c104fb52e629563fbc2de76
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 6 00:42:52 2009 +0200
+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 ++-
+ qt4/src/poppler-qt4.h | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
commit 485252844b5e0964ee724b74e2a7ba2b820b259e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Oct 6 00:41:57 2009 +0200
+Date: Tue Oct 6 00:41:57 2009 +0200
rework how hinting is used in the splash backend
@@ -35361,7 +37377,7 @@
poppler/SplashOutputDev.h | 3 +++
splash/SplashFTFont.cc | 64
++++++++++----------------------------------
- splash/SplashFTFont.h | 4 +--
+ splash/SplashFTFont.h | 4 +--
splash/SplashFTFontEngine.cc | 8 +++---
splash/SplashFTFontEngine.h | 7 ++---
splash/SplashFontEngine.cc | 5 ++--
@@ -35370,14 +37386,14 @@
commit 8194c156cf2167834779e1690a89b5068baf8d58
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Oct 5 00:55:55 2009 +0200
+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 +-
+ 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(-)
@@ -35384,36 +37400,36 @@
commit 091f68ccd59413d6890dfbfcf8911f112e690b50
Author: Kovid Goyal <kovid at kovidgoyal.net>
-Date: Mon Oct 5 00:39:36 2009 +0200
+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 +++--
+ 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/FileSpec.cc | 7 ++++---
poppler/GlobalParams.cc | 37 +++++++++++++++++++------------------
poppler/GlobalParams.h | 4 ++--
- poppler/Link.cc | 3 ++-
- poppler/PDFDoc.cc | 4 ++--
- poppler/PDFDoc.h | 3 ++-
+ 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 ++-
+ test/perf-test.cc | 24 ++++++++++++------------
+ utils/HtmlOutputDev.h | 3 ++-
19 files changed, 108 insertions(+), 72 deletions(-)
commit 7fd8bdfa450db4e323e4e5d12159359fbc47f9ed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Oct 5 00:21:15 2009 +0200
+Date: Mon Oct 5 00:21:15 2009 +0200
Remove spurious ;
@@ -35425,7 +37441,7 @@
commit d46f7343e446331489d3fe6711a7cf778e0bd902
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:04:46 2009 +0200
+Date: Fri Oct 2 22:04:46 2009 +0200
Strings can have 0 inside so use the length
@@ -35436,7 +37452,7 @@
commit 2bc2040081919340415f576ce8266356deadbfcd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:04:03 2009 +0200
+Date: Fri Oct 2 22:04:03 2009 +0200
Increase decimals from 5 to 10, a double has that precision
@@ -35447,7 +37463,7 @@
commit 05eb7342d5234732f27c9c67b7fc1f9e40a4e075
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:03:40 2009 +0200
+Date: Fri Oct 2 22:03:40 2009 +0200
If the stream was wrongly formed save the correct length
@@ -35458,7 +37474,7 @@
commit b98faa4c162392d9416a5a93c9042b41f82d8657
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:02:13 2009 +0200
+Date: Fri Oct 2 22:02:13 2009 +0200
Return the save status as program status
@@ -35467,7 +37483,7 @@
commit f73f59f2c7bb7c7d57eb70cdc1bc30b80a92d0b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:01:45 2009 +0200
+Date: Fri Oct 2 22:01:45 2009 +0200
If the Length entry of the stream is wrong, fix it
@@ -35478,7 +37494,7 @@
commit 91135c7e788bc32e414e1a9c9ab43b326a07e970
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 2 22:00:12 2009 +0200
+Date: Fri Oct 2 22:00:12 2009 +0200
increase the range of characters we sanitize
@@ -35489,7 +37505,7 @@
commit 9dcb3e8be2cd52a795605548e43d6bfc149b2ea5
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
-Date: Sun Sep 27 17:17:32 2009 +0200
+Date: Sun Sep 27 17:17:32 2009 +0200
Fix the linking not to use the .so directly but the lib
@@ -35500,7 +37516,7 @@
commit ed4a6f1cfc7ccd2717d939841c092347c3307547
Author: Kovid Goyal <kovid at kovidgoyal.net>
-Date: Sat Sep 26 19:26:19 2009 +0200
+Date: Sat Sep 26 19:26:19 2009 +0200
Do not crash when saving files that come from a stream without name
@@ -35511,7 +37527,7 @@
commit 04b232d48930af9bc614d7fef47f79ce247713a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 26 18:30:41 2009 +0200
+Date: Sat Sep 26 18:30:41 2009 +0200
Write the Info into the trailer dict if there is one
@@ -35522,7 +37538,7 @@
commit 343e4f9aceb935eb393ad94bbef4dbb1b1a450ee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 26 18:28:40 2009 +0200
+Date: Sat Sep 26 18:28:40 2009 +0200
Plug leak
@@ -35531,13 +37547,13 @@
commit 2ea0032283c4717f1bb285fab7956fc38f375e87
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
-Date: Sat Sep 26 15:01:35 2009 +0200
+Date: Sat Sep 26 15:01:35 2009 +0200
Patch to make poppler work on Cygwin
Bug 4195
- configure.ac | 3 +++
+ configure.ac | 3 +++
qt/Makefile.am | 2 +-
qt4/src/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
@@ -35544,7 +37560,7 @@
commit 074dc5e5e39cebc1fbe9bf6a15b2cae2391006c1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 26 14:56:38 2009 +0200
+Date: Sat Sep 26 14:56:38 2009 +0200
Improve realibility for Streams with broken Length
@@ -35555,7 +37571,7 @@
commit b7702820245fb6cdbf77afba37c53c03d4362a25
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 21 21:58:26 2009 +0200
+Date: Mon Sep 21 21:58:26 2009 +0200
Print with a . and not with a , in all locales
@@ -35566,7 +37582,7 @@
commit d31080d8195694cef740d4e77484179bb38d1f26
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 20 17:21:13 2009 +0200
+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
@@ -35578,7 +37594,7 @@
commit a729d005a7204791fa8415de5aa0834136073ce8
Author: Pino Toscano <pino at kde.org>
-Date: Thu Sep 17 20:12:20 2009 +0200
+Date: Thu Sep 17 20:12:20 2009 +0200
Windows32/MSVC: initialize the font list once per GlobalParams,
instead of once at all
@@ -35595,7 +37611,7 @@
commit 68711d8494e2765c4a24ea59ce8d904981f0f917
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 9 23:24:22 2009 +0200
+Date: Wed Sep 9 23:24:22 2009 +0200
uint -> Guint
@@ -35606,30 +37622,30 @@
commit 943a13c9354dec18cb023642aebbe5d3bb920ed7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 9 20:04:06 2009 +0200
+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 +++---
+ 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 at kde.org>
-Date: Wed Sep 9 19:21:21 2009 +0200
+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 +-
+ qt4/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit e950107006a3b1889646d3705323c1b3d41eaa49
Author: David Benjamin <davidben at mit.edu>
-Date: Wed Sep 9 01:19:38 2009 +0200
+Date: Wed Sep 9 01:19:38 2009 +0200
Fix infinite loop in JBIG2Decoder
@@ -35641,7 +37657,7 @@
commit 1cb25a4adaaf3e2da50724312a3db6928991f425
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Sep 6 10:45:56 2009 +0200
+Date: Sun Sep 6 10:45:56 2009 +0200
[glib] Ignore attachments with an invalid embedded file
@@ -35652,7 +37668,7 @@
commit 842e00f3114666609ef4dec6fa613d46f330a40c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 5 15:20:35 2009 +0200
+Date: Sat Sep 5 15:20:35 2009 +0200
Add EmbeddedFile::isValid
@@ -35659,12 +37675,12 @@
Also do not crash if data() is called on an invalid file
qt4/src/poppler-embeddedfile.cc | 10 +++++++++-
- qt4/src/poppler-qt4.h | 9 ++++++++-
+ qt4/src/poppler-qt4.h | 9 ++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 5 15:19:27 2009 +0200
+Date: Sat Sep 5 15:19:27 2009 +0200
Add EmbFile::isOk
@@ -35676,7 +37692,7 @@
commit 642650b6f70425c8fff2df978ae71249a5ae07f3
Author: David Benjamin <davidben at mit.edu>
-Date: Sat Sep 5 01:12:49 2009 +0200
+Date: Sat Sep 5 01:12:49 2009 +0200
Better fallback when there's a type mismatch
@@ -35687,7 +37703,7 @@
commit bf5811f5331292ccf30f1b0f089fe43d351d96be
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 26 00:43:46 2009 +0200
+Date: Wed Aug 26 00:43:46 2009 +0200
Improve shading color rendering
@@ -35699,7 +37715,7 @@
commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 26 00:42:49 2009 +0200
+Date: Wed Aug 26 00:42:49 2009 +0200
Make code a bit more readable
@@ -35708,7 +37724,7 @@
commit 465212780557705fd939dfe54f96913505bfc96e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 25 21:55:45 2009 +0200
+Date: Tue Aug 25 21:55:45 2009 +0200
forgot to update my copyright
@@ -35717,7 +37733,7 @@
commit 4f6016d01ced32002bef22b9b5d5426a74e55842
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 25 21:10:07 2009 +0200
+Date: Tue Aug 25 21:10:07 2009 +0200
Fix format security warnings
@@ -35728,7 +37744,7 @@
commit 4616b23382b5d155f8b2f1942733037cf5730844
Author: Christian Persch <chpe at gnome.org>
-Date: Tue Aug 25 21:09:40 2009 +0200
+Date: Tue Aug 25 21:09:40 2009 +0200
Fix format security warnings
@@ -35739,14 +37755,14 @@
commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc
Author: Christian Persch <chpe at gnome.org>
-Date: Tue Aug 25 21:03:16 2009 +0200
+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 +
+ Makefile.am | 2 +-
+ configure.ac | 1 +
glib/Makefile.am | 4 ++--
qt4/demos/Makefile.am | 2 +-
qt4/src/Makefile.am | 2 +-
@@ -35755,7 +37771,7 @@
commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a
Author: Christian Persch <chpe at gnome.org>
-Date: Tue Aug 25 21:01:13 2009 +0200
+Date: Tue Aug 25 21:01:13 2009 +0200
Fix automake check, and add automake 1.11 support
@@ -35768,7 +37784,7 @@
commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834
Author: Rex Dieter <rdieter at math.unl.edu>
-Date: Mon Aug 24 20:08:46 2009 +0200
+Date: Mon Aug 24 20:08:46 2009 +0200
Use Requires.private if available
@@ -35783,7 +37799,7 @@
commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f
Author: Jakub Wilk <ubanus at users.sf.net>
-Date: Mon Aug 24 19:51:34 2009 +0200
+Date: Mon Aug 24 19:51:34 2009 +0200
common options for pdftoabw
@@ -35798,20 +37814,20 @@
commit 365683d5faea6e0a7570b139d1f3366c22271f8e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 18 21:18:13 2009 +0200
+Date: Tue Aug 18 21:18:13 2009 +0200
0.11.3
CMakeLists.txt | 2 +-
- NEWS | 22 ++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at gnome.org>
-Date: Mon Aug 17 14:14:03 2009 +0200
+Date: Mon Aug 17 14:14:03 2009 +0200
[glib] Add FORMAT_MAJOR/MINOR properties to get the PDF version
@@ -35822,7 +37838,7 @@
commit 1b5612841b0c663f6d391d4581f65f68a2975db0
Author: Pino Toscano <pino at kde.org>
-Date: Mon Aug 17 01:04:04 2009 +0200
+Date: Mon Aug 17 01:04:04 2009 +0200
[Qt] add Document::getPdfVersion(int *major, int *minor) for the
document PDF version numbers
@@ -35831,12 +37847,12 @@
document, putting major and minor numbers in own variables.
qt/poppler-document.cc | 8 ++++++++
- qt/poppler-qt.h | 12 ++++++++++++
+ qt/poppler-qt.h | 12 ++++++++++++
2 files changed, 20 insertions(+)
commit aef8ecda1e80b921228f415a53c9c5a52df87d94
Author: Pino Toscano <pino at kde.org>
-Date: Mon Aug 17 00:57:08 2009 +0200
+Date: Mon Aug 17 00:57:08 2009 +0200
[Qt4] deprecate Document::pdfVersion()
@@ -35847,7 +37863,7 @@
commit 830140f70e48e8033ad4411b6bd405d5ad7358a3
Author: Pino Toscano <pino at kde.org>
-Date: Mon Aug 17 00:51:13 2009 +0200
+Date: Mon Aug 17 00:51:13 2009 +0200
[Qt4] add Document::getPdfVersion(int *major, int *minor) for the
document PDF version numbers
@@ -35857,13 +37873,13 @@
Add them to the relative unit test.
qt4/src/poppler-document.cc | 8 ++++++++
- qt4/src/poppler-qt4.h | 13 +++++++++++++
+ qt4/src/poppler-qt4.h | 13 +++++++++++++
qt4/tests/check_metadata.cpp | 4 ++++
3 files changed, 25 insertions(+)
commit 5491d16dfbd73f0256c62e49d02622dc3185012e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 17 00:24:41 2009 +0200
+Date: Mon Aug 17 00:24:41 2009 +0200
Move poppler core away from using a double as PDF file version
@@ -35870,16 +37886,16 @@
Frontends are yet to come
glib/poppler-document.cc | 2 +-
- poppler/PDFDoc.cc | 7 ++++---
- poppler/PDFDoc.h | 8 +++++---
+ poppler/PDFDoc.cc | 7 ++++---
+ poppler/PDFDoc.h | 8 +++++---
qt/poppler-document.cc | 4 ++--
qt4/src/poppler-document.cc | 4 ++--
- utils/pdfinfo.cc | 4 ++--
+ utils/pdfinfo.cc | 4 ++--
6 files changed, 16 insertions(+), 13 deletions(-)
commit efd5dd63a5b08249529d9a9f5906aefe806fb3aa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 17 00:21:22 2009 +0200
+Date: Mon Aug 17 00:21:22 2009 +0200
Forgot to update copyright info
@@ -35890,7 +37906,7 @@
commit 25ff4be0b4521cc3d2de386cdeb589beb245d435
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 17 00:15:10 2009 +0200
+Date: Mon Aug 17 00:15:10 2009 +0200
No need to change the locale since we use gatof that does the
right thing
@@ -35900,7 +37916,7 @@
commit a6f698b4edc42c0414dd4690e1e037088321db2c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 17 00:14:35 2009 +0200
+Date: Mon Aug 17 00:14:35 2009 +0200
Use gatof instead of atof
@@ -35913,7 +37929,7 @@
commit 807b121cae45832d2e5832bad19c31e77420bfec
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 17 00:10:30 2009 +0200
+Date: Mon Aug 17 00:10:30 2009 +0200
Add a custom strtod that comes from libspectre
@@ -35923,12 +37939,12 @@
goo/Makefile.am | 6 ++-
goo/gstrtod.cc | 147
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- goo/gstrtod.h | 43 +++++++++++++++++
+ goo/gstrtod.h | 43 +++++++++++++++++
4 files changed, 196 insertions(+), 2 deletions(-)
commit 914bf7677a14494b69857b1d8070092a9999fe79
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 16 20:50:02 2009 +0200
+Date: Sun Aug 16 20:50:02 2009 +0200
When writing the cm matrix write 4 significant digits not 4 decimals
@@ -35936,14 +37952,14 @@
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 +++-
+ 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 at gnome.org>
-Date: Sun Aug 16 19:28:37 2009 +0200
+Date: Sun Aug 16 19:28:37 2009 +0200
[cairo] CairoImageOutputDev doesn't implement patterns
@@ -35952,7 +37968,7 @@
commit d20d65111aee2ee4b8cdea2962ed1bb149122ba9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Aug 16 17:36:14 2009 +0200
+Date: Sun Aug 16 17:36:14 2009 +0200
[cairo] Implement tiling patterns in cairo backend
@@ -35965,7 +37981,7 @@
commit e965d0686d979c775b64a93f8e2f775f81885417
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 13 14:48:10 2009 +0200
+Date: Thu Aug 13 14:48:10 2009 +0200
Change OutputDev::tilingPatternFill to return a GBool
@@ -35973,15 +37989,15 @@
depending
on the parameters, like shaded patterns currently do.
- poppler/Gfx.cc | 37 +++++++++++++++++++------------------
- poppler/OutputDev.h | 11 ++++++-----
+ poppler/Gfx.cc | 37 +++++++++++++++++++------------------
+ poppler/OutputDev.h | 11 ++++++-----
poppler/PSOutputDev.cc | 12 +++++++-----
- poppler/PSOutputDev.h | 10 +++++-----
+ poppler/PSOutputDev.h | 10 +++++-----
4 files changed, 37 insertions(+), 33 deletions(-)
commit ce70ef7d6afc800e24031dae43da301e9e542f0e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 15 17:45:57 2009 +0200
+Date: Sat Aug 15 17:45:57 2009 +0200
Fix backwards search
@@ -35990,7 +38006,7 @@
commit 5b7b1cdc5c3b8652d3ae583b4d7b8b6de625adc2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 15 17:45:05 2009 +0200
+Date: Sat Aug 15 17:45:05 2009 +0200
Add an autotest showing previousresult fails
@@ -36000,7 +38016,7 @@
commit 2484b0dcb8eb62f8e2c147498c58871ec04630b5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 14 11:47:11 2009 +0200
+Date: Fri Aug 14 11:47:11 2009 +0200
Implement the alpha path
@@ -36015,7 +38031,7 @@
commit 03970d8b6d7624444664320470baa6d1b1299622
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Aug 11 12:01:07 2009 +0200
+Date: Tue Aug 11 12:01:07 2009 +0200
[build] Fix build with autotools
@@ -36024,7 +38040,7 @@
commit 15752b7cd5c94620e3ad3b6afd9c70ccc754c9b3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 10 20:02:13 2009 +0200
+Date: Mon Aug 10 20:02:13 2009 +0200
[cairo] Add empty updateBlendMode to CairoImageOutputDev
@@ -36037,7 +38053,7 @@
commit 45dae4e66b2b833f95656850b5f1b0ffd1d96f1d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 10 20:00:04 2009 +0200
+Date: Mon Aug 10 20:00:04 2009 +0200
[cairo] Use current fill_opacity when drawing images
@@ -36048,7 +38064,7 @@
commit b1cd54546844f2f7cd6bf7cc14b7584c84c3fc14
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 10 19:55:44 2009 +0200
+Date: Mon Aug 10 19:55:44 2009 +0200
[cairo] Do not save the font file twice for FreeType fonts
@@ -36059,7 +38075,7 @@
commit 4181a0ff11195eb7a56d76be23994b843e20b483
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 10 19:58:09 2009 +0200
+Date: Mon Aug 10 19:58:09 2009 +0200
this branch is unlikely to happen
@@ -36068,7 +38084,7 @@
commit 2a3025f32951ce7b7343aeef111902615d71595e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 10 19:55:40 2009 +0200
+Date: Mon Aug 10 19:55:40 2009 +0200
fix overflow calculation not to depend on the variable overflowing
@@ -36077,7 +38093,7 @@
commit a38001f724f78231c2fdadd28e647a35b41bab74
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 9 23:26:02 2009 +0200
+Date: Sun Aug 9 23:26:02 2009 +0200
Check for overflow when parsing integers
@@ -36088,7 +38104,7 @@
commit 4c4c0e44452d07bea88d98b7df0c01fadd7693cc
Author: Jakub Wilk <ubanus at users.sf.net>
-Date: Sat Aug 8 17:26:14 2009 +0200
+Date: Sat Aug 8 17:26:14 2009 +0200
Silence some warnings when using internal headers and not compiling
with -Wno-write-strings
@@ -36100,7 +38116,7 @@
commit e2c319ba18ab473fd969db9519a9231be67538c3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 8 00:48:18 2009 +0200
+Date: Sat Aug 8 00:48:18 2009 +0200
Also implement mono so that -mono in pdftoppm -png works
@@ -36111,7 +38127,7 @@
commit c669e7f3ca421265e78161cc3fdecd2a0c7510c9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 8 00:38:50 2009 +0200
+Date: Sat Aug 8 00:38:50 2009 +0200
Support splashModeMono8 in writePNGFile
@@ -36123,7 +38139,7 @@
commit 92744b72df9084fd2d69ba78406898378884aed8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 8 00:20:52 2009 +0200
+Date: Sat Aug 8 00:20:52 2009 +0200
Add the -png flag to pdftoppm to output to PNG
@@ -36130,25 +38146,25 @@
Based on a patch by Shen Liang <shenzhuxi at gmail.com>
Also factored common PNG code from HtmlOutputDev to PNGWriter
- CMakeLists.txt | 5 +++
- goo/Makefile.am | 9 +++-
- goo/PNGWriter.cc | 110
+ CMakeLists.txt | 5 +++
+ goo/Makefile.am | 9 +++-
+ goo/PNGWriter.cc | 110
++++++++++++++++++++++++++++++++++++++++++++++
- goo/PNGWriter.h | 43 ++++++++++++++++++
- poppler/Makefile.am | 8 ++++
+ goo/PNGWriter.h | 43 ++++++++++++++++++
+ poppler/Makefile.am | 8 ++++
splash/SplashBitmap.cc | 70 +++++++++++++++++++++++++++++
- splash/SplashBitmap.h | 5 +++
+ splash/SplashBitmap.h | 5 +++
splash/SplashErrorCodes.h | 4 +-
- utils/CMakeLists.txt | 4 --
+ utils/CMakeLists.txt | 4 --
utils/HtmlOutputDev.cc | 66 +++++-----------------------
- utils/Makefile.am | 4 --
- utils/pdftoppm.1 | 3 ++
- utils/pdftoppm.cc | 21 +++++++--
+ 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 at gnome.org>
-Date: Fri Aug 7 15:23:57 2009 +0200
+Date: Fri Aug 7 15:23:57 2009 +0200
[cairo] Don't apply masks when fill color space mode is csPattern
@@ -36161,7 +38177,7 @@
commit 7194f59a18e4f6997ae560af3db1bd101d6f726e
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Thu Aug 6 11:24:22 2009 +0100
+Date: Thu Aug 6 11:24:22 2009 +0100
[cairo] Use FT_New_Memory_Face() for mmapped fonts
@@ -36175,7 +38191,7 @@
commit 7e2bbcf6f85111d1006b0d5bc1503cadaba83c9f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 4 00:10:58 2009 +0200
+Date: Tue Aug 4 00:10:58 2009 +0200
Set KDAB via gamaral copyright
@@ -36184,7 +38200,7 @@
commit ed5918e16dafebc9ecf6db8ce0186f407ecbf7d5
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 1 20:00:22 2009 +0200
+Date: Sat Aug 1 20:00:22 2009 +0200
[Qt4 apidox] make example for FontIterator... not leak ;)
@@ -36193,7 +38209,7 @@
commit f3b36d9c992491e614e88dbf1a84b5433a7647f4
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 1 19:54:52 2009 +0200
+Date: Sat Aug 1 19:54:52 2009 +0200
[Qt4] Add color management API.
@@ -36206,13 +38222,13 @@
qt4/src/poppler-document.cc | 52
+++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 50
+ qt4/src/poppler-qt4.h | 50
+++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
commit 78a1969d040018c0c2bb74c94f5507f786e4666e
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 1 18:00:06 2009 +0200
+Date: Sat Aug 1 18:00:06 2009 +0200
[Qt] add unhandled cases and remove unused code
@@ -36221,20 +38237,20 @@
commit bddebec0712e92e13b57d3d05d652673fe737866
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 1 17:12:22 2009 +0200
+Date: Sat Aug 1 17:12:22 2009 +0200
0.11.2
CMakeLists.txt | 2 +-
- NEWS | 30 ++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at gnome.org>
-Date: Sat Aug 1 15:48:02 2009 +0200
+Date: Sat Aug 1 15:48:02 2009 +0200
[glib-demo] Add cast to make sure the comparison is always valid
@@ -36243,7 +38259,7 @@
commit 464e95ef451103daddc9a30cd26b986291f02176
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Aug 1 15:47:25 2009 +0200
+Date: Sat Aug 1 15:47:25 2009 +0200
[glib-demo] Add missing return
@@ -36252,7 +38268,7 @@
commit 7f48369e4d29b2a71abffa9e1966e3a2252de895
Author: Guillermo Antonio Amaral Bastidas <gamaral at amaral.com.mx>
-Date: Sat Aug 1 15:41:34 2009 +0200
+Date: Sat Aug 1 15:41:34 2009 +0200
Call fillChildrenSiblingsID in fillChildrenSiblingsID instaed of
loadChildrenDefaults
@@ -36262,7 +38278,7 @@
commit e21a3e40bf6f4365064cea751ae186580d8f81f5
Author: William Bader <williambader at hotmail.com>
-Date: Sat Aug 1 15:23:03 2009 +0200
+Date: Sat Aug 1 15:23:03 2009 +0200
Add the possibility of disabling font substitution in pdftops
@@ -36272,14 +38288,14 @@
poppler/GlobalParams.h | 4 ++++
poppler/PSOutputDev.cc | 59
+++++++++++++++++++++++++++----------------------
- poppler/PSOutputDev.h | 2 ++
- utils/pdftops.1 | 8 ++++++-
- utils/pdftops.cc | 7 ++++++
+ 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 at kde.org>
-Date: Sat Aug 1 15:19:48 2009 +0200
+Date: Sat Aug 1 15:19:48 2009 +0200
Forgot to add my copyright
@@ -36288,7 +38304,7 @@
commit 173451730948c320f16a0f5924a58302603eca0b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 1 15:13:35 2009 +0200
+Date: Sat Aug 1 15:13:35 2009 +0200
Try to workaround some incorrect PDF
@@ -36301,7 +38317,7 @@
commit 35c408ca49be08144bcf14aa112505fd556725d2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:27:02 2009 +0200
+Date: Fri Jul 31 23:27:02 2009 +0200
add the overloaded virtual warning also the autotools based build
@@ -36310,7 +38326,7 @@
commit 1c32bd2d101e5dfb37e28276ecad699f121b27b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:22:25 2009 +0200
+Date: Fri Jul 31 23:22:25 2009 +0200
Add my copyright to files i just edited
@@ -36321,7 +38337,7 @@
commit 10717a48c85f1dbeff1c6bcd094006a9ecc92efc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:22:10 2009 +0200
+Date: Fri Jul 31 23:22:10 2009 +0200
Add -Woverloaded-virtual as default CXX flag
@@ -36330,7 +38346,7 @@
commit db5f736655f01575ac5d7c524cbf131924ae91fa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:12:00 2009 +0200
+Date: Fri Jul 31 23:12:00 2009 +0200
rename the function
@@ -36338,12 +38354,12 @@
not seem like a wrong overload
utils/HtmlOutputDev.cc | 4 ++--
- utils/HtmlOutputDev.h | 2 +-
+ utils/HtmlOutputDev.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 4be87f87509b93c4fe4025f9bd788e9412416663
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:11:32 2009 +0200
+Date: Fri Jul 31 23:11:32 2009 +0200
Remove Outputdev::beginMarkedContent as noone uses it
@@ -36354,7 +38370,7 @@
commit 6ab2ec8a89519d2bd1576c8d62f8aec51b04479a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 31 23:10:56 2009 +0200
+Date: Fri Jul 31 23:10:56 2009 +0200
Warning--
@@ -36363,7 +38379,7 @@
commit 53c3d636ad645a350b576160e1498726238a7bd1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 31 18:23:57 2009 +0200
+Date: Fri Jul 31 18:23:57 2009 +0200
[cairo] Implement radialShadedFill in cairo backend using cairo
gradients
@@ -36372,28 +38388,28 @@
poppler/CairoOutputDev.cc | 28 +++++++++
poppler/CairoOutputDev.h | 2 +
- poppler/Gfx.cc | 141
+ poppler/Gfx.cc | 141
+++++++++++++++++++++++++++-------------------
- poppler/OutputDev.h | 2 +-
+ poppler/OutputDev.h | 2 +-
poppler/PSOutputDev.cc | 3 +-
- poppler/PSOutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
6 files changed, 117 insertions(+), 61 deletions(-)
commit 2ba937545d1a2b9fa798f04fee755ccdf0e74ec7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 31 17:49:18 2009 +0200
+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 ++++
+ poppler/Gfx.cc | 34 ++++++++++++++++++++++++++++------
+ poppler/OutputDev.h | 4 ++++
4 files changed, 42 insertions(+), 6 deletions(-)
commit b054756113f0df6b59935823882f412486e96db5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jun 17 11:10:15 2009 +0200
+Date: Wed Jun 17 11:10:15 2009 +0200
[cairo] Implement blend mdoes in cairo backend
@@ -36400,7 +38416,7 @@
It requires cairo from git master to work at the moment. Fixes bugs
#22384, #12979, #13603, #17919, #22255
- configure.ac | 27 ++++++++++++++++++++++
+ configure.ac | 27 ++++++++++++++++++++++
poppler/CairoOutputDev.cc | 59
+++++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 1 +
@@ -36408,7 +38424,7 @@
commit bf8964726c9311e7e82b1faf49cc2272e5c1e339
Author: William Bader <williambader at hotmail.com>
-Date: Thu Jul 30 22:08:43 2009 +0200
+Date: Thu Jul 30 22:08:43 2009 +0200
Fix some double to int warnings by explicit casting
@@ -36417,7 +38433,7 @@
commit fdbd0c548e963461b2bc4bdf1beaa1577cafcea7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 30 21:05:18 2009 +0200
+Date: Thu Jul 30 21:05:18 2009 +0200
Update gtk-doc build files
@@ -36428,7 +38444,7 @@
commit ae84dce5cea4d249526a6ed5b2feb2d3f241da1b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 30 20:45:39 2009 +0200
+Date: Thu Jul 30 20:45:39 2009 +0200
Revert "Remove unneeded files from repo"
@@ -36436,16 +38452,16 @@
See bug #22697.
- configure.ac | 2 +-
- glib/reference/Makefile.am | 4 +-
- gtk-doc.make | 155
+ configure.ac | 2 +-
+ glib/reference/Makefile.am | 4 +-
+ gtk-doc.make | 155
+++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4 | 53 ++++++++++++++++
+ m4/gtk-doc.m4 | 53 ++++++++++++++++
4 files changed, 211 insertions(+), 3 deletions(-)
commit 7e14516a78b16453c747eb92b08665632e5f6844
Author: Sanjoy Mahajan <sanjoy at mit.edu>
-Date: Mon Jul 27 23:20:50 2009 +0200
+Date: Mon Jul 27 23:20:50 2009 +0200
Fix displayPages call
@@ -36463,7 +38479,7 @@
commit 3d53a0eb14420d54c0ebf8590e34c018b8da105d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 19 16:02:33 2009 +0200
+Date: Sun Jul 19 16:02:33 2009 +0200
Copy byte_lookup in copy constructor
@@ -36472,7 +38488,7 @@
commit 8f7271acf17c46e663cd48d90c382b04a834fba2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 19 15:53:49 2009 +0200
+Date: Sun Jul 19 15:53:49 2009 +0200
Don't use byte_lookup table when color space doesn't support getLine
methods
@@ -36494,12 +38510,12 @@
poppler/GfxState.cc | 125
++++++++++++++++++++++++++++++----------------------
- poppler/GfxState.h | 21 +++++++--
+ poppler/GfxState.h | 21 +++++++--
2 files changed, 91 insertions(+), 55 deletions(-)
commit 1bc737796bef1c65289a101b2d4c367267b9c974
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 19 15:51:43 2009 +0200
+Date: Sun Jul 19 15:51:43 2009 +0200
Remove unused variable
@@ -36508,7 +38524,7 @@
commit 512b2c654fd80c83b82e7adc828a478a18de17ab
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 26 19:35:06 2009 +0200
+Date: Sun Jul 26 19:35:06 2009 +0200
[cairo] Use CAIRO_EXTEND_PAD in drawImageMaskPrescaled too
@@ -36517,7 +38533,7 @@
commit ad26e34bede53cb6300bc463cbdcc2b5adf101c2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 26 18:36:06 2009 +0200
+Date: Sun Jul 26 18:36:06 2009 +0200
[cairo] Use rectangle + clip instead of invert + tranform
@@ -36528,7 +38544,7 @@
commit ee6b761a55baef4c3bbe4614b0c3b3d761a3111f
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Sun Jul 26 16:19:15 2009 +0200
+Date: Sun Jul 26 16:19:15 2009 +0200
[cairo] Apply a clip for masked drawImage
@@ -36545,7 +38561,7 @@
commit 499c6c972bac14936b5370276da723a6e98861b3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jul 26 11:30:08 2009 +0200
+Date: Sun Jul 26 11:30:08 2009 +0200
[cairo] Use CAIRO_EXTEND_PAD when drawing images
@@ -36555,7 +38571,7 @@
commit f91eb7d01cef0897727c63267db309bc92297d37
Author: Koji Otani <sho at bbr.jp>
-Date: Sat Jul 25 16:34:12 2009 +0200
+Date: Sat Jul 25 16:34:12 2009 +0200
Fix generation of ps for some files
@@ -36567,7 +38583,7 @@
commit f93f5e17d8f23f3e2862f3411f43a95b334e6c91
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 20 17:10:37 2009 +0200
+Date: Mon Jul 20 17:10:37 2009 +0200
[cairo] Improve performance when rendering one-channel images
@@ -36582,7 +38598,7 @@
commit e7475062b6ae5c495fa72faaf8fb3d97391f8544
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 14 17:22:52 2009 +0200
+Date: Tue Jul 14 17:22:52 2009 +0200
[cairo] Handle fontType1COT fonts in CairoFontEngine
@@ -36591,7 +38607,7 @@
commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 12 19:55:14 2009 +0200
+Date: Sun Jul 12 19:55:14 2009 +0200
glade is not used anymore
@@ -36600,7 +38616,7 @@
commit 454f7468c6a6a442a5064b5daa24d65ebf4fc6b6
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Thu Jul 9 10:43:00 2009 +0100
+Date: Thu Jul 9 10:43:00 2009 +0100
[cairo] Fix drawImage() for non-1x1 images
@@ -36623,7 +38639,7 @@
commit f8d93eae3c7b9388feabac71f2380d0b42a855e7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 8 20:14:35 2009 +0200
+Date: Wed Jul 8 20:14:35 2009 +0200
Lookup UF and F entries before Unix, MAC and DOS in getFileSpec
@@ -36632,7 +38648,7 @@
commit 767c534f5fdf6ccbccfd85a0086d72c215c278f1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 8 19:13:54 2009 +0200
+Date: Wed Jul 8 19:13:54 2009 +0200
Use UF entry when present in dict in getFileSpecName() too
@@ -36641,7 +38657,7 @@
commit 569627ac4d56ddd58e109ce2a37179a85e042030
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 8 13:02:16 2009 +0200
+Date: Wed Jul 8 13:02:16 2009 +0200
Implement axialShadedFill in cairo backend using cairo gradients
@@ -36649,15 +38665,15 @@
poppler/CairoOutputDev.cc | 29 +++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 10 ++++++++++
- poppler/Gfx.cc | 29 ++++++++++++++++++++---------
- poppler/OutputDev.h | 6 +++++-
+ poppler/Gfx.cc | 29 ++++++++++++++++++++---------
+ poppler/OutputDev.h | 6 +++++-
poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
6 files changed, 66 insertions(+), 12 deletions(-)
commit 6ae0a6c0044713affa23eb1ee6a070785ed6c2f3
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Wed Jul 8 16:48:26 2009 +0100
+Date: Wed Jul 8 16:48:26 2009 +0100
[cairo] premultiply image mask
@@ -36672,7 +38688,7 @@
commit 646e5884e748ecce7094c673400484aa1d902bdd
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Wed Jul 8 17:00:34 2009 +0100
+Date: Wed Jul 8 17:00:34 2009 +0100
[cairo] maskColors is an array of ints, no scaling required
@@ -36687,7 +38703,7 @@
commit d75feb1ee84385a9f94308cf47a43f4583092ddf
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Wed Jul 8 16:37:19 2009 +0100
+Date: Wed Jul 8 16:37:19 2009 +0100
[cairo] cleanse DrawImage()
@@ -36700,7 +38716,7 @@
commit 52f3704fed16cfc1e9dd85f72dde7922371e4099
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 8 11:40:52 2009 +0200
+Date: Wed Jul 8 11:40:52 2009 +0200
[TODO] Update TODO file
@@ -36709,7 +38725,7 @@
commit ef261f5f72d37a0aa2709611ee2bad7d55340ed8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 7 10:57:31 2009 +0200
+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
@@ -36720,7 +38736,7 @@
commit cafd4653dc6c7574214e80aa09489dcd24e347a6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 1 11:41:32 2009 +0200
+Date: Wed Jul 1 11:41:32 2009 +0200
[glib-demo] Fix a typo
@@ -36729,7 +38745,7 @@
commit a3c9c6d0c0ee55dccd2d03f20d5683ae300cdc6b
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jul 8 02:01:39 2009 +0200
+Date: Wed Jul 8 02:01:39 2009 +0200
start updating the TODO file
@@ -36752,7 +38768,7 @@
commit 92ad0ef89fe7690d83854b4821178dfdb2e22897
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 4 00:19:23 2009 +0200
+Date: Sat Jul 4 00:19:23 2009 +0200
[Qt4 demo] hopefully fix the page size on zoom change
@@ -36761,7 +38777,7 @@
commit 97094d13bc0f144b25e13c1de7a5328608ab13e3
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jul 4 00:07:12 2009 +0200
+Date: Sat Jul 4 00:07:12 2009 +0200
[Qt4 demo] show a list of checked/unchecked items for the document
permissions
@@ -36772,7 +38788,7 @@
commit 0d8f2ee0f03a14e7b8477c4b787c3441a758f26b
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jul 3 23:55:42 2009 +0200
+Date: Fri Jul 3 23:55:42 2009 +0200
[Qt4 demo] show page numbers in the toolbar as 1..n
@@ -36781,35 +38797,35 @@
commit b0d48df9121c55f8162ddf0ee63832f9adebf37b
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jul 3 17:55:31 2009 +0200
+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 ++
+ qt4/demos/pageview.h | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
commit dcc3c384919f1562b8f312ad3ac847e23f3e83ab
Author: Sebastien Bacher <seb128 at ubuntu.com>
-Date: Wed Jul 1 10:09:12 2009 +0200
+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 ++--
+ 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
+ test/pdf-inspector.ui | 416
++++++++++++++++++++++++++++++++++++++++++
6 files changed, 439 insertions(+), 452 deletions(-)
commit 28208d1c9b8afbb769a5f4d9b0655b99fd4af16e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 1 09:52:12 2009 +0200
+Date: Wed Jul 1 09:52:12 2009 +0200
[glib-demo] Do not use gio if glib < 2.15
@@ -36820,7 +38836,7 @@
commit 6ef83414ab55294cf46b6b05813927bb04066986
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 30 23:07:00 2009 +0200
+Date: Tue Jun 30 23:07:00 2009 +0200
Check getFileSpecNameForPlatform succeeded before using it's return
value
@@ -36834,7 +38850,7 @@
commit 4b9db83841a8b97df1e0991c1b853897b7095777
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 30 11:24:29 2009 +0200
+Date: Tue Jun 30 11:24:29 2009 +0200
[glib-demo] Do not fill the surface before rendering
@@ -36845,7 +38861,7 @@
commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8
Author: William Bader <williambader at hotmail.com>
-Date: Mon Jun 29 21:55:49 2009 +0200
+Date: Mon Jun 29 21:55:49 2009 +0200
Fix interpolate parameter position
@@ -36855,7 +38871,7 @@
commit e1e9ae2826eff1665d798b4b50b5c63e8282246b
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jun 28 20:11:42 2009 +0200
+Date: Sun Jun 28 20:11:42 2009 +0200
[Qt4 demo] do not crash when changing the zoom with no document
@@ -36864,20 +38880,20 @@
commit a98de97137cb343182bd03c443fc08ff4e0fd9a5
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jun 28 19:08:02 2009 +0200
+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 ++
+ 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 at kde.org>
-Date: Sun Jun 28 16:45:19 2009 +0200
+Date: Sun Jun 28 16:45:19 2009 +0200
Make sure the array is big enough to read from it
@@ -36886,7 +38902,7 @@
commit 0a1b41ff6de5a41e3450ecbcb1ba754dc06c29d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 26 19:31:22 2009 +0200
+Date: Fri Jun 26 19:31:22 2009 +0200
Do not crash when we can't find onStr
@@ -36899,7 +38915,7 @@
commit 6cb846664e57b02c99f1e6ad2b4e9128c9622e0a
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Thu Jun 25 20:13:29 2009 +0200
+Date: Thu Jun 25 20:13:29 2009 +0200
Initilize AnnotColot properly when the Array is not correct
@@ -36908,18 +38924,18 @@
commit 5fdc3acb8dded2e7d08e6ef30f4c5ae1a4a11b5e
Author: Till Kamppeter <till.kamppeter at gmail.com>
-Date: Mon Jun 22 21:38:23 2009 +0200
+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 ++++
+ poppler/PSOutputDev.h | 4 ++++
2 files changed, 13 insertions(+), 1 deletion(-)
commit bf69beeb257cfd750c6ddc8b68aeb859b36380b2
Author: David Benjamin <davidben at mit.edu>
-Date: Sat Jun 20 23:51:09 2009 +0200
+Date: Sat Jun 20 23:51:09 2009 +0200
Make DecryptStream return sane values for getPos()
@@ -36934,7 +38950,7 @@
commit 5ee4ff2aaf98e2eaa1ec2dc9f7e659b3b01ba7bf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 20 15:00:16 2009 +0200
+Date: Sat Jun 20 15:00:16 2009 +0200
[glib-demo] Allow using relative paths in demo application
@@ -36943,20 +38959,20 @@
commit a568248d3255407fcaa7368c4925c20e95619d20
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 19 21:07:39 2009 +0200
+Date: Fri Jun 19 21:07:39 2009 +0200
0.11.1
CMakeLists.txt | 2 +-
- NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Fri Jun 19 21:03:29 2009 +0200
+Date: Fri Jun 19 21:03:29 2009 +0200
ship PopplerCache.h
@@ -36965,7 +38981,7 @@
commit 84984d2aa25917d68c9971cefe636e626eada13d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 19 20:54:15 2009 +0200
+Date: Fri Jun 19 20:54:15 2009 +0200
Ship PopplerCache.h too
@@ -36974,7 +38990,7 @@
commit 3a52d46e5df8eb926b550d7f7a82f316dbf6808f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 19 17:45:44 2009 +0200
+Date: Fri Jun 19 17:45:44 2009 +0200
[glib-demo] Destroy pattern after using it
@@ -36983,7 +38999,7 @@
commit 2e97524e5d82a4c33a4e6410fead444681db6749
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 19 14:20:16 2009 +0200
+Date: Fri Jun 19 14:20:16 2009 +0200
[glib-demo] Use a transparent surface and fill it in white after
rendering
@@ -36993,7 +39009,7 @@
commit 009937842d5a8bfc12394e9e3ab71b7c33340a85
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 19 14:10:05 2009 +0200
+Date: Fri Jun 19 14:10:05 2009 +0200
[glib-demo] Use cairo_paint instead of rectangle + fill
@@ -37002,7 +39018,7 @@
commit 7248da095f67d57c3999cee7d980e62fd8a7cf49
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 19 09:37:02 2009 +0200
+Date: Fri Jun 19 09:37:02 2009 +0200
Use Interpolate flag to decide whether applying image interpolation
during rendering
@@ -37009,22 +39025,22 @@
Fixes bug #9860
- poppler/ArthurOutputDev.cc | 4 +-
- poppler/ArthurOutputDev.h | 5 ++-
+ 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/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/HtmlOutputDev.h | 7 ++--
utils/ImageOutputDev.cc | 20 +++++-----
utils/ImageOutputDev.h | 12 ++++--
17 files changed, 248 insertions(+), 129 deletions(-)
@@ -37031,16 +39047,16 @@
commit 37e3f877ee725648734ff41e1e83870a210bcbd7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 19 00:37:21 2009 +0200
+Date: Fri Jun 19 00:37:21 2009 +0200
Handle Streams in CMap definitions
Fixes bug 22334
- poppler/CMap.cc | 50
+ poppler/CMap.cc | 50
++++++++++++++++++++++++++++++-------------------
- poppler/CMap.h | 17 ++++++++++++-----
- poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++-------------
+ poppler/CMap.h | 17 ++++++++++++-----
+ poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++-------------
poppler/GlobalParams.cc | 6 +++---
poppler/GlobalParams.h | 5 +++--
5 files changed, 77 insertions(+), 42 deletions(-)
@@ -37047,7 +39063,7 @@
commit 47de8eef46300832556ce5ed869e391e477fd843
Author: David Benjamin <davidben at mit.edu>
-Date: Fri Jun 19 00:30:35 2009 +0200
+Date: Fri Jun 19 00:30:35 2009 +0200
Fix some bugs in JBIG2Stream handling
@@ -37056,12 +39072,12 @@
poppler/JBIG2Stream.cc | 88
+++++++++++++++++++++++++++-----------------------
- poppler/JBIG2Stream.h | 15 +++++++++
+ poppler/JBIG2Stream.h | 15 +++++++++
2 files changed, 63 insertions(+), 40 deletions(-)
commit d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 2 11:44:08 2009 +0200
+Date: Tue Jun 2 11:44:08 2009 +0200
Add setOpen() and setIcon() in AnnotText
@@ -37071,7 +39087,7 @@
commit 287feffc1c1c0aa42a398fc071b489acef9ef22e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 2 11:26:40 2009 +0200
+Date: Tue Jun 2 11:26:40 2009 +0200
Add setLabel() and setPopup() to AnnotMarkup
@@ -37081,7 +39097,7 @@
commit 2a938af5624fbc79316dd6bee5e550f2b4270a76
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 2 10:59:44 2009 +0200
+Date: Tue Jun 2 10:59:44 2009 +0200
Add setParent() and setOpen() to AnnotPopup
@@ -37091,7 +39107,7 @@
commit 0af5464352dfa51f0458c57a3590c847a45964c7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 2 10:37:49 2009 +0200
+Date: Tue Jun 2 10:37:49 2009 +0200
Save parent reference of popup annotations
@@ -37101,7 +39117,7 @@
commit fc4bc43dcd6f6871a47b9198e8c2571a5d448c3e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 1 14:52:21 2009 +0200
+Date: Mon Jun 1 14:52:21 2009 +0200
Fix a crash in pdf-inspector
@@ -37110,7 +39126,7 @@
commit 3da7a2657892fde52b62e1f73476cb33d6c75e96
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 13:35:39 2009 +0200
+Date: Fri May 29 13:35:39 2009 +0200
Add Annot::setColor()
@@ -37120,7 +39136,7 @@
commit 3eabdf57729852205855cf74ff2d2f9d7bc03f73
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 13:23:26 2009 +0200
+Date: Fri May 29 13:23:26 2009 +0200
Add construtors to create AnnotColor objects directly from color
values
@@ -37131,7 +39147,7 @@
commit 8045e7a1a84a3d54a1c9415ac63b5b9df5ecc349
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 13:06:40 2009 +0200
+Date: Fri May 29 13:06:40 2009 +0200
Add Page::addAnnot() to add a new annotation to the page
@@ -37141,7 +39157,7 @@
commit fe80eb84ec711b7400cef95e791a74c8fd259af7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 13:00:19 2009 +0200
+Date: Fri May 29 13:00:19 2009 +0200
Add getRef() to get the annotation reference
@@ -37150,7 +39166,7 @@
commit 1c92657be72c44dba7185808ffb00dd85c5ab289
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 12:14:02 2009 +0200
+Date: Fri May 29 12:14:02 2009 +0200
Save page object and ref in Page class
@@ -37163,7 +39179,7 @@
commit 4ad2d663262008e4b97342c4ed67c686ff5abd13
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 29 11:43:30 2009 +0200
+Date: Fri May 29 11:43:30 2009 +0200
Add annot constructors to create annot objects without a dict
@@ -37179,7 +39195,7 @@
commit e5c4862b0c1b08a0fab47070cb9c862026e93567
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 10 23:28:03 2009 +0200
+Date: Wed Jun 10 23:28:03 2009 +0200
ignore++
@@ -37188,7 +39204,7 @@
commit 572779f8037763c1e0ee64c47a3dad6df0d3b693
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Jun 10 22:55:26 2009 +0200
+Date: Wed Jun 10 22:55:26 2009 +0200
Fix dashed line in page 1 of bug 20011
@@ -37197,7 +39213,7 @@
commit b97591672e0d9c31a3d044fe52e34cc80a491221
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Jun 10 22:54:57 2009 +0200
+Date: Wed Jun 10 22:54:57 2009 +0200
Fix "Conditional jump or move depends on uninitialised value"
@@ -37211,12 +39227,12 @@
commit a92b38836b1e4475d5a7a1b9cb8f3e9429cef275
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 9 22:39:19 2009 +0200
+Date: Tue Jun 9 22:39:19 2009 +0200
Correctly duplicate the cache on PostScriptFunction(PostScriptFunction
*func)
- poppler/Function.cc | 28 ++++++++++++++++++++++++++++
+ poppler/Function.cc | 28 ++++++++++++++++++++++++++++
poppler/PopplerCache.cc | 20 ++++++++++++++++++++
poppler/PopplerCache.h | 14 ++++++++++++++
3 files changed, 62 insertions(+)
@@ -37223,7 +39239,7 @@
commit 2cecdf922f4c8178b0e55d3ddf86c31f8be3313a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jun 9 11:04:39 2009 +0200
+Date: Tue Jun 9 11:04:39 2009 +0200
[glib] Fix a crash when a destination points to an invalid page
@@ -37232,7 +39248,7 @@
commit 831288c13c3a7502bbccd1313c6e376283be367c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 18:37:20 2009 +0200
+Date: Sun Jun 7 18:37:20 2009 +0200
Optimize roll() a bit
@@ -37245,7 +39261,7 @@
commit 3d40dcad850a2bc0e28845a15722db0c79920135
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 13:38:50 2009 +0200
+Date: Sun Jun 7 13:38:50 2009 +0200
Move the GfxState cache to the new poppler cache class
@@ -37256,7 +39272,7 @@
commit 2619e09833f421fb3d8cc68d41d15081ae6824e4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 13:37:40 2009 +0200
+Date: Sun Jun 7 13:37:40 2009 +0200
Implement a cache for PostscriptFunction transforms
@@ -37264,17 +39280,17 @@
poppler/Function.cc | 76
+++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Function.h | 2 ++
+ poppler/Function.h | 2 ++
2 files changed, 78 insertions(+)
commit 588bfe3c14f42be492066c2a98e30482475a6926
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 13:36:39 2009 +0200
+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 +
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
poppler/PopplerCache.cc | 82
+++++++++++++++++++++++++++++++++++++++++++++++++
poppler/PopplerCache.h | 47 ++++++++++++++++++++++++++++
@@ -37282,7 +39298,7 @@
commit d09478fcc44b5c594f1803fc24654af5e10fa129
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 01:34:01 2009 +0200
+Date: Sun Jun 7 01:34:01 2009 +0200
Move index and pop to class definition too
@@ -37291,7 +39307,7 @@
commit 2083264e8ab0fd9976294de08a18de615d5a1168
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 7 01:21:19 2009 +0200
+Date: Sun Jun 7 01:21:19 2009 +0200
Move the implementations to the class definition
@@ -37304,7 +39320,7 @@
commit 24580fcd2be74db5f3140bdb2ebff8431b7d3f1e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 6 16:17:26 2009 +0200
+Date: Sat Jun 6 16:17:26 2009 +0200
Add a debug saying how much rendering took
@@ -37313,7 +39329,7 @@
commit 50cf7cffff760e41774957ad8f1f92803142438e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 6 16:04:54 2009 +0200
+Date: Sat Jun 6 16:04:54 2009 +0200
Use g_path_get_basename instead of g_basename in gtk-cairo-test
@@ -37324,22 +39340,22 @@
commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592
Author: Christian Persch <chpe at gnome.org>
-Date: Sat Jun 6 12:13:48 2009 +0200
+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
+ configure.ac | 2 +-
+ glib/reference/Makefile.am | 4 +-
+ gtk-doc.make | 155
---------------------------------------------
- m4/gtk-doc.m4 | 53 ----------------
+ m4/gtk-doc.m4 | 53 ----------------
4 files changed, 3 insertions(+), 211 deletions(-)
commit c94e476dbff9e527c72e52377d830f35f29ba3d6
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 5 11:09:44 2009 +0200
+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
@@ -37349,7 +39365,7 @@
commit 2298acac267257b1916c802bdb902428e69e683b
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 5 11:08:51 2009 +0200
+Date: Fri Jun 5 11:08:51 2009 +0200
[Qt4 apidox] FontInterator is new in 0.12
@@ -37358,7 +39374,7 @@
commit 37c48c2521c623c485841472c4a174a1841aea33
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 5 10:54:30 2009 +0200
+Date: Fri Jun 5 10:54:30 2009 +0200
[CMake] Add poppler version defines and version check macro
@@ -37365,24 +39381,24 @@
Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
POPPLER_CHECK_VERSION macro. FDO bug #22091.
- CMakeLists.txt | 5 ++++-
+ CMakeLists.txt | 5 ++++-
glib/poppler-features.h.cmake | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
commit 26f6fb1d79c2589829cd896d57da63d16641f307
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 5 10:51:26 2009 +0200
+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/CMakeLists.txt | 2 +-
glib/poppler-features.h.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 89704635b727db42f6c72ba101091eb7eddb967a
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jun 5 10:39:17 2009 +0200
+Date: Fri Jun 5 10:39:17 2009 +0200
[Qt4 demo] compile the new thumbnail module with autotools as well
@@ -37391,7 +39407,7 @@
commit 291bafe64c8755fe5f85a51b184ac6e3d3170e1d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 5 10:07:16 2009 +0200
+Date: Fri Jun 5 10:07:16 2009 +0200
[glib] Use g_strerror instead of strerror
@@ -37402,7 +39418,7 @@
commit 0ca7e214fb5f9c9fb59792149bd23c1617d38cac
Author: Christian Persch <chpe at gnome.org>
-Date: Thu Jun 4 22:35:40 2009 +0200
+Date: Thu Jun 4 22:35:40 2009 +0200
Add poppler version defines and version check macro
@@ -37409,10 +39425,10 @@
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 ++++
+ 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 deletion(-)
@@ -37419,7 +39435,7 @@
commit 4ce04da0040e5a2626c110f94a128e2d272401b9
Author: Matthias Drochner <M.Drochner at fz-juelich.de>
-Date: Thu Jun 4 23:05:22 2009 +0200
+Date: Thu Jun 4 23:05:22 2009 +0200
Use the correct value when creating the V field
@@ -37432,7 +39448,7 @@
commit 7e01e37a834bfdd75d739ea2b48e9127ca7f259e
Author: Till Kamppeter <till.kamppeter at gmail.com>
-Date: Thu Jun 4 20:25:55 2009 +0200
+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
@@ -37442,7 +39458,7 @@
commit 50a7b4bcaa6e5f56cc25fe6936f9dc537a1b4b37
Author: Jeremy C. Reed <reed at reedmedia.net>
-Date: Thu Jun 4 20:19:03 2009 +0200
+Date: Thu Jun 4 20:19:03 2009 +0200
[glib] Hyphenate UTF-8 and UTF-16BE
@@ -37452,13 +39468,13 @@
"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-annot.cc | 2 +-
glib/poppler-form-field.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 2cf9e6a2318b770ae62572944c687576d1801d31
Author: Till Kamppeter <till.kamppeter at gmail.com>
-Date: Thu Jun 4 19:48:42 2009 +0200
+Date: Thu Jun 4 19:48:42 2009 +0200
Support multiple page sizes when converting to PS
@@ -37465,14 +39481,14 @@
Fixes byg #19777
poppler/PSOutputDev.cc | 31 +++++++++++++++++++++++++++++--
- poppler/PSOutputDev.h | 4 +++-
- utils/pdftops.1 | 26 +++++++++++++++++++++-----
- utils/pdftops.cc | 17 ++++++++++++-----
+ 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 at kde.org>
-Date: Thu Jun 4 19:25:22 2009 +0200
+Date: Thu Jun 4 19:25:22 2009 +0200
Add missing { }
@@ -37481,7 +39497,7 @@
commit 1beec21ed3a016998fee3849d460166895db9047
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 3 22:37:43 2009 +0200
+Date: Wed Jun 3 22:37:43 2009 +0200
Give an error when using level1sep without having CMYK support
@@ -37492,7 +39508,7 @@
commit e80d645c34c7d44d1f35da0a25669d1c4cde6e7f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 3 22:00:49 2009 +0200
+Date: Wed Jun 3 22:00:49 2009 +0200
Also accept tokens with to leading 00
@@ -37503,7 +39519,7 @@
commit e521c1efaeba3f35d10e46bca3d9650dabd2d889
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Jun 3 22:08:57 2009 +0930
+Date: Wed Jun 3 22:08:57 2009 +0930
Implement text in pattern colorspace for the cairo backend
@@ -37514,7 +39530,7 @@
commit a87978b09a026b2db6b0f80271d87b44b336a121
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 3 13:49:56 2009 +0200
+Date: Wed Jun 3 13:49:56 2009 +0200
[Qt4 demo] show the checksum for embedded files
@@ -37523,7 +39539,7 @@
commit db5102842494a124d813db1696bb60820db3442b
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 3 13:21:22 2009 +0200
+Date: Wed Jun 3 13:21:22 2009 +0200
[Qt4 demo] remove checks for Qt >= 4.2
@@ -37530,29 +39546,29 @@
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/fonts.cpp | 2 --
+ qt4/demos/info.cpp | 2 --
qt4/demos/optcontent.cpp | 2 --
qt4/demos/permissions.cpp | 2 --
- qt4/demos/toc.cpp | 2 --
+ qt4/demos/toc.cpp | 2 --
6 files changed, 12 deletions(-)
commit e8d897581656ee4a20e9bb87dd999425663ace3b
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 3 02:54:29 2009 +0200
+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/pageview.h | 3 ---
qt4/demos/thumbnails.cpp | 2 +-
qt4/demos/thumbnails.h | 3 ---
- qt4/demos/viewer.cpp | 1 -
+ qt4/demos/viewer.cpp | 1 -
5 files changed, 1 insertion(+), 13 deletions(-)
commit f69a4fe47d3478cccbc03e4ac0929c7eada681c0
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jun 3 01:24:21 2009 +0200
+Date: Wed Jun 3 01:24:21 2009 +0200
[Qt4 demo] Add a thumbnail dock widget
@@ -37565,22 +39581,22 @@
qt4/demos/thumbnails.cpp | 84
++++++++++++++++++++++++++++++++++++++++++++++++
qt4/demos/thumbnails.h | 51 +++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 11 ++++++-
+ qt4/demos/viewer.cpp | 11 ++++++-
4 files changed, 146 insertions(+), 1 deletion(-)
commit 2f24ac0f4bbd6de1c9f137110b3ac2bd3b23b0b9
Author: Shawn Rutledge <shawn.t.rutledge at gmail.com>
-Date: Wed Jun 3 01:22:31 2009 +0200
+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 +++
+ qt4/demos/pageview.h | 3 +++
2 files changed, 8 insertions(+)
commit 1f1baf186f9e37606765e51ec5b9893ddfbfa893
Author: Shawn Rutledge <shawn.t.rutledge at gmail.com>
-Date: Wed Jun 3 01:19:16 2009 +0200
+Date: Wed Jun 3 01:19:16 2009 +0200
[Qt4] Add Page::thumbnail()
@@ -37589,12 +39605,12 @@
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 +++++++++++
+ qt4/src/poppler-qt4.h | 11 +++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
commit 5cc24be1e9af0a27ab88ffa719bcabc2378868e4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 3 00:05:54 2009 +0200
+Date: Wed Jun 3 00:05:54 2009 +0200
Remove unused variables
@@ -37603,7 +39619,7 @@
commit 45823bf8f4abacbbf257f6708264de074eda3cf4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 3 00:02:54 2009 +0200
+Date: Wed Jun 3 00:02:54 2009 +0200
Make it compile :-/
@@ -37612,7 +39628,7 @@
commit f5ae14907261a46c121f3ed7aea9d7ad9b9c55de
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 2 23:52:59 2009 +0200
+Date: Tue Jun 2 23:52:59 2009 +0200
Really fix the typo
@@ -37621,7 +39637,7 @@
commit 5d4b1995cdd57db7cef3d88704850aaf66ed7fff
Author: William Bader <williambader at hotmail.com>
-Date: Tue Jun 2 23:10:53 2009 +0200
+Date: Tue Jun 2 23:10:53 2009 +0200
Fix three typos in README
@@ -37630,7 +39646,7 @@
commit 104f9286ceb5fcb5f4795bca7633029142d5f6a4
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Tue Jun 2 22:59:42 2009 +0200
+Date: Tue Jun 2 22:59:42 2009 +0200
Support colorizing text in pattern colorspace
@@ -37641,15 +39657,15 @@
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 +------
+ 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/Makefile.am | 1 +
+ poppler/OutputDev.h | 14 ++
poppler/PSOutputDev.cc | 285 +++++++++++++++++++-------------
- poppler/PSOutputDev.h | 18 ++
+ poppler/PSOutputDev.h | 18 ++
poppler/SplashOutputDev.cc | 404
++++++++++++++++++++++++++++++++++++++-------
poppler/SplashOutputDev.h | 19 +++
@@ -37657,7 +39673,7 @@
commit d3e4563146cbff4cb507522783e60462461c7524
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun May 31 23:23:07 2009 +0200
+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
@@ -37667,7 +39683,7 @@
commit 78a58931b4347ecb505bad5a51104382ef5f91c7
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun May 31 22:52:23 2009 +0200
+Date: Sun May 31 22:52:23 2009 +0200
Add splashClearColor that assigns white to the given colorptr
@@ -37676,7 +39692,7 @@
commit 47c26747b32c242ec8ac60e7b93150a67eb22e31
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
-Date: Sun May 31 22:51:22 2009 +0200
+Date: Sun May 31 22:51:22 2009 +0200
Fix splashColorModeNComps to correctly include all values for each
SplashColorMode
@@ -37686,7 +39702,7 @@
commit 41775d8c0b44bf591d8ff5ede7fad276e8fa9eef
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 1 15:24:24 2009 +0200
+Date: Mon Jun 1 15:24:24 2009 +0200
[glib-demo] Use poppler_annot_markup_has_popup()
@@ -37695,7 +39711,7 @@
commit f542c5294394e837298cb7e7d1d94bb336bfd09d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jun 1 15:24:04 2009 +0200
+Date: Mon Jun 1 15:24:04 2009 +0200
[glib] Add poppler_annot_markup_has_popup()
@@ -37705,7 +39721,7 @@
commit af32d56af779edcc539b680e634755941d1bf45c
Author: Petr Gajdos <pgajdos at novell.com>
-Date: Thu May 21 00:37:18 2009 +0200
+Date: Thu May 21 00:37:18 2009 +0200
Add the possibility of forcing no hinting of fonts
@@ -37715,7 +39731,7 @@
poppler/SplashOutputDev.cc | 2 ++
splash/SplashFTFont.cc | 76
+++++++++++++++++++++++++++-----------------
- splash/SplashFTFont.h | 2 ++
+ splash/SplashFTFont.h | 2 ++
splash/SplashFTFontEngine.cc | 8 +++--
splash/SplashFTFontEngine.h | 6 ++--
splash/SplashFontEngine.cc | 4 ++-
@@ -37724,7 +39740,7 @@
commit 1a69d9638214943b3c2278f570694d9722a5de15
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 20 23:58:44 2009 +0200
+Date: Wed May 20 23:58:44 2009 +0200
Do not create the GfxColorTransform if the lcms could not be created
@@ -37735,7 +39751,7 @@
commit 95246d39c1289111a4ba3eb2ffbec50d7702e5eb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 20 23:20:20 2009 +0200
+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
@@ -37747,7 +39763,7 @@
commit 0c3517bfb4e1e1a28962f8d490ad69ec5766b6a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 20 23:08:41 2009 +0200
+Date: Wed May 20 23:08:41 2009 +0200
Fix pdftops crash on file from KDE bug 174899
@@ -37759,7 +39775,7 @@
commit 548c72600b8a5e076647041660ed5031feedc7cc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 20 22:43:11 2009 +0200
+Date: Wed May 20 22:43:11 2009 +0200
Do not exit(1) on a pdf i have lying around
@@ -37770,7 +39786,7 @@
commit f78d3a7ff5ef4b500d76d84ebc45aac3be162dab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 18 20:44:40 2009 +0200
+Date: Mon May 18 20:44:40 2009 +0200
Move lcms.h include to GfxState.cc, replace lcms typedefs by void *
@@ -37781,7 +39797,7 @@
commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 17 20:00:53 2009 +0200
+Date: Sun May 17 20:00:53 2009 +0200
Use the lcms include dir
@@ -37791,17 +39807,17 @@
commit e0fcf7055af480498a81a000dcd9f977a783df66
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 17 12:07:05 2009 +0200
+Date: Sun May 17 12:07:05 2009 +0200
Use pkgconfig for autotools cms check
- configure.ac | 12 +++++++-----
- poppler/Makefile.am | 2 +-
+ configure.ac | 12 +++++++-----
+ poppler/Makefile.am | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
commit 657734c19274ab281328cba9297eca45e48777aa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 17 12:06:47 2009 +0200
+Date: Sun May 17 12:06:47 2009 +0200
Better lcms check comming from kdelibs
@@ -37811,7 +39827,7 @@
commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Thu May 14 16:15:22 2009 +0200
+Date: Thu May 14 16:15:22 2009 +0200
[Win32] Build fix for MSVC.
@@ -37821,15 +39837,15 @@
commit d1c0e8a6c63361304cd453bb4c51e84a1aab7efa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 14 00:29:18 2009 +0200
+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.cc | 58
++++++++++----------------------------------
- goo/gfile.h | 3 ++-
+ goo/gfile.h | 3 ++-
poppler/CairoFontEngine.cc | 6 ++---
splash/SplashFTFontEngine.cc | 3 ++-
splash/SplashT1FontEngine.cc | 3 ++-
@@ -37838,7 +39854,7 @@
commit e237d8b5c2ae8805487a0790d9fb218263686712
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 13 18:37:07 2009 +0200
+Date: Wed May 13 18:37:07 2009 +0200
[Qt4] we don't need an output device anymore (since long, even)
for resolving destinations
@@ -37848,7 +39864,7 @@
commit 9a2a851da93ef1a0c291fc9523a468e808ffd08e
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 13 18:19:11 2009 +0200
+Date: Wed May 13 18:19:11 2009 +0200
[Qt4] Do not try to resolve named destinations for GoTo links pointing
to external documents.
@@ -37869,12 +39885,12 @@
commit 51f6cc26fc5fdccce1ba4d4816dec374ce85d67a
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 13 17:38:00 2009 +0200
+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/Makefile.am | 5 +++
qt4/tests/check_links.cpp | 96
+++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 102 insertions(+)
@@ -37881,7 +39897,7 @@
commit 174f8087f5e09c5d1915de128b7a15acf47c1e13
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 13 16:44:59 2009 +0200
+Date: Wed May 13 16:44:59 2009 +0200
[Qt4] set the destination name only when it is not resolved
@@ -37890,7 +39906,7 @@
commit fb0cb2add9443992f166acdf744fbec875faaabf
Author: Pino Toscano <pino at kde.org>
-Date: Tue May 12 01:53:43 2009 +0200
+Date: Tue May 12 01:53:43 2009 +0200
[Qt4] Add LinkDestination::destinationName() that returns the name
of the current destination.
@@ -37901,30 +39917,30 @@
commit b8bd44f1302f7b6a6923d41c98ec74c118a5abb8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 11 20:49:34 2009 +0200
+Date: Mon May 11 20:49:34 2009 +0200
Poppler 0.11.0 aka 0.12 Alpha 1
- CMakeLists.txt | 4 +-
- NEWS | 142
+ CMakeLists.txt | 4 +-
+ NEWS | 142
++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +--
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
+ 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 at gnome.org>
-Date: Mon May 11 19:59:57 2009 +0200
+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 +
+ 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(-)
@@ -37931,7 +39947,7 @@
commit f16e36df3a74e1adf14513a6340be2e8665f8d65
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 10 19:24:32 2009 +0200
+Date: Sun May 10 19:24:32 2009 +0200
Don't include popups annots with a parent in annots list
@@ -37940,15 +39956,15 @@
commit 5051ebed1477ff3f7721606f79d66d56a80c1145
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 10 19:10:51 2009 +0200
+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 +++
+ 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(-)
@@ -37955,7 +39971,7 @@
commit 829ed964374676ddfa4a9048c940dc20a309ca47
Author: M Joonas Pihlaja <jpihlaja at cc.helsinki.fi>
-Date: Sun May 10 23:39:11 2009 +0200
+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
@@ -37968,7 +39984,7 @@
commit 68d9644499676ed1553b2bfcdbfc9a5677c75345
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 9 22:25:12 2009 +0200
+Date: Sat May 9 22:25:12 2009 +0200
Hidden property depends on parent being hidden, not only yourself
@@ -37979,7 +39995,7 @@
commit 810a71ea66f0e07d9849a5e9bf28911472482d1b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri May 8 09:36:31 2009 +0200
+Date: Fri May 8 09:36:31 2009 +0200
[glib] Add poppler_annot_markup_get_popup_rectangle
@@ -37990,7 +40006,7 @@
commit 5d328282da4713356fbe4283bd992ac2fc9010a2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 7 23:11:55 2009 +0200
+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
@@ -38000,7 +40016,7 @@
commit 5b0fb6f94d6d54b1b0c97762db61e2ab0dd07c85
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 6 22:59:55 2009 +0200
+Date: Wed May 6 22:59:55 2009 +0200
Fix format printing
@@ -38009,7 +40025,7 @@
commit c21b08a254f42f53d4b59ad4fb308c7c68c32d15
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed May 6 15:56:21 2009 +0200
+Date: Wed May 6 15:56:21 2009 +0200
[glib] Several fixes in poppler_annot_get_color()
@@ -38028,7 +40044,7 @@
commit 63cc40ec02498e1ec249d5f74e23f574c665872e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 2 14:08:23 2009 +0200
+Date: Sat May 2 14:08:23 2009 +0200
Link pdftoabw to abiword libs
@@ -38039,7 +40055,7 @@
commit 70e06e9ae28d08bb7495a7f2eb03b0b5714a1e54
Author: Kouhei Sutou <kou at cozmixng.org>
-Date: Wed Apr 29 09:52:21 2009 +0900
+Date: Wed Apr 29 09:52:21 2009 +0900
PopplerAttachment refers its document.
@@ -38048,7 +40064,7 @@
commit 977a13f1091700bf7e7b31859e0e6632dc323462
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Apr 25 19:07:01 2009 +0200
+Date: Sat Apr 25 19:07:01 2009 +0200
[glib] Only create checksum string for valid checksums
@@ -38057,7 +40073,7 @@
commit fb6e7141e3008ae230ae5819e2c7a0425296d8d2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 24 10:13:53 2009 +0200
+Date: Fri Apr 24 10:13:53 2009 +0200
Update copyright headers
@@ -38071,7 +40087,7 @@
commit fc7e52fef0317f9c85ead2c4f8a0e9b688decca3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 24 09:53:41 2009 +0200
+Date: Fri Apr 24 09:53:41 2009 +0200
Fix typos in Annot::setContents() documentation
@@ -38080,7 +40096,7 @@
commit df0032cf5f6e5dc44bad056c659180e4065d32e2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 23 13:19:25 2009 +0200
+Date: Thu Apr 23 13:19:25 2009 +0200
Document Annot::setContents() method
@@ -38089,7 +40105,7 @@
commit 86a37a8f3f93e3378b446f8d81d80571267c7660
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 23 13:16:04 2009 +0200
+Date: Thu Apr 23 13:16:04 2009 +0200
Update the annotation last modified time when it's modified
@@ -38099,20 +40115,20 @@
commit 9662bfa2b4b2282d0fc29d2a327b62d8bde56ff2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Apr 23 13:13:07 2009 +0200
+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 +
+ configure.ac | 1 +
poppler/DateInfo.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/DateInfo.h | 7 +++++++
+ poppler/DateInfo.h | 7 +++++++
3 files changed, 55 insertions(+)
commit dc4cf0c29b53cda5c1c2badc5026af3429502e3a
Author: Pino Toscano <pino at kde.org>
-Date: Tue Apr 21 21:51:52 2009 +0200
+Date: Tue Apr 21 21:51:52 2009 +0200
add poppler-date.{cc,h}
@@ -38121,7 +40137,7 @@
commit 0750c6502faeabff571f5730b567097e793dca64
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 20:04:27 2009 +0200
+Date: Tue Apr 21 20:04:27 2009 +0200
[glib-demo] Fix dates handling in annots demo
@@ -38131,7 +40147,7 @@
commit fe73bf9771e8294af4c8a11ec4c2891ff8f8d859
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 20:02:25 2009 +0200
+Date: Tue Apr 21 20:02:25 2009 +0200
[glib-demo] GTime is deprecated, use time_t instead
@@ -38141,7 +40157,7 @@
commit 6d468cfa0cb89760e5d6cca43521cde6d99aa52e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 20:00:20 2009 +0200
+Date: Tue Apr 21 20:00:20 2009 +0200
[glib-demo] Use format_date from utils and remove duplicated code
@@ -38150,7 +40166,7 @@
commit e5f5ea01d0da4c4d877b93755523dc2a7f2ec049
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 19:57:11 2009 +0200
+Date: Tue Apr 21 19:57:11 2009 +0200
[glib] Fix poppler_annot_markup_get_date()
@@ -38163,7 +40179,7 @@
commit 876ad1bcc8a7b2f37656bf15cee7eb888fd46ed4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 19:36:33 2009 +0200
+Date: Tue Apr 21 19:36:33 2009 +0200
[glib] Add info about the return value in poppler_annot_get_modified()
doc
@@ -38173,7 +40189,7 @@
commit 8c54a15e1715721ee7af7e82c90b8dda3689c65f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 19:35:14 2009 +0200
+Date: Tue Apr 21 19:35:14 2009 +0200
[glib] Fix a typo in poppler_date_parse documentation
@@ -38182,7 +40198,7 @@
commit 39d09fa237d06fa93b02eb916d2c0242c4e8fe85
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 19:29:32 2009 +0200
+Date: Tue Apr 21 19:29:32 2009 +0200
[glib] Add poppler_date_parse to parse PDF format date strings
@@ -38205,19 +40221,19 @@
by the
document.
- glib/Makefile.am | 2 ++
+ glib/Makefile.am | 2 ++
glib/poppler-attachment.cc | 4 +--
- glib/poppler-date.cc | 66
+ glib/poppler-date.cc | 66
++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-date.h | 30 +++++++++++++++++++++
+ glib/poppler-date.h | 30 +++++++++++++++++++++
glib/poppler-document.cc | 45 ++++++-------------------------
glib/poppler-private.h | 2 +-
- glib/poppler.h | 1 +
+ glib/poppler.h | 1 +
7 files changed, 110 insertions(+), 40 deletions(-)
commit 9c2714a3e1c02f445661618e24bcd27f1392b2b7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 18:08:06 2009 +0200
+Date: Tue Apr 21 18:08:06 2009 +0200
[glib] Implement poppler_annot_set_contents()
@@ -38227,7 +40243,7 @@
commit eec550e8b3cf96aefed9b03a78d365c2848fb8f2
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Apr 21 18:06:34 2009 +0200
+Date: Tue Apr 21 18:06:34 2009 +0200
Add setContents() to modify the annot contents
@@ -38237,7 +40253,7 @@
commit 047a8870a8cea9b680080e0d3bf68d0685431233
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 20 23:38:53 2009 +0200
+Date: Mon Apr 20 23:38:53 2009 +0200
In case of err3 or err2 in readPageTree we need to free kidRef too
@@ -38246,7 +40262,7 @@
commit cb61b555f2c4db8685dec5491ca86570c962aab6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Apr 18 18:30:04 2009 +0200
+Date: Sat Apr 18 18:30:04 2009 +0200
Extend test-poppler-glib to show more page annotations and actions
@@ -38258,7 +40274,7 @@
commit 2221b8a9ae5e986c79ea3f6c9f3b0246d328c7ab
Author: Matthias Franz <matthias at ktug.or.kr>
-Date: Sun Apr 19 23:29:18 2009 +0200
+Date: Sun Apr 19 23:29:18 2009 +0200
Fix decryption using owner password on some pdf
@@ -38269,7 +40285,7 @@
commit e20efbf6cc676758b8ef7d2ad607560fcdbbf89e
Author: Peter Kerzum <kerzum at yandex-team.ru>
-Date: Fri Apr 17 22:14:26 2009 +0200
+Date: Fri Apr 17 22:14:26 2009 +0200
Fix typo in GfxFont.cc
@@ -38278,7 +40294,7 @@
commit b760debea03380280d72cd39d792cbc1a380a87c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 17 21:04:26 2009 +0200
+Date: Fri Apr 17 21:04:26 2009 +0200
Fix rendering of axial shadings
@@ -38290,7 +40306,7 @@
commit 9f1312f3d7dfa7e536606a7c7296b7c876b11c00
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 16 22:13:26 2009 +0200
+Date: Thu Apr 16 22:13:26 2009 +0200
Fix problems that happen when parsing broken JBIG2 files
@@ -38309,12 +40325,12 @@
poppler/JBIG2Stream.cc | 447
+++++++++++++++++++++++++++++++++++--------------
- poppler/JBIG2Stream.h | 4 +
+ poppler/JBIG2Stream.h | 4 +
2 files changed, 324 insertions(+), 127 deletions(-)
commit 284a92899602daa4a7f429e61849e794569310b5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 13 21:51:12 2009 +0200
+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
@@ -38323,12 +40339,12 @@
commit 9cf2325fb22f812b31858e519411f57747d39bd8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 11 00:31:57 2009 +0200
+Date: Sat Apr 11 00:31:57 2009 +0200
More gmalloc → gmallocn
- glib/poppler-page.cc | 2 +-
- splash/Splash.cc | 8 ++++----
+ glib/poppler-page.cc | 2 +-
+ splash/Splash.cc | 8 ++++----
splash/SplashBitmap.cc | 6 +++---
splash/SplashFTFont.cc | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
@@ -38335,7 +40351,7 @@
commit c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 11 00:26:23 2009 +0200
+Date: Sat Apr 11 00:26:23 2009 +0200
Revert part of last commit, i need more math classes :D
@@ -38344,13 +40360,13 @@
commit 7b2d314a61fd0e12f47c62996cb49ec0d1ba747a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 11 00:23:04 2009 +0200
+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/GfxState.cc | 8 ++++----
poppler/JBIG2Stream.cc | 4 ++--
poppler/PSOutputDev.cc | 6 +++---
poppler/SplashOutputDev.cc | 20 ++++++++++----------
@@ -38358,17 +40374,17 @@
commit 0131f0a01cba8691d10a18de1137a4744988b346
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 11 00:20:55 2009 +0200
+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 ++
+ goo/gmem.h | 2 ++
2 files changed, 24 insertions(+)
commit 75c3466ba2e4980802e80b939495981240261cd5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 10 18:05:54 2009 +0200
+Date: Fri Apr 10 18:05:54 2009 +0200
Make it compile in Solaris
@@ -38379,7 +40395,7 @@
commit 3210970dc1d6faf51bce59bb7ecb6b881f9c0fe6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Apr 10 13:09:37 2009 +0200
+Date: Fri Apr 10 13:09:37 2009 +0200
[glib] Print annotations with the print flag enabled
@@ -38388,7 +40404,7 @@
commit b0b9798c85c7c6d6f336f73135a98974897b9f60
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 30 23:26:39 2009 +0200
+Date: Mon Mar 30 23:26:39 2009 +0200
Fix clip test for fonts
@@ -38403,7 +40419,7 @@
commit 5c08f57aa80092954746d722bb13655aee3f162c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 29 23:52:31 2009 +0200
+Date: Sun Mar 29 23:52:31 2009 +0200
Forgot Ross copyright
@@ -38412,7 +40428,7 @@
commit c6d3e7884010ebdcc961d81ca8c692870fc9b139
Author: Ross Moore <ross at maths.mq.edu.au>
-Date: Sun Mar 29 23:46:09 2009 +0200
+Date: Sun Mar 29 23:46:09 2009 +0200
Fix extraction of some ActualText content
@@ -38423,7 +40439,7 @@
commit e4b3f7cbcb6ccdfa8b18d8da5f7074f4140b776a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 25 22:16:07 2009 +0100
+Date: Wed Mar 25 22:16:07 2009 +0100
Fix getGlyphAdvance to behave correctly on font size changes
@@ -38434,7 +40450,7 @@
commit 4acde05ac4d0b03466c949138321cc3445a14158
Author: Eric Toombs <ewtoombs at uwaterloo.ca>
-Date: Wed Mar 25 21:11:03 2009 +0100
+Date: Wed Mar 25 21:11:03 2009 +0100
Remove case-insensitive matching of filenames in PDFDoc constructor
@@ -38443,7 +40459,7 @@
commit 120c7f6697ed1edaff6e17ae1ed202c69f03a73c
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 24 22:56:33 2009 +0100
+Date: Tue Mar 24 22:56:33 2009 +0100
declare the matrix at the beginning
@@ -38452,7 +40468,7 @@
commit 441a9cd56935bfe2d8fddc5d3bc2c0104aeffaca
Author: Eric Toombs <ewtoombs at uwaterloo.ca>
-Date: Sun Mar 22 22:50:14 2009 +0100
+Date: Sun Mar 22 22:50:14 2009 +0100
Improved error reporting of ErrOpenFile errors
@@ -38459,14 +40475,14 @@
See bug #20660 for more information
glib/poppler-document.cc | 14 ++++++++++---
- poppler/PDFDoc.cc | 54
+ poppler/PDFDoc.cc | 54
++++++++++++++++++++++++++++--------------------
- poppler/PDFDoc.h | 8 +++++++
+ poppler/PDFDoc.h | 8 +++++++
3 files changed, 51 insertions(+), 25 deletions(-)
commit 16af0ced4a0762f2f538135bd8dd72b469f6fdca
Author: Michael K. Johnson <a1237 at danlj.org>
-Date: Sat Mar 21 16:14:06 2009 +0100
+Date: Sat Mar 21 16:14:06 2009 +0100
Support rendering non-square pixels in pdftoppm
@@ -38478,17 +40494,17 @@
commit a103c60abd5fe4c721b099c005daf22d6350c355
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 21 15:47:12 2009 +0100
+Date: Sat Mar 21 15:47:12 2009 +0100
Update version we need of Qt4
CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
+ configure.ac | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
commit c4b1754fdd3a4649551556de2655c8291daafddf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 21 13:29:38 2009 +0100
+Date: Sat Mar 21 13:29:38 2009 +0100
Bump cairo dependency to 1.8.4
@@ -38500,18 +40516,18 @@
commit 50c4ee413929e5a70133839e3cde039da738fab2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 18 22:00:05 2009 +0100
+Date: Wed Mar 18 22:00:05 2009 +0100
Add more _checkoverflow variants, rework internals
goo/gmem.cc | 92
++++++++++++++++++++++++++++++-------------------------------
- goo/gmem.h | 4 ++-
+ goo/gmem.h | 4 ++-
2 files changed, 48 insertions(+), 48 deletions(-)
commit 121c44db0884f0d70ba1470a66aa78441257c421
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Mar 20 23:25:19 2009 +1030
+Date: Fri Mar 20 23:25:19 2009 +1030
Fix cairo luminosity smask when cairo ctm != identity
@@ -38520,7 +40536,7 @@
commit 3f55aff56a1d2002ba79f3efba5eb77e94575439
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Thu Mar 19 22:34:23 2009 +1030
+Date: Thu Mar 19 22:34:23 2009 +1030
Fix bug in cairo backend with nested masks
@@ -38532,7 +40548,7 @@
commit 4cc3cb8992ac554352d68e97563823b9bbd556ce
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Mar 20 12:38:28 2009 +0100
+Date: Fri Mar 20 12:38:28 2009 +0100
Bump cairo dependency to 1.8.4
@@ -38544,7 +40560,7 @@
commit da94fe717a1ab60fb074fae61d582d1ee7151fc2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 16 22:54:27 2009 +0100
+Date: Mon Mar 16 22:54:27 2009 +0100
Fix parsing of border arrays
@@ -38556,7 +40572,7 @@
commit 8df0323f1ca4548a5d5824ece8736b356ce7ca42
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 12 00:09:03 2009 +0100
+Date: Thu Mar 12 00:09:03 2009 +0100
Really fix jpeg lib init order?
@@ -38565,7 +40581,7 @@
commit 12aac6774fc6f92def3d5567051117951cc32223
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 11 23:00:37 2009 +0100
+Date: Wed Mar 11 23:00:37 2009 +0100
fontCIDType2OT fonts can also have a CIDToGIDMap
@@ -38576,7 +40592,7 @@
commit 0ca9ae2848808d15e7a2b00f5eb33bb8f990c887
Author: Vincent Torri <vtorri at univ-evry.fr>
-Date: Wed Mar 11 00:39:59 2009 +0100
+Date: Wed Mar 11 00:39:59 2009 +0100
remove the fortran check during the initialisation of libtool
@@ -38585,7 +40601,7 @@
commit 710e329a3a6a9ee2eed997c9eeaea21c44237423
Author: Vincent Torri <vtorri at univ-evry.fr>
-Date: Wed Mar 11 00:37:11 2009 +0100
+Date: Wed Mar 11 00:37:11 2009 +0100
Add AC_CONFIG_MACRO_DIR([m4])
@@ -38597,7 +40613,7 @@
commit d15e47158ae31909212d3875159046afb208de97
Author: Vincent Torri <vtorri at univ-evry.fr>
-Date: Wed Mar 11 00:36:27 2009 +0100
+Date: Wed Mar 11 00:36:27 2009 +0100
Better check for pkg-config
@@ -38606,7 +40622,7 @@
commit b3f569f9a6c117c097acac52ae6552209fcd2101
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 11 00:25:07 2009 +0100
+Date: Wed Mar 11 00:25:07 2009 +0100
Check there is an optional content config before using it
@@ -38617,7 +40633,7 @@
commit 7a5d1e57b2757c986da17f7238415b927e73127f
Author: Brian Ewins <Brian.Ewins at gmail.com>
-Date: Mon Mar 9 22:54:58 2009 +0100
+Date: Mon Mar 9 22:54:58 2009 +0100
Check for pkgconfig before using it
@@ -38630,7 +40646,7 @@
commit 8dc9e4d57a4759de2b56a87d9bace80d5d563fef
Author: Marc Kleine-Budde <mkl at pengutronix.de>
-Date: Sun Mar 8 15:29:02 2009 +0100
+Date: Sun Mar 8 15:29:02 2009 +0100
use AC_CHECK_HEADER to find headers
@@ -38648,7 +40664,7 @@
commit bf2e2f056cadbc488cd3e9576b44beb34689ec81
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 8 13:44:44 2009 +0100
+Date: Sun Mar 8 13:44:44 2009 +0100
Add the new croptting options explanations
@@ -38657,7 +40673,7 @@
commit 663d9e5a448641421d290dd228be692a0f236b9c
Author: Jan Jockusch <jan at jockusch.de>
-Date: Sun Mar 8 13:44:20 2009 +0100
+Date: Sun Mar 8 13:44:20 2009 +0100
Make pdftotext to accept cropping options like pdftoppm
@@ -38668,7 +40684,7 @@
commit cc4b61f19b69c31d9a73ae7361c4b6a94345d1c2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 8 12:55:45 2009 +0100
+Date: Sun Mar 8 12:55:45 2009 +0100
Fix the previous fix
@@ -38681,7 +40697,7 @@
commit a4a73cd9f9ee9767d74fbb44ffe083d2057a9d61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 8 12:44:06 2009 +0100
+Date: Sun Mar 8 12:44:06 2009 +0100
I should compile before commiting :-/
@@ -38690,7 +40706,7 @@
commit 6a6b3cc91053e771a67dffa979076d130f87ff11
Author: Ryszard Trojnacki <rysiek at menel.com>
-Date: Sun Mar 8 12:38:42 2009 +0100
+Date: Sun Mar 8 12:38:42 2009 +0100
set up the error-manager before calling jpeg_create_decompress
@@ -38701,7 +40717,7 @@
commit 4dfa7460ddc4b5684d5ef8db17efa50b95b7b735
Author: Nick Jones <nick.jones at network-box.com>
-Date: Tue Mar 3 00:55:53 2009 +0100
+Date: Tue Mar 3 00:55:53 2009 +0100
Do not blindly follow loops parsing OutlineItem
@@ -38712,7 +40728,7 @@
commit de3131ae38fc9442b198d4d7b0c57c6939ad66ce
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 2 15:20:07 2009 +0100
+Date: Mon Mar 2 15:20:07 2009 +0100
[Qt4] adapt to the new PDFDoc saving API
@@ -38723,7 +40739,7 @@
commit dac0542eb793603090416f1b7712ca08253f1e7f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 2 09:54:22 2009 +0100
+Date: Mon Mar 2 09:54:22 2009 +0100
[glib] Correctly handle doc->saveAs() error code.
@@ -38734,7 +40750,7 @@
commit bfc6572614727565d883b9545d4b6665f3c2fdfe
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 28 13:16:49 2009 +0100
+Date: Sat Feb 28 13:16:49 2009 +0100
Return an error code instead of a GBool when saving
@@ -38744,7 +40760,7 @@
commit f7c88148fdb671736d81dd5f01a3fb68f944510c
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Feb 25 23:38:35 2009 +0100
+Date: Wed Feb 25 23:38:35 2009 +0100
Fix cache shifting
@@ -38753,7 +40769,7 @@
commit 305af8cdb6822858e152e1f930bba2ce3904bf1b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 25 22:40:24 2009 +0100
+Date: Wed Feb 25 22:40:24 2009 +0100
Make JBIG2Stream not crash in 2009-41414141.pdf
@@ -38763,7 +40779,7 @@
commit 26a8217160c1eaeeadb92023b27e68f402e38dd0
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 22 18:14:15 2009 +0100
+Date: Sun Feb 22 18:14:15 2009 +0100
Check if cairo_shape is not NULL before using it.
@@ -38775,7 +40791,7 @@
commit 5e68e52da65b4d8c3817e5fbb6f1a937da321d48
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 21 18:03:15 2009 +0100
+Date: Sat Feb 21 18:03:15 2009 +0100
[Qt4] do not assume the destination file name for links is ASCII
@@ -38784,7 +40800,7 @@
commit 439cb397fed33df627a09c70788d72bef20dc872
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 21 18:02:36 2009 +0100
+Date: Sat Feb 21 18:02:36 2009 +0100
[Qt] do not assume the destination file name for links is ASCII
@@ -38793,7 +40809,7 @@
commit 3ea5f45ad3e5a55e577a2e45f61b55932ed17013
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 21 17:46:30 2009 +0100
+Date: Sat Feb 21 17:46:30 2009 +0100
[glib] Make sure filename is valid utf-8 for remote dests
@@ -38802,7 +40818,7 @@
commit b5989e4ffece6c1831610ee163d05fd80386a001
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 21 17:45:18 2009 +0100
+Date: Sat Feb 21 17:45:18 2009 +0100
Use the UF entry when present in Filespec dictionary
@@ -38811,14 +40827,14 @@
commit 943fca42b5fa815fad650e42da4ad6e806adc3b1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 21 12:08:00 2009 +0100
+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-annot.cc | 15 ++------
glib/poppler-document.cc | 44 +++++----------------
- glib/poppler-page.cc | 99
+ glib/poppler-page.cc | 99
++++++++++--------------------------------------
glib/poppler-private.h | 20 ++++++++++
5 files changed, 53 insertions(+), 151 deletions(-)
@@ -38825,11 +40841,11 @@
commit 7406337ed2d38a86308f20f8273a152538e524de
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 21 11:11:20 2009 +0100
+Date: Sat Feb 21 11:11:20 2009 +0100
[glib] Use template files to create poppler-enums
- glib/Makefile.am | 43
+ glib/Makefile.am | 43
+++++++++++++-----------------------------
glib/poppler-enums.c.template | 44
+++++++++++++++++++++++++++++++++++++++++++
@@ -38838,23 +40854,23 @@
commit 29bc9d1dd115b5d400975533c3924993c3adae30
Author: Thomas Viehmann <tv at beamnet.de>
-Date: Sat Jan 17 13:16:38 2009 +0100
+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 --
+ glib/poppler-layer.cc | 2 ++
+ glib/poppler.cc | 2 --
3 files changed, 3 insertions(+), 3 deletions(-)
commit a06e715d89a99b909b8e7b73b733066c67b1ade3
Author: Thomas Viehmann <tv at beamnet.de>
-Date: Sat Jan 17 12:58:20 2009 +0100
+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/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 55 +++++
glib/reference/tmpl/poppler-action.sgml | 9 +-
glib/reference/tmpl/poppler-annot.sgml | 368
++++++++++++++++++++++++++++++++
@@ -38863,13 +40879,13 @@
commit 3a21dafa46d42d86daec440a85b9d63b292a3c88
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 3 21:33:00 2009 +0100
+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];
+ 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
@@ -38878,7 +40894,7 @@
commit 0ed3fd52bb2d3375ed302285b18f076721b8028e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 1 10:37:25 2009 +0100
+Date: Sun Feb 1 10:37:25 2009 +0100
[glib-demo] Fix a typo in format string
@@ -38887,7 +40903,7 @@
commit 2df6d530cd9acd8648a6196031218ef10e7b3891
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 29 00:51:13 2009 +0100
+Date: Thu Jan 29 00:51:13 2009 +0100
Add line that for some reason was not imported from xpdf file
@@ -38898,7 +40914,7 @@
commit 1fc342eadcbbb41302f190b215c5daf23c9ec9b1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 28 22:53:43 2009 +0100
+Date: Wed Jan 28 22:53:43 2009 +0100
Fix crash on unexepcted Form Opt value
@@ -38909,7 +40925,7 @@
commit b1d4efb082ac3dadd7752a557e5aeb6651e17471
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 27 00:26:08 2009 +0100
+Date: Tue Jan 27 00:26:08 2009 +0100
PostScriptFunction::transform optimization
@@ -38923,7 +40939,7 @@
commit 90f95127d8d89cfcadeb7d701437ab07ce4a8a61
Author: Koji Otani <sho at bbr.jp>
-Date: Sun Jan 25 23:17:39 2009 +0100
+Date: Sun Jan 25 23:17:39 2009 +0100
Cache last 5 GfxICCBasedColorSpace
@@ -38934,7 +40950,7 @@
commit d3f04f537fb3e963c149a7e2d8d83c7cb19da8c0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jan 23 23:08:46 2009 +0100
+Date: Fri Jan 23 23:08:46 2009 +0100
Do not crash in some PDF we don't parse correctly
@@ -38945,7 +40961,7 @@
commit 3990c9e52da7b17215506857c792c90a37ebac79
Author: Koji Otani <sho at bbr.jp>
-Date: Mon Jan 19 09:53:00 2009 +0100
+Date: Mon Jan 19 09:53:00 2009 +0100
Fix a problem in cairo backend when using a CMYK Profile
@@ -38954,7 +40970,7 @@
commit 6e51ae7fe8b9dc8ad52b735f2fe056f8ea8f1dcb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 15 22:33:04 2009 +0100
+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
@@ -38964,7 +40980,7 @@
commit ea2aa7bd1ceb0e3282398f52683e4f52ef401f74
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 15 22:18:48 2009 +0100
+Date: Thu Jan 15 22:18:48 2009 +0100
Forgot my copyrights
@@ -38975,7 +40991,7 @@
commit d65dd23752ec14635d0d224afa7dd605f98a10a4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 15 22:17:14 2009 +0100
+Date: Thu Jan 15 22:17:14 2009 +0100
Minor optimizations
@@ -38986,7 +41002,7 @@
commit d3d2910f757dfc3e141aed62aa970136f9d7186f
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 11 00:40:46 2009 +0100
+Date: Sun Jan 11 00:40:46 2009 +0100
fix a (relatively small) memory leak when asking for a document-level
JS
@@ -38996,7 +41012,7 @@
commit 869584a84eed507775ff1c3183fe484c14b6f77b
Author: Jonathan Kew <jonathan_kew at sil.org>
-Date: Sat Jan 10 18:28:47 2009 +0100
+Date: Sat Jan 10 18:28:47 2009 +0100
Add the possibility of setting the datadir on runtime
@@ -39006,7 +41022,7 @@
commit cf112dceb1d6653beae73ce2fac6fb5eee48ff33
Author: Koji Otani <sho at bbr.jp>
-Date: Sat Jan 10 18:11:20 2009 +0100
+Date: Sat Jan 10 18:11:20 2009 +0100
Fix some problems with color management in CMYK Color Profile.
@@ -39018,7 +41034,7 @@
commit 6dd77338d16f80760ae32ff9f3e2be9768fc0c49
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 8 11:49:45 2009 +0100
+Date: Thu Jan 8 11:49:45 2009 +0100
[Qt4] use the cropbox for the annotations coordinates
@@ -39029,7 +41045,7 @@
commit 69c07c031159d36dde52609bffa6d48c3c56cef5
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 8 00:59:19 2009 +0100
+Date: Thu Jan 8 00:59:19 2009 +0100
update Poppler copyright to 2009
@@ -39040,7 +41056,7 @@
commit 79e0eea85cf063c6323caafbec97f3d71fc04ca2
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 8 00:57:03 2009 +0100
+Date: Thu Jan 8 00:57:03 2009 +0100
remove old cmake modules, add a new one
@@ -39049,60 +41065,60 @@
commit 0e6420ece2d6fcc046d5814b48a2754fb86771e2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 7 23:33:02 2009 +0100
+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
+ CMakeLists.txt | 4 +-
+ cmake/modules/FindFreetype.cmake | 74
-----------------------
cmake/modules/FindPackageHandleStandardArgs.cmake | 58 ------------------
- glib/CMakeLists.txt | 2 +-
+ glib/CMakeLists.txt | 2 +-
4 files changed, 3 insertions(+), 135 deletions(-)
commit a69add73bf7bef17c677c735db77934ba67188a5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 7 19:06:13 2009 +0100
+Date: Wed Jan 7 19:06:13 2009 +0100
Update copyright notices
- poppler/FontInfo.cc | 1 +
- poppler/FontInfo.h | 1 +
+ 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 +-
+ qt4/src/poppler-qt4.h | 2 +-
8 files changed, 8 insertions(+), 4 deletions(-)
commit 18d584158a781fecb4f696b01fb4d17803ce7d7a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 7 17:55:48 2009 +0100
+Date: Wed Jan 7 17:55:48 2009 +0100
Add lcms option to cmake buildsystem
- CMakeLists.txt | 9 +++++++++
+ CMakeLists.txt | 9 +++++++++
cmake/modules/FindLCMS.cmake | 37 +++++++++++++++++++++++++++++++++++++
- config.h.cmake | 3 +++
+ config.h.cmake | 3 +++
3 files changed, 49 insertions(+)
commit 140b8ed97416f9c2ec02eb749ca45ca50bd651a8
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Jan 7 17:43:44 2009 +0100
+Date: Wed Jan 7 17:43:44 2009 +0100
Add initial support for color management
- configure.ac | 19 ++
+ configure.ac | 19 ++
poppler/GfxState.cc | 697
++++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/GfxState.h | 74 +++++-
- poppler/Makefile.am | 5 +
+ poppler/GfxState.h | 74 +++++-
+ poppler/Makefile.am | 5 +
4 files changed, 738 insertions(+), 57 deletions(-)
commit bdc76dc811a6e4d5fd929bbdc8cd3300aeaea31f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jan 6 15:45:37 2009 +0100
+Date: Tue Jan 6 15:45:37 2009 +0100
[Qt4] apidox improvements for the font functions of Document; mark
scanForFonts() as deprecated
@@ -39112,7 +41128,7 @@
commit 6630e715714161cd803fc064f5d3cf880f42b0a5
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jan 6 15:36:19 2009 +0100
+Date: Tue Jan 6 15:36:19 2009 +0100
tell Doxygen to consider Q_DECL_DEPRECATED as empty
@@ -39121,7 +41137,7 @@
commit d748d430b106580b8be29ca3ec75caf05b55812e
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jan 6 15:24:25 2009 +0100
+Date: Tue Jan 6 15:24:25 2009 +0100
[Qt4] Add a FontIterator for iterating through the fonts of the
document, page by page.
@@ -39134,10 +41150,10 @@
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/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(-)
@@ -39144,7 +41160,7 @@
commit b9804542bb50216786dc11ca16efd84304f4b832
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jan 6 15:16:53 2009 +0100
+Date: Tue Jan 6 15:16:53 2009 +0100
Add the possibility to set the first page to scan.
@@ -39157,7 +41173,7 @@
commit af74fef03bfbd79334da5612c63c7793952542f9
Author: Warren Toomey <poppler at tuhs.org>
-Date: Tue Jan 6 01:36:31 2009 +0100
+Date: Tue Jan 6 01:36:31 2009 +0100
Add forgotten file to let the autotools based system build
@@ -39167,7 +41183,7 @@
commit ae588500f62bab5666174ff3b1564c414c5a76c5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 6 01:35:38 2009 +0100
+Date: Tue Jan 6 01:35:38 2009 +0100
Fix the cmake buildsystem
@@ -39178,7 +41194,7 @@
commit 940d060a14712c09da427e2fac4ec579f7291b0f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 6 01:27:06 2009 +0100
+Date: Tue Jan 6 01:27:06 2009 +0100
do not leak fName if fopen fails
@@ -39187,7 +41203,7 @@
commit 7be9198adb940ad7c5fffc6db0158cf7042e1b8f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 6 01:24:15 2009 +0100
+Date: Tue Jan 6 01:24:15 2009 +0100
Do not leak pgNum and imgnum if fopen fails
@@ -39196,20 +41212,20 @@
commit dfba6c022b150553cb2b18b027e661b3b4625ce7
Author: Warren Toomey <poppler at tuhs.org>
-Date: Tue Jan 6 01:16:31 2009 +0100
+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 ++++++
+ configure.ac | 14 ++++++
utils/HtmlOutputDev.cc | 126
++++++++++++++++++++++++++++++++++++++++++++++---
- utils/HtmlOutputDev.h | 3 +-
- utils/Makefile.am | 4 ++
+ utils/HtmlOutputDev.h | 3 +-
+ utils/Makefile.am | 4 ++
4 files changed, 140 insertions(+), 7 deletions(-)
commit 0963c276ba972a36c2895e4fe1c7475acd489738
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 4 16:54:32 2009 +0100
+Date: Sun Jan 4 16:54:32 2009 +0100
Fix some checked checkboxes not rendering correctly
@@ -39220,12 +41236,12 @@
poppler/Annot.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
poppler/Annot.h | 2 ++
- poppler/Gfx.h | 7 ++++---
+ poppler/Gfx.h | 7 ++++---
3 files changed, 53 insertions(+), 5 deletions(-)
commit 46128cf83b322c112eb0c409c20052bdb2ea4a37
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 4 14:21:15 2009 +0100
+Date: Sun Jan 4 14:21:15 2009 +0100
Remove wrong and unused FormWidget(FormWidget *dest) contructor
@@ -39235,7 +41251,7 @@
commit 5203aefc41fa47c461812cc46f28281edd226515
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 4 14:03:16 2009 +0100
+Date: Sun Jan 4 14:03:16 2009 +0100
Plug some memory leaks
@@ -39245,7 +41261,7 @@
commit 5fb7ec7e6af4cfb2b256a5b9b9752e68330b4aec
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 30 23:46:59 2008 +0100
+Date: Tue Dec 30 23:46:59 2008 +0100
If Length2 is zero just write until we find EOF of the stream
@@ -39257,7 +41273,7 @@
commit ca35fdbc7c31dae432d775b6c087a83fa9b897fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 30 23:03:57 2008 +0100
+Date: Tue Dec 30 23:03:57 2008 +0100
We need spaces here too to satify other consumer parsers
@@ -39266,7 +41282,7 @@
commit 3c07c73e07a9cb59ee4c23ca60d2adce92de45f7
Author: Pino Toscano <pino at kde.org>
-Date: Tue Dec 30 22:21:27 2008 +0100
+Date: Tue Dec 30 22:21:27 2008 +0100
[Qt4-demo] load a document when passed via command line
@@ -39275,7 +41291,7 @@
commit aba0aaa896d634a51fbb3a3e6eae411be462f930
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 29 00:31:18 2008 +0100
+Date: Mon Dec 29 00:31:18 2008 +0100
More improvements in document writing
@@ -39287,7 +41303,7 @@
commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 28 22:59:14 2008 +0100
+Date: Sun Dec 28 22:59:14 2008 +0100
Let compiler figure out CDECL
@@ -39312,17 +41328,17 @@
commit de70c0aeb37d788f595b0574796844f51ddedec1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 28 21:21:12 2008 +0100
+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 ++--
+ qt4/src/poppler-qt4.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit effb32658019e09dc86c017e39154fd554fc94f8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 28 02:56:30 2008 +0100
+Date: Sun Dec 28 02:56:30 2008 +0100
Form Rects are against the cropbox, not the media box
@@ -39333,7 +41349,7 @@
commit 0f10561f3b1c90acc030d973399316bfca5f495e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 28 01:44:25 2008 +0100
+Date: Sun Dec 28 01:44:25 2008 +0100
Fix my last commit, copy&paste is really evil
@@ -39343,22 +41359,22 @@
commit 217b46484ff56bfd5906b293ebee70b82cc0263d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 28 01:29:41 2008 +0100
+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 ++++++-
+ goo/GooString.cc | 36 ++++++++++++++++++++++++++++++++++++
+ goo/GooString.h | 7 +++++++
+ poppler/PDFDoc.cc | 7 ++++++-
poppler/PSOutputDev.cc | 49
+++++++++----------------------------------------
- poppler/PSOutputDev.h | 3 +--
+ poppler/PSOutputDev.h | 3 +--
5 files changed, 59 insertions(+), 43 deletions(-)
commit f41fa9ee71aef5539cf9976c79b32bf1713c8167
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 26 22:56:12 2008 +0100
+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
@@ -39368,11 +41384,11 @@
commit b8ae7d91dedc9a75200b6050628ec2740af84b98
Author: Hib Eris <hib at hiberis.nl>
-Date: Fri Dec 26 22:28:09 2008 +0100
+Date: Fri Dec 26 22:28:09 2008 +0100
Fix compile warnings on auto imports for mingw32
- configure.ac | 3 +++
+ configure.ac | 3 +++
glib/Makefile.am | 2 +-
glib/demo/Makefile.am | 2 ++
test/Makefile.am | 2 ++
@@ -39381,7 +41397,7 @@
commit ba47bd2ba05f883306606eda30bff17bd4a8eec6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 26 19:47:42 2008 +0100
+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
@@ -39388,15 +41404,15 @@
Fixes bug 19298
- CMakeLists.txt | 1 -
+ CMakeLists.txt | 1 -
poppler/BaseFile.h | 82
-----------------------------------------------------
- poppler/Makefile.am | 1 -
+ poppler/Makefile.am | 1 -
3 files changed, 84 deletions(-)
commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Dec 24 19:27:19 2008 +0100
+Date: Wed Dec 24 19:27:19 2008 +0100
Let libtool build DLLs on windows too
@@ -39405,7 +41421,7 @@
commit 08cef528f2e51cc62cff4125f179021ad9555317
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Dec 24 17:48:46 2008 +0100
+Date: Wed Dec 24 17:48:46 2008 +0100
Fix compile warning on string literal format
@@ -39414,7 +41430,7 @@
commit 0606b4bba8e889204c7b7c9d376f63b659f83a4f
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Dec 24 17:48:10 2008 +0100
+Date: Wed Dec 24 17:48:10 2008 +0100
Fix compile warnings on parentheses and/or
@@ -39423,17 +41439,17 @@
commit eba2232cabd5fb1e177db2a6053f0d1a0aee882b
Author: Hib Eris <hib at hiberis.nl>
-Date: Wed Dec 24 17:46:32 2008 +0100
+Date: Wed Dec 24 17:46:32 2008 +0100
Fix some more warnings
test/gtk-cairo-test.cc | 11 -----------
- test/pdf-inspector.cc | 9 +++++----
+ test/pdf-inspector.cc | 9 +++++----
2 files changed, 5 insertions(+), 15 deletions(-)
commit c80431eb1626d89e7b615e5a5149d3436b554b66
Author: Hib Eris <hib at hiberis.nl>
-Date: Mon Dec 22 09:28:47 2008 +0100
+Date: Mon Dec 22 09:28:47 2008 +0100
Fix compile warning on format type
@@ -39442,7 +41458,7 @@
commit fda181c35b7c7500b6d3c6ca9d454addd54929c5
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 22 00:53:44 2008 +0100
+Date: Mon Dec 22 00:53:44 2008 +0100
group condition within brackets
@@ -39451,7 +41467,7 @@
commit c1beeecbd6cbf82811d70c75cb24059b4b492abe
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 22 00:46:49 2008 +0100
+Date: Mon Dec 22 00:46:49 2008 +0100
[demo] use the proper format field for gsize types
@@ -39461,7 +41477,7 @@
commit bfb975466f0ff78e9e292b6af7cac66e4c331456
Merge: 3e27892 ea3546f
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 22 00:29:38 2008 +0100
+Date: Mon Dec 22 00:29:38 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -39468,7 +41484,7 @@
commit 3e2789257f5fc4ae0573a0c62ea380d8e83a5bb5
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 22 00:24:23 2008 +0100
+Date: Mon Dec 22 00:24:23 2008 +0100
[Qt] deserialize also the value of 'right'
@@ -39477,23 +41493,23 @@
commit 7c053ab7623cea1ac650d3e960d2d91a1ef21557
Author: Pino Toscano <pino at kde.org>
-Date: Mon Dec 22 00:19:02 2008 +0100
+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/CMakeLists.txt | 1 +
+ qt/Makefile.am | 1 +
qt/poppler-document.cc | 10 ----
- qt/poppler-page.cc | 1 +
- qt/poppler-private.cc | 147
+ qt/poppler-page.cc | 1 +
+ qt/poppler-private.cc | 147
+++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-private.h | 106 +++--------------------------------
+ qt/poppler-private.h | 106 +++--------------------------------
6 files changed, 157 insertions(+), 109 deletions(-)
commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 23:33:49 2008 +0100
+Date: Sun Dec 21 23:33:49 2008 +0100
Fix compile warnings on signed/unsigned comparison
@@ -39502,7 +41518,7 @@
commit ca672ae51d2c1fa59a891717b418ba86b5e7345c
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 23:33:00 2008 +0100
+Date: Sun Dec 21 23:33:00 2008 +0100
Fix compile warnings on ignored pragma with mingw compiler
@@ -39511,7 +41527,7 @@
commit 86cfe8ab2b4e0b600f3f6682701c2fcfbe5d0ca9
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 23:08:56 2008 +0100
+Date: Sun Dec 21 23:08:56 2008 +0100
Fix compile warnings on signed/unsigned comparison
@@ -39520,7 +41536,7 @@
commit e34af7ffe0a4024e2eb39314bdb09eb9a662e53e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 21 22:16:39 2008 +0100
+Date: Sun Dec 21 22:16:39 2008 +0100
Update copyright of last commits
@@ -39531,7 +41547,7 @@
commit f6d84dcfc9cc587c7408af79b1ee7658d456f8d8
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 22:09:00 2008 +0100
+Date: Sun Dec 21 22:09:00 2008 +0100
Fix compile warning to suggest parentheses and/or
@@ -39540,7 +41556,7 @@
commit 15205403eaa95d6fba0e36983de993877dd3a983
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 21:59:45 2008 +0100
+Date: Sun Dec 21 21:59:45 2008 +0100
Fix warning to suggest parentheses inside shift
@@ -39549,7 +41565,7 @@
commit cc24f37e582bfc0069faf286da97a48fe4794db1
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 21:35:29 2008 +0100
+Date: Sun Dec 21 21:35:29 2008 +0100
Fix compile warning on ambiguous else
@@ -39558,7 +41574,7 @@
commit a8cc4ad8c2da804f25db8cca1c85433d5a63307c
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 21:34:28 2008 +0100
+Date: Sun Dec 21 21:34:28 2008 +0100
Fix compile warning on format not a string literal
@@ -39567,7 +41583,7 @@
commit 3cbbf8226730aa7ee6273e154e4a9d58670a3cda
Author: Hib Eris <hib at hiberis.nl>
-Date: Sun Dec 21 21:30:54 2008 +0100
+Date: Sun Dec 21 21:30:54 2008 +0100
Fix compile warning about uninitialized variable
@@ -39576,7 +41592,7 @@
commit f675916277cb76cd1293225a1271f835a02148fb
Author: Pino Toscano <pino at kde.org>
-Date: Sat Dec 20 23:23:10 2008 +0100
+Date: Sat Dec 20 23:23:10 2008 +0100
reset to NULL after being deleted
@@ -39587,7 +41603,7 @@
commit c976770c64e4c991fff27e413414473583b6fd86
Author: Pino Toscano <pino at kde.org>
-Date: Sat Dec 20 22:25:55 2008 +0100
+Date: Sat Dec 20 22:25:55 2008 +0100
[Qt4] use QHash instead of QMap where applicable
@@ -39599,7 +41615,7 @@
commit 944f6049a50eb3be9fb29174d67adc4ad1d0b9fe
Author: Pino Toscano <pino at kde.org>
-Date: Sat Dec 20 20:13:43 2008 +0100
+Date: Sat Dec 20 20:13:43 2008 +0100
add find.c and text.c
@@ -39608,7 +41624,7 @@
commit ba91b889c3b50239e339938f3c9d31fffcd87d44
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 20 19:29:40 2008 +0100
+Date: Sat Dec 20 19:29:40 2008 +0100
Make destructor private in TextPage
@@ -39617,7 +41633,7 @@
commit 0da16537aa83f6ed6d8895c7e54266263a71c1cf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 19 19:08:21 2008 +0100
+Date: Fri Dec 19 19:08:21 2008 +0100
Refactor actual text code adding a new ActualText class
@@ -39634,7 +41650,7 @@
commit 0f8ab301c633133eea3dbd4f2254f31c50e3c4a9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 14 13:12:34 2008 +0100
+Date: Sun Dec 14 13:12:34 2008 +0100
[glib-demo] Add find demo
@@ -39647,7 +41663,7 @@
commit 88df9e9aa9adb53f0a9714ea404d46f111495df3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 14 11:54:35 2008 +0100
+Date: Sun Dec 14 11:54:35 2008 +0100
[glib-demo] Add Text demo
@@ -39660,11 +41676,11 @@
commit 5b0f2355d55a5104820fd0bf16b4e76b25959de4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 14 11:49:00 2008 +0100
+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-page.cc | 148
++++++++++++++++++++++++++++++++++---------------
glib/poppler-private.h | 4 ++
2 files changed, 107 insertions(+), 45 deletions(-)
@@ -39671,7 +41687,7 @@
commit 3ced71fb68d62308db7b9535367eafefb55d1cde
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 14 11:18:00 2008 +0100
+Date: Sun Dec 14 11:18:00 2008 +0100
Add optionally text support to CairoOutputDev
@@ -39686,7 +41702,7 @@
commit 0bdad35cc4cfdb8da5acaf44678920b7a0025f99
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 14 11:14:12 2008 +0100
+Date: Sun Dec 14 11:14:12 2008 +0100
Add refcount support to TextPage
@@ -39697,7 +41713,7 @@
commit f86514c3fbc867fc6457feacba23451e89993524
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Dec 17 00:36:39 2008 +0100
+Date: Wed Dec 17 00:36:39 2008 +0100
Fix wrong PS generation when a large image is in Patterns
@@ -39709,7 +41725,7 @@
commit fc395eb90b418e43453acefb42cd04baf0b7ad40
Author: Richard Airlie <richard.airlie at maglabs.net>
-Date: Tue Dec 16 21:11:53 2008 +0100
+Date: Tue Dec 16 21:11:53 2008 +0100
Allow the use of cropbox in pdftoppm
@@ -39718,7 +41734,7 @@
commit 80f415176952635a485356cf36048eee53396c25
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 16 20:37:39 2008 +0100
+Date: Tue Dec 16 20:37:39 2008 +0100
Make destructors private/protected since you are not supposed to
use them
@@ -39729,7 +41745,7 @@
commit dbcebda953cb36a45a125aada68e85249fb73f43
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 15 20:10:31 2008 +0100
+Date: Mon Dec 15 20:10:31 2008 +0100
Do not leak on AnnotScreen destructor
@@ -39740,7 +41756,7 @@
commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a
Author: Pino Toscano <pino at kde.org>
-Date: Fri Dec 12 00:43:19 2008 +0100
+Date: Fri Dec 12 00:43:19 2008 +0100
update the xpdf headers installation
@@ -39749,7 +41765,7 @@
commit 7c6527fa05389f705872aaaaff12e739b5d1577e
Author: Pino Toscano <pino at kde.org>
-Date: Fri Dec 12 00:41:21 2008 +0100
+Date: Fri Dec 12 00:41:21 2008 +0100
don't install Function.cc, as it is not an header
@@ -39758,7 +41774,7 @@
commit 0179e21b128ffccb5afd13203137ab8435197609
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 12 00:16:38 2008 +0100
+Date: Fri Dec 12 00:16:38 2008 +0100
Be more helpful with bad boys that want to use poppler core directly
@@ -39770,7 +41786,7 @@
commit 401632e4eeb4b10b1183a820f32461da77e8e4f2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 12 00:14:04 2008 +0100
+Date: Fri Dec 12 00:14:04 2008 +0100
Try harder to look for openjpeg
@@ -39779,7 +41795,7 @@
commit ab539f46089702f60b96b1ba2b2bc1544173c264
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 11 23:15:45 2008 +0100
+Date: Thu Dec 11 23:15:45 2008 +0100
Fix crash when reading outline
@@ -39792,7 +41808,7 @@
commit c9a755f9fd14511f43a2ca7fcda36bdd64bb1d87
Author: Ilya Gorenbein <igorenbein at finjan.com>
-Date: Sun Dec 7 17:59:19 2008 +0100
+Date: Sun Dec 7 17:59:19 2008 +0100
Fix memory leak
@@ -39803,7 +41819,7 @@
commit 4cd364c179ae91ed383a8237ba1ad263952fd7aa
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 30 16:57:52 2008 +0100
+Date: Sun Nov 30 16:57:52 2008 +0100
add my copyright here
@@ -39812,7 +41828,7 @@
commit 6b1676deb773675d90469adc84c3de8dcdaf174c
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 30 16:56:43 2008 +0100
+Date: Sun Nov 30 16:56:43 2008 +0100
[Qt4] support URI actions for TOC items
@@ -39821,7 +41837,7 @@
commit b5cd58b5565055fd0c13771461245ddcd80edfcf
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 30 16:34:57 2008 +0100
+Date: Sun Nov 30 16:34:57 2008 +0100
extract the LinkAction "serialization" in an own function, and make
it more safe
@@ -39832,7 +41848,7 @@
commit ee191363e22940ae7b06945e68c4738b17c78348
Author: Pino Toscano <pino at kde.org>
-Date: Sun Nov 30 16:17:32 2008 +0100
+Date: Sun Nov 30 16:17:32 2008 +0100
move the addTocChildren() implementation in the cpp
@@ -39846,7 +41862,7 @@
commit f8eaabf1aa7e384619129a7509be85d0c3bfb825
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 30 13:33:12 2008 +0100
+Date: Sun Nov 30 13:33:12 2008 +0100
Update copyrights of the last commits
@@ -39855,7 +41871,7 @@
commit 5f4fedfae6098e25644ffe5d4b1ed0bac043841d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 29 19:51:27 2008 +0100
+Date: Sat Nov 29 19:51:27 2008 +0100
Use the Length specified in the Stream as initial bufSize
@@ -39867,7 +41883,7 @@
commit 12f6d6ba2052fbdc8ea4ba7c7c9277e75bf170a5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 23 18:20:14 2008 +0100
+Date: Sun Nov 23 18:20:14 2008 +0100
Fix a crash when the second argument of opMarkPoint is not a
dictionary
@@ -39881,7 +41897,7 @@
commit 817e123a28e9f6b7e5be23f7ac2ba3bcec5e3f3f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 22 21:48:37 2008 +1030
+Date: Sat Nov 22 21:48:37 2008 +1030
Don't compare print flag for non Type 3 fonts in cairo font cache
@@ -39891,7 +41907,7 @@
commit 68f8ade28764855d4f663607c50c8202b1268296
Author: Albert Astals Cid <tsdgeos at samsung.localdomain>
-Date: Sun Nov 23 10:54:46 2008 +0100
+Date: Sun Nov 23 10:54:46 2008 +0100
Compile with -pedantic
@@ -39902,7 +41918,7 @@
commit 4a4fa7ed44a87e47a6078a1f7bb6f41071672ea7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Nov 18 20:11:07 2008 +0100
+Date: Tue Nov 18 20:11:07 2008 +0100
Fix a crash when selecting text in word mode
@@ -39911,7 +41927,7 @@
commit a6f5032ab0d6edbf3879f39efff7916b1f7233da
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 16 18:24:06 2008 +0100
+Date: Sun Nov 16 18:24:06 2008 +0100
optContentConfig is not actually stored in PDFDoc but in Catalog
@@ -39920,7 +41936,7 @@
commit b843ac34c6c4ca1580f99fa2220c59dfcd91f026
Author: Pino Toscano <pino at kde.org>
-Date: Sat Nov 15 14:49:02 2008 +0100
+Date: Sat Nov 15 14:49:02 2008 +0100
[Qt4] deserialize the value of the 'right' coordinate, too
@@ -39929,19 +41945,19 @@
commit 03061fdae49842556c9ff48e61914fc88502e1d8
Author: Tim Mooney <enchanter at users.sourceforge.net>
-Date: Thu Nov 13 22:32:22 2008 +0100
+Date: Thu Nov 13 22:32:22 2008 +0100
Fix build on Solaris 10 + Sun Studio 12.
Fixes bug 17496
- configure.ac | 14 ++++++++++++++
+ configure.ac | 14 ++++++++++++++
test/Makefile.am | 6 ++++--
2 files changed, 18 insertions(+), 2 deletions(-)
commit 17b18be4fd25f2ca2b4ed7382d9fda50410c44f1
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Nov 12 20:40:57 2008 +1030
+Date: Wed Nov 12 20:40:57 2008 +1030
Ensure cairo font matrix is invertable
@@ -39952,14 +41968,14 @@
commit e2257e6916cd1067d43db9ed45f944413c61ed64
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 9 22:44:48 2008 +0100
+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/Form.cc | 2 +-
+ poppler/Gfx.h | 1 +
poppler/OptionalContent.h | 1 +
qt4/src/poppler-optcontent.cc | 1 +
6 files changed, 6 insertions(+), 1 deletion(-)
@@ -39966,17 +41982,17 @@
commit 069f8ad9453e612e907b561aa50983c34400193d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 9 20:36:06 2008 +0100
+Date: Sun Nov 9 20:36:06 2008 +0100
MakeItBuild
- glib/CMakeLists.txt | 1 +
+ glib/CMakeLists.txt | 1 +
glib/demo/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+)
commit 04025c4f65bbb7e4330f6d17d917a035c0906f3d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Nov 9 17:03:20 2008 +0100
+Date: Sun Nov 9 17:03:20 2008 +0100
Fix a crash when initializing an Annot with a null catalog
@@ -39988,7 +42004,7 @@
commit 471255c5a3850984997d91c7850759eb0c7e8a9c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Nov 8 20:58:57 2008 +0100
+Date: Sat Nov 8 20:58:57 2008 +0100
[glib-demo] Add Optional Content demo
@@ -40001,24 +42017,24 @@
commit 7363c25e1d83332932d9b4fe16d7fb4e364da628
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 26 19:47:35 2008 +0100
+Date: Sun Oct 26 19:47:35 2008 +0100
[glib] Add Optional Content support
- glib/Makefile.am | 2 +
+ 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-layer.cc | 201 ++++++++++++++++++++++++
+ glib/poppler-layer.h | 43 ++++++
glib/poppler-private.h | 21 +++
- glib/poppler.h | 3 +
+ glib/poppler.h | 3 +
glib/test-poppler-glib.cc | 52 ++++++-
8 files changed, 710 insertions(+), 1 deletion(-)
commit c674566f458b54097f21aae0d4bf8637146565c5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 26 19:42:53 2008 +0100
+Date: Sun Oct 26 19:42:53 2008 +0100
Fix memory leaks in OptionalContent
@@ -40028,7 +42044,7 @@
commit 06ca313b8ecb8abb8dec3b418d118525b7bb0fdf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Oct 26 19:11:45 2008 +0100
+Date: Sun Oct 26 19:11:45 2008 +0100
Check annotation optional content properties before drawing it
@@ -40038,7 +42054,7 @@
commit a6d58927b048aa043cb6b6ed3ee9aeb213578924
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Nov 8 20:50:40 2008 +0100
+Date: Sat Nov 8 20:50:40 2008 +0100
Do not show hidden optional content
@@ -40047,12 +42063,12 @@
poppler/Gfx.cc | 113
++++++++++++++++++++++++++++++++++++++++-----------------
- poppler/Gfx.h | 7 +++-
+ poppler/Gfx.h | 7 +++-
2 files changed, 84 insertions(+), 36 deletions(-)
commit 5f168f991477e291290350a28f4a60a565e187b9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Oct 20 17:56:11 2008 +0200
+Date: Mon Oct 20 17:56:11 2008 +0200
[glib] Show action titles when printing the index in test program
@@ -40061,23 +42077,23 @@
commit a906d12e16748d9a40c0db4043a576fd3d004341
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Nov 8 20:20:00 2008 +0100
+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 +++---
+ 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 at gnome.org>
-Date: Sun Oct 19 12:44:13 2008 +0200
+Date: Sun Oct 19 12:44:13 2008 +0200
Delete the optContent object if it's invalid
- poppler/Catalog.cc | 4 ++++
+ poppler/Catalog.cc | 4 ++++
poppler/OptionalContent.cc | 3 +++
poppler/OptionalContent.h | 5 +++++
3 files changed, 12 insertions(+)
@@ -40084,7 +42100,7 @@
commit 2900e7e4c920d735d5a727e9e39f71df97bd7b93
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 8 18:12:47 2008 +0100
+Date: Sat Nov 8 18:12:47 2008 +0100
A new cairo is needed
@@ -40093,7 +42109,7 @@
commit aaaecd2e86769d3a99e21577448a193711985958
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 22:47:30 2008 +0100
+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
@@ -40105,7 +42121,7 @@
commit 82f4228a50efe6447c68f7f6d34a7805b7e4b75e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 20:57:17 2008 +0100
+Date: Wed Nov 5 20:57:17 2008 +0100
Add myself here
@@ -40114,7 +42130,7 @@
commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 20:49:01 2008 +0100
+Date: Wed Nov 5 20:49:01 2008 +0100
[Qt4Demo] Fix leak
@@ -40123,7 +42139,7 @@
commit d3c424e0362f53bda5c4e2e415823d78ace76253
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 20:14:17 2008 +0100
+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
@@ -40133,7 +42149,7 @@
commit 9d12de9b59de4336eabb423f7bf0363b6a35e2a8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 20:00:01 2008 +0100
+Date: Wed Nov 5 20:00:01 2008 +0100
Fix crash in case indices is NULL
@@ -40145,7 +42161,7 @@
commit fc61dad9daa15f83802ffa5c3cd9b59d80bb310b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 19:52:00 2008 +0100
+Date: Wed Nov 5 19:52:00 2008 +0100
[Qt] Fix leak
@@ -40154,7 +42170,7 @@
commit 981fb857b0afb1cda7836744dcf37906285512b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 19:49:18 2008 +0100
+Date: Wed Nov 5 19:49:18 2008 +0100
[Qt] Fix memory leak
@@ -40163,7 +42179,7 @@
commit e925e92d5cbfc009c138ece117227a3b0894ead6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 5 19:44:40 2008 +0100
+Date: Wed Nov 5 19:44:40 2008 +0100
Do not leak uBuf in the error case
@@ -40172,7 +42188,7 @@
commit 0741a402632ec5a8641ff11707142bf2731c1833
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 22:27:48 2008 +1030
+Date: Sat Nov 1 22:27:48 2008 +1030
Restore the cairo Type3 font image prescaling funtionality
@@ -40185,7 +42201,7 @@
commit 91a7c3fdd44f30b0b50ed05a3313bbb1b5c86e71
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 20:57:24 2008 +1030
+Date: Sat Nov 1 20:57:24 2008 +1030
Remove cairo font matrix y flip when inside a Type 3 char
@@ -40197,7 +42213,7 @@
commit 3bf4d7d75b455a9a0b5ee3a8c78b218e5af5185a
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 20:50:07 2008 +1030
+Date: Sat Nov 1 20:50:07 2008 +1030
Transform the glyph advance by the font matrix
@@ -40206,7 +42222,7 @@
commit 4aa32bad61d008a854fdc9e902d6834bb1687d7e
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 20:49:04 2008 +1030
+Date: Sat Nov 1 20:49:04 2008 +1030
Use the font BBox, not the font matrix to set the Gfx BBox
@@ -40215,7 +42231,7 @@
commit 987955440c7711f440c3d2b5cc8c05ec07228a77
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 20:47:05 2008 +1030
+Date: Sat Nov 1 20:47:05 2008 +1030
Ensure both the font matrix and y-axis flip are in the matrix
@@ -40226,7 +42242,7 @@
commit 5c051aa117477cba5d350adfc539acb4b5f2a56a
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 01:59:07 2008 +1030
+Date: Sat Nov 1 01:59:07 2008 +1030
Require cairo 1.8.2 for user-font support
@@ -40235,7 +42251,7 @@
commit a3edfa30680864b95a5196c5619846de42980857
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 01:57:32 2008 +1030
+Date: Sat Nov 1 01:57:32 2008 +1030
Implement Type 3 fonts in cairo backend using cairo user-fonts
@@ -40242,13 +42258,13 @@
poppler/CairoFontEngine.cc | 174
+++++++++++++++++++++++++++++++++++++++++++--
poppler/CairoFontEngine.h | 18 +++++
- poppler/CairoOutputDev.cc | 9 ++-
- poppler/CairoOutputDev.h | 4 +-
+ poppler/CairoOutputDev.cc | 9 ++-
+ poppler/CairoOutputDev.h | 4 +-
4 files changed, 194 insertions(+), 11 deletions(-)
commit feab1e982a2ee39bb372d593633a06b6a499822f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 01:21:39 2008 +1030
+Date: Sat Nov 1 01:21:39 2008 +1030
Add CairoOutputDev functions for getting Type 3 glyph metrics
@@ -40258,7 +42274,7 @@
commit a75efe208d899d4a23d5e2fcef200e4225721636
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Nov 1 00:26:40 2008 +1030
+Date: Sat Nov 1 00:26:40 2008 +1030
Make the catalog available to CairoFontEngine
@@ -40267,12 +42283,12 @@
poppler/CairoFontEngine.h | 3 ++-
poppler/CairoOutputDev.cc | 7 +++++--
poppler/CairoOutputDev.h | 3 ++-
- test/pdf-inspector.cc | 2 +-
+ test/pdf-inspector.cc | 2 +-
6 files changed, 13 insertions(+), 7 deletions(-)
commit 941d3976c496b75a3c5a9d19b80044fc2b57bd98
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Oct 31 22:44:41 2008 +1030
+Date: Fri Oct 31 22:44:41 2008 +1030
Allow multiple instances of CairoOutputDev to be created
@@ -40284,7 +42300,7 @@
commit 94cff513d8589f51b243fcb078f82cb931bb6d35
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Oct 31 21:11:01 2008 +1030
+Date: Fri Oct 31 21:11:01 2008 +1030
Use correct return type in _ft_new_face
@@ -40293,7 +42309,7 @@
commit 0b5ee897a24ce1edfca19a3b843f9b7ee7026d07
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri Oct 31 20:55:14 2008 +1030
+Date: Fri Oct 31 20:55:14 2008 +1030
Refactor CairoFont
@@ -40307,30 +42323,30 @@
commit a5865dae5b414de5f6dbda2a512101050c374e06
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Oct 28 10:30:59 2008 +0100
+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 +-
+ 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/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 +-
+ glib/demo/utils.h | 2 +-
15 files changed, 20 insertions(+), 14 deletions(-)
commit e07bfb54b77430e10e50c33151cf0afc9854006c
Author: Christian Persch <chpe at gnome.org>
-Date: Tue Oct 28 10:29:51 2008 +0100
+Date: Tue Oct 28 10:29:51 2008 +0100
[glib] Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES
@@ -40339,19 +42355,19 @@
commit a84d272ffd2b593ac98148e71b83fba299c60fea
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Oct 28 10:01:00 2008 +0100
+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 +++-
+ 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 at kde.org>
-Date: Tue Oct 21 23:00:55 2008 +0200
+Date: Tue Oct 21 23:00:55 2008 +0200
[Qt4] Small docu improvement
@@ -40360,7 +42376,7 @@
commit 00f9995b4960575cd1f392474c585f2140c8e587
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 12 14:20:01 2008 +0200
+Date: Sun Oct 12 14:20:01 2008 +0200
Do not crash if there is not font
@@ -40371,7 +42387,7 @@
commit 084cc4335cfe2c0e66219eba4c1177ee7ff018c5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Oct 10 23:15:35 2008 +0200
+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
@@ -40381,7 +42397,7 @@
commit d7442c90206d4b7a8ebc58f995647eb87ac35f42
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 9 22:53:00 2008 +0200
+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
@@ -40390,20 +42406,20 @@
commit 93f8dd9e837557bbfc0f058a664c356e3d6e82c0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Oct 9 21:28:27 2008 +0200
+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 +++---
+ 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 at finjan.com>
-Date: Wed Oct 8 22:29:11 2008 +0200
+Date: Wed Oct 8 22:29:11 2008 +0200
Initialize properly OptionalContentGroup::m_name
@@ -40412,7 +42428,7 @@
commit c7b87f3b8cbbcca29a1974debc2233f621a2e33b
Author: Carlo Bramini <carlo.bramix at libero.it>
-Date: Mon Oct 6 19:32:27 2008 +0200
+Date: Mon Oct 6 19:32:27 2008 +0200
Fix link on Mingw+Msys
@@ -40421,7 +42437,7 @@
commit e92255296511cae9cbbac8de800d8b26e5f681f1
Author: Pino Toscano <pino at kde.org>
-Date: Sun Oct 5 15:57:06 2008 +0200
+Date: Sun Oct 5 15:57:06 2008 +0200
[Qt4] when the PDF exporting fails, delete the file if it was
created by
@@ -40432,7 +42448,7 @@
commit 360f470b852e37d400949343763a18bf598820e8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 20:04:44 2008 +0200
+Date: Sat Oct 4 20:04:44 2008 +0200
Remove unused var
@@ -40441,7 +42457,7 @@
commit df7317f1320513b4f66cb6618d753b82042671f5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 19:48:57 2008 +0200
+Date: Sat Oct 4 19:48:57 2008 +0200
free the object
@@ -40450,7 +42466,7 @@
commit 9946d9af9dd5d5b96d5c777413a3e253dfd1f291
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 19:39:46 2008 +0200
+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
@@ -40460,7 +42476,7 @@
commit 108959432af7714cb8ffe42d98d40c97f936a2e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 19:39:24 2008 +0200
+Date: Sat Oct 4 19:39:24 2008 +0200
Correctly return wheter it was saved or not
@@ -40469,7 +42485,7 @@
commit 4c6cb1c204d782e2ac2113b57f6d372b4716017d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 01:46:58 2008 +0200
+Date: Sat Oct 4 01:46:58 2008 +0200
Remove spurious //
@@ -40478,7 +42494,7 @@
commit e8e7809ab4b115cbe67251da12989fc024912514
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 01:43:02 2008 +0200
+Date: Sat Oct 4 01:43:02 2008 +0200
There are files that have more than one encoding definition per line,
make them work
@@ -40491,7 +42507,7 @@
commit 7604e025038fee24c2cb3001f2100d5d1e48efe1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Oct 4 00:35:46 2008 +0200
+Date: Sat Oct 4 00:35:46 2008 +0200
Fix Poppler::Link::linkArea for rotated pages
@@ -40502,7 +42518,7 @@
commit 450b21e4528a8e890d3dda37ecb0a68602f8efaa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 1 00:46:29 2008 +0200
+Date: Wed Oct 1 00:46:29 2008 +0200
I've changed these files this year too, update copyright
@@ -40512,7 +42528,7 @@
commit 98310ca24841789cf53b10d34e271ceb4e054001
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 30 23:59:43 2008 +0200
+Date: Tue Sep 30 23:59:43 2008 +0200
Fix StitchingFunction(StitchingFunction *func) and
GfxAxialShading(GfxAxialShading *shading)
@@ -40525,20 +42541,20 @@
commit d12f5f4395eb18f8d29182e24acddd3e2b5cfe88
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 30 23:20:26 2008 +0200
+Date: Tue Sep 30 23:20:26 2008 +0200
0.9.3
CMakeLists.txt | 2 +-
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Tue Sep 30 19:26:17 2008 +0200
+Date: Tue Sep 30 19:26:17 2008 +0200
Timothy also agreed, now Ed Catmur is the last one missing to answer
@@ -40548,7 +42564,7 @@
commit 3225f54fea7cbb6b25d7223268cdeccfdd823375
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 30 00:27:49 2008 +0200
+Date: Tue Sep 30 00:27:49 2008 +0200
And Marco said yes to GPLv2+
@@ -40563,7 +42579,7 @@
commit 268d803c9dd67b7f78f8dcdc3c7653c8b2c2d08f
Author: Warren Toomey <wkt at tuhs.org>
-Date: Mon Sep 29 21:14:40 2008 +0200
+Date: Mon Sep 29 21:14:40 2008 +0200
Let HmtlOutputDev process images
@@ -40573,7 +42589,7 @@
commit a29984ab777c64a1cb286b667a6a91ad9b191f40
Merge: f399afe 6865872
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 28 23:39:08 2008 +0200
+Date: Sun Sep 28 23:39:08 2008 +0200
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -40580,19 +42596,19 @@
commit f399afe6f6b9c250327d0e4c5b3f2839889d7095
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 28 23:38:34 2008 +0200
+Date: Sun Sep 28 23:38:34 2008 +0200
[Qt4] various apidox improvements
- qt4/src/Mainpage.dox | 10 +---
+ qt4/src/Mainpage.dox | 10 +---
qt4/src/poppler-link.h | 92 +++++++++++++++++++++++++++++++++----
- qt4/src/poppler-qt4.h | 121
+ qt4/src/poppler-qt4.h | 121
+++++++++++++++++++++++++++++++++----------------
3 files changed, 168 insertions(+), 55 deletions(-)
commit 68658721583b05ebacb1165ac36e91d49735bbd9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 28 19:29:06 2008 +0200
+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
@@ -40602,7 +42618,7 @@
commit 3cb5b7fc5ae168ef58fd1905f61c1b9abe6cb86c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 28 19:25:53 2008 +0200
+Date: Sun Sep 28 19:25:53 2008 +0200
Introduce greallocn_checkoverflow and use it in FoFiTrueType::parse
@@ -40609,13 +42625,13 @@
Fixes the other part of bug 17811
fofi/FoFiTrueType.cc | 4 ++--
- goo/gmem.cc | 21 +++++++++++++++++++++
- goo/gmem.h | 1 +
+ goo/gmem.cc | 21 +++++++++++++++++++++
+ goo/gmem.h | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
commit aa7ef03af49f74ed558dcbab8ad4c594bb2b7d53
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 28 19:24:43 2008 +0200
+Date: Sun Sep 28 19:24:43 2008 +0200
If libjpeg tells us to abort, let's abort :D
@@ -40626,29 +42642,29 @@
commit e2461c9aa4d74b5511621d7222979948e31541ad
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 28 18:07:25 2008 +0200
+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 ++
+ qt4/src/poppler-qt4.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011
Author: Carlo Bramini <carlo.bramix at libero.it>
-Date: Sat Sep 27 17:23:20 2008 +0200
+Date: Sat Sep 27 17:23:20 2008 +0200
Misc mingw fixes
- configure.ac | 2 +-
+ configure.ac | 2 +-
glib/Makefile.am | 2 +-
glib/demo/info.cc | 1 +
- m4/libjpeg.m4 | 2 +-
+ m4/libjpeg.m4 | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
commit b3828203c4e594754957033ea826e8e22164fd5b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 26 23:08:14 2008 +0200
+Date: Fri Sep 26 23:08:14 2008 +0200
Carl agreed too, so CairoOutputDev.cc is done
@@ -40659,7 +42675,7 @@
commit a197a07728d19abc2708979c95b4ef53e88fcb55
Author: Carlo Bramini <carlo.bramix at libero.it>
-Date: Fri Sep 26 18:42:05 2008 +0200
+Date: Fri Sep 26 18:42:05 2008 +0200
Compile where localtime_r is not available
@@ -40668,7 +42684,7 @@
commit 38884e1722ac7e15c62cece20035c5fb0020f4b3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 24 14:18:38 2008 +0200
+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
@@ -40680,7 +42696,7 @@
commit 0e080aaf44816e5d5b9008f3c2fb54868932f0ac
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 24 13:12:13 2008 +0200
+Date: Wed Sep 24 13:12:13 2008 +0200
Remove non-needed X includes
@@ -40687,12 +42703,12 @@
Spotted by Carlo Bramini
test/gtk-cairo-test.cc | 3 ---
- test/pdf-inspector.cc | 3 ---
+ test/pdf-inspector.cc | 3 ---
2 files changed, 6 deletions(-)
commit 6888b023fdb199d3c5fb705bd928aedf68eeffdb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 23 23:28:04 2008 +0200
+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
@@ -40704,20 +42720,20 @@
commit 539d29f4f3b24b98c9fc5f88d3477e427fbe409d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 23 22:39:50 2008 +0200
+Date: Tue Sep 23 22:39:50 2008 +0200
0.9.2
CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Mon Sep 22 20:23:11 2008 +0200
+Date: Mon Sep 22 20:23:11 2008 +0200
Check the types here too
@@ -40729,7 +42745,7 @@
commit df47e4c441e4ec79b1bb40de7044c9501f243b76
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue Sep 16 12:56:04 2008 +0100
+Date: Tue Sep 16 12:56:04 2008 +0100
Check for duplicate open fonts.
@@ -40744,7 +42760,7 @@
just 90
MiB.
- configure.ac | 1 +
+ configure.ac | 1 +
poppler/CairoFontEngine.cc | 214
+++++++++++++++++++++++++++++++++++++++------
2 files changed, 190 insertions(+), 25 deletions(-)
@@ -40751,7 +42767,7 @@
commit 41d1edddcf84ca23c0fc39c5f4f3a49e408a9f1a
Author: Kouhei Sutou <kou at cozmixng.org>
-Date: Sun Sep 21 16:33:33 2008 +0200
+Date: Sun Sep 21 16:33:33 2008 +0200
[glib-demo] Fix a crash in forms demo
@@ -40760,7 +42776,7 @@
commit fe26075353226be9a02c8cf1a6a29586de15ce86
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 21 12:03:21 2008 +0200
+Date: Sun Sep 21 12:03:21 2008 +0200
really use the key passed to it
@@ -40769,7 +42785,7 @@
commit 8aa531cb478d6ae838a94f9f31e6a0bbd0dd957c
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 21 11:18:22 2008 +0200
+Date: Sun Sep 21 11:18:22 2008 +0200
Read the 'readOnly' attribute directly in the FormField constructor.
@@ -40778,7 +42794,7 @@
commit b56f64d676bdabd4a3ebe0eb2237f4c202a3707d
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 21 00:53:54 2008 +0200
+Date: Sun Sep 21 00:53:54 2008 +0200
Handle streams as entries for the catalog JS name tree.
@@ -40787,67 +42803,67 @@
commit 93386d67b3d7adbd87547e9742e4df1c10eadbc1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 20 16:20:03 2008 +0200
+Date: Sat Sep 20 16:20:03 2008 +0200
Compile with -pedantic
- poppler/Form.h | 4 ++--
+ 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 +-
+ 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 at gmail.com>
-Date: Sat Sep 20 16:13:37 2008 +0200
+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 ++++----
+ 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 ++-
+ 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 at kde.org>
-Date: Sat Sep 20 16:10:50 2008 +0200
+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/SplashBitmap.h | 3 +++
splash/SplashErrorCodes.h | 3 +++
splash/SplashFTFont.cc | 3 +++
- splash/SplashFTFont.h | 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/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/SplashT1Font.h | 3 +++
splash/SplashT1FontEngine.cc | 3 +++
splash/SplashT1FontFile.cc | 3 +++
splash/SplashT1FontFile.h | 3 +++
- splash/SplashTypes.h | 3 +++
+ splash/SplashTypes.h | 3 +++
splash/SplashXPathScanner.cc | 3 +++
22 files changed, 66 insertions(+)
commit beb87362072d5b480cf6b2c02445ec17c119ff56
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 20 15:47:25 2008 +0200
+Date: Sat Sep 20 15:47:25 2008 +0200
Add Tomas' Copyright
@@ -40856,7 +42872,7 @@
commit 8ccb1bb651b129875ef802356c4a229b2ce31973
Author: Tomas Are Haavet <tomasare at gmail.com>
-Date: Sat Sep 20 15:45:47 2008 +0200
+Date: Sat Sep 20 15:45:47 2008 +0200
Initialize pos the correct value to not have crashes
@@ -40865,7 +42881,7 @@
commit 77bf8ec94e36fef7e120f1dc4bb1390be71cfb97
Author: Tomas Are Haavet <tomasare at gmail.com>
-Date: Sat Sep 20 14:17:06 2008 +0200
+Date: Sat Sep 20 14:17:06 2008 +0200
Fix memory leak
@@ -40874,7 +42890,7 @@
commit b22be54dc2205269974315ca748d835d0990d6da
Author: Tomas Are Haavet <tomasare at gmail.com>
-Date: Sat Sep 20 14:16:26 2008 +0200
+Date: Sat Sep 20 14:16:26 2008 +0200
Fix mismatched free/delete
@@ -40883,7 +42899,7 @@
commit ac16174da1d6f19445f78e7cd7c4a18cb9524dde
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 20 00:52:19 2008 +0200
+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
@@ -40893,20 +42909,20 @@
commit ffa4ffdf7fe83035c72addd8c4c8ee566621ba06
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 17 23:27:30 2008 +0200
+Date: Wed Sep 17 23:27:30 2008 +0200
0.9.1
CMakeLists.txt | 2 +-
- NEWS | 13 +++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Sun Sep 14 22:18:38 2008 +0200
+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
@@ -40919,7 +42935,7 @@
commit 1a852064ff5a1a15bc315ddca472a0ad74292581
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Sep 13 12:11:41 2008 +0200
+Date: Sat Sep 13 12:11:41 2008 +0200
[glib-demo] Do not try to get info about remote destinations
@@ -40928,7 +42944,7 @@
commit 951cffeb2cbff4e179043033b5ac7f5eb764d6dc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 12 12:05:53 2008 +0200
+Date: Fri Sep 12 12:05:53 2008 +0200
Make sure DecryptAESState::bufIdx is never bigger than 16, otherwise
we crash
@@ -40941,7 +42957,7 @@
commit 491109edbe827860e764b5fcb67456867923858d
Author: Haruyuki Kawabe <Haruyuki.Kawabe at unisys.co.jp>
-Date: Wed Sep 10 23:00:32 2008 +0200
+Date: Wed Sep 10 23:00:32 2008 +0200
Generate the outline file at the same place the other files are
generated
@@ -40953,7 +42969,7 @@
commit 7dfc1e4c9348d537896bda7b0f2ae591afc72866
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 10 00:03:50 2008 +0200
+Date: Wed Sep 10 00:03:50 2008 +0200
we want to distribute this file too
@@ -40962,7 +42978,7 @@
commit ddb73e8dc1ccbddf3b170e12c7153ccaf716d7cc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 23:47:33 2008 +0200
+Date: Tue Sep 9 23:47:33 2008 +0200
We want to distribute cmake/modules/FindLIBOPENJPEG.cmake too
@@ -40971,7 +42987,7 @@
commit 646ccc2bb8563d411dc25bdbab53725ae08572ba
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 23:22:17 2008 +0200
+Date: Tue Sep 9 23:22:17 2008 +0200
m_doc->doc->getOptContentConfig() can be null, so check for it
@@ -40980,23 +42996,23 @@
commit d7f0bce67101f37f8d3e69d7d701388bcdc7200f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 23:18:49 2008 +0200
+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 ++++--
+ 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 ++++--
+ utils/pdfinfo.cc | 6 ++++--
+ utils/pdftohtml.cc | 6 ++++--
7 files changed, 50 insertions(+), 18 deletions(-)
commit 0af8609e6c932de2d85168cc9147854ee84b3a1b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 20:55:27 2008 +0200
+Date: Tue Sep 9 20:55:27 2008 +0200
i want this packaged too
@@ -41005,7 +43021,7 @@
commit dd0f4c1510382e17cf33d3fe163e384da1d6d289
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 20:48:04 2008 +0200
+Date: Tue Sep 9 20:48:04 2008 +0200
Fix includepath
@@ -41014,7 +43030,7 @@
commit 16c0842c3e01608a72709af55cc5cb8b567efedf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 9 20:36:18 2008 +0200
+Date: Tue Sep 9 20:36:18 2008 +0200
API changed, so increase soname
@@ -41024,7 +43040,7 @@
commit 217c0d1f80a78713977a7bfbe680fce90f1c6b36
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 8 23:56:28 2008 +0200
+Date: Mon Sep 8 23:56:28 2008 +0200
change version to 0.9.0
@@ -41032,14 +43048,14 @@
in glib/ and we'll have 0.9.0 :-)
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Mon Sep 8 23:36:04 2008 +0200
+Date: Mon Sep 8 23:36:04 2008 +0200
Increase soname for libpoppler, i'm almost sure we broke BC there
@@ -41049,17 +43065,17 @@
commit bc275049d6ef083daf71a043ccf23fd0634f5c4d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 8 23:33:24 2008 +0200
+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 +-
+ qt4/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 06743a25a73adc3fba95f7b4ad74a6dde1a54ead
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 8 23:23:06 2008 +0200
+Date: Mon Sep 8 23:23:06 2008 +0200
added news for 0.9.0
@@ -41069,7 +43085,7 @@
commit d35ca2ce5df12d40e295873e44b1f18ea40ba897
Author: Pino Toscano <pino at kde.org>
-Date: Sun Sep 7 01:13:33 2008 +0200
+Date: Sun Sep 7 01:13:33 2008 +0200
[Qt4] apidox improvements
@@ -41076,12 +43092,12 @@
qt4/src/poppler-annotation.h | 70
+++++++++++++++++++++++++++++++++++++++++---
qt4/src/poppler-link.h | 12 +++++---
- qt4/src/poppler-qt4.h | 22 ++++++++++++--
+ qt4/src/poppler-qt4.h | 22 ++++++++++++--
3 files changed, 93 insertions(+), 11 deletions(-)
commit 796d4c002d47c85716775d173eddfb2ae8866eaf
Author: Pino Toscano <pino at kde.org>
-Date: Sat Sep 6 22:48:13 2008 +0200
+Date: Sat Sep 6 22:48:13 2008 +0200
no more need for including the qt3 paths
@@ -41092,7 +43108,7 @@
commit db7ee3b3ae0f42155f9245691e4bfdef98a8ed6f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 6 23:16:05 2008 +0200
+Date: Sat Sep 6 23:16:05 2008 +0200
[Qt4] Fix docu
@@ -41101,7 +43117,7 @@
commit 3366059a25611f19ab592cda18c5efe0b9359771
Author: Pino Toscano <pino at kde.org>
-Date: Sat Sep 6 16:34:58 2008 +0200
+Date: Sat Sep 6 16:34:58 2008 +0200
[Qt4] add option flags for the PS converter
@@ -41109,12 +43125,12 @@
- add a flag for setting the "printing" mode
qt4/src/poppler-ps-converter.cc | 34 ++++++++++++++++++++++++++--------
- qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 8 deletions(-)
commit afa26d5c9ac9feb61aad30eb65dc00c9854d7f2e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 6 15:46:12 2008 +0200
+Date: Sat Sep 6 15:46:12 2008 +0200
we are printing so pass the print flag as true
@@ -41123,7 +43139,7 @@
commit f5d1eb5eaabaf3ab4bb87b8b4b901bbf30b20b29
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 6 15:43:32 2008 +0200
+Date: Sat Sep 6 15:43:32 2008 +0200
We are pringint here, so pass the printing flag as true
@@ -41135,17 +43151,17 @@
commit 58e828d732f06bae9133dd518d89fa4348f1cca8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 5 18:45:23 2008 +0200
+Date: Fri Sep 5 18:45:23 2008 +0200
Only like QtTest to the tests, not to the lib itself
- configure.ac | 13 +++++++++++--
+ configure.ac | 13 +++++++++++--
qt4/tests/Makefile.am | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 13 deletions(-)
commit 49b3e4560f62a9a7db350d94d50e229f5e1208bf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 5 18:17:45 2008 +0200
+Date: Fri Sep 5 18:17:45 2008 +0200
Movie filename is not a string, but a File Specification
@@ -41156,25 +43172,25 @@
commit 996d2e176057e22acbc374cff7a712ce6fd92d93
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 5 18:17:25 2008 +0200
+Date: Fri Sep 5 18:17:25 2008 +0200
Unify multiple File Specification parsers
- CMakeLists.txt | 2 +
- poppler/FileSpec.cc | 146
+ CMakeLists.txt | 2 +
+ poppler/FileSpec.cc | 146
+++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FileSpec.h | 24 ++++++++
- poppler/Link.cc | 104 +++++------------------------------
- poppler/Link.h | 4 --
- poppler/Makefile.am | 2 +
+ 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 ++-
+ poppler/PSOutputDev.h | 1 -
+ poppler/Sound.cc | 7 ++-
9 files changed, 197 insertions(+), 128 deletions(-)
commit 31f3eb2d6b43f7fbf4d978730d109b08b1563989
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 3 21:49:23 2008 +0200
+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
@@ -41185,7 +43201,7 @@
commit c75abac7ba07990ef54a46fa0d429eea580a71ef
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 2 19:16:55 2008 +0200
+Date: Tue Sep 2 19:16:55 2008 +0200
Kjartan was missing and just agreed
@@ -41195,7 +43211,7 @@
commit 630aa133017d15ddc7bf96c79f43c5b60fa9749a
Merge: b2bc9b3 de82255
Author: Pino Toscano <pino at kde.org>
-Date: Tue Sep 2 01:25:55 2008 +0200
+Date: Tue Sep 2 01:25:55 2008 +0200
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -41202,7 +43218,7 @@
commit b2bc9b3f59ef8e5fea18f0bc91b71fc9eb9a4157
Author: Pino Toscano <pino at kde.org>
-Date: Tue Sep 2 01:24:39 2008 +0200
+Date: Tue Sep 2 01:24:39 2008 +0200
[Qt4] small apidox improvements
@@ -41213,13 +43229,13 @@
qt4/src/poppler-form.h | 8 ++++++
qt4/src/poppler-link.h | 14 ++++++++---
qt4/src/poppler-optcontent.h | 11 +++++++++
- qt4/src/poppler-qt4.h | 59
+ qt4/src/poppler-qt4.h | 59
++++++++++++++++++++++++++++++++++++++------
5 files changed, 90 insertions(+), 11 deletions(-)
commit 6bc4881477ea15d70d420e57b5663052f2f9df76
Author: Pino Toscano <pino at kde.org>
-Date: Tue Sep 2 00:47:56 2008 +0200
+Date: Tue Sep 2 00:47:56 2008 +0200
expand the macros, extract poppler-optcontent.h
@@ -41232,7 +43248,7 @@
commit de822554acdb1b2bc9e70c0668c43a10c0ec129a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 1 23:50:37 2008 +0200
+Date: Mon Sep 1 23:50:37 2008 +0200
Initialize widget to null before calling initialize not after :-(
@@ -41241,7 +43257,7 @@
commit 1a7b7199112d97e816a099cbc1a5672c83e64156
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 1 20:42:06 2008 +0200
+Date: Mon Sep 1 20:42:06 2008 +0200
Add my copyright
@@ -41250,7 +43266,7 @@
commit 1fef34782a003f46fceab0d3bed36212bbf32c4c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 1 20:35:37 2008 +0200
+Date: Mon Sep 1 20:35:37 2008 +0200
Find reverse way in Dict
@@ -41267,7 +43283,7 @@
commit bb7996eaaad6a70404891bb2ff530160737ea3d7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 1 20:29:25 2008 +0200
+Date: Mon Sep 1 20:29:25 2008 +0200
Do not crash on documents with no pages
@@ -41276,108 +43292,108 @@
commit 0c11d390e4b0e3765ae20968359c7562c9857db7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 1 20:13:33 2008 +0200
+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
+ Catalog.cc
+ Outline.cc
+ Outline.h
Kjartan Maraas
- HtmlOutputDev.cc
+ HtmlOutputDev.cc
Timothy Lee
- ImageOutputDev.h
- ImageOutputDev.cc
+ ImageOutputDev.h
+ ImageOutputDev.cc
Carl Worth
- CairoOutputDev.cc
+ CairoOutputDev.cc
Ed Catmur
- GfxFont.cc
- GlobalParams.cc
- TextOutputDev.cc
- TextOutputDev.h
- UnicodeTypeTable.cc
- UnicodeTypeTable.h
+ 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/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/CMap.cc | 3 +++
+ poppler/CMap.h | 3 +++
poppler/CairoFontEngine.cc | 3 +++
poppler/CairoFontEngine.h | 3 +++
poppler/CairoOutputDev.h | 3 +++
- poppler/Catalog.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/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/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/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/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 +++
+ 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(+)
commit 8670bfed7900586725b30e3af67f6849acc6efda
Author: Vasile Gaburici <gaburici at cs.umd.edu>
-Date: Sat Aug 30 12:47:13 2008 +0200
+Date: Sat Aug 30 12:47:13 2008 +0200
Fix extraction of images
@@ -41388,7 +43404,7 @@
commit 1c98f197664b1a2c06e2caf32116a8487f4054bf
Author: Vasile Gaburici <gaburici at cs.umd.edu>
-Date: Sat Aug 30 12:44:02 2008 +0200
+Date: Sat Aug 30 12:44:02 2008 +0200
Read sMap reverse so CMap entries take precedence
@@ -41399,27 +43415,27 @@
commit 8f1deb3f8000bdeb845a6c786a654bc7eb684f0a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 29 23:06:19 2008 +0200
+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
+ 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 ++-----------
+ 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 ++----
+ 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 at kde.org>
-Date: Fri Aug 29 20:50:57 2008 +0200
+Date: Fri Aug 29 20:50:57 2008 +0200
Add a readme for contributors with licensing and misc info
@@ -41428,7 +43444,7 @@
commit 35a72590ffd3284e63601af79599e5fa025e567f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 28 00:58:11 2008 +0200
+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
@@ -41440,7 +43456,7 @@
commit 33727cf6773b12d736ba245fdd146559ce93102d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 20:36:13 2008 +0200
+Date: Sun Aug 24 20:36:13 2008 +0200
fix location of the comment
@@ -41449,7 +43465,7 @@
commit abe29b4fdb33f449649fdea5d7af2deeb702f0bb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 20:24:35 2008 +0200
+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+
@@ -41463,7 +43479,7 @@
commit 6346d7050a03935c71336c65d5f8f0fe2860d321
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 20:23:50 2008 +0200
+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+
@@ -41470,15 +43486,15 @@
goo/GooString.cc | 3 +++
goo/GooString.h | 3 +++
- goo/gfile.cc | 3 +++
- goo/gfile.h | 3 +++
- goo/gmem.cc | 3 +++
- goo/gmem.h | 3 +++
+ goo/gfile.cc | 3 +++
+ goo/gfile.h | 3 +++
+ goo/gmem.cc | 3 +++
+ goo/gmem.h | 3 +++
6 files changed, 18 insertions(+)
commit d6e1f1fb4e83527d3ece51d98fa20262713b7da1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 20:22:06 2008 +0200
+Date: Sun Aug 24 20:22:06 2008 +0200
.cc -> .h
@@ -41487,7 +43503,7 @@
commit 9f0ac70f7ad806cadce379d4fabb90eff697ad52
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 19:25:27 2008 +0200
+Date: Sun Aug 24 19:25:27 2008 +0200
Add missing addresses
@@ -41494,13 +43510,13 @@
poppler/ABWOutputDev.cc | 4 ++--
poppler/ABWOutputDev.h | 2 +-
poppler/FlateStream.cc | 2 +-
- poppler/FlateStream.h | 2 +-
+ poppler/FlateStream.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
commit 22f6af73961686895f207fe13022a21333455862
Merge: 12a9e42 6d6913a
Author: Pino Toscano <pino at kde.org>
-Date: Sun Aug 24 19:03:24 2008 +0200
+Date: Sun Aug 24 19:03:24 2008 +0200
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -41507,17 +43523,17 @@
commit 12a9e427fb487165b1797f81d52d733c27bfa2e1
Author: Pino Toscano <pino at kde.org>
-Date: Sun Aug 24 18:57:52 2008 +0200
+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 ++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 20 ++++++++++++++++++++
2 files changed, 34 insertions(+)
commit c444c652859b6e52160e5571e84f8eb1292d65f1
Author: Pino Toscano <pino at kde.org>
-Date: Sun Aug 24 18:47:58 2008 +0200
+Date: Sun Aug 24 18:47:58 2008 +0200
[Qt4] make the MovieObject ctor private, with only Page able to use it
@@ -41526,7 +43542,7 @@
commit 6d6913a79779769ce0fe2f0b516a90a50e51b947
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 18:45:45 2008 +0200
+Date: Sun Aug 24 18:45:45 2008 +0200
fix Jeff's entry
@@ -41536,7 +43552,7 @@
commit 25bd5967f9f550a32e20eea91cd00cbeff98249e
Author: Pino Toscano <pino at kde.org>
-Date: Sun Aug 24 18:45:25 2008 +0200
+Date: Sun Aug 24 18:45:25 2008 +0200
[Qt4] initialize the MovieObject from an AnnotMovie
@@ -41544,12 +43560,12 @@
qt4/src/poppler-movie.cc | 8 ++++----
qt4/src/poppler-page.cc | 4 +---
- qt4/src/poppler-qt4.h | 4 ++--
+ qt4/src/poppler-qt4.h | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 24 18:18:13 2008 +0200
+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
@@ -41557,176 +43573,176 @@
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 +-
+ 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 ++++++++++++
+ 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 at dooz.org>
-Date: Wed Aug 20 22:10:07 2008 +0200
+Date: Wed Aug 20 22:10:07 2008 +0200
Fixes escaping of hyphens in man pages
@@ -41736,7 +43752,7 @@
commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165
Author: Loïc Minier <lool at dooz.org>
-Date: Wed Aug 20 19:57:42 2008 +0200
+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
@@ -41746,7 +43762,7 @@
commit 48a73cc709a8bed9d2d0f9cbd2a9d2b6c0dad05b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 19:26:01 2008 +0200
+Date: Sat Aug 23 19:26:01 2008 +0200
[Qt4] convert the title of movie annotations
@@ -41755,7 +43771,7 @@
commit 419ec15ac825f2e0052b411462f00ac57fed030e
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 19:25:04 2008 +0200
+Date: Sat Aug 23 19:25:04 2008 +0200
[Qt4] get/set the title for movie annotations
@@ -41765,7 +43781,7 @@
commit 63bcaf113fcb5a4a9e5c120df2c3dafb2977c90a
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:58:30 2008 +0200
+Date: Sat Aug 23 01:58:30 2008 +0200
[Qt4] convert the movie annotation from the core type to the Qt4 one
@@ -41774,7 +43790,7 @@
commit 5cc490de74af12726bdeb9b5a6a0f0d1d79383b5
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:55:41 2008 +0200
+Date: Sat Aug 23 01:55:41 2008 +0200
[Qt4] first version of a MovieAnnotation
@@ -41787,17 +43803,17 @@
commit 3d5c2e22d790d7c139e1cd28aebb21cfe76b8b6b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:54:30 2008 +0200
+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 +
+ qt4/src/Makefile.am | 1 +
2 files changed, 2 insertions(+)
commit 599698a9b133999f1f0bb0548489111e9d7b6f05
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:52:58 2008 +0200
+Date: Sat Aug 23 01:52:58 2008 +0200
[Qt4] first version of a MovieObject object for movies
@@ -41805,12 +43821,12 @@
qt4/src/poppler-movie.cc | 73
++++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 34 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 34 ++++++++++++++++++++++
2 files changed, 107 insertions(+)
commit 820f15009845870701e1f4e7f4fc4fb93312ab3e
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:45:07 2008 +0200
+Date: Sat Aug 23 01:45:07 2008 +0200
fix Movie::copy()
@@ -41824,7 +43840,7 @@
commit c3a006ae35250e9a5638c2ce713b7470380751c7
Author: Pino Toscano <pino at kde.org>
-Date: Sat Aug 23 01:04:34 2008 +0200
+Date: Sat Aug 23 01:04:34 2008 +0200
compile attachments.c in the demo with cmake as well
@@ -41833,7 +43849,7 @@
commit b5a7987a50b3d28fbfa219e2cef85b9e53aaf079
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 21 20:40:18 2008 +0200
+Date: Thu Aug 21 20:40:18 2008 +0200
[glib-demo] Fix attachments demo with documents that don't contain
attachments
@@ -41843,7 +43859,7 @@
commit a2b0aefedbdb20ce0ef8398a700202021fcf00db
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 21 20:14:50 2008 +0200
+Date: Thu Aug 21 20:14:50 2008 +0200
[glib-demo] Fix typo
@@ -41852,7 +43868,7 @@
commit 9e563d6d877624b1caf82ac30c5ae30a1eb48f21
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 21 20:12:33 2008 +0200
+Date: Thu Aug 21 20:12:33 2008 +0200
[glib-demo] Add checksum validation to attachments demo
@@ -41862,22 +43878,22 @@
commit e233325e6f13d8b232bf68a2812fe755e7fccd4d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 21 19:03:32 2008 +0200
+Date: Thu Aug 21 19:03:32 2008 +0200
[glib-demo] Add demo for attachments
- glib/demo/Makefile.am | 2 +
+ 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 +
+ glib/demo/main.c | 4 +-
+ glib/demo/utils.c | 23 +++++
+ glib/demo/utils.h | 1 +
6 files changed, 302 insertions(+), 1 deletion(-)
commit 0e2efa0fce5bf059ce85d3e3bec2293b405ec3c9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 21 19:02:24 2008 +0200
+Date: Thu Aug 21 19:02:24 2008 +0200
[glib] Make sure name and descripction are valid utf8 strings
@@ -41886,7 +43902,7 @@
commit 15a73704ab6b009ca5e07c08f0b12d970adc387d
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Tue Aug 19 09:18:03 2008 +0100
+Date: Tue Aug 19 09:18:03 2008 +0100
Memleak and invalid free.
@@ -41902,7 +43918,7 @@
commit d3110e392097db54e9ee59300213e490dee39126
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 19 19:19:09 2008 +0200
+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
@@ -41915,18 +43931,18 @@
commit 303249e5548bfbf6823e97850e498970d802b4a0
Author: Albert Astals Cid <tsdgeos at samsung.localdomain>
-Date: Fri Aug 15 01:52:52 2008 +0200
+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 ---
+ poppler/Gfx.h | 3 ---
2 files changed, 2 insertions(+), 15 deletions(-)
commit 27ddf3c5e839358c8553d41743faa8ee304767bf
Author: Pino Toscano <pino at kde.org>
-Date: Wed Aug 13 13:55:57 2008 +0200
+Date: Wed Aug 13 13:55:57 2008 +0200
[Qt4] make sure to use the correct page width/height for form
widgets coordinates
@@ -41936,7 +43952,7 @@
commit 2e7b0eb4af8cf5938833e5659d01b77096e7b7f7
Author: Pino Toscano <pino at kde.org>
-Date: Tue Aug 12 13:49:52 2008 +0200
+Date: Tue Aug 12 13:49:52 2008 +0200
[Qt4] add a method to get the activation action of a FormField
@@ -41946,17 +43962,17 @@
commit f9e679adbd6830da26eb9909bcb16e3bdf0da6b4
Author: Pino Toscano <pino at kde.org>
-Date: Tue Aug 12 13:47:15 2008 +0200
+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 +++++
+ qt4/src/poppler-page.cc | 5 +++++
2 files changed, 7 insertions(+)
commit a6ecc864ea3e94d7232cff6a2e8f49919d8f24ff
Author: Albert Astals Cid <tsdgeos at samsung.localdomain>
-Date: Tue Aug 12 01:23:21 2008 +0200
+Date: Tue Aug 12 01:23:21 2008 +0200
initialize widget, fixes crash on EC2006.pdf
@@ -41965,7 +43981,7 @@
commit 123a87aff2e35b10efe6a1d715585b427e4a9afa
Author: Albert Astals Cid <tsdgeos at samsung.localdomain>
-Date: Tue Aug 12 00:37:09 2008 +0200
+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
@@ -41974,12 +43990,12 @@
msec) in kde bug 168663
poppler/Gfx.cc | 14 ++++++++++++--
- poppler/Gfx.h | 3 +++
+ poppler/Gfx.h | 3 +++
2 files changed, 15 insertions(+), 2 deletions(-)
commit 5ad1a12183f4b8e328f32386a74b5616e7e59070
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 4 20:34:42 2008 +0200
+Date: Mon Aug 4 20:34:42 2008 +0200
Be less strict when parsing TTF tables
@@ -41991,7 +44007,7 @@
commit d322720428fa416b7d5f23acc72d1d4b4f74d041
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 4 20:16:50 2008 +0200
+Date: Mon Aug 4 20:16:50 2008 +0200
Report an error when FoFiTrueType::load or FoFiTrueType::make fail
@@ -42000,7 +44016,7 @@
commit 901ebc84ff7c0872c3f9f5e6eaf418ba6400fa10
Author: Pino Toscano <pino at kde.org>
-Date: Sun Aug 3 10:54:09 2008 +0200
+Date: Sun Aug 3 10:54:09 2008 +0200
[Qt4] Make the paper color setting working as it should.
@@ -42013,7 +44029,7 @@
commit 66b34c78943be598778a3ef438b0cefac668c6a2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 2 13:54:34 2008 +0200
+Date: Sat Aug 2 13:54:34 2008 +0200
This should not be here, breaks jpeg rendering when not using libjpeg
@@ -42024,7 +44040,7 @@
commit fd8d71ea8b12393201ece9c09372fd69c7573025
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 23:47:51 2008 +0200
+Date: Fri Aug 1 23:47:51 2008 +0200
These defines are unneeded too
@@ -42035,7 +44051,7 @@
commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 23:36:09 2008 +0200
+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
@@ -42046,18 +44062,18 @@
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 ++-
+ 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 at kde.org>
-Date: Fri Aug 1 23:14:28 2008 +0200
+Date: Fri Aug 1 23:14:28 2008 +0200
Add GooList *getEncodingNames();
@@ -42069,7 +44085,7 @@
commit 9fd34443d765ccd61864d18bceadc049d905b957
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 23:09:39 2008 +0200
+Date: Fri Aug 1 23:09:39 2008 +0200
remove defines we don't use at all
@@ -42080,7 +44096,7 @@
commit 0f13013dc3079915572b6b002dac8d01d2dbde04
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 23:06:50 2008 +0200
+Date: Fri Aug 1 23:06:50 2008 +0200
xpdfrc has been dead for a while
@@ -42091,7 +44107,7 @@
commit 96392667d1331d2f8750f27c116e34bbf9282dca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 22:20:55 2008 +0200
+Date: Fri Aug 1 22:20:55 2008 +0200
Provide a default constructor for FontInfo so you can use it as
metatype for qvariant
@@ -42098,12 +44114,12 @@
qt4/src/poppler-fontinfo.cc | 5 +++++
qt4/src/poppler-private.h | 7 +++++++
- qt4/src/poppler-qt4.h | 5 +++++
+ qt4/src/poppler-qt4.h | 5 +++++
3 files changed, 17 insertions(+)
commit 9fd1077e63d97a316380b8df4821bf4c9434fb52
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 17:47:51 2008 +0200
+Date: Fri Aug 1 17:47:51 2008 +0200
Build with cmake too
@@ -42112,7 +44128,7 @@
commit d8d6a3f46620d45c279b7ca1a4a2fa3a36285cde
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 1 17:44:07 2008 +0200
+Date: Fri Aug 1 17:44:07 2008 +0200
Improve manpages and add -listenc to pdfinfo and pdftotext in the way
@@ -42124,15 +44140,15 @@
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/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(-)
@@ -42139,7 +44155,7 @@
commit f5b0ca794b0879e3d239bf1d6138b15ead27d9ca
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Tue Jul 29 20:18:33 2008 +0930
+Date: Tue Jul 29 20:18:33 2008 +0930
Fix ActualText string length check in TextOutputDev.cc
@@ -42148,11 +44164,11 @@
commit 21bbdc9d663995336900f1ce97cf294f04464e01
Author: Boris Toloknov <tlknv at yandex.ru>
-Date: Mon Jul 28 21:02:07 2008 +0200
+Date: Mon Jul 28 21:02:07 2008 +0200
make xml output valid xml
- utils/HtmlLinks.cc | 33 ++++++++++++++++++--
+ utils/HtmlLinks.cc | 33 ++++++++++++++++++--
utils/HtmlOutputDev.cc | 85
++++++++++++++++++++++++++++++++------------------
2 files changed, 85 insertions(+), 33 deletions(-)
@@ -42159,7 +44175,7 @@
commit dccfc4c2910b47a77cd7b6019d9365f1684ffd0c
Author: Boris Toloknov <tlknv at yandex.ru>
-Date: Mon Jul 28 20:58:13 2008 +0200
+Date: Mon Jul 28 20:58:13 2008 +0200
Limit ascent and descent are to reasonable values.
@@ -42170,17 +44186,17 @@
commit 0fd5a3db1ddad447d44b64eff9abfb077a7853a0
Author: Boris Toloknov <tlknv at yandex.ru>
-Date: Mon Jul 28 20:52:19 2008 +0200
+Date: Mon Jul 28 20:52:19 2008 +0200
Make html output to keep all the spaces with
- utils/HtmlFonts.cc | 2 ++
+ utils/HtmlFonts.cc | 2 ++
utils/HtmlOutputDev.cc | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
commit 650c73fa0f570f699d907e33060fb23290940b42
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 28 20:44:13 2008 +0200
+Date: Mon Jul 28 20:44:13 2008 +0200
findDest crashes on null goostrings so rework the ifs a bit
@@ -42189,7 +44205,7 @@
commit adee9c0e9e8b2de20309b3ae6eb8e6d6ed05cf85
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jul 26 00:04:03 2008 +0200
+Date: Sat Jul 26 00:04:03 2008 +0200
We are not storing the ctu, so decref and leak-- :-)
@@ -42198,7 +44214,7 @@
commit e7b3e3ae3080bd6f239f7d96761729ad30b075ae
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 23:52:28 2008 +0200
+Date: Fri Jul 25 23:52:28 2008 +0200
Fix leak
@@ -42207,7 +44223,7 @@
commit 006b974d4faae53e6bd51a4281dd923ab1c2d4e8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 23:15:11 2008 +0200
+Date: Fri Jul 25 23:15:11 2008 +0200
Fix memory leak
@@ -42216,7 +44232,7 @@
commit 3a549d75acceedfa25dcf79074d0cdfb643c746e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 23:08:21 2008 +0200
+Date: Fri Jul 25 23:08:21 2008 +0200
Free the previous modified object in case it exists
@@ -42225,7 +44241,7 @@
commit 040d244b97a554342061c777a286e99dbb9acabd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 21:31:55 2008 +0200
+Date: Fri Jul 25 21:31:55 2008 +0200
Need this or otherwise it crashes on complete overwrite
@@ -42234,7 +44250,7 @@
commit 11ebceeef938a7e6fa9b5437e65b5b4b822f3018
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 21:30:24 2008 +0200
+Date: Fri Jul 25 21:30:24 2008 +0200
Fix my last fix about saving, i think this is the correct one
@@ -42251,7 +44267,7 @@
commit 03d445f485f90972ab1c05d79b2999b763ab7377
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 20:16:54 2008 +0200
+Date: Fri Jul 25 20:16:54 2008 +0200
Fix XRef::writeToFile after my change
@@ -42260,7 +44276,7 @@
commit 136fa97576f2df0d7a7563b34651ca222927ea57
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 25 20:12:51 2008 +0200
+Date: Fri Jul 25 20:12:51 2008 +0200
Fix XRef::add and XRef::addIndirectObject, also remove num from
XRefEntry
@@ -42273,7 +44289,7 @@
Conflicts:
- poppler/XRef.cc
+ poppler/XRef.cc
poppler/XRef.cc | 70
+++++++++++++++++++++------------------------------------
@@ -42282,7 +44298,7 @@
commit 55572b77da95c47393b78f3aff804ea9c5ae17e5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 22 22:50:00 2008 +0200
+Date: Tue Jul 22 22:50:00 2008 +0200
Really do what the comment says and also init changeLeft, changeTop
and changeZoom
@@ -42292,7 +44308,7 @@
commit 8dc7afaeea08183de331ecfd41ce1971e7772fd0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 22 21:05:03 2008 +0200
+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
@@ -42300,12 +44316,12 @@
Fixes infinite loop on http://bugs.kde.org/show_bug.cgi?id=166145
poppler/FontInfo.cc | 44 ++++++++++++++++++++++++++++++++++++--------
- poppler/FontInfo.h | 4 ++++
+ poppler/FontInfo.h | 4 ++++
2 files changed, 40 insertions(+), 8 deletions(-)
commit 9fb17c952dcff798e45280eeb9c718680147e766
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 20 13:47:11 2008 +0200
+Date: Sun Jul 20 13:47:11 2008 +0200
Fix condition, we want thumb to be a Stream, not to be non null
@@ -42316,7 +44332,7 @@
commit 3696025977fd345b12767f75a2de6ed7e9467365
Author: Pino Toscano <pino at kde.org>
-Date: Fri Jul 18 23:32:25 2008 +0200
+Date: Fri Jul 18 23:32:25 2008 +0200
initialize pageWidgets, otherwise it can be a rubbish pointer
is Annots
@@ -42327,7 +44343,7 @@
commit 0189ff8b86de18486f7397076f7a0fbf133a1a33
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 1 20:16:50 2008 +0200
+Date: Tue Jul 1 20:16:50 2008 +0200
Fix condition, we want fetched_thumb to be a Stream, not to be
non null
@@ -42339,7 +44355,7 @@
commit 5bd77dcdd5220d63934f4b3e78d85a936947a53d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 1 00:49:01 2008 +0200
+Date: Tue Jul 1 00:49:01 2008 +0200
forgot about we use autofoo too
@@ -42348,17 +44364,17 @@
commit 5ed2503003d973b5461594af15485af49591451d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 1 00:43:26 2008 +0200
+Date: Tue Jul 1 00:43:26 2008 +0200
unittesting about ActualText
- qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/CMakeLists.txt | 1 +
qt4/tests/check_actualtext.cpp | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
commit f3bb2eb556f5248242f6db85052ef045fcb697c6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 1 00:41:35 2008 +0200
+Date: Tue Jul 1 00:41:35 2008 +0200
Unbreak ActualText extraction
@@ -42367,7 +44383,7 @@
commit 9e9543b105b39f8b0048c00fc94741e43ad615e9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jun 26 20:19:06 2008 +0200
+Date: Thu Jun 26 20:19:06 2008 +0200
use FindPackageHandleStandardArgs
@@ -42376,7 +44392,7 @@
commit fec41ceddebe194f139bcc5b2f3fa74e7d1ae502
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jun 26 20:18:27 2008 +0200
+Date: Thu Jun 26 20:18:27 2008 +0200
need to use LIBOPENJPEG_FOUND, as it really represents whether
libopenjpeg was found or not
@@ -42386,7 +44402,7 @@
commit 5498d93e59a0b79e5add3dc6181d5e98ba689217
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Fri Jun 20 21:42:34 2008 -0700
+Date: Fri Jun 20 21:42:34 2008 -0700
Use a single global FT_Library in CairoOutputDev
@@ -42412,10 +44428,10 @@
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.
+ 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
+ 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.
@@ -42426,7 +44442,7 @@
commit c75632d62a052d3c3739b96f5586f97c68baf25b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 24 02:31:43 2008 +0200
+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
@@ -42436,7 +44452,7 @@
commit 9810fdfc54aac80aa99561a9d820d11b062e4637
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 24 02:12:21 2008 +0200
+Date: Tue Jun 24 02:12:21 2008 +0200
the entry is not updated here either, fix uninitialized variable use
@@ -42445,19 +44461,19 @@
commit 2da15db4751d3cb93d40b48e348dbc51f6e7a29f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jun 20 11:39:08 2008 +0200
+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/Catalog.cc | 5 +++--
+ poppler/Gfx.cc | 12 +++++++++++-
poppler/OptionalContent.cc | 25 +++++--------------------
3 files changed, 19 insertions(+), 23 deletions(-)
commit d6fb5dcb7b7596961800d9744d17b6adb8d9a2ad
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Wed Jun 18 11:24:05 2008 -0700
+Date: Wed Jun 18 11:24:05 2008 -0700
Fix a crash in the cairo backend with Type 3 glyphs
@@ -42466,8 +44482,8 @@
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.
+ 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.
@@ -42483,7 +44499,7 @@
commit c3a00c83f1d24c1f88e7ed3b3f772460e578f3cc
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jun 15 02:39:31 2008 +0200
+Date: Sun Jun 15 02:39:31 2008 +0200
poppler-page-transition.h is here now
@@ -42492,7 +44508,7 @@
commit 2affed0fc97b958ae46f531c471a3cf0b04c0f55
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 14 01:24:49 2008 +0200
+Date: Sat Jun 14 01:24:49 2008 +0200
Give warnings if the build configuration for stream decoders is
different from default one
@@ -42502,7 +44518,7 @@
commit 8e74bc612cb4102891324ffdbfcdb47293ecb95e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 14 01:13:53 2008 +0200
+Date: Sat Jun 14 01:13:53 2008 +0200
Warn the user if he does not have any enabled rendering backend
@@ -42511,7 +44527,7 @@
commit 99d2361032cbaafd69bd796170757ed6482f208d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 14 00:53:38 2008 +0200
+Date: Sat Jun 14 00:53:38 2008 +0200
Add a JPEG2000 decoder based on OpenJPEG
@@ -42520,31 +44536,31 @@
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
+ 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 +-
+ 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 at kde.org>
-Date: Wed Jun 11 00:48:53 2008 +0200
+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 +++++
+ qt4/src/poppler-private.h | 3 +++
+ qt4/src/poppler-qt4.h | 5 +++++
3 files changed, 31 insertions(+)
commit 184292ffb8fef5aa5a72bdbfcc0c95b663f452bd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 10 23:00:11 2008 +0200
+Date: Tue Jun 10 23:00:11 2008 +0200
Make the fontRef and the embRef accessible to FontInfo users
@@ -42554,7 +44570,7 @@
commit 86b7e8a3bee74c5b89c451137cf9c2758ba6913f
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jun 8 18:00:05 2008 +0930
+Date: Sun Jun 8 18:00:05 2008 +0930
Ensure cairo renders Type 3 glyphs with only the fill color
@@ -42564,7 +44580,7 @@
commit 99e2d95728f41c91ab59a01c62d82b19a7a2e083
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Jun 1 00:49:32 2008 +0930
+Date: Sun Jun 1 00:49:32 2008 +0930
glib: save/restore cairo state when rendering a page
@@ -42573,11 +44589,11 @@
commit 6f40ee4af6b59f9d2c326adc8d2574e45f4d4d29
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 8 23:46:04 2008 +0200
+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 ++++++++++++++++++++
+ configure.ac | 20 ++++++++++++++++++++
qt4/demos/Makefile.am | 2 +-
qt4/src/Makefile.am | 2 +-
qt4/tests/Makefile.am | 2 +-
@@ -42585,7 +44601,7 @@
commit 86aa8fc0708f7da4a907a8bdb1845e53d29892b7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 5 19:21:08 2008 +0200
+Date: Thu Jun 5 19:21:08 2008 +0200
Fix leak on ABWOutputDev.cc
@@ -42594,33 +44610,33 @@
commit 979ef1cafa968d776a2b804ce555b11212212397
Author: Koji Otani <sho at bbr.jp>
-Date: Tue Jun 3 21:07:15 2008 +0200
+Date: Tue Jun 3 21:07:15 2008 +0200
Support for surrogates outside the BMP plane
poppler/TextOutputDev.cc | 19 ++++++++++++++++++-
- poppler/UTF8.h | 14 ++++++++++++++
+ poppler/UTF8.h | 14 ++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
commit 1614ab3036cf25c9b94967163996678d386ce0ac
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 1 16:32:55 2008 +0200
+Date: Sun Jun 1 16:32:55 2008 +0200
Do not limit CharCodeToUnicodeString to 8 characters
- poppler/Annot.cc | 10 +++++-----
+ poppler/Annot.cc | 10 +++++-----
poppler/CharCodeToUnicode.cc | 37 +++++++++++++++++++++----------------
poppler/CharCodeToUnicode.h | 2 +-
- poppler/Gfx.cc | 8 ++++----
- poppler/GfxFont.cc | 43
+ poppler/Gfx.cc | 8 ++++----
+ poppler/GfxFont.cc | 43
++++++++++++++++++++++++-------------------
- poppler/GfxFont.h | 6 +++---
+ poppler/GfxFont.h | 6 +++---
poppler/PSOutputDev.cc | 4 ++--
7 files changed, 60 insertions(+), 50 deletions(-)
commit bf95c6970dacaa62512de858cf60ff6cf0c1bf7c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 1 00:07:11 2008 +0200
+Date: Sun Jun 1 00:07:11 2008 +0200
[Qt] Fix leak when calling Poppler::Document::scanForFonts
@@ -42629,7 +44645,7 @@
commit d21d7271fc74ab78cd157549138d0027cf179471
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 31 23:57:31 2008 +0200
+Date: Sat May 31 23:57:31 2008 +0200
Make sure file exists before printing it
@@ -42638,7 +44654,7 @@
commit 0480a788c0f25af1bc09360b599debb37f831e10
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 27 23:20:32 2008 +0200
+Date: Tue May 27 23:20:32 2008 +0200
require gthread-2.0
@@ -42647,7 +44663,7 @@
commit 2e40ef652eb9fca7fe947acb2adfecc96ad3c50e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 26 22:13:38 2008 +0200
+Date: Mon May 26 22:13:38 2008 +0200
Do not shadow a paramer with a local variable name
@@ -42656,7 +44672,7 @@
commit 1fd856aa1fb48869111e5b86f263bfd94fa7af17
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 26 20:52:53 2008 +0200
+Date: Mon May 26 20:52:53 2008 +0200
Do not leak tSplash if transpGroupStack->blendingColorSpace is NULL
@@ -42665,7 +44681,7 @@
commit 492209ec8648342a3a5447611f3f1ce63b63e8e9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 26 20:51:06 2008 +0200
+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
@@ -42675,7 +44691,7 @@
commit 79ab8cceb318f3bb5ebad431824e3ae593aea340
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 26 20:38:59 2008 +0200
+Date: Mon May 26 20:38:59 2008 +0200
Do not leak memory if data_out is NULL
@@ -42684,17 +44700,17 @@
commit f44c33344d4af31ee008826179bcd92db445f35a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 25 19:16:12 2008 +0200
+Date: Sun May 25 19:16:12 2008 +0200
[glib] Init glib threads in demo app as required by g_timer
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
glib/demo/main.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
commit 58d5b7b9ab9ac245481299c4765f3bd305580d2e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 21 22:18:29 2008 +0200
+Date: Wed May 21 22:18:29 2008 +0200
[Qt4] Fix text() method
@@ -42706,7 +44722,7 @@
commit e3e4113c73128f49f99289b592446d4382b5d65c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 12 15:39:43 2008 +0200
+Date: Mon May 12 15:39:43 2008 +0200
Add getters to some TextBlock members.
@@ -42717,7 +44733,7 @@
commit ff699e64bd1de78915aad4ddb79d6f529aef2b87
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 11 23:44:50 2008 +0200
+Date: Sun May 11 23:44:50 2008 +0200
Check the OC we found exists before using it
@@ -42728,7 +44744,7 @@
commit ac26ba5148b99a03a56e37ba201ad420b8619943
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 9 20:17:37 2008 +0200
+Date: Fri May 9 20:17:37 2008 +0200
Do not crash on unlock with wrong password
@@ -42737,7 +44753,7 @@
commit 19ec5a531cb03a7bee1cfcc9c7d5c4390fbd069d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 8 23:15:58 2008 +0200
+Date: Thu May 8 23:15:58 2008 +0200
Fix build with --enable-fixedpoint
@@ -42746,7 +44762,7 @@
commit 1cf5f0fda542efef575a123622637d81b9c42053
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 7 18:49:28 2008 +0200
+Date: Wed May 7 18:49:28 2008 +0200
[Qt] Fix Document::unlock
@@ -42755,7 +44771,7 @@
commit b5041924eb023cc095f2445935ff713cf65dacce
Author: Pino Toscano <pino at kde.org>
-Date: Wed May 7 16:44:03 2008 +0200
+Date: Wed May 7 16:44:03 2008 +0200
do not delete the GooString owned by an Object
@@ -42764,11 +44780,11 @@
commit 546a7b700862db00240de9fd50bdba1dd347765b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 4 15:26:26 2008 +0200
+Date: Sun May 4 15:26:26 2008 +0200
Fix leaks on error conditions
- poppler/Annot.cc | 6 ++++++
+ poppler/Annot.cc | 6 ++++++
poppler/ArthurOutputDev.cc | 1 +
poppler/JBIG2Stream.cc | 1 +
3 files changed, 8 insertions(+)
@@ -42775,7 +44791,7 @@
commit 914f1b1d814ab3d958aa0ca21ad73ef5aed20b89
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 3 18:21:28 2008 +0200
+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
@@ -42785,7 +44801,7 @@
commit c907e41ab18dda10cd3c9789bd0e7fe71b6402a8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 30 00:42:34 2008 +0200
+Date: Wed Apr 30 00:42:34 2008 +0200
findSegment can return NULL check for it
@@ -42794,7 +44810,7 @@
commit 8b7f29b577bca3295e99fea4a5cf4a6bb7ba2617
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 30 00:26:28 2008 +0200
+Date: Wed Apr 30 00:26:28 2008 +0200
new[] implies delete[]
@@ -42803,7 +44819,7 @@
commit 926c13825d5f7364286975db8ffa507b92f4b3ab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:44:51 2008 +0200
+Date: Tue Apr 29 23:44:51 2008 +0200
add lost return when adding kees patch
@@ -42812,7 +44828,7 @@
commit ba9283f6bc78e97006e52ef5de20c958ee9e1a37
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:42:00 2008 +0200
+Date: Tue Apr 29 23:42:00 2008 +0200
make the function static
@@ -42821,7 +44837,7 @@
commit 931a8272f556ba8a35342f0c5bf53bdb57ea7a31
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:41:31 2008 +0200
+Date: Tue Apr 29 23:41:31 2008 +0200
make the variable static
@@ -42830,41 +44846,41 @@
commit 1887d2910d2006c7fc3ecc95db0150f1537e9d0a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:35:17 2008 +0200
+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/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/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 +-
+ poppler/Stream.cc | 10 +++++-----
+ poppler/UnicodeTypeTable.cc | 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
commit 51140e2d9490696d716f77d3225da0bfdfc212b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:14:59 2008 +0200
+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/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 at kde.org>
-Date: Tue Apr 29 23:03:51 2008 +0200
+Date: Tue Apr 29 23:03:51 2008 +0200
add static
@@ -42873,7 +44889,7 @@
commit 7333bc913111e56ee241b7ef2bf6e9fea68b7da2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 23:01:13 2008 +0200
+Date: Tue Apr 29 23:01:13 2008 +0200
add static
@@ -42882,7 +44898,7 @@
commit 1ea36507f9c9f163b6772268046e7560d0c00dbc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 22:47:19 2008 +0200
+Date: Tue Apr 29 22:47:19 2008 +0200
make findModifier static
@@ -42891,7 +44907,7 @@
commit be9961571dbfabb982e6f69abd3bbc98fa971864
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 21:48:09 2008 +0200
+Date: Tue Apr 29 21:48:09 2008 +0200
make variables not used outside static
@@ -42900,7 +44916,7 @@
commit b157064a85350da6ea9c4f46e965e45ebc59d227
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 21:43:23 2008 +0200
+Date: Tue Apr 29 21:43:23 2008 +0200
constify setPSPaperSize
@@ -42909,7 +44925,7 @@
commit ee57ead8a6f34fa8de044399e5912395e0f3a425
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 21:37:57 2008 +0200
+Date: Tue Apr 29 21:37:57 2008 +0200
constify argDesc arrays
@@ -42929,7 +44945,7 @@
commit 9f93d9eb464877e0d23dcf205295da9162f03253
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 29 20:45:01 2008 +0200
+Date: Tue Apr 29 20:45:01 2008 +0200
make psOpNames static
@@ -42940,7 +44956,7 @@
commit 29e3e779c68371b7c4aadcf68ee0712046f39c6d
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 23:47:01 2008 +0200
+Date: Sat Apr 26 23:47:01 2008 +0200
remember to call the base implementation here
@@ -42949,7 +44965,7 @@
commit a188f3cd36775d78ace5b5d62c8ab7c059b3b2b1
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 23:42:09 2008 +0200
+Date: Sat Apr 26 23:42:09 2008 +0200
reset the current page to 0, when closing a document
@@ -42958,7 +44974,7 @@
commit 7eca6da6436ffc1c41cfed1a07be4dafa1172463
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 23:41:45 2008 +0200
+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
@@ -42968,7 +44984,7 @@
commit 6cddda7f3c3b8ddb95e6aba1b234a27c4454c23d
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 22:41:59 2008 +0200
+Date: Sat Apr 26 22:41:59 2008 +0200
sync updateFont() with SplashOutputDev
@@ -42978,7 +44994,7 @@
commit ddc7c1f8c24762bae615e7dec92e92a58c827478
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 18:12:51 2008 +0200
+Date: Sat Apr 26 18:12:51 2008 +0200
construct AnnotPolygon for Polygon and PolyLine annotations
@@ -42988,7 +45004,7 @@
commit f9c7e8037b7165b6271ce7aea0d315053c4d66a5
Merge: 59d33d8 f5fec4f
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 18:09:59 2008 +0200
+Date: Sat Apr 26 18:09:59 2008 +0200
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -42995,7 +45011,7 @@
commit 59d33d8e99673f73ccf2ad9a62bd25fca51f0eb8
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 17:56:42 2008 +0200
+Date: Sat Apr 26 17:56:42 2008 +0200
use the base implementation to update all the states
@@ -43004,7 +45020,7 @@
commit 45d2a9529bf241554c59437118cb8c705554dc27
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 17:55:39 2008 +0200
+Date: Sat Apr 26 17:55:39 2008 +0200
Set the font antialiasing from the painter settings, instead of the
global settings.
@@ -43014,7 +45030,7 @@
commit 5faa72fd70e0d85268e807a8b870d80dda9189a9
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 26 17:53:28 2008 +0200
+Date: Sat Apr 26 17:53:28 2008 +0200
Get the font and painter matrices, and reenable the font drawing.
@@ -43023,7 +45039,7 @@
commit f5fec4fdedd8d316b19968545e447e2036a1bb47
Author: Kees Cook <kees at outflux.net>
-Date: Wed Apr 23 19:53:03 2008 +0200
+Date: Wed Apr 23 19:53:03 2008 +0200
provide type-checking for union pointer accesses
@@ -43033,7 +45049,7 @@
commit a567c921ce538616f4ba0b7933086ef5a8ab0f55
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Apr 22 23:09:10 2008 +0200
+Date: Tue Apr 22 23:09:10 2008 +0200
Little change to avoid AnnotWidget crashing when they aren't related
to FormWidgets.
@@ -43045,21 +45061,21 @@
commit 73798c95b8a4c0504e9246e6f73fd31f812ad6fa
Author: Albert Astals Cid <tsdgeos at bluebox.(none)>
-Date: Mon Apr 21 19:56:52 2008 +0200
+Date: Mon Apr 21 19:56:52 2008 +0200
Link to pthread when needed
Should fix bug 15625
- configure.ac | 2 +
+ configure.ac | 2 +
m4/acx_pthread.m4 | 280
++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Makefile.am | 4 +
+ poppler/Makefile.am | 4 +
3 files changed, 286 insertions(+)
commit 6c248bdad77235a45402d9693a0b822cc208b6b9
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 20 18:32:59 2008 +0200
+Date: Sun Apr 20 18:32:59 2008 +0200
the dtor should be virtual
@@ -43068,7 +45084,7 @@
commit 68dba1a452ca70add5b05ab8e2adab838bc2cb73
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 20 16:21:10 2008 +0200
+Date: Sun Apr 20 16:21:10 2008 +0200
if ncand is a Guint cand should be one too
@@ -43077,7 +45093,7 @@
commit 0b91eb19f5a3d07b625ee5188f1fcb4b4b1544ea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 20 16:17:50 2008 +0200
+Date: Sun Apr 20 16:17:50 2008 +0200
Unused var--
@@ -43086,7 +45102,7 @@
commit 1ed3cc40987b691319fd9f1a30296d80de5732fd
Author: Pino Toscano <pino at kde.org>
-Date: Wed Apr 16 15:45:45 2008 +0200
+Date: Wed Apr 16 15:45:45 2008 +0200
fix border style conversion
@@ -43095,7 +45111,7 @@
commit 7c8feb4e3627bde2052a7e536d2d49d1cbbce8ee
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 15 21:57:31 2008 +0200
+Date: Tue Apr 15 21:57:31 2008 +0200
Hack to "support" 16 bits images
@@ -43109,7 +45125,7 @@
commit f338a9ded5d42dd65853c5c7bbe27f6724096416
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 21:41:51 2008 +0200
+Date: Sun Apr 13 21:41:51 2008 +0200
[Qt4] convert the sound annotations
@@ -43118,7 +45134,7 @@
commit 733d51fca04ee682fed2242f868edd545f3755fa
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 21:38:25 2008 +0200
+Date: Sun Apr 13 21:38:25 2008 +0200
[Qt4] First version of a SoundAnnotation.
@@ -43129,7 +45145,7 @@
commit feb1ea091111bd7292879c465590acfd7671c876
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 21:36:26 2008 +0200
+Date: Sun Apr 13 21:36:26 2008 +0200
First version of AnnotSound.
@@ -43139,7 +45155,7 @@
commit ec2cf81edf1b2c6707de4d30316ff5f5e24534d4
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 18:31:21 2008 +0200
+Date: Sun Apr 13 18:31:21 2008 +0200
[Qt4] convert the file attachment annotations
@@ -43148,7 +45164,7 @@
commit 9fa2e96c96d365ae67859545ebd635d726784fca
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 18:29:00 2008 +0200
+Date: Sun Apr 13 18:29:00 2008 +0200
[Qt4] Initial version of FileAttachmentAnnotation
@@ -43159,7 +45175,7 @@
commit 5899aff11f94e707654574e830e0757b1df558d4
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 10:50:39 2008 +0200
+Date: Sun Apr 13 10:50:39 2008 +0200
[Qt4] Read the annotations from the core, instead of own parsing.
@@ -43169,14 +45185,14 @@
out how to convert, yet.
Covert also the Caret annotations.
- qt4/src/poppler-annotation-helper.h | 2 +-
- qt4/src/poppler-page.cc | 851
+ 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 at kde.org>
-Date: Sun Apr 13 02:21:55 2008 +0200
+Date: Sun Apr 13 02:21:55 2008 +0200
add getters for the AnnotPolygon properties
@@ -43185,7 +45201,7 @@
commit 9311f75d4c3da991efb8afd00701a0ce1cbae1b0
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Apr 13 01:52:36 2008 +0200
+Date: Sun Apr 13 01:52:36 2008 +0200
Almost full AnnotPolygon support.
@@ -43198,7 +45214,7 @@
commit 01aa052ed761a4ada471d196985825986bb58627
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Apr 13 01:13:49 2008 +0200
+Date: Sun Apr 13 01:13:49 2008 +0200
Extend AnnotPath behaviour to include cooordinate array parsing.
@@ -43211,7 +45227,7 @@
commit ca52830e9519ae7b778f98e5c2547daef7da5f09
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Apr 13 00:54:13 2008 +0200
+Date: Sun Apr 13 00:54:13 2008 +0200
Added OptionalContent support to Annots.
@@ -43223,7 +45239,7 @@
commit 4b87196b7829c87d15af4e8b4138ca97548fb519
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 00:18:24 2008 +0200
+Date: Sun Apr 13 00:18:24 2008 +0200
Isolate the embedded file reading logic into a new EmbFile
constructor.
@@ -43233,12 +45249,12 @@
poppler/Catalog.cc | 205
+++++++++++++++++++++++++++++------------------------
- poppler/Catalog.h | 1 +
+ poppler/Catalog.h | 1 +
2 files changed, 112 insertions(+), 94 deletions(-)
commit 45b407e51905948690065749085a4af1cbb29a8e
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 13 00:14:38 2008 +0200
+Date: Sun Apr 13 00:14:38 2008 +0200
correctly get the FileSpec dictionary
@@ -43248,7 +45264,7 @@
commit c3aa3a97d9c553ea7976741d798901352fb5381c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 12 22:45:57 2008 +0200
+Date: Sat Apr 12 22:45:57 2008 +0200
properly initialize an AnnotPath
@@ -43257,7 +45273,7 @@
commit a3406fb2ace1390db1c181823a7bfc66c9174d98
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 12 22:40:42 2008 +0200
+Date: Sat Apr 12 22:40:42 2008 +0200
properly dispose the memory of the ink lists
@@ -43267,7 +45283,7 @@
commit 0dad70e2d12e8b587cab8ce2d914c81c6897a1d1
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 12 22:15:35 2008 +0200
+Date: Sat Apr 12 22:15:35 2008 +0200
make AnnotInk working.
@@ -43280,7 +45296,7 @@
commit 77404e24ea1e175fc9b55097dc5b35cc34760659
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 12 21:08:54 2008 +0200
+Date: Sat Apr 12 21:08:54 2008 +0200
a length is an int
@@ -43290,7 +45306,7 @@
commit bc2b2ffd2144f951c311e968fba4bc50b7c43ff3
Merge: cd5afe6 bacc1dd
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Apr 12 17:40:49 2008 +0200
+Date: Sat Apr 12 17:40:49 2008 +0200
Fixed merging conflict.
@@ -43298,7 +45314,7 @@
commit cd5afe6d9eca687ee224ff7680a8cba28d81a36d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 12 00:44:08 2008 +0200
+Date: Sat Apr 12 00:44:08 2008 +0200
Do not take into account Colorspace resource subdictionary for
image XObjects
@@ -43320,7 +45336,7 @@
commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 12 17:20:09 2008 +0200
+Date: Sat Apr 12 17:20:09 2008 +0200
Read the "in reply to" reference as such, without reading the
associated annotation dictionary.
@@ -43331,7 +45347,7 @@
commit ffe09454a0948a6107bcc38f23ba2068151c547d
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Apr 12 17:17:59 2008 +0200
+Date: Sat Apr 12 17:17:59 2008 +0200
Initial Annot3D parsing a few general improvements.
@@ -43344,7 +45360,7 @@
commit 8757c577241dda31bc59c7d1c208c159ad428877
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Apr 12 10:38:07 2008 +0200
+Date: Sat Apr 12 10:38:07 2008 +0200
AnnotFileAttachment support.
@@ -43356,7 +45372,7 @@
commit 36989658149fc9e5e8a049ce070a102f35b7bddc
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Apr 12 09:55:26 2008 +0200
+Date: Sat Apr 12 09:55:26 2008 +0200
AnnotInk support.
@@ -43369,7 +45385,7 @@
commit 464b171d0e9b989196c287f2ee4dfbbc14212aa9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 12 00:44:08 2008 +0200
+Date: Sat Apr 12 00:44:08 2008 +0200
Do not take into account Colorspace resource subdictionary for
image XObjects
@@ -43391,7 +45407,7 @@
commit 42db4890e8295aaec5a1be12d1414fc0a9048550
Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Thu Mar 27 10:52:22 2008 +0000
+Date: Thu Mar 27 10:52:22 2008 +0000
Do not call FT_Done_Face on a live cairo_font_face_t.
@@ -43402,46 +45418,46 @@
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
+ ==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
+ ==13745== by 0x4A117AB: _cairo_scaled_glyph_lookup
(cairo-scaled-font.c:1674)
- ==13745== by 0x4A12A5A: _cairo_scaled_font_glyph_device_extents
+ ==13745== by 0x4A12A5A: _cairo_scaled_font_glyph_device_extents
(cairo-scaled-font.c:1124)
- ==13745== by 0x4A21ECD: _cairo_analysis_surface_show_glyphs
+ ==13745== by 0x4A21ECD: _cairo_analysis_surface_show_glyphs
(cairo-analysis-surface.c:516)
- ==13745== by 0x4A144DC: _cairo_surface_show_glyphs
+ ==13745== by 0x4A144DC: _cairo_surface_show_glyphs
(cairo-surface.c:2086)
- ==13745== by 0x4A1FCC8: _cairo_meta_surface_replay_internal
+ ==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
+ ==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
+ ==13745== by 0x4A14BDF: cairo_surface_show_page
(cairo-surface.c:1702)
- ==13745== by 0x49FF661: cairo_show_page (cairo.c:2155)
- ==13745== by 0xA267D97:
+ ==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()
+ ==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*)
+ ==13745== by 0x436401D: CairoFontEngine::getFont(GfxFont*, XRef*)
(CairoFontEngine.cc:335)
- ==13745== by 0x4366915: CairoOutputDev::updateFont(GfxState*)
+ ==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)
+ ==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)
+ ==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
@@ -43452,7 +45468,7 @@
commit 5f60843824582ece36d806508ec388330ddee854
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Apr 8 00:30:57 2008 +0200
+Date: Tue Apr 8 00:30:57 2008 +0200
Added AnnotCoord support.
@@ -43466,7 +45482,7 @@
commit a6f70f465a3e6719d63cefbe3c27bae015be43c1
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 6 13:12:01 2008 +0200
+Date: Sun Apr 6 13:12:01 2008 +0200
add getters for the coordinates in an AnnotLine
@@ -43475,7 +45491,7 @@
commit 1d83d6edf9a843335e37a4d1e0e0dd71eb23d93b
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 6 12:24:42 2008 +0200
+Date: Sun Apr 6 12:24:42 2008 +0200
[Qt4] the caret symbol is an enum value, now
@@ -43485,7 +45501,7 @@
commit 229d991a3258cb9b56f5e00f2deb3c976253cf68
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 6 12:23:04 2008 +0200
+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
@@ -43496,7 +45512,7 @@
commit fc24500ddd9182f97d23c46eaafc6be79a6721eb
Author: Pino Toscano <pino at kde.org>
-Date: Sun Apr 6 11:43:49 2008 +0200
+Date: Sun Apr 6 11:43:49 2008 +0200
propetly initialise a couple of members; leak less
@@ -43505,7 +45521,7 @@
commit 9409de1e7c5b3770c7ef00c01ee376953dd532a5
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Apr 6 01:38:25 2008 +0200
+Date: Sun Apr 6 01:38:25 2008 +0200
Changed AnnotFreeText RD field to the new parseDiffRectangle.
@@ -43516,7 +45532,7 @@
commit 28c5ee2e9fc2a24d2f2efb3d74d5cf882a106239
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 23:19:33 2008 +0200
+Date: Sat Apr 5 23:19:33 2008 +0200
typo fix
@@ -43525,7 +45541,7 @@
commit ed02769688466ca72bf35d4223c3822a1245604b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 19:36:21 2008 +0200
+Date: Sat Apr 5 19:36:21 2008 +0200
read the destination of a link annotation
@@ -43535,7 +45551,7 @@
commit ca31bf12a9d70bac88e457f7799e9935aba58640
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 16:48:53 2008 +0200
+Date: Sat Apr 5 16:48:53 2008 +0200
variable forgotten in the copy&paste...
@@ -43544,7 +45560,7 @@
commit 4168daa141b76e5fcd07d046aca8dac2f3037ff9
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 16:34:12 2008 +0200
+Date: Sat Apr 5 16:34:12 2008 +0200
[Qt4] deserialize also CaretAnnotation's
@@ -43553,7 +45569,7 @@
commit b55bcc2aa95825863bef23ab96364b350a49949d
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 16:31:31 2008 +0200
+Date: Sat Apr 5 16:31:31 2008 +0200
[Qt4] first version of a CaretAnnotation.
@@ -43564,7 +45580,7 @@
commit 4c9a02b7e49666efe10fdc16e7a03d8d520b65ec
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 16:01:58 2008 +0200
+Date: Sat Apr 5 16:01:58 2008 +0200
First version of AnnotCaret.
@@ -43574,7 +45590,7 @@
commit d260fe9e514c667b66969b982119429cc922eb07
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 15:54:29 2008 +0200
+Date: Sat Apr 5 15:54:29 2008 +0200
isolate the code for parsing a "difference rectangle" in an own
function
@@ -43585,7 +45601,7 @@
commit 760833e409c122c0a61f7c87fd3133eebc10b402
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 15:36:43 2008 +0200
+Date: Sat Apr 5 15:36:43 2008 +0200
First version of AnnotGeometry.
@@ -43596,7 +45612,7 @@
commit 95d9d2362534c0524ad0448818b2d69b0909d482
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 03:23:00 2008 +0200
+Date: Sat Apr 5 03:23:00 2008 +0200
finally, load the QuadPoints correctly
@@ -43609,7 +45625,7 @@
commit af1ffcbcec1730332d11f8da4a7ddac833b22408
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 02:54:00 2008 +0200
+Date: Sat Apr 5 02:54:00 2008 +0200
More robust reading of QuadPoints (reset the allocated memory,
use the heap)
@@ -43619,7 +45635,7 @@
commit 68fd98d69bac20282665cf6b824da30c3b310f0b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 02:51:41 2008 +0200
+Date: Sat Apr 5 02:51:41 2008 +0200
Really implement AnnotTextMarkup.
@@ -43629,7 +45645,7 @@
commit 69a2ecfaf8f8cffd3027db5c3cc88c41413e42f1
Author: Pino Toscano <pino at kde.org>
-Date: Sat Apr 5 01:38:28 2008 +0200
+Date: Sat Apr 5 01:38:28 2008 +0200
Add the Stamp annotation type.
@@ -43639,7 +45655,7 @@
commit 97be4332818bcf58461816be995d88926809a4e5
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Fri Apr 4 23:49:12 2008 +0200
+Date: Fri Apr 4 23:49:12 2008 +0200
Updated glib bindings.
@@ -43652,7 +45668,7 @@
commit 5caac407cdaf58621ac27e5561b31a995404ccb3
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Fri Apr 4 23:36:46 2008 +0200
+Date: Fri Apr 4 23:36:46 2008 +0200
Fixed icon name in AnnotText.
@@ -43664,7 +45680,7 @@
commit 0b714a61383da1b62daf2a60e3f6fcda09b4e9f2
Author: Adam Batkin <adam at batkin.net>
-Date: Thu Apr 3 20:02:52 2008 +0200
+Date: Thu Apr 3 20:02:52 2008 +0200
FindFirstFile returns INVALID_HANDLE_VALUE and not NULL on error
@@ -43673,7 +45689,7 @@
commit be765f27cc5430d9bb2a3e113eb245d67c20a376
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Mar 31 12:37:33 2008 +0200
+Date: Mon Mar 31 12:37:33 2008 +0200
[glib] Fix a crash in outline demo due to page_num == dest_page_num
- 1
@@ -43683,7 +45699,7 @@
commit e991e9ac6fcc0b6928b96fe8326eebcf3cb720ca
Author: Albert Astals Cid <tsdgeos at localhost.(none)>
-Date: Sat Mar 29 13:25:52 2008 +0100
+Date: Sat Mar 29 13:25:52 2008 +0100
Add the export macro
@@ -43692,21 +45708,21 @@
commit b70ca35dce6da6efdff254c11a63de4f44228278
Author: Albert Astals Cid <tsdgeos at localhost.(none)>
-Date: Sat Mar 29 00:30:31 2008 +0100
+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/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
+ 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 at gmail.com>
-Date: Wed Mar 26 23:56:49 2008 +0100
+Date: Wed Mar 26 23:56:49 2008 +0100
Improved glib annot demo.
@@ -43718,7 +45734,7 @@
commit 7cc8fd70f68d2cdab7ab83a0ecf6c8896c971d62
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 21:03:34 2008 +0100
+Date: Wed Mar 26 21:03:34 2008 +0100
remove damn error
@@ -43728,7 +45744,7 @@
commit 7a47ff3b54678a3de6964d25050e02186484f39a
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 21:00:32 2008 +0100
+Date: Wed Mar 26 21:00:32 2008 +0100
[Qt4] Add support for JavaScript links, and create them when present.
@@ -43741,17 +45757,17 @@
commit a6f2c10ee01ee62ae945b50f6b6eae380377fe03
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 20:59:21 2008 +0100
+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 ++++++++
+ qt4/src/poppler-qt4.h | 8 ++++++++
2 files changed, 23 insertions(+)
commit b8a471e55b998836c09c65ff736afdef8ac55189
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 20:56:01 2008 +0100
+Date: Wed Mar 26 20:56:01 2008 +0100
Add support for JavaScript actions, and read them when found.
@@ -43761,7 +45777,7 @@
commit 2fd85dc1b8b2ababadfc60e285c08a844737e4bb
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 20:53:42 2008 +0100
+Date: Wed Mar 26 20:53:42 2008 +0100
Read the JavaScript codes in the NameTree of the Catalog.
@@ -43771,7 +45787,7 @@
commit 312f14f5b7be1f0d62620477222919423c3869e0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 20:05:31 2008 +0100
+Date: Wed Mar 26 20:05:31 2008 +0100
compile++
@@ -43780,19 +45796,19 @@
commit 5bd750062e1fb136f77a55d1f35b2d6fabaad1b3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 26 19:42:43 2008 +0100
+Date: Wed Mar 26 19:42:43 2008 +0100
update version
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
+ 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 at kde.org>
-Date: Wed Mar 26 19:42:36 2008 +0100
+Date: Wed Mar 26 19:42:36 2008 +0100
fill news
@@ -43801,7 +45817,7 @@
commit 2069826d61ebd527768b6455689276c0a8288085
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 16:05:06 2008 +0100
+Date: Wed Mar 26 16:05:06 2008 +0100
missing break
@@ -43810,7 +45826,7 @@
commit d6a0c6a6803a03f402c2dcde41c6195e951470ba
Author: Pino Toscano <pino at kde.org>
-Date: Wed Mar 26 15:50:39 2008 +0100
+Date: Wed Mar 26 15:50:39 2008 +0100
initialize posterStream to avoid crashing later
@@ -43819,7 +45835,7 @@
commit 0be811b3ad86b1cb14be94a017e70c65b8e64730
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 25 22:59:22 2008 +0100
+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
@@ -43829,22 +45845,22 @@
commit 0222c6ceb0fcf1d7c4422691a68a035a558ad614
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 24 17:14:07 2008 +0100
+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 +
+ 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 +-
+ 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 at kde.org>
-Date: Mon Mar 24 15:10:31 2008 +0100
+Date: Mon Mar 24 15:10:31 2008 +0100
fix some cmake HAVE_foo
@@ -43853,7 +45869,7 @@
commit 22f615aee488cc363a078330861e80f389f47061
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Mar 23 13:22:07 2008 +0100
+Date: Sun Mar 23 13:22:07 2008 +0100
Fixed wrong functions.
@@ -43864,7 +45880,7 @@
commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 19:12:05 2008 +0100
+Date: Sat Mar 22 19:12:05 2008 +0100
Fix rm line not to error when no *moc file is present
@@ -43874,7 +45890,7 @@
commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 19:11:17 2008 +0100
+Date: Sat Mar 22 19:11:17 2008 +0100
Fix rm line not to error if no *moc file is present
@@ -43883,7 +45899,7 @@
commit d9d52e622c6b28a9941168bb73839ec335ca7232
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 19:10:40 2008 +0100
+Date: Sat Mar 22 19:10:40 2008 +0100
Fix configure to not require gdk when we are on try mode
@@ -43892,7 +45908,7 @@
commit 9b8809298dd16cdbffcc12b6db8e274578934063
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 15:49:02 2008 +0100
+Date: Sat Mar 22 15:49:02 2008 +0100
It's really only an error if < 0
@@ -43901,7 +45917,7 @@
commit 0fb1e697cc4100ce23298141c8b5829273872423
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 15:46:44 2008 +0100
+Date: Sat Mar 22 15:46:44 2008 +0100
remove unneeded variable
@@ -43910,21 +45926,21 @@
commit 3404cb626ee9b4520d6fe601e07560745a4cb42a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 15:44:50 2008 +0100
+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 -----
+ poppler/Stream.cc | 5 -----
+ poppler/Stream.h | 5 -----
qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
- qt4/src/poppler-qiodeviceoutstream.cc | 5 -----
+ qt4/src/poppler-qiodeviceoutstream.cc | 5 -----
4 files changed, 16 deletions(-)
commit 066595dd06c930997d5ec65a06c822616af9baa0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 22 15:43:07 2008 +0100
+Date: Sat Mar 22 15:43:07 2008 +0100
Check the document stream is seekable when opening it
@@ -43935,7 +45951,7 @@
commit 23b6475463f8973b5ac83bb21a6b7b6000cc435b
Author: Ed Avis <eda at waniasset.com>
-Date: Sat Mar 22 13:55:59 2008 +0100
+Date: Sat Mar 22 13:55:59 2008 +0100
Check for fseek return values
@@ -43945,7 +45961,7 @@
commit b33bb282e45cf1a083cfbb13603ac465d386c28d
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Fri Mar 21 13:53:21 2008 +0100
+Date: Fri Mar 21 13:53:21 2008 +0100
Fixed poppler glib public api.
@@ -43957,7 +45973,7 @@
commit 371932f413d570d7784c668f30834d3d92d7aa80
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 20 11:44:32 2008 +0100
+Date: Thu Mar 20 11:44:32 2008 +0100
[glib] Remove unused variable.
@@ -43966,13 +45982,13 @@
commit 21fa476ac384256c15a954b708e009f2b336b06f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Mar 20 11:42:32 2008 +0100
+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-page.cc | 60
+++++++++++++++++++++++++++--------------------
glib/poppler-private.h | 3 ---
glib/test-poppler-glib.cc | 9 ++++++-
@@ -43980,7 +45996,7 @@
commit 22cd70d8fc308fb8b19d36d0172014ba532230fb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 19 21:52:14 2008 +0100
+Date: Wed Mar 19 21:52:14 2008 +0100
poppler_annot_markup_get_opacity returns a double so use %f
@@ -43989,17 +46005,17 @@
commit b9a5fd4671638caa91f8a389be278d993391f499
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 19 21:28:49 2008 +0100
+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 +++
+ glib/reference/tmpl/poppler.sgml | 3 +++
2 files changed, 4 insertions(+)
commit b7e0b740578ea1e84ac0ef850b5a03c66b2863e3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 19 21:28:01 2008 +0100
+Date: Wed Mar 19 21:28:01 2008 +0100
Fill 0.7.3 news
@@ -44008,19 +46024,19 @@
commit 3adaff1dad8127fdd06653cf49196027ad414a08
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 19 21:27:46 2008 +0100
+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 +++---
+ 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 at gnome.org>
-Date: Wed Mar 19 18:35:35 2008 +0100
+Date: Wed Mar 19 18:35:35 2008 +0100
[glib] Update outline and links demos to the new POPPLER_ACTION_NONE
@@ -44029,27 +46045,27 @@
commit 6a22f0a20df38156c06e8ba10649e0828a1da102
Author: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
-Date: Wed Mar 19 18:32:48 2008 +0100
+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 +
+ glib/poppler-action.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit 185d5818fd546f85934b041d5b0cdcdf1849b1dc
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 18 20:08:21 2008 +0100
+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 ++++-
+ glib/poppler.h | 5 ++++-
2 files changed, 32 insertions(+), 13 deletions(-)
commit 9bba2748985049515bfd9c9b44f26b92fa704078
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 15 01:11:39 2008 +0100
+Date: Sat Mar 15 01:11:39 2008 +0100
Some more free
@@ -44058,7 +46074,7 @@
commit bfc308935fa138e27c4d2ad0e1c1cad20eba8e8a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 15 01:05:32 2008 +0100
+Date: Sat Mar 15 01:05:32 2008 +0100
Use error instead of printf
@@ -44067,7 +46083,7 @@
commit 998b1523ee653c1585f03b4a580e0d95ba694aca
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Mar 15 01:02:31 2008 +0100
+Date: Sat Mar 15 01:02:31 2008 +0100
Some free
@@ -44076,7 +46092,7 @@
commit c65a66a82259f547927cbb918611bcf4a8e264b2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 14 20:29:53 2008 +0100
+Date: Fri Mar 14 20:29:53 2008 +0100
xx0 is non exclusive so that should be < not <=
@@ -44087,7 +46103,7 @@
commit bd2272f3079319d1c05ca93f7fb6eb0a5370b938
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Mar 14 19:52:04 2008 +0100
+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
@@ -44099,7 +46115,7 @@
commit 5bf8d864e68854f0855e07fb67aa124e06c739cd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 12 22:48:07 2008 +0100
+Date: Wed Mar 12 22:48:07 2008 +0100
fix build
@@ -44108,20 +46124,20 @@
commit d0be5c86dcd3310062d820b3515c31e4720af2ca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 12 22:40:59 2008 +0100
+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 +++---
+ 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 at kde.org>
-Date: Wed Mar 12 22:38:57 2008 +0100
+Date: Wed Mar 12 22:38:57 2008 +0100
update soname here too
@@ -44130,43 +46146,43 @@
commit f5065016b168e4896e2fe774cd22bbd900849b52
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Mar 12 22:06:53 2008 +0100
+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
+ 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 +-
+ 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 at kde.org>
-Date: Wed Mar 12 20:35:33 2008 +0100
+Date: Wed Mar 12 20:35:33 2008 +0100
Increment version of libpoppler and libpoppler-qt4
- CMakeLists.txt | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 2 +-
+ poppler/Makefile.am | 2 +-
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 12 20:34:48 2008 +0100
+Date: Wed Mar 12 20:34:48 2008 +0100
Init to false updated field of XRefEntries plus indenting fixes
@@ -44175,7 +46191,7 @@
commit 6a671686c6265ecdb4c48f04392de9c56d4e0936
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Wed Mar 12 21:43:12 2008 +1030
+Date: Wed Mar 12 21:43:12 2008 +1030
Fix regression in cairo output when transforming ctm
@@ -44194,7 +46210,7 @@
commit 0b2c3bb25c908b07e760d824dbfe93c6051812aa
Merge: 362fe01 9c472f7
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Wed Mar 12 00:23:58 2008 +0100
+Date: Wed Mar 12 00:23:58 2008 +0100
Merge branch 'master' of
ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
@@ -44201,7 +46217,7 @@
commit 362fe013c0d96698b52d70cf5226cddca7fe52d4
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Wed Mar 12 00:07:12 2008 +0100
+Date: Wed Mar 12 00:07:12 2008 +0100
Enabled back the AnnotWidget support.
@@ -44212,7 +46228,7 @@
commit 9c472f76d2462d0e775c851fdbac6ca2bc9812ea
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 12 00:00:20 2008 +0100
+Date: Wed Mar 12 00:00:20 2008 +0100
cmake build
@@ -44221,7 +46237,7 @@
commit 821858f5c36786955d9475044bfee57f5060ad2f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 11 23:58:05 2008 +0100
+Date: Tue Mar 11 23:58:05 2008 +0100
Return char bounding box instead of edge, it's much more useful for
character positioning
@@ -44228,7 +46244,7 @@
qt4/src/poppler-page.cc | 8 ++++++--
qt4/src/poppler-private.h | 3 +--
- qt4/src/poppler-qt4.h | 6 ++----
+ qt4/src/poppler-qt4.h | 6 ++----
qt4/src/poppler-textbox.cc | 4 ++--
4 files changed, 11 insertions(+), 10 deletions(-)
@@ -44235,7 +46251,7 @@
commit d7e642732ced592362d9787bddadb7a110dcc5a5
Merge: 3642f0c 2d6c605
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Mar 11 23:41:59 2008 +0100
+Date: Tue Mar 11 23:41:59 2008 +0100
Merge branch 'master' of
ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
@@ -44242,7 +46258,7 @@
commit 3642f0c48bc49cd4d698e769544c1d8604c6482f
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Mar 11 23:13:33 2008 +0100
+Date: Tue Mar 11 23:13:33 2008 +0100
glib annots demo.
@@ -44257,7 +46273,7 @@
commit 2d6c60537317bd3ac9e0582e0da09e7365729097
Author: Pino Toscano <pino at kde.org>
-Date: Tue Mar 11 22:54:44 2008 +0100
+Date: Tue Mar 11 22:54:44 2008 +0100
For now we cannot handle MovieLink's, so comment them out.
@@ -44268,7 +46284,7 @@
commit a354f7198c493990613a1db131c662ec27948863
Author: Hugo Mercier <hmercier31 at gmail.com>
-Date: Tue Mar 11 22:49:00 2008 +0100
+Date: Tue Mar 11 22:49:00 2008 +0100
Initial Movie support (2)
@@ -44282,7 +46298,7 @@
commit 43e5dd941d4bc35c4eebbad66c13235639e0c1a0
Merge: aab1768 4fdd254
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 11 22:31:22 2008 +0100
+Date: Tue Mar 11 22:31:22 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -44289,7 +46305,7 @@
commit 4fdd254370ea6055e95c8ebee51b69e06c501714
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Mar 11 22:31:00 2008 +0100
+Date: Tue Mar 11 22:31:00 2008 +0100
Fix build
@@ -44298,22 +46314,22 @@
commit aab17684dc3f21ff2b1ee6eacdc0c565d368df78
Author: Hugo Mercier <hmercier31 at gmail.com>
-Date: Tue Mar 11 22:28:28 2008 +0100
+Date: Tue Mar 11 22:28:28 2008 +0100
Initial Movie support
- CMakeLists.txt | 2 +
+ CMakeLists.txt | 2 +
poppler/Annot.cc | 316
+++++++++++++++++++++++++++++++++++++++++++++++++++-
poppler/Annot.h | 125 +++++++++++++++++++++
poppler/Link.cc | 108 +++++++++++++++---
- poppler/Link.h | 64 ++++++++++-
- poppler/Makefile.am | 2 +
+ poppler/Link.h | 64 ++++++++++-
+ poppler/Makefile.am | 2 +
6 files changed, 591 insertions(+), 26 deletions(-)
commit 13a0d2390b9e4684af070c213f385485715353df
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 11 22:27:38 2008 +0100
+Date: Tue Mar 11 22:27:38 2008 +0100
Add poppler-annot to the cmake build system
@@ -44322,23 +46338,23 @@
commit 19f0e3b40bce4d8157d8c8bd04eaf6bacbef38b8
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Mar 11 22:09:04 2008 +0100
+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/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-annot.h | 181 ++++++++++++
+ glib/poppler-page.cc | 166 +++++++++++
+ glib/poppler-page.h | 15 +
glib/poppler-private.h | 5 +-
- glib/poppler.h | 7 +
+ glib/poppler.h | 7 +
7 files changed, 1151 insertions(+), 1 deletion(-)
commit 6fa3ab20fee311b4aff92be18870fd0e1730a81f
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Tue Mar 11 18:44:27 2008 +0100
+Date: Tue Mar 11 18:44:27 2008 +0100
Changed AnnotMarkup inheritance
@@ -44348,7 +46364,7 @@
commit 3111cfe2ccb32f9680baaad0c3f0678dd5969f8b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 10 22:12:36 2008 +0100
+Date: Mon Mar 10 22:12:36 2008 +0100
And free the memory
@@ -44357,7 +46373,7 @@
commit 58f88c23402ac2e678dc655f64d93d89bb1812be
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 10 22:08:43 2008 +0100
+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
@@ -44369,7 +46385,7 @@
commit 94ceb3cae79dc7786fa59fd889a87160780ed5df
Merge: 0f9e843 35f34bd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 9 23:34:11 2008 +0100
+Date: Sun Mar 9 23:34:11 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -44376,7 +46392,7 @@
commit 0f9e84302ac2108f05bdbb10e7e57ae19ad1e9f3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 9 23:33:11 2008 +0100
+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
@@ -44388,7 +46404,7 @@
commit 35f34bd44c74eeb76a58b30acfbb0303d7285f06
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Mar 9 17:38:54 2008 +0100
+Date: Sun Mar 9 17:38:54 2008 +0100
Fix build when compiling without cairo support
@@ -44397,7 +46413,7 @@
commit 32637db19dd80a9b8452f86eb677b10e77290627
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 9 00:57:08 2008 +0100
+Date: Sun Mar 9 00:57:08 2008 +0100
proper lib64 Qt detection
@@ -44408,7 +46424,7 @@
commit 65a88a95a5c54c890048e8a986df361585d601dd
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 8 03:11:36 2008 +0100
+Date: Sat Mar 8 03:11:36 2008 +0100
Provide the mime type for an embedded file, if known.
@@ -44415,13 +46431,13 @@
Adapt the unit test for that.
qt4/src/poppler-embeddedfile.cc | 5 +++++
- qt4/src/poppler-qt4.h | 5 +++++
+ qt4/src/poppler-qt4.h | 5 +++++
qt4/tests/check_attachments.cpp | 7 +++++++
3 files changed, 17 insertions(+)
commit 23da27a229c8b3cc2a0a0dd6354c40723934390c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Mar 8 03:10:58 2008 +0100
+Date: Sat Mar 8 03:10:58 2008 +0100
Optionally read the mimetype for the embedded files.
@@ -44431,7 +46447,7 @@
commit 42c254b978c61e2ccfda083dfeffec9fc35a5fe7
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 3 16:56:09 2008 +0100
+Date: Mon Mar 3 16:56:09 2008 +0100
be safe about out-of-range values
@@ -44440,7 +46456,7 @@
commit 5db75df77938eb7620867d0618058be52ed2d3cb
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 3 16:53:39 2008 +0100
+Date: Mon Mar 3 16:53:39 2008 +0100
initialize nicely
@@ -44449,17 +46465,17 @@
commit 3ad0ab7e4abd37528284269c69be3cdfb8d31d2e
Author: Pino Toscano <pino at kde.org>
-Date: Mon Mar 3 16:49:23 2008 +0100
+Date: Mon Mar 3 16:49:23 2008 +0100
apidox
qt4/src/poppler-link.h | 17 +++++++++++++++++
- qt4/src/poppler-qt4.h | 23 ++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h | 23 ++++++++++++++++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
commit ec01926e5a9dc16e200060497c43e79a1623698d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Mar 2 20:15:20 2008 -0500
+Date: Sun Mar 2 20:15:20 2008 -0500
Avoid setting a singular ctm
@@ -44471,7 +46487,7 @@
commit 4882d7a118b93fdb5c441d70757e485be7ee25d7
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 28 15:12:23 2008 +0100
+Date: Thu Feb 28 15:12:23 2008 +0100
printf -> qDebug
@@ -44480,7 +46496,7 @@
commit 31ce4049bf12c2716be7ec0fb8eda502d989f66e
Author: Brad Hards <bradh at saxicola.cuneata.net>
-Date: Thu Feb 28 22:09:30 2008 +1100
+Date: Thu Feb 28 22:09:30 2008 +1100
Respect PageMode for optional content and embedded files.
@@ -44494,7 +46510,7 @@
commit ff938c431799d49325c0f46f1e6cbe1033993a83
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 23:12:53 2008 +0100
+Date: Wed Feb 27 23:12:53 2008 +0100
do not forget to distribute GlobalParamsWin.cc next time
@@ -44503,7 +46519,7 @@
commit 277382b8186d137a9f2a62bc2d22e9f0cda7d923
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 22:56:33 2008 +0100
+Date: Wed Feb 27 22:56:33 2008 +0100
fix typo
@@ -44513,7 +46529,7 @@
commit 5b2f8f21fca63508570a0c77c6f7221a322e6e57
Merge: 7e65118 4254f12
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 22:10:12 2008 +0100
+Date: Wed Feb 27 22:10:12 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -44520,7 +46536,7 @@
commit 7e651186f483976f9833de245b6c7add38e77a16
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 22:03:17 2008 +0100
+Date: Wed Feb 27 22:03:17 2008 +0100
Properly enable/disable the contents when their parents are changed.
@@ -44531,7 +46547,7 @@
to their children, and so on].
qt4/src/poppler-optcontent-private.h | 8 +++++++-
- qt4/src/poppler-optcontent.cc | 37
+ qt4/src/poppler-optcontent.cc | 37
+++++++++++++++++++++++++++++++-----
2 files changed, 39 insertions(+), 6 deletions(-)
@@ -44538,7 +46554,7 @@
commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff
Merge: ed6c0c2 0569ae7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 20:44:27 2008 +0100
+Date: Wed Feb 27 20:44:27 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -44545,17 +46561,17 @@
commit 8d384c06f96ba8cb3e73c275b3c708c64da4595d
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 20:39:09 2008 +0100
+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 ++++---
+ qt4/src/poppler-optcontent.cc | 7 ++++---
2 files changed, 11 insertions(+), 5 deletions(-)
commit ed6c0c260837a0025279765ef7778b83d6ee2209
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 20:43:45 2008 +0100
+Date: Wed Feb 27 20:43:45 2008 +0100
fix build and distcheck with autools
@@ -44566,7 +46582,7 @@
commit 344d55539b1b6bcabec609fd828db372a07491b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 20:43:13 2008 +0100
+Date: Wed Feb 27 20:43:13 2008 +0100
fill the NEWS for 0.7.1
@@ -44575,13 +46591,13 @@
commit 1c47633ba782021978fa34d41a4ab0badf3af9d3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 27 20:42:55 2008 +0100
+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 +++---
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
qt4/src/Doxyfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
@@ -44588,7 +46604,7 @@
commit 0569ae76b6af1723b4606af189242a23199f387d
Merge: f395531 d8eba8c
Author: Brad Hards <bradh at kde.org>
-Date: Thu Feb 28 06:26:09 2008 +1100
+Date: Thu Feb 28 06:26:09 2008 +1100
Merge branch 'master' of
ssh://bradh@git.freedesktop.org/git/poppler/poppler
@@ -44595,7 +46611,7 @@
commit d8eba8c10834116b4f0f295375805172f5216993
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 19:07:46 2008 +0100
+Date: Wed Feb 27 19:07:46 2008 +0100
export the OptContentModel
@@ -44604,7 +46620,7 @@
commit 0445e64a4124af7c1b84673f237022e133eb8542
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 19:04:03 2008 +0100
+Date: Wed Feb 27 19:04:03 2008 +0100
make only the Document able to create OptContentsModel's
@@ -44613,18 +46629,18 @@
commit c965437b67a4f97ee8365a217bd10406fba3767a
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 18:58:31 2008 +0100
+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 ----
+ 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 at kde.org>
-Date: Wed Feb 27 18:50:35 2008 +0100
+Date: Wed Feb 27 18:50:35 2008 +0100
small cleanup
@@ -44633,7 +46649,7 @@
commit f11aa0008585e845ce509172d76f72f941be497d
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 18:44:09 2008 +0100
+Date: Wed Feb 27 18:44:09 2008 +0100
adapt the tests to the new layout of the contents model
@@ -44643,17 +46659,17 @@
commit 4a324484b5c77ddc348746e7bcf6051ade28e389
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 18:04:52 2008 +0100
+Date: Wed Feb 27 18:04:52 2008 +0100
free some objects (thus leak less)
- poppler/Gfx.cc | 2 ++
+ poppler/Gfx.cc | 2 ++
poppler/OptionalContent.cc | 2 ++
2 files changed, 4 insertions(+)
commit 0f4e7791ab6884072a1aee56e9cec212d8cea263
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 15:58:21 2008 +0100
+Date: Wed Feb 27 15:58:21 2008 +0100
ignore any generated .moc here
@@ -44662,30 +46678,30 @@
commit 136ae44f155b17d9e8b041b67f75531d8544337c
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 15:56:09 2008 +0100
+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
+ qt4/src/poppler-optcontent.cc | 38
++++++++++++++++++++++++++++--------
2 files changed, 32 insertions(+), 10 deletions(-)
commit b73e2afef7e5e1b68d82a10c94bca3c201c5f8b3
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 15:52:06 2008 +0100
+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 +++++++++----------
+ qt4/src/poppler-optcontent.cc | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
commit 803787f763578320aa5f405ed49c64e6b924bad3
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 15:30:18 2008 +0100
+Date: Wed Feb 27 15:30:18 2008 +0100
compile with the autotools
@@ -44696,17 +46712,17 @@
commit 0b527a8ed62677bb09df4587f072a310c2959750
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 14:34:13 2008 +0100
+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 ++++++-
+ qt4/src/poppler-optcontent.cc | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit c94d6cc95c6838f31e27832cb3090389bf4d8227
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 14:30:26 2008 +0100
+Date: Wed Feb 27 14:30:26 2008 +0100
Make index(), data() and setData() more safe.
@@ -44713,12 +46729,12 @@
Errors spotted using ModelTest.
qt4/src/poppler-optcontent-private.h | 2 +-
- qt4/src/poppler-optcontent.cc | 15 +++++++++------
+ qt4/src/poppler-optcontent.cc | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
commit b8e833733d84eaa93d6bae522710feb3075ca329
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 14:05:19 2008 +0100
+Date: Wed Feb 27 14:05:19 2008 +0100
fix build with the autotools
@@ -44727,7 +46743,7 @@
commit f89ba474bae281f1cdeddb72ac8425dee1087e35
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 13:28:50 2008 +0100
+Date: Wed Feb 27 13:28:50 2008 +0100
Put the check states of the optional contents in the same column as
the name.
@@ -44742,7 +46758,7 @@
commit defa0ecb2790402a4069fea3b3c285a50675682d
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 12:24:16 2008 +0100
+Date: Wed Feb 27 12:24:16 2008 +0100
Add a skeleton of OptContentModel::headerData().
@@ -44754,7 +46770,7 @@
commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57
Author: Brad Hards <bradh at kde.org>
-Date: Wed Feb 27 22:22:51 2008 +1100
+Date: Wed Feb 27 22:22:51 2008 +1100
Minor cleanup.
@@ -44763,7 +46779,7 @@
commit 0a19486cb4de57c0c987cc4ce2434a96bbd18338
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 12:15:44 2008 +0100
+Date: Wed Feb 27 12:15:44 2008 +0100
refresh the current page when the data of the content model change
@@ -44773,41 +46789,41 @@
commit 09b7cc2efb7d21fa4dabd23d2d2de877cc7d86ee
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 12:15:18 2008 +0100
+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 +
+ qt4/demos/documentobserver.h | 1 +
2 files changed, 6 insertions(+)
commit 39fe905be8f2ae79d9c26cd87547f3ea2608411e
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 12:00:29 2008 +0100
+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/Makefile.am | 3 +++
qt4/demos/optcontent.cpp | 55
++++++++++++++++++++++++++++++++++++++++++++++++
qt4/demos/optcontent.h | 43 +++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++++
+ qt4/demos/viewer.cpp | 7 ++++++
5 files changed, 109 insertions(+)
commit f17dd5539501a996479b903ac9b8aceb3c4cfafe
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 11:53:32 2008 +0100
+Date: Wed Feb 27 11:53:32 2008 +0100
cleanup
qt4/src/poppler-optcontent-private.h | 3 ++-
- qt4/src/poppler-optcontent.h | 4 +---
+ qt4/src/poppler-optcontent.h | 4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
commit f3cc894559f10dbd4277fa9f30de9931ed69dfd4
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 27 11:43:34 2008 +0100
+Date: Wed Feb 27 11:43:34 2008 +0100
OptContentModel::itemFromRef() and OptContentItem are private API.
@@ -44815,25 +46831,25 @@
qt4/src/poppler-optcontent-private.h | 43
++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.cc | 8 +++----
- qt4/src/poppler-optcontent.h | 42
+ 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 at kde.org>
-Date: Wed Feb 27 11:28:16 2008 +0100
+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 ----
+ 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 at kde.org>
-Date: Wed Feb 27 11:06:57 2008 +0100
+Date: Wed Feb 27 11:06:57 2008 +0100
use a QPointer for the OptContentModel, so we are safe about
ownership.
@@ -44844,7 +46860,7 @@
commit 48557da71adb0fe6bd4da2fb32433796a96c3576
Author: Brad Hards <bradh at kde.org>
-Date: Wed Feb 27 19:39:18 2008 +1100
+Date: Wed Feb 27 19:39:18 2008 +1100
We need to install the optional content header.
@@ -44853,29 +46869,29 @@
commit 6e2bb03b5ef256c03a8da1cbf9bbc87c593942ad
Author: Brad Hards <bradh at kde.org>
-Date: Wed Feb 27 19:23:49 2008 +1100
+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 ++++-----------
+ 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 at kde.org>
-Date: Wed Feb 27 16:12:38 2008 +1100
+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 +++++---
+ qt4/src/poppler-qt4.h | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
commit 81891667e18fcf164af02f5f366de07f78d67c8f
Author: Brad Hards <bradh at kde.org>
-Date: Wed Feb 27 15:47:03 2008 +1100
+Date: Wed Feb 27 15:47:03 2008 +1100
Add in the initial part of the optional content support.
@@ -44888,28 +46904,28 @@
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 +
+ 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(-)
@@ -44916,7 +46932,7 @@
commit 11b70bcda905e618c199a067db6b0246612e101d
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 26 23:01:27 2008 +0100
+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)
@@ -44926,32 +46942,32 @@
commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 26 22:57:02 2008 +0100
+Date: Tue Feb 26 22:57:02 2008 +0100
install the export header
qt4/src/CMakeLists.txt | 1 +
- qt4/src/Makefile.am | 1 +
+ qt4/src/Makefile.am | 1 +
2 files changed, 2 insertions(+)
commit 4ba2e2d21710135656adbf93c5994cfb46502308
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 26 22:55:30 2008 +0100
+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-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-page-private.h | 1 -
+ qt4/src/poppler-private.h | 1 -
qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
7 files changed, 7 deletions(-)
commit 0a466c09fb70b92f39df19bc315b6575e419ad5b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 26 22:47:31 2008 +0100
+Date: Tue Feb 26 22:47:31 2008 +0100
We also need to distribute poppler-export.h
@@ -44960,32 +46976,32 @@
commit 2034d57c700049bc9a6565bbb818e1c9f4467784
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 26 22:46:29 2008 +0100
+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 +++++----
+ 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-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 ++++++
+ 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 at kde.org>
-Date: Tue Feb 26 22:42:16 2008 +0100
+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
@@ -44996,7 +47012,7 @@
commit 1778fddb36d6cb2c7f7848bee06189158f69f16e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 24 23:02:08 2008 +0100
+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
@@ -45006,7 +47022,7 @@
commit 51f171e10a42d492c8c32a5e2578d05b73d89238
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 24 22:47:46 2008 +0100
+Date: Sun Feb 24 22:47:46 2008 +0100
ignore more
@@ -45015,7 +47031,7 @@
commit adb1ccdb9265f0583cb348c456a39efac610aff1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 24 22:46:33 2008 +0100
+Date: Sun Feb 24 22:46:33 2008 +0100
ignore
@@ -45024,7 +47040,7 @@
commit 101e526c63175ffc1a75e1b68da7bb4fff9cd530
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Feb 24 20:52:41 2008 +0100
+Date: Sun Feb 24 20:52:41 2008 +0100
define snprintf to _snprintf if we are building on MSVC
@@ -45033,7 +47049,7 @@
commit f7f8ab488257c3979d20e5c0690ec5d7c2cd831b
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Feb 24 20:43:11 2008 +0100
+Date: Sun Feb 24 20:43:11 2008 +0100
define M_PI in case it is not defined
@@ -45042,7 +47058,7 @@
commit f00436b63bf9a42dcb2728a07db9c20f1f23d0bc
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Sun Feb 24 20:39:42 2008 +0100
+Date: Sun Feb 24 20:39:42 2008 +0100
Add proper dirent.h guards
@@ -45052,7 +47068,7 @@
commit e1463451c584181f918265438cf6ddcb408bf731
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 21 20:43:56 2008 +0100
+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
@@ -45062,7 +47078,7 @@
commit 88d4bbbcf828e3247454c8ba3c2fb0fb58207b6a
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Thu Feb 21 19:53:03 2008 +0100
+Date: Thu Feb 21 19:53:03 2008 +0100
If a bitmap's dimensions are invalid, do not try to display it.
@@ -45071,7 +47087,7 @@
commit 452ae6f5674b00b43955952961f7ca0583f73e27
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 21 19:46:19 2008 +0100
+Date: Thu Feb 21 19:46:19 2008 +0100
Make sure we don't draw outside the bitmap on Splash::fillGlyph2
@@ -45081,7 +47097,7 @@
commit 7f60fa806bd6d3d28917f349a2a19b52f97f593a
Author: James Cloos <cloos at jhcloos.com>
-Date: Thu Feb 21 13:00:05 2008 -0500
+Date: Thu Feb 21 13:00:05 2008 -0500
Fix typo
@@ -45092,7 +47108,7 @@
commit 053ecae534a4522d152b0139b6aed6da2059d760
Author: Carl Worth <cworth at cworth.org>
-Date: Wed Feb 20 17:21:27 2008 -0800
+Date: Wed Feb 20 17:21:27 2008 -0800
Keep cairo and cairo_shape consistent
@@ -45105,21 +47121,21 @@
commit bf6dd890994150406b4464e45355a4a99870fc60
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 21 01:23:07 2008 +0100
+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/Makefile.am | 3 +++
qt4/demos/metadata.cpp | 50
++++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/metadata.h | 43 +++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 +++++++
+ qt4/demos/metadata.h | 43 +++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 +++++++
5 files changed, 104 insertions(+)
commit b6f0c8f83924c08be20b602b128651bf018172a3
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 21 00:54:26 2008 +0100
+Date: Thu Feb 21 00:54:26 2008 +0100
Do not assign conflicting accelerators.
@@ -45128,7 +47144,7 @@
commit e0c27a968c7e7a0f6a89a050ddbfe328229f431d
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 21 00:53:24 2008 +0100
+Date: Thu Feb 21 00:53:24 2008 +0100
Apply the antialias settings w/o notify the observers.
@@ -45137,7 +47153,7 @@
commit 2c6149abcecda15c6f73a1dee537072240ddd545
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 21 00:51:21 2008 +0100
+Date: Thu Feb 21 00:51:21 2008 +0100
Add a settings menu to choose the render backend.
@@ -45147,23 +47163,23 @@
commit db2b0778dca364751a1d22294be29f8c7799e2e9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 21 00:33:23 2008 +0100
+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/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 3 ++
qt4/demos/embeddedfiles.cpp | 75
+++++++++++++++++++++++++++++++++++++++++++++
qt4/demos/embeddedfiles.h | 43 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 +++++
+ qt4/demos/viewer.cpp | 7 +++++
5 files changed, 129 insertions(+)
commit 51fba47ccb12a66282769fc504bac4c9f5123f75
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 17 01:49:59 2008 +0100
+Date: Sun Feb 17 01:49:59 2008 +0100
clear the page label when the document is closed
@@ -45172,7 +47188,7 @@
commit e964e2b9fbbe9b52b137ecd06729a06530835227
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Tue Feb 19 23:22:55 2008 +0100
+Date: Tue Feb 19 23:22:55 2008 +0100
Allow grouped checkboxes to be selected individually.
@@ -45194,17 +47210,17 @@
commit 702fdd6c56b5369554c683d8c8e0e2c66e80886c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 00:18:04 2008 +0100
+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 +-
+ glib/reference/tmpl/poppler-page.sgml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 9e13b91ba38c20989d283588e73490a1601f5bb0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Feb 19 00:10:24 2008 +0100
+Date: Tue Feb 19 00:10:24 2008 +0100
distribute the headers too
@@ -45213,15 +47229,15 @@
commit 194e0ced7c38514ec3126666531862e3b29b4b77
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 23:34:06 2008 +0100
+Date: Mon Feb 18 23:34:06 2008 +0100
Fill NEWS and increase version number to 0.7
CMakeLists.txt | 2 +-
- NEWS | 96
+ NEWS | 96
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 ++--
+ configure.ac | 2 +-
+ msvc/config.h | 6 ++--
qt4/src/Doxyfile | 2 +-
5 files changed, 102 insertions(+), 6 deletions(-)
@@ -45228,7 +47244,7 @@
commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95
Merge: 51f0cea 7f4acb8
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 18 21:30:42 2008 +0100
+Date: Mon Feb 18 21:30:42 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45235,7 +47251,7 @@
commit 51f0cea0e3ba1acfc63877752e950fdd8c07e258
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 18 21:29:41 2008 +0100
+Date: Mon Feb 18 21:29:41 2008 +0100
make the poppler_qt4viewer compile with the auto"tools"
@@ -45244,7 +47260,7 @@
commit 7f4acb879d300e18dfaff768027c88195d7d8f1b
Author: Timothy Lee <timothy.lee at siriushk.com>
-Date: Mon Feb 18 20:56:35 2008 +0100
+Date: Mon Feb 18 20:56:35 2008 +0100
Implement ImageOutputDev::drawMaskedImage and
ImageOutputDev::drawSoftMaskedImage so all images are exported when
@@ -45256,7 +47272,7 @@
commit 064b316648e35416bb49336639da1d8d288d1ecf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 18 20:17:37 2008 +0100
+Date: Mon Feb 18 20:17:37 2008 +0100
xref can be null so check for it before checking we went out of bounds
@@ -45267,7 +47283,7 @@
commit b287b611b1c7b7dd00e12518cee3a6c35044e161
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 17 01:21:07 2008 +0100
+Date: Sun Feb 17 01:21:07 2008 +0100
Really niptick: help menu with about dialog for us and Qt.
@@ -45277,7 +47293,7 @@
commit 6400254fdabf3d0d32f27ebd00faa6958be62019
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 17 01:12:27 2008 +0100
+Date: Sun Feb 17 01:12:27 2008 +0100
Add a title to the viewer :)
@@ -45286,7 +47302,7 @@
commit b363c0568c9c61e7ee8ed86d808f0eed0b93b525
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 17 01:09:57 2008 +0100
+Date: Sun Feb 17 01:09:57 2008 +0100
Add the possibility to save a copy of the file.
@@ -45296,21 +47312,21 @@
commit 42987dcdd8d7432145f78cfc550f0c099e6e7311
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 17 00:33:01 2008 +0100
+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/Makefile.am | 1 +
qt4/demos/permissions.cpp | 77
+++++++++++++++++++++++++++++++++++++++++++++++
qt4/demos/permissions.h | 43 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 +++++
+ qt4/demos/viewer.cpp | 7 +++++
5 files changed, 129 insertions(+)
commit 9d1dda64de1d9e3f6fc81e40a0c2246a6270dfa8
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 23:56:17 2008 +0100
+Date: Sat Feb 16 23:56:17 2008 +0100
Add settings for antialias.
@@ -45320,21 +47336,21 @@
commit 3abb8703d7d8b7a5fbcbb3c19d8e84d640abe88c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 22:25:11 2008 +0100
+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/Makefile.am | 1 +
+ qt4/demos/toc.cpp | 90
++++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/toc.h | 43 +++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++
+ qt4/demos/toc.h | 43 +++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++
5 files changed, 142 insertions(+)
commit 80925f06d125ebfc9909e36bdbe5d37fd0e48bdc
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 21:51:10 2008 +0100
+Date: Sat Feb 16 21:51:10 2008 +0100
Adapt the Fonts and Info docks to the new abstract info dock.
@@ -45346,20 +47362,20 @@
commit c03531d691e56aba2b4c6538cf9e2463e1e0aa29
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 21:43:19 2008 +0100
+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/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
qt4/demos/abstractinfodock.cpp | 57
++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/abstractinfodock.h | 48 +++++++++++++++++++++++++++++++++++
+ qt4/demos/abstractinfodock.h | 48 +++++++++++++++++++++++++++++++++++
4 files changed, 107 insertions(+)
commit 0f7d51c7fc2439ee9392c166576c341238f00f36
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 18:49:52 2008 +0100
+Date: Sat Feb 16 18:49:52 2008 +0100
Delete the poppler page after usage.
@@ -45368,7 +47384,7 @@
commit b41d069cdd1435ddb14b3de2986875069523c814
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 18:48:57 2008 +0100
+Date: Sat Feb 16 18:48:57 2008 +0100
Initialize the current page number correctly.
@@ -45377,21 +47393,21 @@
commit 75e516af0e72a2e3041660300e522ad00869372b
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 18:43:56 2008 +0100
+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/Makefile.am | 1 +
+ qt4/demos/fonts.cpp | 78
++++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/fonts.h | 44 +++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 +++++
+ qt4/demos/fonts.h | 44 +++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 +++++
5 files changed, 131 insertions(+)
commit 8e642d1cbd48d4790a6769287cbfd90c3bc9fc34
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 17:21:30 2008 +0100
+Date: Sat Feb 16 17:21:30 2008 +0100
Add a View menu where the dock widget toogle actions will be.
@@ -45402,21 +47418,21 @@
commit c1feb7c2b5008cc04edb3c028f888072920ce4dc
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 17:14:00 2008 +0100
+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/Makefile.am | 1 +
+ qt4/demos/info.cpp | 78
++++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/info.h | 44 +++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 5 ++++
+ qt4/demos/info.h | 44 +++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 5 ++++
5 files changed, 129 insertions(+)
commit abc9b00c6470f9f6b66c280455f544ad0ee3aa8c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 16:09:52 2008 +0100
+Date: Sat Feb 16 16:09:52 2008 +0100
Basic work in the demo PDF viewer, open documents and navigate into
the pages.
@@ -45426,33 +47442,33 @@
Both the navigation toolbar and the page view are implemented as
observers.
- qt4/demos/CMakeLists.txt | 3 ++
- qt4/demos/Makefile.am | 3 ++
+ qt4/demos/CMakeLists.txt | 3 ++
+ qt4/demos/Makefile.am | 3 ++
qt4/demos/documentobserver.cpp | 45 +++++++++++++++++++
- qt4/demos/documentobserver.h | 49 +++++++++++++++++++++
+ 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/navigationtoolbar.h | 56 +++++++++++++++++++++++
+ qt4/demos/pageview.cpp | 60 +++++++++++++++++++++++++
+ qt4/demos/pageview.h | 44 ++++++++++++++++++
+ qt4/demos/viewer.cpp | 98
+++++++++++++++++++++++++++++++++++++++--
- qt4/demos/viewer.h | 17 +++++++
+ qt4/demos/viewer.h | 17 +++++++
10 files changed, 470 insertions(+), 3 deletions(-)
commit 14c88853a5675f40efb72f3ef01f49eb06ab846c
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 00:32:30 2008 +0100
+Date: Sat Feb 16 00:32:30 2008 +0100
Compile the poppler_qt4viewer.
qt4/demos/CMakeLists.txt | 7 +++++++
- qt4/demos/Makefile.am | 12 ++++++++++--
+ qt4/demos/Makefile.am | 12 ++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
commit aeb591f015d5e7a2643ed75d872358d2b1256b99
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 16 00:31:46 2008 +0100
+Date: Sat Feb 16 00:31:46 2008 +0100
Add a very minimal base PDF viewer.
@@ -45459,28 +47475,28 @@
So minimal that it does nothing at the moment...
qt4/demos/main_viewer.cpp | 29 +++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 46
+ qt4/demos/viewer.cpp | 46
++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.h | 45
+ qt4/demos/viewer.h | 45
+++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+)
commit 8da490b090487c4c37290b63bdc9abcfaf6d6940
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 15 23:59:39 2008 +0100
+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 +-
+ configure.ac | 1 +
+ qt4/CMakeLists.txt | 1 +
+ qt4/Makefile.am | 2 +-
qt4/demos/CMakeLists.txt | 10 ++++++++++
- qt4/demos/Makefile.am | 20 ++++++++++++++++++++
+ qt4/demos/Makefile.am | 20 ++++++++++++++++++++
5 files changed, 33 insertions(+), 1 deletion(-)
commit e24b49d52a5c1716641695ee731dd49848a114d9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 14 22:21:54 2008 +0100
+Date: Thu Feb 14 22:21:54 2008 +0100
do not print it as string
@@ -45489,7 +47505,7 @@
commit 2316455864e9c900c08d051c59b9508eddcb7c34
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 14 21:02:20 2008 +0100
+Date: Thu Feb 14 21:02:20 2008 +0100
Pipe the poppler error messages through the Qt debug system.
@@ -45499,7 +47515,7 @@
commit d985d3b0cdc57370137865add2a5f3a7802109c7
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 14 14:56:18 2008 +0100
+Date: Thu Feb 14 14:56:18 2008 +0100
Use what FormWidgetText give us.
@@ -45508,7 +47524,7 @@
commit a69bd442e52f4495f8d6bfd3bb58b3ebd1be1a63
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Thu Feb 14 12:52:22 2008 +0100
+Date: Thu Feb 14 12:52:22 2008 +0100
Provide Unicode mappings for some control characters in
PDFDocEncoding.
@@ -45531,7 +47547,7 @@
commit ce17383e0ed21770b471e88f25046a64a23e7e45
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 13 20:56:39 2008 +0100
+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
@@ -45544,7 +47560,7 @@
commit 15a61cac718ae8cbf83911e299b4cfdd24cdf178
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 13 20:55:18 2008 +0100
+Date: Wed Feb 13 20:55:18 2008 +0100
add images.c
@@ -45554,7 +47570,7 @@
commit 9cfe10ab7f51d329647e102e446baaef043d8cc6
Merge: e918729 7d65b4d
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 13 20:53:43 2008 +0100
+Date: Wed Feb 13 20:53:43 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45561,7 +47577,7 @@
commit 7d65b4da1bc060aeb94d67c2ff26912cef48c030
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Feb 13 20:32:43 2008 +0100
+Date: Wed Feb 13 20:32:43 2008 +0100
Add images demo
@@ -45574,7 +47590,7 @@
commit e9187292701e72db1020f7701d0725d83eee4b00
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 13 19:41:57 2008 +0100
+Date: Wed Feb 13 19:41:57 2008 +0100
Do the one-time initialisation in initTestCase().
@@ -45583,7 +47599,7 @@
commit fb996c46e3c6b56a2c67819620000bcd804aacd6
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Wed Feb 13 18:44:41 2008 +0100
+Date: Wed Feb 13 18:44:41 2008 +0100
Major rework of text display in form fields code.
@@ -45593,7 +47609,7 @@
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
+ 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
@@ -45609,7 +47625,7 @@
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
+ identity CMap, but this is still untested. Support for more
complex CMaps
is missing.
@@ -45624,7 +47640,7 @@
commit 88c780aed4c9855f879e3c7a9f82500a859635a2
Author: Michael Vrable <mvrable at cs.ucsd.edu>
-Date: Wed Feb 13 18:42:49 2008 +0100
+Date: Wed Feb 13 18:42:49 2008 +0100
Fix what look to be a few bugs in functions for mapping to/from
Unicode.
@@ -45631,19 +47647,19 @@
- Endianness fix in pdfDocEncodingToUTF16 (previously looked to
assume a
- little-endian processor)
+ little-endian processor)
- Add support for CharCodeToUnicode::mapToCharCode for Unicode
codepoints
- above 255.
+ above 255.
poppler/CharCodeToUnicode.cc | 4 ++--
- poppler/Form.cc | 4 ++--
+ poppler/Form.cc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 7574cb71f24ce5b32427f243c39b6029fb58ec81
Merge: e798802 4e45e5c
Author: Pino Toscano <pino at kde.org>
-Date: Wed Feb 13 01:07:31 2008 +0100
+Date: Wed Feb 13 01:07:31 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45650,7 +47666,7 @@
commit 4e45e5ca4ab0ba2a6586505d80ed81f4b3426752
Author: Patrick Spendrin <ps_ml at gmx.de>
-Date: Tue Feb 12 21:41:26 2008 +0100
+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
@@ -45660,7 +47676,7 @@
commit e798802f00bff0a24ee6d1312d6c62624395865a
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 12 20:57:56 2008 +0100
+Date: Tue Feb 12 20:57:56 2008 +0100
Apidox fix: state which checksum is returned (if available).
@@ -45669,7 +47685,7 @@
commit 4e2ba70a88c40fef6775053b1cc5fa30e622cea7
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 12 11:25:34 2008 +0100
+Date: Tue Feb 12 11:25:34 2008 +0100
Free the Object after you use it.
@@ -45678,7 +47694,7 @@
commit 039545fcd2c12631c7b8aea89c35f36cb387a17a
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 12 11:13:27 2008 +0100
+Date: Tue Feb 12 11:13:27 2008 +0100
Return the siblings even for checkboxes.
@@ -45687,7 +47703,7 @@
commit fe5ee75cdf3e11e314318af12edf9d5bc8986250
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 12 11:12:01 2008 +0100
+Date: Tue Feb 12 11:12:01 2008 +0100
Initialize correctly; free your memory.
@@ -45696,7 +47712,7 @@
commit e0eff92c7067d43faa8e93baed1f061863111251
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Feb 11 20:32:41 2008 +0100
+Date: Mon Feb 11 20:32:41 2008 +0100
Update the field dict instead of the annot dict for non composed dicts
@@ -45713,7 +47729,7 @@
commit 905e6da9795fee94329022c0cafbc229055fd4f6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 10 19:22:50 2008 +0100
+Date: Sun Feb 10 19:22:50 2008 +0100
Move forms specific draw methods from Annot to AnnotWidget class
@@ -45727,7 +47743,7 @@
commit 78afbc4d7819654e8742d4457c9847ad02b73bf1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Feb 10 17:12:59 2008 +0100
+Date: Sun Feb 10 17:12:59 2008 +0100
Some code refactoring and cleanup
@@ -45746,7 +47762,7 @@
commit 5f8e2f9140ee2ede841700726b974768ec863672
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 20:16:44 2008 +0100
+Date: Mon Feb 11 20:16:44 2008 +0100
Use QVarLengthArray instead of relying on gcc-ism.
@@ -45755,7 +47771,7 @@
commit 7499764d382366823519aa13a38e1e44781c78af
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 11:57:50 2008 +0100
+Date: Mon Feb 11 11:57:50 2008 +0100
Add FormFieldButton::siblings().
@@ -45767,7 +47783,7 @@
commit 85bfa4f499a90d45b13df4d0a8760a7da6fc1532
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 02:40:37 2008 +0100
+Date: Mon Feb 11 02:40:37 2008 +0100
Small apidox fix.
@@ -45776,7 +47792,7 @@
commit ada05055c91e967dc3e2af32a2176dd12cb7fe70
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 02:27:19 2008 +0100
+Date: Mon Feb 11 02:27:19 2008 +0100
Preliminary support for "button" form fields (ie, push buttons,
check boxes, and radio buttons).
@@ -45791,7 +47807,7 @@
commit 278b33f25df418ef12798100002845a3e2ceebd3
Merge: c730b33 fdb0a4a
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 00:57:24 2008 +0100
+Date: Mon Feb 11 00:57:24 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45798,7 +47814,7 @@
commit fdb0a4a2f1d86aec7a3b0fcd4b4d48455791ecad
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Feb 10 18:47:40 2008 -0500
+Date: Sun Feb 10 18:47:40 2008 -0500
Avoid prescaling images when printing.
@@ -45808,7 +47824,7 @@
images. This way
cairo gets the full resolution image for use in the printed output.
- glib/poppler-page.cc | 1 +
+ glib/poppler-page.cc | 1 +
poppler/CairoOutputDev.cc | 3 ++-
poppler/CairoOutputDev.h | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
@@ -45815,21 +47831,21 @@
commit c730b33f1ec2032c4b8c2660738448d954eb0f7d
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 11 00:46:20 2008 +0100
+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 -
+ qt4/src/poppler-private.h | 1 -
2 files changed, 11 insertions(+), 23 deletions(-)
commit 5915e57e7785370ce305cbbb3c2fedf36886689f
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 10 03:19:18 2008 +0100
+Date: Sun Feb 10 03:19:18 2008 +0100
const & in foreach
- qt4/tests/poppler-fonts.cpp | 2 +-
+ 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 +-
@@ -45838,12 +47854,12 @@
commit d8374e0c2eb3ba05be101687e20c5fcbc42c1ad0
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 10 01:32:24 2008 +0100
+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/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 ++++++----
@@ -45852,7 +47868,7 @@
commit fa01a1115c4554b18c3462b568d76860d2fbe17b
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 10 01:09:57 2008 +0100
+Date: Sun Feb 10 01:09:57 2008 +0100
Comment out unused vars.
@@ -45862,7 +47878,7 @@
commit d3275e4263372b534c276f81d0c997ecb6675487
Merge: c2186c1 5347a97
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 9 23:57:03 2008 +0100
+Date: Sat Feb 9 23:57:03 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -45869,7 +47885,7 @@
commit c2186c1829c695c4ddb6c471ef8ad4ffa23c1b70
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 9 23:56:32 2008 +0100
+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)
@@ -45881,7 +47897,7 @@
commit 5347a97e39388ae38cf2ab9c67f953b0f7a02a13
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 18:26:41 2008 +0100
+Date: Sat Feb 9 18:26:41 2008 +0100
Add the operators for the flags we have.
@@ -45890,19 +47906,19 @@
commit 329ade4f936bf063539cdc887aaf9a1722a5b8e0
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 18:23:59 2008 +0100
+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 ++++++++++++++
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
commit afb255366d56551bdc307766199bef9c5021d3ac
Merge: 8c44b17 8cb0e75
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 17:58:49 2008 +0100
+Date: Sat Feb 9 17:58:49 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45909,7 +47925,7 @@
commit 8c44b175081983c492821858341109fee9e86b16
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 17:57:57 2008 +0100
+Date: Sat Feb 9 17:57:57 2008 +0100
Do not rely on GNU extensions, but at least use Qt.
@@ -45918,7 +47934,7 @@
commit 8cb0e75203daa01439413d1a775482b48e784baa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 9 17:56:13 2008 +0100
+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
@@ -45928,7 +47944,7 @@
commit c8f734ba4258059fa4521a4d364f62ca1632840b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 9 13:37:04 2008 +0100
+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
@@ -45939,7 +47955,7 @@
commit 5fb0c9d31c1abf2e6ad306c112fbd2a7c33d8772
Merge: 2655663 2255c85
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 9 13:15:15 2008 +0100
+Date: Sat Feb 9 13:15:15 2008 +0100
Merge branch 'master' of
ssh://carlosgc@git.freedesktop.org/git/poppler/poppler
@@ -45946,7 +47962,7 @@
commit 26556636e71d5abcbfdd1373f5576d1233532cf8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Feb 9 13:14:41 2008 +0100
+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
@@ -45953,14 +47969,14 @@
glib/poppler-document.cc | 41 ++++++++++++++++++++++++++++++++++++++++-
glib/poppler-document.h | 3 +++
- poppler/PDFDoc.cc | 38 ++++++++++++++++++++++++++++++++------
- poppler/PDFDoc.h | 4 ++++
+ poppler/PDFDoc.cc | 38 ++++++++++++++++++++++++++++++++------
+ poppler/PDFDoc.h | 4 ++++
4 files changed, 79 insertions(+), 7 deletions(-)
commit 2255c85e4939a0752083dca21984ff4398baf8d2
Merge: 5ba9287 56c9246
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 12:49:45 2008 +0100
+Date: Sat Feb 9 12:49:45 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -45967,17 +47983,17 @@
commit 5ba928762471e1ea8b81acd4644dfd3f58d18f77
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 12:48:04 2008 +0100
+Date: Sat Feb 9 12:48:04 2008 +0100
Fix placeholders in printf-like functions.
- glib/demo/page.c | 2 +-
+ 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 at kde.org>
-Date: Sat Feb 9 12:26:06 2008 +0100
+Date: Sat Feb 9 12:26:06 2008 +0100
atan operator must yield a degrees result between 0 and 360
@@ -45988,7 +48004,7 @@
commit 2a39932ae35a2716842bd2a1c3d4f9ce6b1e3dd8
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 01:31:20 2008 +0100
+Date: Sat Feb 9 01:31:20 2008 +0100
Few improvements to the password test.
@@ -46002,7 +48018,7 @@
commit cc9c124d4d859b845eebf4ca1e4397870a35fd4e
Author: Pino Toscano <pino at kde.org>
-Date: Sat Feb 9 01:09:02 2008 +0100
+Date: Sat Feb 9 01:09:02 2008 +0100
Add an unit test case for few invalid dates.
@@ -46012,7 +48028,7 @@
commit eca91761741de5b340f7a2160db5b33401feb935
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 18:42:14 2008 +0100
+Date: Fri Feb 8 18:42:14 2008 +0100
Remove unneeded headers.
@@ -46021,7 +48037,7 @@
commit 899627505a4645fb1cc7d3599adbeec449c57041
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 18:41:13 2008 +0100
+Date: Fri Feb 8 18:41:13 2008 +0100
The return value is QString, so return QString's...
@@ -46030,18 +48046,18 @@
commit a1606fa4ff438983e3a7f55dd2d10a66f72e6711
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 17:31:32 2008 +0100
+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 +-
+ qt4/src/poppler-qt4.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
commit f1ec70a83f807493dab5118761df31c0f67decad
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 17:26:41 2008 +0100
+Date: Fri Feb 8 17:26:41 2008 +0100
Remove C-ism.
@@ -46050,7 +48066,7 @@
commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 12:21:56 2008 +0100
+Date: Fri Feb 8 12:21:56 2008 +0100
Add the missing font types.
@@ -46059,7 +48075,7 @@
commit ba07963f85d777a441349e23d4c2f510e45c73be
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 12:19:04 2008 +0100
+Date: Fri Feb 8 12:19:04 2008 +0100
Be safe against self-assignment.
@@ -46068,7 +48084,7 @@
commit 834b86548e09f4b24cdb2f194299d053b9b55022
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 12:15:16 2008 +0100
+Date: Fri Feb 8 12:15:16 2008 +0100
Small apidox fix.
@@ -46077,7 +48093,7 @@
commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 02:21:32 2008 +0100
+Date: Fri Feb 8 02:21:32 2008 +0100
Pack few bools together.
@@ -46089,7 +48105,7 @@
commit 1aeba15b5eb9b30943259824678ebc9e4f56e870
Merge: a489063 22d10c1
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 01:39:16 2008 +0100
+Date: Fri Feb 8 01:39:16 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -46096,7 +48112,7 @@
commit a4890637a2c2ab1623311d9a6920e82131c2597c
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 01:36:56 2008 +0100
+Date: Fri Feb 8 01:36:56 2008 +0100
Move QStringToUnicodeGooString() and QStringToGooString() to the
private module.
@@ -46104,17 +48120,17 @@
qt4/src/poppler-document.cc | 10 ----------
qt4/src/poppler-form.cc | 15 ---------------
qt4/src/poppler-private.cc | 25 +++++++++++++++++++++++++
- qt4/src/poppler-private.h | 4 ++++
+ qt4/src/poppler-private.h | 4 ++++
4 files changed, 29 insertions(+), 25 deletions(-)
commit 5e44241c4976b819f7be6badd2d183fbfb8ee6de
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 01:30:07 2008 +0100
+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/Makefile.am | 1 +
qt4/src/poppler-private.cc | 70
++++++++++++++++++++++++++++++++++++++++++++++
qt4/src/poppler-private.h | 46 +++---------------------------
@@ -46122,24 +48138,24 @@
commit 124d92139241ad95da559d22af48254b45ac4a2e
Author: Pino Toscano <pino at kde.org>
-Date: Fri Feb 8 01:07:43 2008 +0100
+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-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 ++--
+ 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 at kde.org>
-Date: Thu Feb 7 23:38:50 2008 +0100
+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
@@ -46150,7 +48166,7 @@
commit ee9f85915feb86b54ace1a403baa13bbdd7c3966
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 7 18:07:53 2008 +0100
+Date: Thu Feb 7 18:07:53 2008 +0100
Having a PageData is mandatory.
@@ -46162,28 +48178,28 @@
commit ad4b1361f6c25359e6ddb38599bfc1e4e3e80408
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 7 18:03:30 2008 +0100
+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 ++++++++------
+ qt4/src/poppler-link-extractor.cc | 14 ++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
commit 82432dbc62a0879f4513640c2e0f594fda9347ad
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 7 17:51:50 2008 +0100
+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 ++++++++++++++-----------------------
+ qt4/src/poppler-page.cc | 37 ++++++++++++++-----------------------
2 files changed, 17 insertions(+), 23 deletions(-)
commit 8ec51f7ca518aa6a4a69f30d373722d05f50cf07
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 7 16:48:16 2008 +0100
+Date: Thu Feb 7 16:48:16 2008 +0100
Compile the stress-poppler-dir test as well.
@@ -46192,7 +48208,7 @@
commit 8a946b76ae2e7c2c5238b4e580c1c226eb457dc9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Feb 7 01:07:28 2008 +0100
+Date: Thu Feb 7 01:07:28 2008 +0100
Micro-touches to the debug messages.
@@ -46202,7 +48218,7 @@
commit c31990dfe50c7a0e3999e6d967699fce5ccb3339
Merge: 7701e2a 6d58cda
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 5 00:38:00 2008 +0100
+Date: Tue Feb 5 00:38:00 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -46209,17 +48225,17 @@
commit 7701e2a5c7d18fdaa0fa40c190e6ee0524746046
Author: Pino Toscano <pino at kde.org>
-Date: Tue Feb 5 00:37:01 2008 +0100
+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 +++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation-helper.h | 6 ++++++
+ qt4/src/poppler-annotation.cc | 31 +++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
commit 6d58cda82b0181f2cca6e9d95b15877793be0812
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 4 23:33:51 2008 +0100
+Date: Mon Feb 4 23:33:51 2008 +0100
Protect us against weird dateString values
@@ -46229,7 +48245,7 @@
commit aa0435f1544fe1adcf10173e34eaeaf2a7a703c7
Merge: b43f4e9 37600b5
Author: Pino Toscano <pino at kde.org>
-Date: Mon Feb 4 20:56:53 2008 +0100
+Date: Mon Feb 4 20:56:53 2008 +0100
Merge branch 'master' of
ssh://pino@git.freedesktop.org/git/poppler/poppler
@@ -46236,7 +48252,7 @@
commit 37600b5e848386d2c92c3dff8219c9dda16b0dca
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Feb 3 22:42:51 2008 +0100
+Date: Sun Feb 3 22:42:51 2008 +0100
Minor changes to Annot related stuff.
@@ -46251,22 +48267,22 @@
commit b43f4e9a161a1fd7b827244dc21b1bd2a6df7054
Author: Pino Toscano <pino at kde.org>
-Date: Sun Feb 3 20:32:15 2008 +0100
+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-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-link-extractor.cc | 8 ++--
+ qt4/src/poppler-page-private.h | 4 +-
+ qt4/src/poppler-page.cc | 64
++++++++++++++++----------------
- qt4/src/poppler-qt4.h | 5 +--
+ qt4/src/poppler-qt4.h | 5 +--
6 files changed, 42 insertions(+), 45 deletions(-)
commit 4e0bb0307fccefc21f74a4c5a3a0d7e8e687b550
Author: Pino Toscano <pino at draco.(none)>
-Date: Sat Feb 2 12:57:25 2008 +0100
+Date: Sat Feb 2 12:57:25 2008 +0100
Fix include guard.
@@ -46275,7 +48291,7 @@
commit 6f11ef660540fd13aad1350385beb90758ca86af
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Feb 1 23:55:37 2008 +0100
+Date: Fri Feb 1 23:55:37 2008 +0100
Fix for end condition, init ucode to 0
@@ -46284,7 +48300,7 @@
commit 1da2091807ae7f7d4d3f446953c41b4c440d4b1b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 31 23:52:20 2008 +0100
+Date: Thu Jan 31 23:52:20 2008 +0100
Ensure we don't draw outside the main bitmap on
SplashOutputDev::setSoftMask
@@ -46296,7 +48312,7 @@
commit ecabc9469b137e8251344e5502de1cbf875223b9
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 31 00:20:55 2008 +0100
+Date: Thu Jan 31 00:20:55 2008 +0100
Set RelWithDebInfo as default build type, if not specified.
@@ -46305,7 +48321,7 @@
commit 19da87a20b3906523a330e3c956903a58a3ede7f
Author: Pino Toscano <pino at kde.org>
-Date: Thu Jan 31 00:11:58 2008 +0100
+Date: Thu Jan 31 00:11:58 2008 +0100
Support the different CMake build modes.
@@ -46314,13 +48330,13 @@
The supported build types are: None (as in no type is specified on
command line), RelWithDebInfo, Release, Debug, DebugFull, Profile.
- CMakeLists.txt | 7 -------
+ CMakeLists.txt | 7 -------
cmake/modules/PopplerMacros.cmake | 29 +++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 7 deletions(-)
commit 37d2055137c310ceb217164a76814b188be3b1b2
Author: Pino Toscano <pino at draco.(none)>
-Date: Wed Jan 30 23:12:03 2008 +0100
+Date: Wed Jan 30 23:12:03 2008 +0100
Introduce the CMake-based build system.
@@ -46329,45 +48345,45 @@
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 ++
+ 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/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 ++
+ 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(+)
commit 1ea831d3eee6eda35fadfb3c75962a0c708e6c7b
Author: Pino Toscano <pino at kde.org>
-Date: Wed Jan 30 22:17:38 2008 +0100
+Date: Wed Jan 30 22:17:38 2008 +0100
Preprocessor #warning is GCC-specific.
@@ -46376,7 +48392,7 @@
commit 4c738cc6bd51f9d9e23ba83949c490c5c8691345
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 29 23:45:52 2008 +0100
+Date: Tue Jan 29 23:45:52 2008 +0100
Scale text to match 'm' size
@@ -46385,8 +48401,8 @@
poppler/SplashOutputDev.cc | 37 +++++++++++++++++++++++++++++++
splash/SplashFTFont.cc | 55
+++++++++++++++++++++++++++++++++++++++++++++-
- splash/SplashFTFont.h | 4 ++++
- splash/SplashFont.h | 4 ++++
+ splash/SplashFTFont.h | 4 ++++
+ splash/SplashFont.h | 4 ++++
splash/SplashFontFile.cc | 1 +
splash/SplashFontFile.h | 2 ++
6 files changed, 102 insertions(+), 1 deletion(-)
@@ -46393,7 +48409,7 @@
commit 64f16cf6ebf2870852fe8d937b25be58869ad40a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 29 23:41:15 2008 +0100
+Date: Tue Jan 29 23:41:15 2008 +0100
Enable antialias by default on the test tool
@@ -46402,13 +48418,13 @@
commit 90f0e6bc1e96d9f1666cb8476a92e127f5b927d4
Author: Jonathan Kew <jonathan_kew at sil.org>
-Date: Tue Jan 29 20:23:08 2008 +0100
+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 +++++
+ configure.ac | 1 -
+ goo/gmem.cc | 7 +++++++
+ goo/gmem.h | 5 +++++
poppler/GfxFont.cc | 8 +-------
4 files changed, 13 insertions(+), 8 deletions(-)
@@ -46415,7 +48431,7 @@
commit 77b91c852ad3d5554afc03aee92a1d928f233401
Merge: 0babb0e 0533696
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 28 20:44:34 2008 +0100
+Date: Mon Jan 28 20:44:34 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -46422,17 +48438,17 @@
commit 0babb0eb1afa343fb12a3fd037b98d2d1c794a1c
Author: Jonathan Kew <jonathan_kew at sil.org>
-Date: Mon Jan 28 20:42:44 2008 +0100
+Date: Mon Jan 28 20:42:44 2008 +0100
Introduce a check for strndup and alternative for systems without it
- configure.ac | 1 +
+ configure.ac | 1 +
poppler/GfxFont.cc | 6 ++++++
2 files changed, 7 insertions(+)
commit 053369678963206a4afa88a614de1994872c7c5a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 27 19:36:28 2008 +0100
+Date: Sun Jan 27 19:36:28 2008 +0100
Add ok_to_fill_form permission flag
@@ -46443,7 +48459,7 @@
commit 3085a9495ad87a54758da0024372610fdaf88d57
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Jan 27 19:15:34 2008 +0100
+Date: Sun Jan 27 19:15:34 2008 +0100
Fix slice rendering in poppler glib demo
@@ -46452,7 +48468,7 @@
commit 7ad6c4ba110b970516d5380444a03ae217496ddf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 24 21:14:44 2008 +0100
+Date: Thu Jan 24 21:14:44 2008 +0100
Incrementing the iterator would be a good idea
@@ -46461,7 +48477,7 @@
commit 7c99ec4635a4971321bbead7d1bc723da59b755e
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Thu Jan 24 19:18:15 2008 +0100
+Date: Thu Jan 24 19:18:15 2008 +0100
Revert unwanted change on Dict, fix leak on writeTrailer
@@ -46471,7 +48487,7 @@
commit 2335fb6034d2e9ec304abba400119b88302b3160
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 23 23:26:20 2008 +0100
+Date: Wed Jan 23 23:26:20 2008 +0100
Draw underlined Links correctly
@@ -46482,7 +48498,7 @@
commit 96c532ea4b56a147de1deb965126e31f87df588b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jan 23 13:30:12 2008 +0100
+Date: Wed Jan 23 13:30:12 2008 +0100
Fix memory leak
@@ -46491,7 +48507,7 @@
commit 6bca64407c675ca837f83a12c0f655f975f14407
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jan 23 13:27:45 2008 +0100
+Date: Wed Jan 23 13:27:45 2008 +0100
Make sure default values are not loaded more than once for the
same widget.
@@ -46502,7 +48518,7 @@
commit eccf84b51a1cf5d478c0ec84be3fc9be8e458f4f
Author: Pino Toscano <pino at kde.org>
-Date: Tue Jan 22 23:28:16 2008 +0100
+Date: Tue Jan 22 23:28:16 2008 +0100
Refactor the PSConverter and add a PDFConverter (for PDF export/save).
@@ -46514,21 +48530,21 @@
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/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 +++++++++++---
+ 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 at gnome.org>
-Date: Tue Jan 22 13:22:20 2008 +0100
+Date: Tue Jan 22 13:22:20 2008 +0100
Fix a crash when createAnnot returns NULL due to invalid annot dict.
@@ -46537,7 +48553,7 @@
commit 0d558841142587d66bd3b2025e5a9ca39f7a6159
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 21 21:43:39 2008 +0100
+Date: Mon Jan 21 21:43:39 2008 +0100
Fix another reversed comparison due to cmp
@@ -46546,7 +48562,7 @@
commit cb6a87e39336e2e3893f3e5f577e4d176d237a9f
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Jan 21 10:07:35 2008 +0100
+Date: Mon Jan 21 10:07:35 2008 +0100
Fixed a few compare issues with Annots.
@@ -46557,7 +48573,7 @@
commit 7cf85dc8d7c895a211684c7d36757063ed4f469b
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Jan 21 21:27:49 2008 +0100
+Date: Mon Jan 21 21:27:49 2008 +0100
The glade file needs to be distributed
@@ -46566,7 +48582,7 @@
commit 46e93d31dd9b5909ecd8f7a8f8de23329444a7bc
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Sun Jan 20 19:56:51 2008 +0100
+Date: Sun Jan 20 19:56:51 2008 +0100
we need time.h if we use time()
@@ -46575,7 +48591,7 @@
commit a0adb006c38ea07f010a01d9c0bb07ca0f48939d
Author: Pino Toscano <pino at kde.org>
-Date: Sun Jan 20 19:55:55 2008 +0100
+Date: Sun Jan 20 19:55:55 2008 +0100
Added a saveAs() overload which takes a plain OutStream
@@ -46585,13 +48601,13 @@
commit fcdd5c51f370d040ae57aa64801c9bd4dbe88752
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jan 19 18:00:10 2008 +0100
+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 ++-
+ glib/poppler-page.cc | 81 +++++++++++++++-------------
+ glib/poppler-page.h | 6 ++-
poppler/CairoOutputDev.cc | 131
++++++++++++++++++++++++++--------------------
poppler/CairoOutputDev.h | 12 ++++-
@@ -46599,7 +48615,7 @@
commit 37ae465775d9a53e7c06cf51aa215439214fd79c
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Sat Jan 19 14:00:31 2008 +0100
+Date: Sat Jan 19 14:00:31 2008 +0100
ignore pdf-fullrewrite binary
@@ -46608,7 +48624,7 @@
commit 1d160935ea4c1116b745c584ed7f1fd03fbbfb46
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Jan 19 13:59:46 2008 +0100
+Date: Sat Jan 19 13:59:46 2008 +0100
AnnotWidget support and few fixes
@@ -46619,7 +48635,7 @@
commit 0e91a3973e525d65236d15930a8ea0e5bbb6a6cc
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Jan 19 13:59:25 2008 +0100
+Date: Sat Jan 19 13:59:25 2008 +0100
AnnotTextMarkup support and improved AnnotQuadrilaterals
@@ -46630,7 +48646,7 @@
commit c13952cd56a40bad14a1bf28699b137f65162f10
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Jan 19 13:59:02 2008 +0100
+Date: Sat Jan 19 13:59:02 2008 +0100
Changed AnnotQuadrilateral parsing inside AnnotLink
@@ -46641,7 +48657,7 @@
commit 2f821f10fbbba9363405201c86494cd861cec2b2
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sat Jan 19 13:49:43 2008 +0100
+Date: Sat Jan 19 13:49:43 2008 +0100
Add AnnotQuadPoints class
@@ -46651,7 +48667,7 @@
commit de4c8fa6607e55c199bede1dc731227692ef4f53
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Dec 30 21:21:56 2007 +0100
+Date: Sun Dec 30 21:21:56 2007 +0100
AnnotFreeText support.
@@ -46664,7 +48680,7 @@
commit c3504a87933ae1516b1ef05e527fd1c039091235
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Sun Dec 30 19:37:18 2007 +0100
+Date: Sun Dec 30 19:37:18 2007 +0100
Improved AnnotLink support.
@@ -46677,17 +48693,17 @@
commit a20468cc38bb590124b2b028a08f364f90f2487f
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 13:02:17 2008 +0100
+Date: Sat Jan 19 13:02:17 2008 +0100
Adds a test application to test full rewrite functionnality.
- test/Makefile.am | 11 ++++++++++-
+ test/Makefile.am | 11 ++++++++++-
test/pdf-fullrewrite.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
commit 246294714c6011651fd0e5b3649bd65919058c72
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:59:03 2008 +0100
+Date: Sat Jan 19 12:59:03 2008 +0100
FormWidget's 'modified' member variable is now updated correctly
each time an update is done.
@@ -46701,7 +48717,7 @@
commit 6e0f297b8b17afb95779724b8618ca39016e664a
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:54:09 2008 +0100
+Date: Sat Jan 19 12:54:09 2008 +0100
Annot will save their generated appearance in their AP dict.
@@ -46711,7 +48727,7 @@
commit e20f6a8e9ac3936b4bc03710a71fe390dfc4c094
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:52:02 2008 +0100
+Date: Sat Jan 19 12:52:02 2008 +0100
Add deep copy constructor to Dict.
@@ -46721,7 +48737,7 @@
commit e8d46cab77c7167edb0896296118daafc0f13b6d
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:51:44 2008 +0100
+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.
@@ -46735,7 +48751,7 @@
commit 742b0c3dec01d8672b84f56d5bb0e2890b178594
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:51:27 2008 +0100
+Date: Sat Jan 19 12:51:27 2008 +0100
Make the md5 method of Decrypt public so it can be used by other
files.
@@ -46746,7 +48762,7 @@
commit bb7867976740dea259d4110c072552fc5953910f
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:51:07 2008 +0100
+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.
@@ -46757,7 +48773,7 @@
commit d80736587fdbc0e163077f27bfd21c5e3a7fa4c7
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:50:49 2008 +0100
+Date: Sat Jan 19 12:50:49 2008 +0100
Adds addIndirectObject method to XRef. This method allow the creation
of new indirect objects.
@@ -46768,7 +48784,7 @@
commit 8bd00dd0872191b8806e9411d9a1adc441f08a47
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:50:16 2008 +0100
+Date: Sat Jan 19 12:50:16 2008 +0100
Add some unfiltered methods to input stream.
@@ -46781,7 +48797,7 @@
commit 8bcda287ddd316f90b3e47a3a307fbe63a5c21f7
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:46:53 2008 +0100
+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.
@@ -46791,7 +48807,7 @@
commit 4fbd143de7e3a8ab386dd14b057e62b3b9fe04e4
Author: Julien Rebetez <julien at fhtagn.net>
-Date: Sat Jan 19 12:45:54 2008 +0100
+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.
@@ -46803,7 +48819,7 @@
commit 696eaa47169fb063b7e6998c876926c578b6fbfa
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jan 17 15:56:59 2008 +0100
+Date: Thu Jan 17 15:56:59 2008 +0100
Fix a crash when editing text form fields
@@ -46812,7 +48828,7 @@
commit 9ec1b28dcdade12498b94b650c26483581294ee6
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jan 17 14:54:34 2008 +0100
+Date: Thu Jan 17 14:54:34 2008 +0100
Fix a crash when a form field contains reference to non existant
children
@@ -46822,7 +48838,7 @@
commit f7ed40c465033bad26dfda008c5984954baa0607
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jan 16 21:01:50 2008 +0100
+Date: Wed Jan 16 21:01:50 2008 +0100
Add a cast to fix build
@@ -46831,20 +48847,17 @@
commit 1c0aa21e598b879ec49d96700e6438ccb8ac2283
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Fri Jan 11 20:28:49 2008 +0100
+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(-)
+ glib/demo/Makefile.am | 2 +-
+ glib/demo/{info.c => info.cc} | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
commit 88f8bf850b6c41d25b9576597b5fc5bd75a122f4
Author: Kjartan Maraas <kmaraas at gnome.org>
-Date: Thu Jan 10 23:51:54 2008 +0100
+Date: Thu Jan 10 23:51:54 2008 +0100
Fix two use after free bugs in HtmlOutputDev.cc
@@ -46854,7 +48867,7 @@
commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179
Merge: 8a8a4f0 4eca2e0
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Sat Jan 5 23:03:06 2008 +0100
+Date: Sat Jan 5 23:03:06 2008 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -46861,7 +48874,7 @@
commit 8a8a4f01272fb86898fafbda07129c0cbc03d527
Author: Pino Toscano <pino at kde.org>
-Date: Sat Jan 5 23:02:22 2008 +0100
+Date: Sat Jan 5 23:02:22 2008 +0100
Make Document::renderHints return the correct render hints
@@ -46870,12 +48883,12 @@
commit 4eca2e041c93349e0c4666e83ad1ca3caff91dee
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jan 1 14:34:00 2008 +0100
+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/Makefile.am | 2 +
+ glib/demo/main.c | 16 +--
glib/demo/transitions.c | 321
++++++++++++++++++++++++++++++++++++++++++++++++
glib/demo/transitions.h | 31 +++++
@@ -46883,7 +48896,7 @@
commit e92b50bbd3dfc8657b611e3c33129d7c5bae2319
Author: Koji Otani <sho at bbr.jp>
-Date: Wed Dec 26 18:56:01 2007 +0100
+Date: Wed Dec 26 18:56:01 2007 +0100
Use getEmbeddedFontID instead of getEmbeddedFontName to check if a
font is embedded or not
@@ -46893,7 +48906,7 @@
commit 30e9bae97e3742913015f7ea46636b2b80937612
Author: Ed Catmur <ed at catmur.co.uk>
-Date: Sat Dec 22 22:54:51 2007 +0100
+Date: Sat Dec 22 22:54:51 2007 +0100
Fixlets for Adobe Glyph Naming convention implementation
@@ -46903,7 +48916,7 @@
commit 40551e616b007ceb15c9d6e3d77c24538ffec924
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Sat Dec 22 14:31:50 2007 +0100
+Date: Sat Dec 22 14:31:50 2007 +0100
Check the destination page of the link does exist
@@ -46912,7 +48925,7 @@
commit c06d6f2236d854f05e7621be280109ff27dc73b9
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Thu Dec 20 20:13:08 2007 +0100
+Date: Thu Dec 20 20:13:08 2007 +0100
Use UnicodeParsedString that does exactly what this code does
@@ -46921,7 +48934,7 @@
commit 5f9f06a10fdb72a9d809ee1f779e1a8f549840e7
Author: Koji Otani <sho at bbr.jp>
-Date: Thu Dec 20 19:59:26 2007 +0100
+Date: Thu Dec 20 19:59:26 2007 +0100
Fix for latest CJK code
@@ -46934,7 +48947,7 @@
commit bb49e1e3909fc7392c197dc67d9b7f5312fd0dad
Author: Ed Catmur <ed at catmur.co.uk>
-Date: Tue Dec 18 20:20:11 2007 +0100
+Date: Tue Dec 18 20:20:11 2007 +0100
Implement Adobe Glyph Naming convention
@@ -46944,7 +48957,7 @@
commit 5634d63abdd64d371f2e8687a1c172f55b052008
Author: Koji Otani <sho at bbr.jp>
-Date: Mon Dec 17 20:43:41 2007 +0100
+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'
@@ -46955,7 +48968,7 @@
commit 7a9e7fc96b47b9d833300233ac38bbd60097f425
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun Dec 16 21:21:08 2007 +0100
+Date: Sun Dec 16 21:21:08 2007 +0100
Add AnnotLink class so that link annots are properly recognized
@@ -46971,7 +48984,7 @@
commit 796d9cb9b188a8af69d7fbf9bccbb408cbf6a71a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Dec 15 15:21:49 2007 +0100
+Date: Sat Dec 15 15:21:49 2007 +0100
Fix a crash when trying to create a temp annot with catalog = NULL
@@ -46982,7 +48995,7 @@
commit 99f049f0dfbfd9c22bea56ae96253837ae421e23
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 14 15:26:24 2007 +0100
+Date: Fri Dec 14 15:26:24 2007 +0100
Use the default dash array when it's not correct in AnnotBorderBS
@@ -46991,7 +49004,7 @@
commit cb2a997aa6f9dd5508ca8b04e63815da893497ef
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 14 14:12:14 2007 +0100
+Date: Fri Dec 14 14:12:14 2007 +0100
Fix another crash due to uninitialized variables
@@ -47001,7 +49014,7 @@
commit f704e86d8c72bacbd9443c4d828cd284d3a11753
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 14 12:58:12 2007 +0100
+Date: Fri Dec 14 12:58:12 2007 +0100
Fix several crashes due to uninitialized variables in Annots.
@@ -47010,7 +49023,7 @@
commit 0820a93ba1c0e893681024feb9f9bd120a9eeb4d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Dec 14 12:38:58 2007 +0100
+Date: Fri Dec 14 12:38:58 2007 +0100
Check whether top and left should be changed in FitH, FitV, FitBH
and FitBV destinations
@@ -47024,7 +49037,7 @@
commit 0fb42a2f557d5ec83b42326eb6b0be41622ca328
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Wed Dec 12 01:02:31 2007 +0100
+Date: Wed Dec 12 01:02:31 2007 +0100
Changed getters to const
@@ -47037,7 +49050,7 @@
commit 29d39a8ae120e6045a16a7aa0944c36560b42508
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Dec 10 17:56:44 2007 +0100
+Date: Mon Dec 10 17:56:44 2007 +0100
AnnotText support.
@@ -47050,7 +49063,7 @@
commit 2acecde458122bd67487cc302478befa78bf6fbe
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Dec 10 16:45:46 2007 +0100
+Date: Mon Dec 10 16:45:46 2007 +0100
AnnotMarkup support.
@@ -47063,7 +49076,7 @@
commit 1f8c1fe34e04688d2ba200f1166cfdd1ffe563f0
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Dec 10 16:34:01 2007 +0100
+Date: Mon Dec 10 16:34:01 2007 +0100
AnnotPopup support.
@@ -47075,7 +49088,7 @@
commit 6c83e06fb2eb77d0dbefd1ebfbcac3e5f0cbb622
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Dec 10 16:24:38 2007 +0100
+Date: Mon Dec 10 16:24:38 2007 +0100
Prepare code to Annotation Subtype support.
@@ -47090,7 +49103,7 @@
commit fa0bb5bbea5bf2769c8b3084f78770b7781002eb
Author: Iñigo MartÃnez <inigomartinez at gmail.com>
-Date: Mon Dec 10 15:41:38 2007 +0100
+Date: Mon Dec 10 15:41:38 2007 +0100
Various Annot improvements
@@ -47100,12 +49113,12 @@
++++++++++++++++++++++++++++++++++++-------------------
poppler/Annot.h | 140 +++++++++++--
poppler/Gfx.cc | 21 +-
- poppler/Gfx.h | 5 +-
+ poppler/Gfx.h | 5 +-
4 files changed, 543 insertions(+), 236 deletions(-)
commit e0f49fd5aef3c798798ad7e7dba55857bde1b4c0
Author: Koji Otani <sho at bbr.jp>
-Date: Thu Dec 13 23:40:46 2007 +0100
+Date: Thu Dec 13 23:40:46 2007 +0100
Some CJK charecters are displayed vertical glyphs incorrectly when
horizontal mode
@@ -47115,7 +49128,7 @@
commit 85901922bf354a1268037d0b6ec5cbf14da979a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 13 23:30:59 2007 +0100
+Date: Thu Dec 13 23:30:59 2007 +0100
Yet another gmallocn to gmallocn_checkoverflow
@@ -47126,7 +49139,7 @@
commit f24259cddb9c5e02cf9d2071bfa0106f3e88bd59
Author: Koji Otani <sho at bbr.jp>
-Date: Mon Dec 10 23:24:14 2007 +0100
+Date: Mon Dec 10 23:24:14 2007 +0100
Display characters outside of unicode BMP with TT font
@@ -47140,7 +49153,7 @@
commit 7cbabbf378cf5a9c0411558ff02b44dec2040ea1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Dec 10 22:00:30 2007 +0100
+Date: Mon Dec 10 22:00:30 2007 +0100
Fix a crash when marked content properties operator is not a dict.
@@ -47150,7 +49163,7 @@
commit e807f9c72c7f0c5cc0655918f676f4af54739442
Merge: bf57117 e2ea743
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 9 18:07:30 2007 +0100
+Date: Sun Dec 9 18:07:30 2007 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -47157,7 +49170,7 @@
commit bf57117df8786778faf31e5d843533004f867ff3
Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sun Dec 9 18:07:00 2007 +0100
+Date: Sun Dec 9 18:07:00 2007 +0100
Add support for ActualText entries
@@ -47164,10 +49177,10 @@
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/Form.cc | 2 +-
+ poppler/Gfx.cc | 2 +-
+ poppler/OutputDev.cc | 2 +-
+ poppler/OutputDev.h | 2 +-
poppler/PDFDocEncoding.h | 4 ++
poppler/TextOutputDev.cc | 98
+++++++++++++++++++++++++++++++++++++++++++++++-
@@ -47176,7 +49189,7 @@
commit e2ea7430e7d6db50cbfdac34713915e5b0942a89
Author: Albert Astals Cid <tsdgeos at localhost.(none)>
-Date: Sat Dec 8 23:21:34 2007 +0100
+Date: Sat Dec 8 23:21:34 2007 +0100
disable warnings about assigning const char * to char *
@@ -47188,7 +49201,7 @@
commit acf70c666d4f534cd97de64d4378bf6399e31fd4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 6 23:58:26 2007 +0100
+Date: Thu Dec 6 23:58:26 2007 +0100
Disable gtk tests if the user disabled glib frontend
@@ -47198,7 +49211,7 @@
commit bb0ec68f21d355081ff75aad641bc3809141e398
Merge: 5a34cdd b925ea2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 6 18:38:54 2007 +0100
+Date: Thu Dec 6 18:38:54 2007 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -47205,7 +49218,7 @@
commit b925ea232b6ed5028712600f9aebe453f3b2ba06
Author: Brad Hards <bradh at kde.org>
-Date: Tue Dec 4 19:11:13 2007 +1100
+Date: Tue Dec 4 19:11:13 2007 +1100
Remove redundant check.
@@ -47214,7 +49227,7 @@
commit 275afca4ef24020273df652ccfdf76c6994e9294
Author: Brad Hards <bradh at kde.org>
-Date: Sun Dec 2 19:45:16 2007 +1100
+Date: Sun Dec 2 19:45:16 2007 +1100
Preserve PDF page labels when we output as postscript.
@@ -47222,12 +49235,12 @@
poppler/PSOutputDev.cc | 81
+++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/PSOutputDev.h | 2 ++
+ poppler/PSOutputDev.h | 2 ++
2 files changed, 82 insertions(+), 1 deletion(-)
commit 641edb83a457083c13f3e374f6ac6c570dd54d7f
Author: Brad Hards <bradh at kde.org>
-Date: Wed Nov 28 19:42:53 2007 +1100
+Date: Wed Nov 28 19:42:53 2007 +1100
Minor API documentation update
@@ -47237,7 +49250,7 @@
commit 3635ec6fcbc89daf633c03efb644df9031b80f59
Author: Brad Hards <bradh at kde.org>
-Date: Wed Nov 28 19:42:22 2007 +1100
+Date: Wed Nov 28 19:42:22 2007 +1100
Update doxygen configuration file to version 1.5.3
@@ -47247,7 +49260,7 @@
commit 02c7ea6e1fd3e225de1eda231813f4db0ffb9fdb
Author: Brad Hards <bradh at kde.org>
-Date: Wed Nov 28 19:41:54 2007 +1100
+Date: Wed Nov 28 19:41:54 2007 +1100
Fix off-by-one in printCommands path.
@@ -47256,7 +49269,7 @@
commit 74af7c1209f47ed39addf7fde3ea106a7c77a408
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Nov 24 18:12:00 2007 +0100
+Date: Sat Nov 24 18:12:00 2007 +0100
Convert passwords from utf-8 to latin-1 when needed. Fixes bug #4557
@@ -47265,7 +49278,7 @@
commit 5a34cddf043cb484549cb411e034786a7d8688a3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 23 23:13:57 2007 +0100
+Date: Fri Nov 23 23:13:57 2007 +0100
add a ignore
@@ -47274,7 +49287,7 @@
commit 21a58562cc1e575ec3d81b6e34bfcb21306eb67f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 23 23:12:06 2007 +0100
+Date: Fri Nov 23 23:12:06 2007 +0100
sscanf does not like null strings, so don't call it on empty qstrings
@@ -47283,7 +49296,7 @@
commit 6f8451cf9d19f57f658d1568643ecb0f953e1075
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Nov 11 21:29:40 2007 -0500
+Date: Sun Nov 11 21:29:40 2007 -0500
Add support for knockout groups to the cairo backend
@@ -47300,7 +49313,7 @@
commit b0fbfb0ac366434d7e4c0350a9be83ddda7b03cf
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Nov 11 16:06:16 2007 -0500
+Date: Sun Nov 11 16:06:16 2007 -0500
Track the AlphaIsShape and TextKnockout state
@@ -47307,13 +49320,13 @@
Parse, store and notify the OutputDevices about these entries.
poppler/Gfx.cc | 14 ++++++++++++++
- poppler/GfxState.h | 6 ++++++
- poppler/OutputDev.h | 2 ++
+ poppler/GfxState.h | 6 ++++++
+ poppler/OutputDev.h | 2 ++
3 files changed, 22 insertions(+)
commit f6429b13a972f2deb25b3d3a9948dca024a54841
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Nov 10 14:08:09 2007 -0500
+Date: Sat Nov 10 14:08:09 2007 -0500
Fix accidental mode change.
@@ -47323,7 +49336,7 @@
commit 5797f50a99d1494767edc5928f9c3e9d927b946d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Nov 10 01:52:00 2007 -0500
+Date: Sat Nov 10 01:52:00 2007 -0500
Scale text to match 'm' size
@@ -47342,7 +49355,7 @@
commit 551212e55127c7e46d9aff3318015fd9b5385687
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Nov 10 11:56:15 2007 +0100
+Date: Sat Nov 10 11:56:15 2007 +0100
Fix uninitialized variable access
@@ -47353,7 +49366,7 @@
commit 934a5ae45eb17bd0e2010be89f55510e8a69816b
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Nov 3 13:08:51 2007 -0400
+Date: Sat Nov 3 13:08:51 2007 -0400
Avoiding using floating point when converting to luminance.
@@ -47364,7 +49377,7 @@
commit 1b3f045a25e5d172357bc87c15ba591c8e1511a7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 8 23:34:07 2007 +0100
+Date: Thu Nov 8 23:34:07 2007 +0100
Move another gmallocn to gmallocn_checkoverflow. Fixes crashes on
incorrect pdf sent by Red Hat
@@ -47375,7 +49388,7 @@
commit 944d327fd7036332a33b4ad6476ceca7a650ef6e
Merge: fb1d1f4 c340255
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 7 23:52:47 2007 +0100
+Date: Wed Nov 7 23:52:47 2007 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -47382,7 +49395,7 @@
commit fb1d1f459784a6c19034212a617268f7f5a90e9c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 7 23:51:58 2007 +0100
+Date: Wed Nov 7 23:51:58 2007 +0100
merge ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
@@ -47393,7 +49406,7 @@
commit c340255f46bc95b5f850abcd3d9bcdc8594199bb
Author: Brad Hards <bradh at kde.org>
-Date: Mon Nov 5 20:36:23 2007 +1100
+Date: Mon Nov 5 20:36:23 2007 +1100
Update .gitignore
@@ -47406,7 +49419,7 @@
commit cebf770379e7d71166e729aebf771a4ca291d48b
Author: Brad Hards <bradh at kde.org>
-Date: Mon Nov 5 20:31:18 2007 +1100
+Date: Mon Nov 5 20:31:18 2007 +1100
Add a new unit test, for non-ASCII searching.
@@ -47416,7 +49429,7 @@
characters as long as they are properly encoded (which the
Qt4 front end does).
- qt4/tests/Makefile.am | 7 ++++++-
+ qt4/tests/Makefile.am | 7 ++++++-
qt4/tests/check_search.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
@@ -47423,13 +49436,13 @@
commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
Merge: 1c7b7a0 7875067
Author: Brad Hards <bradh at kde.org>
-Date: Mon Nov 5 15:55:39 2007 +1100
+Date: Mon Nov 5 15:55:39 2007 +1100
Merge branch 'minor-fixes'
commit 78750679e213d7307cce38166b6af32562e871b8
Author: Brad Hards <bradh at kde.org>
-Date: Mon Nov 5 15:54:36 2007 +1100
+Date: Mon Nov 5 15:54:36 2007 +1100
Additional check for password protected documents
@@ -47442,7 +49455,7 @@
commit 1c7b7a0c581b542945cac257202bbb819d33694c
Author: Brad Hards <bradh at kde.org>
-Date: Mon Nov 5 15:49:45 2007 +1100
+Date: Mon Nov 5 15:49:45 2007 +1100
Minor Qt4 API documentation fix
@@ -47453,78 +49466,78 @@
commit b86fc565d175835cf27e9c8632da47a5e0b50237
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 5 00:14:55 2007 +0100
+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 +-
+ 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 +-
+ 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 at kde.org>
-Date: Mon Nov 5 00:03:55 2007 +0100
+Date: Mon Nov 5 00:03:55 2007 +0100
Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
@@ -47533,7 +49546,7 @@
commit 34a90b35998b65539cf1e8f09194d45db71064a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 4 14:03:35 2007 +0100
+Date: Sun Nov 4 14:03:35 2007 +0100
Remove duplicate checking
@@ -47543,7 +49556,7 @@
commit d694e1dd042fb97fbc62046b69cafe30d6f9ea58
Merge: ba5b31c 432e657
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 4 13:26:47 2007 +0100
+Date: Sun Nov 4 13:26:47 2007 +0100
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -47550,7 +49563,7 @@
commit ba5b31c6a8b2317332bfa148f6d80f66891fb9ce
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Nov 4 13:25:12 2007 +0100
+Date: Sun Nov 4 13:25:12 2007 +0100
Require fontconfig >= 2.0 Fixes bug 9020
@@ -47559,7 +49572,7 @@
commit 432e657a49cb097638a79e38c141088039572816
Author: Jeff Muizelaar <jeff at freiheit.infidigm.net>
-Date: Mon Sep 17 19:15:21 2007 -0400
+Date: Mon Sep 17 19:15:21 2007 -0400
Use realloc/free instead of new/delete when resizing GooStrings
@@ -47581,7 +49594,7 @@
commit cb80112afed2c5b9642c3c43f1cc001ed88d08cb
Author: Jonathan Kew <jonathan_kew at sil.org>
-Date: Thu Nov 1 20:53:05 2007 +0100
+Date: Thu Nov 1 20:53:05 2007 +0100
Do not try to parse directories when processing nameToUnicode
dir. Fixes ugly warnings on mingw32
@@ -47591,7 +49604,7 @@
commit ad6b888edff7b30be72df948c4052b9934a37705
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Thu Nov 1 20:48:21 2007 +0100
+Date: Thu Nov 1 20:48:21 2007 +0100
Add some castings to make it compile
@@ -47600,12 +49613,12 @@
commit a968dcc759379f48265c91bea63ca4cf987d94a9
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Wed Oct 31 23:53:39 2007 +0100
+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/Makefile.am | 13 +++++-
+ qt4/tests/check_password.cpp | 87
++++++++++++++++++++++++++++++++++++++++
qt4/tests/stress-poppler-dir.cpp | 63 +++++++++++++++++++++++++++++
qt4/tests/test-poppler-qt4.cpp | 15 ++++++-
@@ -47613,7 +49626,7 @@
commit 7b7a08863a8278dee7aa1fe7789cf72223c26b35
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Oct 31 23:53:27 2007 +0100
+Date: Wed Oct 31 23:53:27 2007 +0100
Improve documentation
@@ -47623,7 +49636,7 @@
commit 96493c9409186a7e964e894c7f730962b6995fd7
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Wed Oct 31 23:51:25 2007 +0100
+Date: Wed Oct 31 23:51:25 2007 +0100
remove old file
@@ -47633,7 +49646,7 @@
commit 951a05f7a11af4a44e4cb85a015939d6a3e513f5
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Sat Oct 27 12:33:22 2007 +0200
+Date: Sat Oct 27 12:33:22 2007 +0200
Remove fordward declaration of a non-existant class
@@ -47642,7 +49655,7 @@
commit 289679405ab143bc2106cf269227c514a1602e56
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Oct 25 22:16:10 2007 -0400
+Date: Thu Oct 25 22:16:10 2007 -0400
Avoid drawing borders unless /W and /S are specified in /BS
@@ -47655,7 +49668,7 @@
commit ab0a6c37faf9916edcd70e128d9f2654eb795ace
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Thu Oct 25 20:56:58 2007 +0200
+Date: Thu Oct 25 20:56:58 2007 +0200
Fix compilation on mingw. Bug 12493
@@ -47663,8 +49676,8 @@
Moved test-poppler-glib.c to test-poppler-glib.cc to get the correct
compiler
- configure.ac | 1 +
- glib/Makefile.am | 2 +-
+ configure.ac | 1 +
+ glib/Makefile.am | 2 +-
glib/test-poppler-glib.cc | 520
++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 522 insertions(+), 1 deletion(-)
@@ -47672,7 +49685,7 @@
commit 6bd637dc135045b20abf024d394538d7a3160795
Merge: c01ab71 25b273d
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Tue Oct 23 23:27:01 2007 +0200
+Date: Tue Oct 23 23:27:01 2007 +0200
Merge branch 'master' of
ssh://aacid@git.freedesktop.org/git/poppler/poppler
@@ -47679,7 +49692,7 @@
commit c01ab714ecd42e39ecb0be1c0c2504635251ac01
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Tue Oct 23 23:26:21 2007 +0200
+Date: Tue Oct 23 23:26:21 2007 +0200
Provide setters for some methods that only had getters. Fixes
bug 12894
@@ -47691,7 +49704,7 @@
commit 25b273db677815c8df11e52fe9df29fe857a8a88
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Oct 22 23:01:37 2007 -0400
+Date: Mon Oct 22 23:01:37 2007 -0400
Unset the font if it doesn't exist or we can not load it properly
@@ -47708,17 +49721,17 @@
commit 57331767ed5306eba1f9bf60e48fc88debdc2198
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Oct 22 23:33:59 2007 +0200
+Date: Mon Oct 22 23:33:59 2007 +0200
builddir != srcdir fixes by Christian Persch <chpe gnome org>
- autogen.sh | 7 ++++---
+ autogen.sh | 7 ++++---
glib/demo/Makefile.am | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
commit 2a333e5a618b5c92f3c703816b950321f25d3aab
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Oct 22 22:14:43 2007 +0200
+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
@@ -47729,31 +49742,31 @@
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.cc | 207
++++++++++++++++++++++++-------------------------
- splash/Splash.h | 4 +-
+ splash/Splash.h | 4 +-
splash/SplashFTFont.cc | 23 +++++-
- splash/SplashFTFont.h | 4 +-
- splash/SplashFont.cc | 29 +++++--
- splash/SplashFont.h | 5 +-
+ splash/SplashFTFont.h | 4 +-
+ splash/SplashFont.cc | 29 +++++--
+ splash/SplashFont.h | 5 +-
splash/SplashT1Font.cc | 11 ++-
- splash/SplashT1Font.h | 4 +-
+ splash/SplashT1Font.h | 4 +-
8 files changed, 162 insertions(+), 125 deletions(-)
commit cf785cd12ae77e8dd778ed043584f8f26efe675f
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Oct 22 21:59:35 2007 +0200
+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 +++
+ goo/gmem.h | 3 +++
2 files changed, 21 insertions(+)
commit 37e16ac301a35ceca2e3535f8c6100d4cf723c82
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Oct 22 21:54:02 2007 +0200
+Date: Mon Oct 22 21:54:02 2007 +0200
exit(1) is bad in library code, use the src.abort method to describe
failure
@@ -47763,7 +49776,7 @@
commit dbe975c129999a3efceb1c86518fa6fda74f685c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Oct 22 11:25:37 2007 +0200
+Date: Mon Oct 22 11:25:37 2007 +0200
Fix a crash with invalid TrueType fonts
@@ -47772,7 +49785,7 @@
commit 8bfe30a48fd7021591ab307bd51f86c06ff202b9
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Oct 19 15:46:50 2007 +0200
+Date: Fri Oct 19 15:46:50 2007 +0200
Do not generate appearance stream for radio button that are not active
@@ -47781,7 +49794,7 @@
commit 1a531dcfee1c6fc79a414c38cbe7327fbf9a59d8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Oct 19 13:12:24 2007 +0200
+Date: Fri Oct 19 13:12:24 2007 +0200
Fix a crash with invalid embedded fonts
@@ -47790,7 +49803,7 @@
commit e1740278457e512676b623bcdf9968193f0a8d7b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Oct 19 12:21:54 2007 +0200
+Date: Fri Oct 19 12:21:54 2007 +0200
Do not draw annotations when rendering for printing
@@ -47800,7 +49813,7 @@
commit a4d25f79dfc1a7e4998e2e113ef92312bd4af553
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Oct 16 15:24:08 2007 +0200
+Date: Tue Oct 16 15:24:08 2007 +0200
Detect form fields at any depth level
@@ -47813,7 +49826,7 @@
commit 03e1da99f7393fb1103643311b0b5af7b875e09c
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Oct 13 19:38:15 2007 -0400
+Date: Sat Oct 13 19:38:15 2007 -0400
Add an implementation of CairoOutputDev::startPage()
@@ -47826,7 +49839,7 @@
commit 825c942d46e0c3e254028441015c5dd8440cc734
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Fri Oct 12 13:47:09 2007 +0200
+Date: Fri Oct 12 13:47:09 2007 +0200
Copy the embeddef file description string correctly
@@ -47835,17 +49848,17 @@
commit 5e60da78695eff44cc10dbce46ef170727f682b1
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Fri Oct 12 13:46:52 2007 +0200
+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 +-
+ qt4/src/poppler-private.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 1627fbbde8be01af3bdd2583f3439897a37d5215
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Oct 6 23:27:40 2007 -0400
+Date: Sat Oct 6 23:27:40 2007 -0400
Use maskWidth and maskHeight for reading from the mask image in
CairoOutputDev::drawMaskedImage()
@@ -47859,7 +49872,7 @@
commit 3156d560c5eaf6970da422d0b09fd2e95bfe6d1d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Oct 5 11:34:01 2007 +0200
+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
@@ -47869,7 +49882,7 @@
commit f0b5e6286e94c6153c8247b5fae63a18622c48d3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Oct 4 15:22:01 2007 +0200
+Date: Thu Oct 4 15:22:01 2007 +0200
Do not return unknown field type for signature form fields
@@ -47878,7 +49891,7 @@
commit 498fd7fb99b01a879d07e2ad12c0b9462a8fc438
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Oct 4 12:36:39 2007 +0200
+Date: Thu Oct 4 12:36:39 2007 +0200
Add poppler_page_render_for_printing() and
poppler_page_render_to_pixbuf_for_printing()
@@ -47896,7 +49909,7 @@
commit 56af69787c78c2edbb69266e86a5a5b639ca6d3e
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Oct 3 23:02:25 2007 -0400
+Date: Wed Oct 3 23:02:25 2007 -0400
Error out if we can't find a .cidToUnicode for a known character
collection
@@ -47909,7 +49922,7 @@
commit 3d0df46908379bce1d196b9dc41153b1adb5f725
Author: Michael Wolf <maw at ximian.com>
-Date: Wed Oct 3 19:43:55 2007 +0200
+Date: Wed Oct 3 19:43:55 2007 +0200
Fix compile warning
@@ -47918,7 +49931,7 @@
commit aba29e12528025c2cc71bf46e02e76ac4db2b193
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Sep 28 21:01:50 2007 +0200
+Date: Fri Sep 28 21:01:50 2007 +0200
Add forms demo to glib poppler demo
@@ -47933,7 +49946,7 @@
commit d0c0f26d2c95232c216e3daa15e98a3aff14ac27
Merge: 59d55f7 38d5bb1
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Tue Sep 25 03:33:52 2007 -0700
+Date: Tue Sep 25 03:33:52 2007 -0700
Merge branch 'master' of
ssh://kjk@git.freedesktop.org/git/poppler/poppler
@@ -47940,7 +49953,7 @@
commit 38d5bb150a5fe883da1d4256463d1f796d201283
Author: Krzysztof Kowalczyk <kkowalczyk at kjkubu.(none)>
-Date: Tue Sep 25 16:13:51 2007 -0700
+Date: Tue Sep 25 16:13:51 2007 -0700
Silence deprecation warnings - annoying with msvc 2005.
@@ -47949,7 +49962,7 @@
commit 59d55f7371bee81c9392fa2d4174ceffaacde471
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Tue Sep 25 01:21:19 2007 -0700
+Date: Tue Sep 25 01:21:19 2007 -0700
Fix misleading comment.
@@ -47958,7 +49971,7 @@
commit c36d8afc984795aca0a12a94ec7668092067db82
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Tue Sep 25 00:32:29 2007 -0700
+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
@@ -47971,19 +49984,19 @@
commit ff25e83abae1ca17e2e7dd6f20946026fca69fff
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 23:57:25 2007 -0700
+Date: Mon Sep 24 23:57:25 2007 -0700
Make perf-test compile on unix as well.
- test/Makefile.am | 16 ++++++-
+ test/Makefile.am | 16 ++++++-
test/perf-test-preview-dummy.cc | 1 +
- test/perf-test.cc | 104
+ test/perf-test.cc | 104
+++++++++++++++++-----------------------
3 files changed, 59 insertions(+), 62 deletions(-)
commit 70f3bf42b3028d9a2e4aefdc2e1a458b3c77b0e7
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 21:26:54 2007 -0700
+Date: Mon Sep 24 21:26:54 2007 -0700
Let perf-test.cc manage lifetime of rendered bitmap.
@@ -47992,7 +50005,7 @@
commit b622b252cba068a15eae77df5deb261dd98affaf
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 21:20:12 2007 -0700
+Date: Mon Sep 24 21:20:12 2007 -0700
Disable my_error for now - seems to corrupt memory.
@@ -48001,7 +50014,7 @@
commit bde8c9669ca6b43cb6a664bd14df164a718041ea
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 21:08:58 2007 -0700
+Date: Mon Sep 24 21:08:58 2007 -0700
Con't copy the file unless COPY_FILE is defined.
@@ -48010,7 +50023,7 @@
commit bf9b46b012c64624818a2110af7c4b7e3b419728
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 20:13:54 2007 -0700
+Date: Mon Sep 24 20:13:54 2007 -0700
Respect -loadonly cmd-line arg.
@@ -48019,17 +50032,17 @@
commit 2f664b654ca19135f0f8a0fe89872b9e0d526fa2
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 19:41:45 2007 -0700
+Date: Mon Sep 24 19:41:45 2007 -0700
Fix msvc debug build. Fix bitmap leak in perf-test.
- makefile.vc | 6 ++++--
+ makefile.vc | 6 ++++--
test/perf-test.cc | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
commit 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 08:10:37 2007 -0700
+Date: Mon Sep 24 08:10:37 2007 -0700
Use GooTimer instead of my own timer.
@@ -48039,7 +50052,7 @@
commit 05fbce5b6657e883ece9054c79576b25271a05a4
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Mon Sep 24 08:01:11 2007 -0700
+Date: Mon Sep 24 08:01:11 2007 -0700
Make GooTimer work for Windows/msvc build.
@@ -48051,17 +50064,17 @@
commit 6347915085a487da08d39a859f4261fa812dab09
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 24 01:08:17 2007 -0700
+Date: Mon Sep 24 01:08:17 2007 -0700
Add Error.cc in msvc build and use setErrorFunction in perf-test.
- makefile.vc | 3 +--
+ makefile.vc | 3 +--
test/perf-test.cc | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
commit ed01b3965c57ce2a4eabf9c46b5319ea627d3324
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 24 01:03:09 2007 -0700
+Date: Mon Sep 24 01:03:09 2007 -0700
Match declaration of setErrorFunction with its definition.
@@ -48073,23 +50086,23 @@
commit 71fb15f8bd131a13d8cf0f394fe601cfbb6e1772
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 24 00:38:29 2007 -0700
+Date: Mon Sep 24 00:38:29 2007 -0700
Even less compiler warnings.
poppler/CairoOutputDev.cc | 6 +++---
- qt/poppler-page.cc | 3 +++
+ qt/poppler-page.cc | 3 +++
utils/HtmlOutputDev.cc | 10 ++++++----
3 files changed, 12 insertions(+), 7 deletions(-)
commit 7ba3f198a0651d2a7c91b7d9e10a5173dc3de0a3
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 24 00:32:37 2007 -0700
+Date: Mon Sep 24 00:32:37 2007 -0700
Even less compiler warnings.
- qt/poppler-document.cc | 8 ++++++++
- qt/poppler-private.h | 8 --------
+ 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 -------------------------
@@ -48097,7 +50110,7 @@
commit ab1059f594cb9fccd8568ca2a535a363c7521daa
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 24 00:14:01 2007 -0700
+Date: Mon Sep 24 00:14:01 2007 -0700
Don't break aliasing.
@@ -48106,7 +50119,7 @@
commit 71c47b30adf687a0bcece22834933267053360de
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 23:49:31 2007 -0700
+Date: Sun Sep 23 23:49:31 2007 -0700
Reduce compiler warnings.
@@ -48115,7 +50128,7 @@
commit 8466d94929844c976bbad8bb7d1ea7f7f77cc196
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 23:34:52 2007 -0700
+Date: Sun Sep 23 23:34:52 2007 -0700
Reduce compiler warnings. Tabs to spaces.
@@ -48124,24 +50137,24 @@
commit c53b8ccfba6fa4345086493f9e44212721c11d0a
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 23:23:34 2007 -0700
+Date: Sun Sep 23 23:23:34 2007 -0700
Reduce number of compiler warnings.
poppler/CharCodeToUnicode.cc | 2 +-
- poppler/Gfx.cc | 6 ++----
+ poppler/Gfx.cc | 6 ++----
poppler/PageLabelInfo.cc | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
commit abede2a06c5c9dc97b40479deda49621458f1171
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 23:03:36 2007 -0700
+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 +--
+ glib/poppler-page.cc | 3 +--
qt/poppler-document.cc | 1 -
qt4/src/poppler-annotation.cc | 16 +++++++++++++---
5 files changed, 16 insertions(+), 14 deletions(-)
@@ -48148,7 +50161,7 @@
commit 60f5bcea4a920441e25ae11d677636242aabb2db
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 22:48:06 2007 -0700
+Date: Sun Sep 23 22:48:06 2007 -0700
Remove unused variables.
@@ -48157,7 +50170,7 @@
commit 3179eee44eb0afbc642675268b9a4abb16ccdde3
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 22:47:21 2007 -0700
+Date: Sun Sep 23 22:47:21 2007 -0700
Remove unused variables.
@@ -48166,7 +50179,7 @@
commit e9dc379190aa3166870d0b11a05ccc4e9dad2706
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 22:41:59 2007 -0700
+Date: Sun Sep 23 22:41:59 2007 -0700
Remove unused variables.
@@ -48175,7 +50188,7 @@
commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Sun Sep 23 22:28:16 2007 -0700
+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;
@@ -48186,7 +50199,7 @@
commit 5a1f670a4d16affeed86cdf643ab22f481caa3a5
Author: Krzysztof Kowalczyk <kkowalczyk at kjkubu.(none)>
-Date: Sun Sep 23 20:42:59 2007 -0700
+Date: Sun Sep 23 20:42:59 2007 -0700
ignore *.o files
@@ -48195,7 +50208,7 @@
commit c156aed7234f82dea4cb384c1b8a7acdd34545be
Author: Krzysztof Kowalczyk <kkowalczyk at kjkubu.(none)>
-Date: Sun Sep 23 20:41:19 2007 -0700
+Date: Sun Sep 23 20:41:19 2007 -0700
remove unused variables
@@ -48204,31 +50217,31 @@
commit d0bdef4752be5fa609a0766ee87aa54d51611d9a
Author: Krzysztof Kowalczyk <kkowalczyk at kjkubu.(none)>
-Date: Sat Sep 22 13:38:03 2007 -0700
+Date: Sat Sep 22 13:38:03 2007 -0700
undo accidental changes to file permissions
- msvc/poppler/poppler-config.h | 0
- poppler/Annot.cc | 0
- poppler/CairoFontEngine.cc | 0
- poppler/CairoOutputDev.cc | 0
- poppler/Catalog.cc | 0
- poppler/Form.cc | 0
- poppler/GfxFont.cc | 0
- poppler/GfxState.cc | 0
- poppler/Page.cc | 0
- poppler/SplashOutputDev.cc | 0
- poppler/TextOutputDev.cc | 0
- splash/Splash.cc | 0
- splash/SplashFTFontEngine.cc | 0
+ msvc/poppler/poppler-config.h | 0
+ poppler/Annot.cc | 0
+ poppler/CairoFontEngine.cc | 0
+ poppler/CairoOutputDev.cc | 0
+ poppler/Catalog.cc | 0
+ poppler/Form.cc | 0
+ poppler/GfxFont.cc | 0
+ poppler/GfxState.cc | 0
+ poppler/Page.cc | 0
+ poppler/SplashOutputDev.cc | 0
+ poppler/TextOutputDev.cc | 0
+ splash/Splash.cc | 0
+ splash/SplashFTFontEngine.cc | 0
test/perf-test-preview-dummy.cc | 0
- test/perf-test-preview-win.cc | 0
- test/perf-test.cc | 0
+ test/perf-test-preview-win.cc | 0
+ test/perf-test.cc | 0
16 files changed, 0 insertions(+), 0 deletions(-)
commit 6c69473f2f4a49757614ddd249e65bb7a13c63c1
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 08:09:53 2007 -0700
+Date: Fri Sep 21 08:09:53 2007 -0700
undo accidental mode change
@@ -48237,11 +50250,11 @@
commit e7e386e7ce8cb8eb8a7037ebdaa601524d332ae7
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 08:08:53 2007 -0700
+Date: Fri Sep 21 08:08:53 2007 -0700
more simplification by removing unneded code
- makefile.vc | 2 +-
+ makefile.vc | 2 +-
test/perf-test.cc | 60
+++++++++----------------------------------------------
2 files changed, 10 insertions(+), 52 deletions(-)
@@ -48248,7 +50261,7 @@
commit 3e10604637ec193269a3155985476d3b83dc7d62
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 07:48:38 2007 -0700
+Date: Fri Sep 21 07:48:38 2007 -0700
for portability use bool/true/false instead of BOOL/TRUE/FALSE
@@ -48258,7 +50271,7 @@
commit 634718936f2a95fac2a9d12fcea483b3d0ca8fa6
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 07:41:14 2007 -0700
+Date: Fri Sep 21 07:41:14 2007 -0700
simplify perf-test
@@ -48265,36 +50278,36 @@
test/perf-test-pdf-engine.h | 78
-------------------------------------------
test/perf-test-preview-win.cc | 5 ++-
- test/perf-test.cc | 75
+ test/perf-test.cc | 75
+++++++++++++++++++++++++++++++++++++++--
3 files changed, 75 insertions(+), 83 deletions(-)
commit 617550199762fab42ca2e202e641e047b3efbac0
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 05:20:16 2007 -0700
+Date: Fri Sep 21 05:20:16 2007 -0700
simplify perf-test code
- test/perf-test-pdf-engine.h | 67 +++--------------------
+ 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
+ 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 at tlapx60ubu.(none)>
-Date: Fri Sep 21 03:03:26 2007 -0700
+Date: Fri Sep 21 03:03:26 2007 -0700
more msvc build fixes
- makefile.vc | 2 +-
+ makefile.vc | 2 +-
test/perf-test.cc | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
commit 60829b08a7440f36014f68ec54bee7a742412738
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Fri Sep 21 03:02:34 2007 -0700
+Date: Fri Sep 21 03:02:34 2007 -0700
msvc build fixes
@@ -48304,7 +50317,7 @@
commit 853c22a174bae81139edc9aeded7f26ae2655cef
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 23:21:35 2007 -0700
+Date: Thu Sep 20 23:21:35 2007 -0700
add pre-made config.h for msvc build
@@ -48314,7 +50327,7 @@
commit 31c43b118bd4372134018be6f6693f77d1f6a39b
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 22:10:09 2007 -0700
+Date: Thu Sep 20 22:10:09 2007 -0700
remove unused variables
@@ -48325,11 +50338,11 @@
commit 01b99f60e36dd955817f23911ef38947360f61f7
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 21:14:17 2007 -0700
+Date: Thu Sep 20 21:14:17 2007 -0700
remove unused variables
- poppler/GfxState.cc | 11 ++---------
+ poppler/GfxState.cc | 11 ++---------
poppler/SplashOutputDev.cc | 9 +++------
poppler/TextOutputDev.cc | 3 ---
3 files changed, 5 insertions(+), 18 deletions(-)
@@ -48336,7 +50349,7 @@
commit 7c406400532d68524a43cf963d894d3c4b269400
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 20:57:44 2007 -0700
+Date: Thu Sep 20 20:57:44 2007 -0700
remove unused variables
@@ -48349,7 +50362,7 @@
commit 70f23389c97b1870b7311d97322cdd16b580a79d
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 20:23:59 2007 -0700
+Date: Thu Sep 20 20:23:59 2007 -0700
don't silence warnings about unused variables/functions to keep
programmers honest
@@ -48359,7 +50372,7 @@
commit cdb6fcf98137473efd993e1374a6f010e9db67db
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Thu Sep 20 20:00:56 2007 -0700
+Date: Thu Sep 20 20:00:56 2007 -0700
Remove unused variables
@@ -48368,7 +50381,7 @@
commit 0e76b49ac852a5a7ebae4c1f67b153e0b7c9f905
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Tue Sep 18 01:04:50 2007 -0700
+Date: Tue Sep 18 01:04:50 2007 -0700
Explain how to compile on Windows using msvc makefile.
@@ -48378,7 +50391,7 @@
commit c002b4dc75b2688ffe8a734cf3e15f5891797842
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Tue Sep 18 00:04:47 2007 -0700
+Date: Tue Sep 18 00:04:47 2007 -0700
Add Windows/msvc makefile.
@@ -48391,7 +50404,7 @@
commit 1f33fc58201c92120c587189d2e0e819f83167da
Author: Krzysztof Kowalczyk <kkowalczyk at tlapx60ubu.(none)>
-Date: Mon Sep 17 23:53:02 2007 -0700
+Date: Mon Sep 17 23:53:02 2007 -0700
Start on a test program.
@@ -48401,16 +50414,16 @@
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-pdf-engine.h | 131 ++++
test/perf-test-preview-dummy.cc | 22 +
- test/perf-test-preview-win.cc | 222 ++++++
- test/perf-test.cc | 1428
+ test/perf-test-preview-win.cc | 222 ++++++
+ test/perf-test.cc | 1428
+++++++++++++++++++++++++++++++++++++++
4 files changed, 1803 insertions(+)
commit b96db4ad27535c2666fccdfe0a3c04cc7c37792d
Author: Jeff Muizelaar <jeff at freiheit.infidigm.net>
-Date: Mon Sep 17 20:28:38 2007 -0400
+Date: Mon Sep 17 20:28:38 2007 -0400
Avoid double free caused by 302 merge
@@ -48423,7 +50436,7 @@
commit 2a495f19d4465e15fd2fa96656d904315c79a443
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Sep 17 16:52:45 2007 -0400
+Date: Mon Sep 17 16:52:45 2007 -0400
Simplify ChangeLog rule a bit.
@@ -48434,7 +50447,7 @@
commit 7d5abbeec55e4b90b139671d96cfdf58bdab70b8
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Sep 17 15:45:26 2007 -0400
+Date: Mon Sep 17 15:45:26 2007 -0400
Add dist hook to generate ChangeLog.
@@ -48448,7 +50461,7 @@
commit 15ad81c64cd8b1cb438d41be402daa19a239db3d
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
-Date: Mon Sep 17 19:39:29 2007 +0200
+Date: Mon Sep 17 19:39:29 2007 +0200
Use = instead of == in qt.m4
@@ -48457,47 +50470,34 @@
commit 70fabcb96e207b9b889bb32c0cf5ea3fc0aa08f8
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Sep 16 20:40:53 2007 -0400
+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(-)
+ .cvsignore => .gitignore | 0
+ ChangeLog | 4586
+ -----------------------------
+ fofi/{.cvsignore => .gitignore} | 0
+ glib/{.cvsignore => .gitignore} | 0
+ glib/reference/{.cvsignore => .gitignore} | 0
+ goo/{.cvsignore => .gitignore} | 0
+ poppler/{.cvsignore => .gitignore} | 0
+ qt/{.cvsignore => .gitignore} | 0
+ qt4/{.cvsignore => .gitignore} | 0
+ qt4/src/{.cvsignore => .gitignore} | 0
+ qt4/tests/{.cvsignore => .gitignore} | 0
+ splash/{.cvsignore => .gitignore} | 0
+ test/{.cvsignore => .gitignore} | 0
+ utils/{.cvsignore => .gitignore} | 0
+ 14 files changed, 4586 deletions(-)
commit c9f9403ffc5b95ae790c3c81284c7786afe33f4d
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Fri Sep 14 20:50:07 2007 +0000
+Date: Fri Sep 14 20:50:07 2007 +0000
Windows implementation for matching fonts that doesn't use fontconfig
- ChangeLog | 6 +
+ ChangeLog | 6 +
poppler/GlobalParamsWin.cc | 285
+++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 291 insertions(+)
@@ -48504,7 +50504,7 @@
commit d18b5361a0504458da805ed6be037c9d648f9372
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Fri Sep 14 20:47:11 2007 +0000
+Date: Fri Sep 14 20:47:11 2007 +0000
Update ChangeLog for previous checkin
@@ -48513,16 +50513,16 @@
commit 3330763ddca66b30d5ee60aab94d6fe0bbae9c8f
Author: Krzysztof Kowalczyk <kkowalczyk at gmail.com>
-Date: Fri Sep 14 06:17:35 2007 +0000
+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/DCTStream.h | 2 +-
+ poppler/Error.cc | 6 ++++++
+ poppler/FlateStream.h | 2 +-
poppler/GlobalParams.cc | 12 ++++++++++--
poppler/GlobalParams.h | 17 +++++++++++++++++
- poppler/Stream.cc | 2 +-
+ poppler/Stream.cc | 2 +-
splash/SplashFTFontEngine.cc | 2 ++
splash/SplashFontEngine.cc | 2 +-
splash/SplashFontFile.cc | 2 ++
@@ -48532,10 +50532,10 @@
commit 6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 10 17:38:05 2007 +0000
+Date: Mon Sep 10 17:38:05 2007 +0000
- * autogen.sh: Support automake-1.10.
- Patch by Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+ * autogen.sh: Support automake-1.10.
+ Patch by Krzysztof Kowalczyk <kkowalczyk at gmail.com>
ChangeLog | 5 +++++
autogen.sh | 11 ++++++-----
@@ -48543,49 +50543,49 @@
commit 31bbc8c727cfecc79bd8da962ad8d99a0d1d3d33
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 8 10:40:17 2007 +0000
+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.
+ Add PSConverter::setOutputDevice() to set a QIODevice where
+ writing the resulting PS.
- ChangeLog | 7 ++++++
+ ChangeLog | 7 ++++++
qt4/src/poppler-ps-converter.cc | 51
+++++++++++++++++++++++++++++++++++++----
- qt4/src/poppler-qt4.h | 5 +++-
+ qt4/src/poppler-qt4.h | 5 +++-
3 files changed, 58 insertions(+), 5 deletions(-)
commit b3d63d03c310f01cc5b23d00ffd2103c6891fef2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 5 20:22:32 2007 +0000
+Date: Wed Sep 5 20:22:32 2007 +0000
- * qt4/src/poppler-ps-converter.cc: Fix Right<->Left
- interchange
+ * qt4/src/poppler-ps-converter.cc: Fix Right<->Left
+ interchange
- ChangeLog | 1 +
+ ChangeLog | 1 +
qt4/src/poppler-ps-converter.cc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
commit 64368582d5ca4e28c236f440482c96f1dd3a8897
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 5 18:22:52 2007 +0000
+Date: Wed Sep 5 18:22:52 2007 +0000
- * poppler/PSOutputDev.cc: Fix printing of second parameter
+ * poppler/PSOutputDev.cc: Fix printing of second parameter
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PSOutputDev.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit eaf9d06cf0d08ccdc183759e0331dc2439a6f10f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Sep 5 10:57:09 2007 +0000
+Date: Wed Sep 5 10:57:09 2007 +0000
- 2007-09-05 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-page.cc:
- * glib/demo/render.c: Fix build with --disable-cairo-output.
+ 2007-09-05 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-page.cc:
+ * glib/demo/render.c: Fix build with --disable-cairo-output.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/demo/render.c | 31 +++++++++++++++++++++++++++----
glib/poppler-page.cc | 22 ++++++++++++----------
3 files changed, 44 insertions(+), 14 deletions(-)
@@ -48592,7 +50592,7 @@
commit c0f488c2b0e115be3e1b7e4dc7baa38db5837498
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 4 22:04:52 2007 +0000
+Date: Tue Sep 4 22:04:52 2007 +0000
did not want to commit this
@@ -48601,39 +50601,39 @@
commit 3462851b4ea342651095f1803cd488bc3b3f5749
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 4 22:02:06 2007 +0000
+Date: Tue Sep 4 22:02:06 2007 +0000
- * utils/pdftoppm.cc: Fix build on Sun Studio compiler.
- Patch by Brian Cameron <brian.cameron at sun.com>
+ * utils/pdftoppm.cc: Fix build on Sun Studio compiler.
+ Patch by Brian Cameron <brian.cameron at sun.com>
- ChangeLog | 5 +++++
- gtk-doc.make | 2 +-
+ ChangeLog | 5 +++++
+ gtk-doc.make | 2 +-
utils/pdftoppm.cc | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
commit cdf3b9062cc54d558b8dbeefb3211a920ff2cb94
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 3 19:23:11 2007 +0000
+Date: Mon Sep 3 19:23:11 2007 +0000
write news
fix qt4 build
- NEWS | 13 +++++++++++++
- qt4/src/Makefile.am | 3 ++-
+ NEWS | 13 +++++++++++++
+ qt4/src/Makefile.am | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
commit c82208a44f3b09c27bc33831641e4f746dd4361f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 3 18:28:44 2007 +0000
+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
+ * 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 +-
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
glib/Makefile.am | 2 +-
poppler/Makefile.am | 2 +-
qt/Makefile.am | 2 +-
@@ -48642,172 +50642,172 @@
commit 2a12409ebbf96ea3ca4556b71231a45ae37cb052
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 3 17:09:01 2007 +0000
+Date: Mon Sep 3 17:09:01 2007 +0000
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc: Patch by Derek B. Noonburg
- <derekn at foolabs.com>
- to fix some errors in CCITTFaxStream and JBIG2Stream.cc
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc: Patch by Derek B. Noonburg
+ <derekn at foolabs.com>
+ to fix some errors in CCITTFaxStream and JBIG2Stream.cc
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/JBIG2Stream.cc | 7 ++++---
- poppler/Stream.cc | 2 +-
+ poppler/Stream.cc | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
commit 0b483e71ef02b4040b665935c1018c8b30b9c1ca
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Sep 3 08:54:01 2007 +0000
+Date: Mon Sep 3 08:54:01 2007 +0000
- 2007-09-03 Carlos Garcia Campos <carlosgc at 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.
+ 2007-09-03 Carlos Garcia Campos <carlosgc at 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 ++++++
+ 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 +--
+ 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 at kde.org>
-Date: Sun Sep 2 17:02:55 2007 +0000
+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 at sun.com>. Fixes
- #12208
+ * 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 at sun.com>. Fixes
+ #12208
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/GfxState.cc | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
commit 6f6c2180aca2e26ea0e3c2f21f11bc8f457c19c0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 2 16:31:19 2007 +0000
+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 at catmur.co.uk> to
- improve matching of half strings of decomposed
- characters/ligatures.
+ * glib/demo/Makefile.am: Add
+ $(top_builddir)/poppler/libpoppler.la
+ * poppler/TextOutputDev.cc: Patch from Ed Catmur
+ <ed at catmur.co.uk> to
+ improve matching of half strings of decomposed
+ characters/ligatures.
- ChangeLog | 3 +++
- glib/demo/Makefile.am | 1 +
+ 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 at kde.org>
-Date: Sun Sep 2 16:06:03 2007 +0000
+Date: Sun Sep 2 16:06:03 2007 +0000
poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PDFDoc.cc | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 500a87af9240344806c18ebbd05a89f4f4c69955
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Sep 2 00:53:42 2007 +0000
+Date: Sun Sep 2 00:53:42 2007 +0000
- 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/Error.cc:
- * poppler/Error.h: Report any cairo errors when destroying
- the cairo
- context.
+ * poppler/CairoOutputDev.cc:
+ * poppler/Error.cc:
+ * poppler/Error.h: Report any cairo errors when destroying
+ the cairo
+ context.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/CairoOutputDev.cc | 7 ++++++-
- poppler/Error.cc | 7 +++++++
- poppler/Error.h | 1 +
+ poppler/Error.cc | 7 +++++++
+ poppler/Error.h | 1 +
4 files changed, 21 insertions(+), 1 deletion(-)
commit 0c22556bf70ff67eb388cdcd9784603030397785
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Sep 1 23:38:04 2007 +0000
+Date: Sat Sep 1 23:38:04 2007 +0000
- 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
- * glib/demo/Makefile.am: Only build the demo app if the cflags
- will be
- appropriately set.
+ * glib/demo/Makefile.am: Only build the demo app if the
+ cflags will be
+ appropriately set.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/demo/Makefile.am | 2 ++
2 files changed, 7 insertions(+)
commit a23d45dd6cd8a2ac4181170a9ee924fe49a9781b
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Sep 1 23:00:59 2007 +0000
+Date: Sat Sep 1 23:00:59 2007 +0000
- 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-09-01 Jeff Muizelaar <jeff at infidigm.net>
- * glib/poppler-page.cc: Add note about clipping
+ * glib/poppler-page.cc: Add note about clipping
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-page.cc | 2 ++
2 files changed, 6 insertions(+)
commit bf489d5cebc467807f2b38f74f6a6e34a503a9ca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 30 18:39:51 2007 +0000
+Date: Thu Aug 30 18:39:51 2007 +0000
- * poppler/Form.h: Remove unused methods. Fixes 12013
+ * poppler/Form.h: Remove unused methods. Fixes 12013
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Form.h | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
commit a81cc06c855385911dffa826b9e1407d6097e8c8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 30 18:15:34 2007 +0000
+Date: Thu Aug 30 18:15:34 2007 +0000
- 2007-08-30 Carlos Garcia Campos <carlosgc at 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.
+ 2007-08-30 Carlos Garcia Campos <carlosgc at 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
+ ChangeLog | 10 ++++++
+ glib/poppler-page.cc | 81
++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 2 ++
- glib/poppler.h | 4 +--
+ glib/poppler-page.h | 2 ++
+ glib/poppler.h | 4 +--
glib/test-poppler-glib.c | 2 +-
poppler/TextOutputDev.cc | 74 +++++++++++++++++++++++++++++--------------
poppler/TextOutputDev.h | 34 +++++++++++++++-----
@@ -48815,50 +50815,50 @@
commit 59ddb5cc8bec54305b6d256ad9975e95ecdcb935
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 27 18:37:55 2007 +0000
+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 at catmur.co.uk>
+ * poppler/UnicodeTypeTable.cc: Fix error on the NFKC text
+ matching
+ routine. Fixes bug #11775. Patch by Ed Catmur
+ <ed at catmur.co.uk>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/UnicodeTypeTable.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit a6e46ce61670679f368e66c1a98a7d5d1c960c5b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 27 17:56:29 2007 +0000
+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.
+ * 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 +++++++++++-------
+ 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 +++++++++++++++++++++----------
+ qt4/src/poppler-qt4.h | 44 +++++++++++++++++++++----------
7 files changed, 166 insertions(+), 55 deletions(-)
commit a7f8d92fba8c45d6ca83568c045d5e324158ee6b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 27 17:17:14 2007 +0000
+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.
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
qt4/src/poppler-annotation.cc | 4 ++--
qt4/src/poppler-link.cc | 8 ++++++--
qt4/src/poppler-link.h | 1 +
@@ -48866,17 +50866,17 @@
commit 2b1ef8f06879eb0b79288d57540c238ea833db24
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 26 21:39:22 2007 +0000
+Date: Sun Aug 26 21:39:22 2007 +0000
Fix bug 12121
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
utils/ImageOutputDev.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 20bcac5ee1988befb9c590a0d16cb615f0c49901
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 26 21:28:34 2007 +0000
+Date: Sun Aug 26 21:28:34 2007 +0000
forgot to cvs add
@@ -48886,15 +50886,15 @@
commit e48de657db0ef439457b4b5ca39b937da25d531e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 26 18:11:01 2007 +0000
+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.
+ * 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 +
+ ChangeLog | 4 +
qt4/src/poppler-annotation.cc | 969
+++++++++++++++++++++++++++++++++++-------
qt4/src/poppler-annotation.h | 277 ++++++++----
@@ -48903,62 +50903,62 @@
commit 392f050f909b6a1250acf1971446a1849534482c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 26 16:42:46 2007 +0000
+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.
+ * 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 +-
+ 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-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 +-
+ 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 at gnome.org>
-Date: Sun Aug 26 10:52:19 2007 +0000
+Date: Sun Aug 26 10:52:19 2007 +0000
- 2007-08-26 Carlos Garcia Campos <carlosgc at 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.
+ 2007-08-26 Carlos Garcia Campos <carlosgc at 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 +
+ ChangeLog | 14 ++
+ configure.ac | 1 +
glib/Makefile.am | 2 +-
glib/demo/Makefile.am | 26 +++
glib/demo/fonts.c | 276 ++++++++++++++++++++++++++++
@@ -48981,166 +50981,168 @@
commit 7c9529b70dc44bb001d21a3b47fc65916813dec1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Aug 23 20:39:31 2007 +0000
+Date: Thu Aug 23 20:39:31 2007 +0000
- 2007-08-23 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-page.cc: Add missing comma.
+ 2007-08-23 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-page.cc: Add missing comma.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-page.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 3c4a85503261ee81a829a1683f1f5fa85d41f8ee
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Aug 23 20:15:46 2007 +0000
+Date: Thu Aug 23 20:15:46 2007 +0000
- 2007-08-23 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-08-23 Jeff Muizelaar <jeff at 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.
+ * 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 +++++++
+ ChangeLog | 7 +++++++
glib/poppler-page.cc | 5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
commit 3ba088d8caee3c40c2aba0cd85adcf9195ae88a3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 22 21:29:32 2007 +0000
+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 at gmail.com>
+ * 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 at gmail.com>
- ChangeLog | 12 ++++++
+ ChangeLog | 12 ++++++
splash/SplashBitmap.cc | 18 +++++++--
- splash/SplashBitmap.h | 2 +
- utils/pdftoppm.cc | 107
+ splash/SplashBitmap.h | 2 +
+ utils/pdftoppm.cc | 107
+++++++++++++++++++++++++++++++++++++++++--------
4 files changed, 119 insertions(+), 20 deletions(-)
commit 567e82c13aace4f40c7a555a62a3a4d223a46d92
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Aug 22 19:34:02 2007 +0000
+Date: Wed Aug 22 19:34:02 2007 +0000
- 2007-08-22 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-08-22 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/GlobalParams.cc: Fix debug spew. Patch from Matthias
- Clasen.
+ * poppler/GlobalParams.cc: Fix debug spew. Patch from
+ Matthias Clasen.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/GlobalParams.cc | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
commit bc499987074d046baf29deafe4a29d57039c0c5e
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Aug 22 19:28:24 2007 +0000
+Date: Wed Aug 22 19:28:24 2007 +0000
- 2007-08-22 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-08-22 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Fix the computation of the padding
- in the
- image scaling code.
+ * poppler/CairoOutputDev.cc: Fix the computation of the
+ padding in the
+ image scaling code.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
commit d9719233447cb4f85f2bf9d9ec6ef089caa21140
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Aug 19 16:20:21 2007 +0000
+Date: Sun Aug 19 16:20:21 2007 +0000
- 2007-08-19 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-08-19 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Avoid allocating the glyph array if
- currentFont is not set in beginString. This closes a possible
- memory leak.
+ * poppler/CairoOutputDev.cc: Avoid allocating the glyph
+ array if
+ currentFont is not set in beginString. This closes a possible
+ memory leak.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 3 +++
2 files changed, 9 insertions(+)
commit 099eb56896046e020f4ef0365e1ee382f85ec1ab
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 15 18:52:20 2007 +0000
+Date: Wed Aug 15 18:52:20 2007 +0000
- * poppler/JBIG2Stream.cc: Quick fix for bug #12014
+ * poppler/JBIG2Stream.cc: Quick fix for bug #12014
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/JBIG2Stream.cc | 16 +++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
commit 3b7e3645c85c7a3d341457f105835b58c935bd67
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 15 00:04:48 2007 +0000
+Date: Wed Aug 15 00:04:48 2007 +0000
RC2 is out! (0.5.91)
ChangeLog | 1 +
- NEWS | 18 ++++++++++++++++++
+ NEWS | 18 ++++++++++++++++++
configure.ac | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
commit c240daefe660ac3456dc0c5f5dc82aa53ebc3313
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 14 23:10:37 2007 +0000
+Date: Tue Aug 14 23:10:37 2007 +0000
* poppler/Stream.cc: Fix CVE-2007-3387 by merging xpdf-3.02pl1.patch
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Stream.cc | 12 +++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
commit 1ba884b6b98ac8d755c9adc9f23a7a68d8b17b54
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 14 22:47:30 2007 +0000
+Date: Tue Aug 14 22:47:30 2007 +0000
- * configure.ac:
- * pòppler/Makefile.am: Patch by Vincent Torri
- <vtorri at univ-evry.fr> to
- fix linking under MinGW
+ * configure.ac:
+ * pòppler/Makefile.am: Patch by Vincent Torri
+ <vtorri at univ-evry.fr> to
+ fix linking under MinGW
- ChangeLog | 6 ++++++
- configure.ac | 13 +++++++++++++
- poppler/Makefile.am | 5 +++--
+ ChangeLog | 6 ++++++
+ configure.ac | 13 +++++++++++++
+ poppler/Makefile.am | 5 +++--
3 files changed, 22 insertions(+), 2 deletions(-)
commit 3c31f923fcf1aeb361910eb1e9445cc28aa5b3ca
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Aug 7 16:22:12 2007 +0000
+Date: Tue Aug 7 16:22:12 2007 +0000
- 2007-08-07 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-08-07 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
commit af97e5f8e0f3beeb43acde92a0788c02d9718adf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Aug 6 17:41:17 2007 +0000
+Date: Mon Aug 6 17:41:17 2007 +0000
- 2007-08-06 Carlos Garcia Campos <carlosgc at 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.
+ 2007-08-06 Carlos Garcia Campos <carlosgc at 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 ++++++
+ ChangeLog | 9 ++++++
poppler/Annot.cc | 86
++++++++++++++++++++++++++++++++++----------------------
poppler/Annot.h | 8 +++---
@@ -49151,26 +51153,27 @@
commit 74627e71388ca0a4c0938a472c291ef87186f370
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 31 21:40:19 2007 +0000
+Date: Tue Jul 31 21:40:19 2007 +0000
- 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/GlobalParams.cc: s/GList/GooList/ some Windows code.
+ * poppler/GlobalParams.cc: s/GList/GooList/ some Windows code.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/GlobalParams.cc | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
commit f421e2151345ac855b75e819e19343a90789b3bf
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 31 16:50:06 2007 +0000
+Date: Tue Jul 31 16:50:06 2007 +0000
- 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
- * glib/poppler-document.cc:
- * glib/poppler-document.h: Add poppler_fonts_iter_get_file_name.
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h: Add
+ poppler_fonts_iter_get_file_name.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 16 ++++++++++++++++
glib/poppler-document.h | 1 +
3 files changed, 22 insertions(+)
@@ -49177,27 +51180,27 @@
commit 4d57b8a12b845d5d5ac321d7a4bca980d60d429f
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 31 16:48:35 2007 +0000
+Date: Tue Jul 31 16:48:35 2007 +0000
- 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.h: Add comment about
- CairoImageOutputDevice's
- implementation.
+ * poppler/CairoOutputDev.h: Add comment about
+ CairoImageOutputDevice's
+ implementation.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.h | 1 +
2 files changed, 6 insertions(+)
commit f04a67006abdb5843ab481aa1e25b51abd1b1b64
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 31 11:41:53 2007 +0000
+Date: Tue Jul 31 11:41:53 2007 +0000
- 2007-07-31 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/Form.cc:
- * poppler/Form.h: Fix memory leak.
+ 2007-07-31 Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/Form.cc:
+ * poppler/Form.h: Fix memory leak.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Form.cc | 9 +++++----
poppler/Form.h | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
@@ -49204,52 +51207,53 @@
commit ee9d556a8b413160911a535a0e9089b919ca29f5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 31 11:40:22 2007 +0000
+Date: Tue Jul 31 11:40:22 2007 +0000
- 2007-07-31 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/CairoOutputDev.h: Empty implementation of transparency
- groups and soft masks in CairoImageOutputDev. Fixes a crash in
- poppler_page_get_image_mapping.
+ 2007-07-31 Carlos Garcia Campos <carlosgc at 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 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.h | 11 +++++++++++
2 files changed, 17 insertions(+)
commit e08779856c801b9968dc2d47e28e86abc1ec7110
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 31 05:29:57 2007 +0000
+Date: Tue Jul 31 05:29:57 2007 +0000
- 2007-07-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-31 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++++++
+ ChangeLog | 10 ++++++++++
poppler/GfxFont.cc | 1 +
2 files changed, 11 insertions(+)
commit 86fc9a6f343be920f5159e745947401227e41a37
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Jul 30 19:28:17 2007 +0000
+Date: Mon Jul 30 19:28:17 2007 +0000
- 2007-07-30 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-30 Jeff Muizelaar <jeff at 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.
+ * 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 +
+ ChangeLog | 6 +
poppler/CairoOutputDev.cc | 300
++++++++++++++++++++++++++++++++++++++++++++--
poppler/CairoOutputDev.h | 10 +-
@@ -49257,11 +51261,11 @@
commit f754246e47161e9bf99887201e283c1419ade4f1
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Jul 30 19:07:45 2007 +0000
+Date: Mon Jul 30 19:07:45 2007 +0000
- 2007-07-30 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-30 Jeff Muizelaar <jeff at infidigm.net>
- * configure.ac: Update require cairo version to 1.4
+ * configure.ac: Update require cairo version to 1.4
ChangeLog | 4 ++++
configure.ac | 2 +-
@@ -49269,15 +51273,15 @@
commit bb20249ac676995725b617ef442f5feb01f78205
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Jul 30 18:44:41 2007 +0000
+Date: Mon Jul 30 18:44:41 2007 +0000
- 2007-07-30 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-30 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Add transparency group support.
- Fixes #7856.
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Add transparency group support.
+ Fixes #7856.
- ChangeLog | 6 +++
+ ChangeLog | 6 +++
poppler/CairoOutputDev.cc | 133
++++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 21 +++++++-
@@ -49285,16 +51289,16 @@
commit a85acecaeb0d122becbc52a385d918561e995eca
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Jul 30 00:22:35 2007 +0000
+Date: Mon Jul 30 00:22:35 2007 +0000
- 2007-07-29 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-29 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: transform the original matrix for
- type3 fonts
- instead of using set_matrix()
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: transform the original matrix
+ for type3 fonts
+ instead of using set_matrix()
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
poppler/CairoOutputDev.h | 1 +
3 files changed, 24 insertions(+), 3 deletions(-)
@@ -49301,28 +51305,30 @@
commit a81a082169de32d01c36c969616a5c2279f1bac7
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Jul 30 00:18:59 2007 +0000
+Date: Mon Jul 30 00:18:59 2007 +0000
- 2007-07-29 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-07-29 Jeff Muizelaar <jeff at infidigm.net>
- * glib/test-poppler-glib.c: include <time.h> to fix compilation.
+ * glib/test-poppler-glib.c: include <time.h> to fix
+ compilation.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/test-poppler-glib.c | 1 +
2 files changed, 5 insertions(+)
commit 81393cb30f6287caf5195265cdc039555f2767d3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 28 08:22:40 2007 +0000
+Date: Sat Jul 28 08:22:40 2007 +0000
- 2007-07-28 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-28 Carlos Garcia Campos <carlosgc at 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 +++++++
+ ChangeLog | 8 +++++++
poppler/Annot.cc | 43 +++++++++++-------------------------
poppler/Annot.h | 1 -
poppler/Form.cc | 66
@@ -49332,28 +51338,29 @@
commit 81b669dcb14bf821a49c9879f8d4129075647f5f
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 28 08:05:11 2007 +0000
+Date: Sat Jul 28 08:05:11 2007 +0000
- 2007-07-28 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-page.h: Remove unneeded declarations. Fixes bug
- #11744. Patch by Kouhei Sutou <kou at cozmixng.org>.
+ 2007-07-28 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-page.h: Remove unneeded declarations. Fixes bug
+ #11744. Patch by Kouhei Sutou <kou at cozmixng.org>.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.h | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
commit f2c4e5305009f1da770c99d3e2e3371ff37c75f3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Fri Jul 27 09:17:40 2007 +0000
+Date: Fri Jul 27 09:17:40 2007 +0000
- 2007-07-27 Carlos Garcia Campos <carlosgc at 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 at cozmixng.org>.
+ 2007-07-27 Carlos Garcia Campos <carlosgc at 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 at cozmixng.org>.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
glib/poppler-document.cc | 44
++++++++++++++++++++++++++++++++++++++++----
glib/poppler-document.h | 6 +++++-
@@ -49363,7 +51370,7 @@
commit 975c7cff10d9b00359e147329ae2c7a93f8a3833
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 25 17:20:06 2007 +0000
+Date: Wed Jul 25 17:20:06 2007 +0000
micro optimization
@@ -49372,18 +51379,21 @@
commit 525a7f49dd95f2644870a1c59ca15124e30026b4
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 24 16:45:25 2007 +0000
+Date: Tue Jul 24 16:45:25 2007 +0000
- 2007-07-24 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-24 Carlos Garcia Campos <carlosgc at 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 ++++++++
+ ChangeLog | 10 ++++++++
poppler/Annot.cc | 27 ++++++++++----------
poppler/Form.cc | 77
+++++++++++++++++++++++++++++++++++++++-----------------
@@ -49391,34 +51401,34 @@
commit 633a1cde65f86ee6577a68f4f8d36de43d14c714
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 15 21:03:50 2007 +0000
+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
+ * utils/HtmlOutputDev.cc:
+ * utils/HtmlOutputDev.h: Create the html files in the
+ correct place,
+ not in the invocation dir. Fixes bug #11610
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
utils/HtmlOutputDev.cc | 37 ++++++++++---------------------------
- utils/HtmlOutputDev.h | 4 ----
+ utils/HtmlOutputDev.h | 4 ----
3 files changed, 16 insertions(+), 31 deletions(-)
commit ccb2d420ca8d818aa9ba1d64f08f5e94ab313a72
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 15 17:09:29 2007 +0000
+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
+ * 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 ++++++++++
+ ChangeLog | 10 ++++++++++
poppler/DCTStream.cc | 17 ++++++++++++++++-
poppler/DCTStream.h | 1 +
poppler/Stream.cc | 1 -
@@ -49426,42 +51436,44 @@
commit f9d82dfd299ae23a1baf3e35e2c3cd351129c525
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jul 14 18:23:42 2007 +0000
+Date: Sat Jul 14 18:23:42 2007 +0000
- * utils/pdftops.cc: init width/height to -1 so it is
- calculated if not
- specified
+ * utils/pdftops.cc: init width/height to -1 so it is
+ calculated if not
+ specified
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
utils/pdftops.cc | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit 1c04136e9538ccfaa2d6b968861682ca3b69ffb3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 14 15:23:31 2007 +0000
+Date: Sat Jul 14 15:23:31 2007 +0000
- 2007-07-14 Pino Toscano <pino at kde.org>
- * glib/poppler-action.h:
- * glib/poppler-document.h: Remove trailing comma from the last
- item of enums.
+ 2007-07-14 Pino Toscano <pino at 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 +-
+ 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 at gnome.org>
-Date: Sat Jul 14 15:15:57 2007 +0000
+Date: Sat Jul 14 15:15:57 2007 +0000
- 2007-07-14 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-14 Carlos Garcia Campos <carlosgc at 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 ++++++++
+ ChangeLog | 8 ++++++++
glib/poppler-form-field.cc | 10 ++++++++--
glib/poppler-form-field.h | 2 +-
glib/test-poppler-glib.c | 4 ++--
@@ -49469,80 +51481,80 @@
commit 14a8361039d708661b8699b2e7c4496135021a85
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 13 22:18:05 2007 +0000
+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 at bbr.jp> to fix several problems with
- Japanese fonts.
- Fixes bug 11413
+ * 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 at bbr.jp> to fix several problems with
+ Japanese fonts.
+ Fixes bug 11413
- ChangeLog | 13 ++
- fofi/FoFiTrueType.cc | 305
+ ChangeLog | 13 ++
+ fofi/FoFiTrueType.cc | 305
+++++++++++++++++++++++++++++++++++++++++++
- fofi/FoFiTrueType.h | 12 ++
+ fofi/FoFiTrueType.h | 12 ++
poppler/CairoFontEngine.cc | 47 ++-----
poppler/CharCodeToUnicode.cc | 16 +++
poppler/CharCodeToUnicode.h | 1 +
- poppler/GfxFont.cc | 230 ++++++++++++++++++++++++++++----
- poppler/GfxFont.h | 2 +
+ poppler/GfxFont.cc | 230 ++++++++++++++++++++++++++++----
+ poppler/GfxFont.h | 2 +
poppler/SplashOutputDev.cc | 53 ++------
9 files changed, 577 insertions(+), 102 deletions(-)
commit 8389099d8e8940e3f8920b14a83075d69bcd8e6c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 13 18:21:02 2007 +0000
+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
+ * poppler/FontInfo.cc: Fix the FontInfoScanner::scan method to
+ actually scan the number of requested pages
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/FontInfo.cc | 12 ++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
commit 9ced4442372d08375e0ded62f79052d8a3ec9cd6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 13 18:08:44 2007 +0000
+Date: Fri Jul 13 18:08:44 2007 +0000
- * poppler/GlobalParams.cc: Remove dead unused code from
- Win32 ifdef
+ * poppler/GlobalParams.cc: Remove dead unused code from
+ Win32 ifdef
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/GlobalParams.cc | 6 ------
2 files changed, 4 insertions(+), 6 deletions(-)
commit fb89fdb8de608ff94082e16819f042cddabf2bcc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 11 18:52:12 2007 +0000
+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
+ * poppler/PSOutputDev.cc
+ * poppler/PSOutputDev.h
+ * utils/pdftohtml.cc: Fix bug 9746. pdftohtml complex mode
+ had text
+ twice
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/PSOutputDev.cc | 5 +++++
- poppler/PSOutputDev.h | 2 ++
- utils/pdftohtml.cc | 3 +--
+ poppler/PSOutputDev.h | 2 ++
+ utils/pdftohtml.cc | 3 +--
4 files changed, 15 insertions(+), 2 deletions(-)
commit 0c9fa59bf5edf3cfcca1792da51b904a7c7f7615
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 11 18:30:19 2007 +0000
+Date: Wed Jul 11 18:30:19 2007 +0000
- 2007-07-11 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/Form.cc:
- * poppler/XRef.cc:
- * poppler/XRef.h: Fix memory leak.
+ 2007-07-11 Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/Form.cc:
+ * poppler/XRef.cc:
+ * poppler/XRef.h: Fix memory leak.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Form.cc | 49 ++++++++++++++++++++++++-------------------------
poppler/XRef.cc | 22 ++++++++++------------
poppler/XRef.h | 2 +-
@@ -49550,22 +51562,22 @@
commit 4ae7d43bd54c5b3e2f08c48441f741d3099e228f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 11 18:12:26 2007 +0000
+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
+ * 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 +++---
+ ChangeLog | 11 +++++++++++
+ goo/GooVector.h | 4 ++--
+ goo/gfile.cc | 6 +++---
poppler/GlobalParams.cc | 26 +++++++++++++-------------
splash/SplashFontEngine.cc | 2 +-
splash/SplashT1FontEngine.cc | 8 ++++----
@@ -49576,34 +51588,35 @@
commit 7bd125ce96c603fd5cf42d7c6a29b542e82dd4ec
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 11 18:08:07 2007 +0000
+Date: Wed Jul 11 18:08:07 2007 +0000
- 2007-07-11 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-11 Carlos Garcia Campos <carlosgc at 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 +++++++++
+ 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 ++++
+ poppler/Form.cc | 11 +++++++++++
+ poppler/Form.h | 4 ++++
6 files changed, 34 insertions(+)
commit 8a68855735e9d295d71685e82de39204d639ea7a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 9 08:52:58 2007 +0000
+Date: Mon Jul 9 08:52:58 2007 +0000
- 2007-07-09 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/Annot.cc:
- * poppler/Annot.h: Render '*' instead of the actual content in
- password form fields. Patch by Julien Rebetez <julien at fhtagn.net>
+ 2007-07-09 Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Annot.h: Render '*' instead of the actual content in
+ password form fields. Patch by Julien Rebetez
+ <julien at fhtagn.net>
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Annot.cc | 52
+++++++++++++++++++++++++++++-----------------------
poppler/Annot.h | 5 +++--
@@ -49611,89 +51624,93 @@
commit 53cf7d7084dc03a28239f11c94f2095bb02d6108
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 7 16:23:56 2007 +0000
+Date: Sat Jul 7 16:23:56 2007 +0000
- 2007-07-07 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-07 Carlos Garcia Campos <carlosgc at 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 +++++++++
+ 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 ++
+ poppler/Form.cc | 5 +++++
+ poppler/Form.h | 2 ++
6 files changed, 65 insertions(+), 3 deletions(-)
commit de0a40181e5832a0dc263d40ed0a269867764623
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jul 7 15:28:29 2007 +0000
+Date: Sat Jul 7 15:28:29 2007 +0000
- 2007-07-07 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/Form.cc: Fix a crash when setting state on buttons that
- don't have state.
+ 2007-07-07 Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/Form.cc: Fix a crash when setting state on
+ buttons that
+ don't have state.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Form.cc | 3 +++
2 files changed, 8 insertions(+)
commit a33518a3283ff25aa5517bc535ddb61383b1cfdc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 6 09:08:44 2007 +0000
+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 at fhtagn.net>
+ * 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 at fhtagn.net>
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Form.cc | 17 +++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
commit 43f0d5b9bb198cdcbc2f7111f294c6f947105314
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 6 08:47:11 2007 +0000
+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 at sun.com>
+ * goo/GooString.cc:
+ * poppler/ABWOutputDev.cc: Build on Sun Force compiler,
+ patch by
+ Darren Kenny <darren.kenny at sun.com>
- ChangeLog | 6 ++++++
- goo/GooString.cc | 2 +-
+ ChangeLog | 6 ++++++
+ goo/GooString.cc | 2 +-
poppler/ABWOutputDev.cc | 4 +++-
3 files changed, 10 insertions(+), 2 deletions(-)
commit 4e7405071b69889362e4d49de3f881f0e3e261e3
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 5 13:04:01 2007 +0000
+Date: Thu Jul 5 13:04:01 2007 +0000
- 2007-07-05 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-form-field.cc: Allow to set NULL in form fields
- that can contain text.
+ 2007-07-05 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-form-field.cc: Allow to set NULL in form fields
+ that can contain text.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-form-field.cc | 30 ++++++++++++------------------
2 files changed, 17 insertions(+), 18 deletions(-)
commit 625510797c528257527003477fe28adbacfe80e7
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu Jul 5 08:13:51 2007 +0000
+Date: Thu Jul 5 08:13:51 2007 +0000
- 2007-07-05 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-05 Carlos Garcia Campos <carlosgc at 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 ++++++++
+ ChangeLog | 8 ++++++++
glib/poppler-attachment.cc | 4 ++--
glib/poppler-attachment.h | 4 ++--
glib/test-poppler-glib.c | 4 ++--
@@ -49701,15 +51718,15 @@
commit 9b2640f156f24b07c797d9461f84e64d550efa1a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 4 13:57:31 2007 +0000
+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
+ * 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 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-form.cc | 2 +-
qt4/src/poppler-private.h | 15 +++++++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)
@@ -49716,81 +51733,85 @@
commit b70115cf979b29f75c644518ae0e9c0dd9892ebf
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 4 13:06:38 2007 +0000
+Date: Wed Jul 4 13:06:38 2007 +0000
- 2007-07-04 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-form-field.cc: Convert strings from UTF8 to UTF16BE
- before setting them.
+ 2007-07-04 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-form-field.cc: Convert strings from UTF8
+ to UTF16BE
+ before setting them.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-form-field.cc | 34 ++++++++++++++++++++++++----------
2 files changed, 29 insertions(+), 10 deletions(-)
commit d37843877a6f93a9f27502d07ad82cba79e9aa73
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Wed Jul 4 08:26:52 2007 +0000
+Date: Wed Jul 4 08:26:52 2007 +0000
- 2007-07-04 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-04 Carlos Garcia Campos <carlosgc at 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 ++++
+ 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/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 at kde.org>
-Date: Tue Jul 3 20:31:20 2007 +0000
+Date: Tue Jul 3 20:31:20 2007 +0000
- * qt4/tests/poppler-fonts.cpp: For the sake of completeness,
- add all
- the enums
+ * qt4/tests/poppler-fonts.cpp: For the sake of completeness,
+ add all
+ the enums
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
qt4/tests/poppler-fonts.cpp | 28 ++++++++++++++++++++--------
2 files changed, 22 insertions(+), 8 deletions(-)
commit d90b166cfbdc4857351baa627d158d5e0b6652b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 3 16:46:51 2007 +0000
+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
+ * 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 -
+ ChangeLog | 7 +++++++
+ poppler/Catalog.cc | 1 -
qt4/tests/poppler-attachments.cpp | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
commit 7fa87eb2b093770271bc3a72de5b0b9dc228aa1b
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 3 14:01:40 2007 +0000
+Date: Tue Jul 3 14:01:40 2007 +0000
- 2007-07-03 Carlos Garcia Campos <carlosgc at 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.
+ 2007-07-03 Carlos Garcia Campos <carlosgc at 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 +++++++
+ ChangeLog | 7 +++++++
glib/poppler-form-field.cc | 8 ++++++++
glib/poppler-form-field.h | 1 +
glib/test-poppler-glib.c | 2 ++
@@ -49798,14 +51819,14 @@
commit 8b67e0403f6eaab6770cc0b7861074ae0b6d85bb
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Tue Jul 3 13:49:18 2007 +0000
+Date: Tue Jul 3 13:49:18 2007 +0000
- 2007-07-03 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Fix a typo.
+ 2007-07-03 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Fix a typo.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-form-field.cc | 2 +-
glib/poppler-form-field.h | 2 +-
glib/test-poppler-glib.c | 2 +-
@@ -49813,36 +51834,36 @@
commit 33a5765eb404a4b321b09c26af74c1ed64a5d474
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 3 13:22:54 2007 +0000
+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
+ * 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 +++++++++++--
+ ChangeLog | 9 +++++++++
+ poppler/Catalog.cc | 19 ++++++++++++++++---
+ poppler/Catalog.h | 13 +++++++++++--
qt4/src/poppler-embeddedfile.cc | 16 ++++++++++++++++
- qt4/src/poppler-qt4.h | 14 ++++++++++++++
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
5 files changed, 66 insertions(+), 5 deletions(-)
commit c7d21f9354bbe090cce6459124dcaadf1e46639e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 2 13:39:32 2007 +0000
+Date: Mon Jul 2 13:39:32 2007 +0000
- 2007-07-02 Carlos Garcia Campos <carlosgc at 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
+ 2007-07-02 Carlos Garcia Campos <carlosgc at 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 +++++++++
+ ChangeLog | 9 +++++++++
glib/poppler-form-field.cc | 2 +-
glib/poppler-form-field.h | 2 +-
glib/test-poppler-glib.c | 2 +-
@@ -49850,16 +51871,16 @@
commit 5e301064c62c6d58f488839d7bf804af912a3de1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Mon Jul 2 13:34:26 2007 +0000
+Date: Mon Jul 2 13:34:26 2007 +0000
- 2007-07-02 Carlos Garcia Campos <carlosgc at 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
+ 2007-07-02 Carlos Garcia Campos <carlosgc at 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 +++++++++
+ ChangeLog | 9 +++++++++
glib/poppler-form-field.cc | 8 ++++++++
glib/poppler-form-field.h | 1 +
glib/test-poppler-glib.c | 6 +++++-
@@ -49867,58 +51888,60 @@
commit 11875746ce28e8999bcad46167fcfea131cd267a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 30 08:33:30 2007 +0000
+Date: Sat Jun 30 08:33:30 2007 +0000
- 2007-06-30 Carlos Garcia Campos <carlosgc at 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
+ 2007-06-30 Carlos Garcia Campos <carlosgc at 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 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-page.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 0a5acaae3b9bfcd731bc4e072f35f9433aa773da
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 30 08:25:15 2007 +0000
+Date: Sat Jun 30 08:25:15 2007 +0000
- 2007-06-30 Carlos Garcia Campos <carlosgc at 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.
+ 2007-06-30 Carlos Garcia Campos <carlosgc at 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 +
+ 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-page.cc | 210 ++++++++++++------------------
+ glib/poppler-page.h | 55 ++------
glib/poppler-private.h | 11 +-
- glib/poppler.h | 40 +++---
+ glib/poppler.h | 40 +++---
glib/test-poppler-glib.c | 119 ++++++++++++++---
11 files changed, 662 insertions(+), 454 deletions(-)
commit 2212874e57a6eb9db733b2e9a98f0cfcb88a8fc1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 26 21:31:07 2007 +0000
+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...)
+ * poppler/Form.cc: Don't crash on documents with AcroForm
+ but no
+ AcroForm->Fields (it's mandatory but...)
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Form.cc | 54
+++++++++++++++++++++++++++++-------------------------
2 files changed, 34 insertions(+), 25 deletions(-)
@@ -49925,13 +51948,13 @@
commit e48ee9c4af6bf98b6988c51dcab9ee9ef6e3cafe
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sat Jun 23 18:06:07 2007 +0000
+Date: Sat Jun 23 18:06:07 2007 +0000
- 2007-06-23 Carlos Garcia Campos <carlosgc at gnome.org>
- * poppler/Annot.cc:
- * poppler/Form.cc: Fix memory leaks.
+ 2007-06-23 Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Form.cc: Fix memory leaks.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Annot.cc | 2 +-
poppler/Form.cc | 13 +++++++++----
3 files changed, 15 insertions(+), 5 deletions(-)
@@ -49938,46 +51961,46 @@
commit d874a2753e3ac51b6f539dfdf980435c8c381b4f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 20 20:07:15 2007 +0000
+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
+ * 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 +++++
+ 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(+)
commit 08d4c437e735ac50a340c4ae17ee0eeccd00dc20
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 20 18:40:03 2007 +0000
+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 at gmail.com> Approved by Carlos
+ * glib/poppler-document.cc: Allow access to a document's
+ metadata stream
+ through the glib binding. Patch by Jason Kivlighn
+ <jkivlighn at gmail.com> Approved by Carlos
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-document.cc | 21 +++++++++++++++++++++
2 files changed, 27 insertions(+)
commit cdd2a49dc99aa16ded674c58dbb50298f06cf18a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 15 18:15:53 2007 +0000
+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 at gmail.com>. More info at
- bug #11273
+ * 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 at gmail.com>. More info at
+ bug #11273
- ChangeLog | 8 +
+ ChangeLog | 8 +
poppler/ABWOutputDev.cc | 384
++++++++++++------------------------------------
2 files changed, 106 insertions(+), 286 deletions(-)
@@ -49984,14 +52007,14 @@
commit 7f23383197b0e2fa24be7b4925ea6f39eb95bbc1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 13 20:39:21 2007 +0000
+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 at gmail.com>. Fixes bug #11187
+ * poppler/ABWOutputDev.cc
+ * poppler/ABWOutputDev.h: Remove dependency on debugxml. Patch
+ by
+ Jauco Noordzij <jauco.noordzij at gmail.com>. Fixes bug #11187
- ChangeLog | 6 ++++
+ ChangeLog | 6 ++++
poppler/ABWOutputDev.cc | 80
++++++++++++++++++++++++++++++++++++++++++++++++-
poppler/ABWOutputDev.h | 1 +
@@ -49999,38 +52022,38 @@
commit 948520cd529ce47d1970aae6a0b8058128e37c30
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 13 18:50:40 2007 +0000
+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 at 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
+ * goo/FixedPoint.h
+ * goo/gmem.h
+ * poppler/SecurityHandler.h
+ * poppler/poppler-config.h.in
+ * utils/ImageOutputDev.h:
+ Patch by Axel Howind <Axel.Howind at 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 +-
+ ChangeLog | 16 ++++++++++++++++
+ goo/FixedPoint.h | 2 +-
+ goo/gmem.h | 2 +-
+ poppler/SecurityHandler.h | 2 +-
poppler/poppler-config.h.in | 12 +++++++++++-
- utils/ImageOutputDev.h | 2 +-
+ utils/ImageOutputDev.h | 2 +-
6 files changed, 31 insertions(+), 5 deletions(-)
commit 825461e47b05595805e87a0d2960b07197c8da8b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 13 18:24:56 2007 +0000
+Date: Wed Jun 13 18:24:56 2007 +0000
configure.ac: Fix detection of glib
@@ -50040,32 +52063,32 @@
commit a67a93fc6b4812a4f892b311c5b299e59283cd47
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 11 21:14:22 2007 +0000
+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
+ * 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 +-
+ ChangeLog | 9 +++++++++
+ poppler/CMap.h | 2 +-
poppler/CharCodeToUnicode.h | 2 +-
poppler/GlobalParams.h | 2 +-
poppler/PageLabelInfo.h | 6 +++---
- poppler/UnicodeMap.h | 2 +-
+ poppler/UnicodeMap.h | 2 +-
6 files changed, 16 insertions(+), 7 deletions(-)
commit 051b31af053cac4727718169b79b25451a4bdd95
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jun 11 21:11:05 2007 +0000
+Date: Mon Jun 11 21:11:05 2007 +0000
- * qt/poppler-qt.h
- * qt4/src/poppler-qt4.h: Headers cleanup
+ * qt/poppler-qt.h
+ * qt4/src/poppler-qt4.h: Headers cleanup
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt/poppler-qt.h | 6 +++---
qt4/src/poppler-qt4.h | 8 ++++----
3 files changed, 12 insertions(+), 7 deletions(-)
@@ -50072,26 +52095,26 @@
commit 3e1597b80fc6750f1ec3269f9819aa8225879524
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 8 22:39:23 2007 +0000
+Date: Fri Jun 8 22:39:23 2007 +0000
poppler/Annot.cc: Fix leak
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Annot.cc | 1 +
2 files changed, 5 insertions(+)
commit 49535c20b4f71d1c1381134233e2e1449cf560c0
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Jun 7 21:23:03 2007 +0000
+Date: Thu Jun 7 21:23:03 2007 +0000
- 2007-06-07 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-06-07 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/ABWOutputDev.cc: Change "and", "or", "not" to "&&",
- "||",
- "!" for consistency with the rest of the code. Patch by Jens
- Granseuer
+ * poppler/ABWOutputDev.cc: Change "and", "or", "not" to "&&",
+ "||",
+ "!" for consistency with the rest of the code. Patch by
+ Jens Granseuer
- ChangeLog | 5 +++
+ ChangeLog | 5 +++
poppler/ABWOutputDev.cc | 93
+++++++++++++++++++++++++------------------------
2 files changed, 52 insertions(+), 46 deletions(-)
@@ -50098,7 +52121,7 @@
commit dd8fa975bf51dd18120369d0ef2d8f1781e04d93
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 2 09:18:11 2007 +0000
+Date: Sat Jun 2 09:18:11 2007 +0000
correct form of patch 11102
@@ -50107,29 +52130,29 @@
commit cdf70857ece0748f13b11c923ccf9626094555b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jun 1 18:34:48 2007 +0000
+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
+ * poppler/ArthurOutputDev.cc
+ * splash/SplashFTFont.cc
+ * splash/SplashMath.h: Make it compile with
+ --enable-fixedpoint. Fixes
+ bug 11110
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/ArthurOutputDev.cc | 8 ++++----
splash/SplashFTFont.cc | 8 ++++----
- splash/SplashMath.h | 2 +-
+ splash/SplashMath.h | 2 +-
4 files changed, 16 insertions(+), 9 deletions(-)
commit 90b1a404629a884cc32737a3a729c9a75f7a59c1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 30 18:33:24 2007 +0000
+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.
+ * 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 +-
@@ -50137,7 +52160,7 @@
commit 03d766ea1ddd4ce6d938f96b53906a7dc8bd179a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 30 18:29:57 2007 +0000
+Date: Wed May 30 18:29:57 2007 +0000
make dist needs this
@@ -50146,63 +52169,64 @@
commit d540c04268047fdd125ad932ca05c7553a97c0fe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 30 17:50:00 2007 +0000
+Date: Wed May 30 17:50:00 2007 +0000
- * utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch
- by
- Nanning Buitenhuis <nanning at elvenkind.com>
+ * utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch
+ by
+ Nanning Buitenhuis <nanning at elvenkind.com>
And some changes in glib/reference/tmpl
- ChangeLog | 5 +
+ 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-page.sgml | 5 +-
glib/reference/tmpl/poppler-unused.sgml | 130
--------------------------
- utils/HtmlFonts.cc | 2 +-
+ utils/HtmlFonts.cc | 2 +-
6 files changed, 162 insertions(+), 134 deletions(-)
commit ce414f2a36f4d97a3bddfd42baabdc1e34bf9321
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue May 29 22:01:58 2007 +0000
+Date: Tue May 29 22:01:58 2007 +0000
- 2007-05-29 Kristian Høgsberg <krh at redhat.com>
+ 2007-05-29 Kristian Høgsberg <krh at redhat.com>
- * poppler/gen-unicode-tables.py: Add this script to fix distcheck.
+ * poppler/gen-unicode-tables.py: Add this script to fix
+ distcheck.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/gen-unicode-tables.py | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
commit 97e602752b05f3690acb1821bdca31c5771361e1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Sun May 27 11:24:40 2007 +0000
+Date: Sun May 27 11:24:40 2007 +0000
- 2007-05-27 Carlos Garcia Campos <carlosgc at 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.
+ 2007-05-27 Carlos Garcia Campos <carlosgc at 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
+ ChangeLog | 7 ++
+ glib/poppler-page.cc | 198
++++++++++++++++++++++++++++-------------------
- glib/poppler-page.h | 6 +-
+ 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 at gnome.org>
-Date: Sun May 27 10:12:56 2007 +0000
+Date: Sun May 27 10:12:56 2007 +0000
- 2007-05-27 Carlos Garcia Campos <carlosgc at gnome.org>
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- Add missing image mapping type definition.
+ 2007-05-27 Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ Add missing image mapping type definition.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-page.cc | 48
+++++++++++++++++++++++++++++++++++++++++++++---
glib/poppler-page.h | 5 +++++
@@ -50210,30 +52234,30 @@
commit 8284a769568322066a9d4626bd9b2cf3d18a6487
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 26 23:20:12 2007 +0000
+Date: Sat May 26 23:20:12 2007 +0000
- * configure.ac:
- * NEWS: Bump release to 0.5.9 (0.6 Release Candidate)
+ * configure.ac:
+ * NEWS: Bump release to 0.5.9 (0.6 Release Candidate)
ChangeLog | 2 ++
- NEWS | 15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
configure.ac | 2 +-
3 files changed, 18 insertions(+), 1 deletion(-)
commit e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 26 22:33:21 2007 +0000
+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
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
poppler-qt.pc.in | 2 +-
poppler-qt4.pc.in | 2 +-
qt/Makefile.am | 2 +-
@@ -50242,68 +52266,68 @@
commit fefefe495a182c1745314186b99441b9e76ba5b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 25 23:17:58 2007 +0000
+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
+ * 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 ++++++
+ 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 ++++++++-------
+ 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 at kde.org>
-Date: Fri May 25 22:30:20 2007 +0000
+Date: Fri May 25 22:30:20 2007 +0000
- * qt4/src/poppler-link-extractor.cc: Use correct page box
- to extract
- link clickable area
+ * qt4/src/poppler-link-extractor.cc: Use correct page box
+ to extract
+ link clickable area
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-link-extractor.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 774a9456c668ef70b2e8f17d59f8f427aa97bad5
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri May 25 18:43:04 2007 +0000
+Date: Fri May 25 18:43:04 2007 +0000
- 2007-05-25 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-05-25 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ 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 at gnome.org>
-Date: Fri May 25 17:33:37 2007 +0000
+Date: Fri May 25 17:33:37 2007 +0000
- 2007-05-25 Carlos Garcia Campos <carlosgc at 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.
+ 2007-05-25 Carlos Garcia Campos <carlosgc at 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 ++++++++
+ ChangeLog | 8 ++++++++
glib/poppler-page.cc | 30 ++++++++++++++++--------------
glib/poppler-page.h | 6 ++++--
glib/poppler.h | 7 +++++++
@@ -50311,45 +52335,45 @@
commit bf195b489c22875695e202d6ca6659144ef57e61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 23 21:20:58 2007 +0000
+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.
+ * 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
+ 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 at kde.org>
-Date: Mon May 21 21:42:38 2007 +0000
+Date: Mon May 21 21:42:38 2007 +0000
Fix assert in bug 11023
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-action.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 5b411246a2cce6ed3bb2d8c9e9d856227b6aba7f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 21 21:39:08 2007 +0000
+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
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ poppler_page_render_section() for cairo. Bug 7023
- ChangeLog | 6 ++++
+ ChangeLog | 6 ++++
glib/poppler-page.cc | 88
++++++++++++++++++++++++++++++++++++++++++++++------
glib/poppler-page.h | 9 ++++++
@@ -50357,22 +52381,22 @@
commit 409f2a9cb31add29accb87011331c50dc08110cd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 21 21:35:10 2007 +0000
+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
+ * 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 +++
+ ChangeLog | 11 +++
+ glib/poppler-page.cc | 161 ++++++++++++++++++++++++++++++++--
+ glib/poppler-page.h | 10 +++
glib/poppler-private.h | 3 +
- glib/poppler.h | 9 +-
+ glib/poppler.h | 9 +-
glib/test-poppler-glib.c | 27 +++++-
poppler/CairoOutputDev.cc | 215
++++++++++++++++++++++++++++++++++++++++++++++
@@ -50381,38 +52405,38 @@
commit afd11ec66430dae084b5a5560333e933460fc637
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 21 21:29:09 2007 +0000
+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
+ * 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 +
+ ChangeLog | 11 +++++++++++
+ poppler/Annot.cc | 6 ++++++
+ poppler/Form.cc | 1 +
qt4/src/poppler-private.h | 5 ++++-
- splash/SplashTypes.h | 6 +-----
+ splash/SplashTypes.h | 6 +-----
5 files changed, 23 insertions(+), 6 deletions(-)
commit f019c8a8efde004e1663ea88cb48c0e46318d936
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 17 21:32:57 2007 +0000
+Date: Thu May 17 21:32:57 2007 +0000
- 2007-05-17 Pino Toscano <pino at kde.org>
+ 2007-05-17 Pino Toscano <pino at 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
+ * 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 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-link.cc | 12 ++++++++++++
qt4/src/poppler-private.h | 4 +++-
3 files changed, 22 insertions(+), 1 deletion(-)
@@ -50419,15 +52443,15 @@
commit d68a4eb44b5390b3093774f39a6805ad2e95c146
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun May 13 00:53:43 2007 +0000
+Date: Sun May 13 00:53:43 2007 +0000
- 2007-05-12 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-05-12 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Annot.cc: Only do appearance generation for text,
- choice or
- other fields that contain text. Patch by Julien Rebetez.
+ * poppler/Annot.cc: Only do appearance generation for text,
+ choice or
+ other fields that contain text. Patch by Julien Rebetez.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Annot.cc | 52
++++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 51 insertions(+), 6 deletions(-)
@@ -50434,15 +52458,15 @@
commit 96f8731e90af1abce67d00a3febc11880c69ce62
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 7 18:41:09 2007 +0000
+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
+ * Catalog.cc: Fix leak
+ * Form.cc: Fix leak, provide empty
+ FormPageWidgets::~FormPageWidgets
+ implementation
+ * Page.cc: Fix leak
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/Catalog.cc | 1 +
poppler/Form.cc | 5 +++++
poppler/Page.cc | 1 +
@@ -50450,21 +52474,21 @@
commit d46553d696b2d7fe416ce8db40db54dd1d7c6733
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 30 22:34:21 2007 +0000
+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
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/Makefile.am | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
commit d5c52409c532a126bcb8eb65f6f1390113a5f258
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 29 17:37:38 2007 +0000
+Date: Sun Apr 29 17:37:38 2007 +0000
jeff committed this line by mistake
@@ -50473,58 +52497,58 @@
commit 6ddc11ef4c534369ee104422bfb989603c466790
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Apr 29 17:33:58 2007 +0000
+Date: Sun Apr 29 17:33:58 2007 +0000
- 2007-04-29 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-04-29 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/UnicodeTypeTable.cc: Make some of the unicode tables
- const
- which gets rid of about 20k of data.
+ * 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
+ text data bss dec hex filename
+ before: 1415838 128864 8 1544710 179206 libpoppler.so
+ after: 1404574 140128 8 1544710 179206 libpoppler.so
- ChangeLog | 10 ++++++++++
+ ChangeLog | 10 ++++++++++
poppler/UnicodeTypeTable.cc | 24 ++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
commit c5613ab5ce65fc84eb3a5584cee1454171173fa7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 23:25:59 2007 +0000
+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
+ * 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 +++++
+ ChangeLog | 10 +++++
poppler/SplashOutputDev.cc | 102
+++++++++++++++++++++++++++++++++------------
- qt/poppler-private.h | 2 +-
- qt4/src/poppler-private.h | 2 +-
- splash/Splash.cc | 44 +++++++++----------
+ qt/poppler-private.h | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ splash/Splash.cc | 44 +++++++++----------
splash/SplashBitmap.cc | 16 +++----
- splash/SplashTypes.h | 4 +-
+ splash/SplashTypes.h | 4 +-
7 files changed, 120 insertions(+), 60 deletions(-)
commit 6479ce224f1393235ca9888dfe0710327fbfccd2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 22:12:22 2007 +0000
+Date: Sat Apr 28 22:12:22 2007 +0000
fix merging problems
- splash/Splash.cc | 1 +
+ splash/Splash.cc | 1 +
splash/SplashBitmap.cc | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
commit e2ac4ada3e29139053871ff7f53772e1ccc7adc0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 15:39:36 2007 +0000
+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...
@@ -50534,126 +52558,126 @@
commit 9b8133940638c95940edcb9b98126ca9a4f7b8d4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 12:00:38 2007 +0000
+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.
+ * 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 ++-------
+ 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 +++++++++++++++++++++----
+ qt4/src/poppler-qt4.h | 119 +++++++++++++++++++++----
5 files changed, 307 insertions(+), 52 deletions(-)
commit 26d5fefcd4c858e2ebd689d963a65773957ac808
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 11:35:34 2007 +0000
+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.
+ Hopefully fix the calculation of the image size when rendering
+ using
+ ArthurOutputDev.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-page.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 218364bc4951682de8e63e1bd3f061636b08b615
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 11:34:14 2007 +0000
+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.
+ * 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 ++++++++
+ ChangeLog | 8 ++++++++
glib/poppler-document.h | 6 +++++-
- poppler/FontInfo.h | 6 +++++-
- qt/poppler-qt.h | 6 +++++-
- qt4/src/poppler-qt4.h | 20 ++++++++++++--------
+ 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 at kde.org>
-Date: Sat Apr 28 11:20:58 2007 +0000
+Date: Sat Apr 28 11:20:58 2007 +0000
- * qt4/src/poppler-annotation.h:
- Make the header clean.
+ * qt4/src/poppler-annotation.h:
+ Make the header clean.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-annotation.h | 3 +++
2 files changed, 8 insertions(+)
commit 3f4bf880b95e28a1ae7a38b18b341e089860780c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 28 11:16:49 2007 +0000
+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.
+ * 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 +-
+ 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-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 +-
+ 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 at kde.org>
-Date: Fri Apr 27 22:41:10 2007 +0000
+Date: Fri Apr 27 22:41:10 2007 +0000
- 2007-04-28 Albert Astals Cid <aacid at kde.org>
+ 2007-04-28 Albert Astals Cid <aacid at kde.org>
- * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4
+ * 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 --
+ 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/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_fonts.cpp | 1 -
+ qt4/tests/check_metadata.cpp | 1 -
qt4/tests/check_pagelayout.cpp | 1 -
- qt4/tests/check_pagemode.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/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 -
@@ -50661,30 +52685,30 @@
commit 45993a6faafd7646075bc6630d5d2ad7a44f7e20
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 27 22:26:09 2007 +0000
+Date: Fri Apr 27 22:26:09 2007 +0000
- 2007-04-28 Carlos Garcia Campos <carlosgc at gnome.org>
- reviewed and some code by: Albert Astals Cid <aacid at kde.org>
+ 2007-04-28 Carlos Garcia Campos <carlosgc at gnome.org>
+ reviewed and some code by: Albert Astals Cid <aacid at 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.
+ * 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 +++++++++----
+ 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/Makefile.am | 2 +
poppler/PageTransition.cc | 197
+++++++++++++++---------------------------
poppler/PageTransition.h | 86 ++++++++++++++++++
@@ -50694,19 +52718,19 @@
commit 877d6b202a75eb12119b16e740f85cc8b477d589
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Apr 27 21:25:30 2007 +0000
+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
+ * 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
@@ -50713,31 +52737,31 @@
Patches for other frontends more than welcome
Comments and suggestions even more than welcome :-)
- ChangeLog | 14 +++++++++++++
- glib/poppler-page.cc | 3 ++-
+ 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 +-
+ 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 at kde.org>
-Date: Thu Apr 26 17:57:01 2007 +0000
+Date: Thu Apr 26 17:57:01 2007 +0000
- * goo/Makefile.am: Remove duplicate gmem.h
+ * goo/Makefile.am: Remove duplicate gmem.h
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
goo/Makefile.am | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
commit f6adb46cd88d23b34f1918d3be31c05b68b6a443
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 25 21:31:17 2007 +0000
+Date: Wed Apr 25 21:31:17 2007 +0000
ignore pdftoabw binary
@@ -50746,15 +52770,15 @@
commit e09f231ac6c03ac2c3606f1bf20ba1bde3d85abd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 25 21:25:06 2007 +0000
+Date: Wed Apr 25 21:25:06 2007 +0000
- 2007-04-25 Albert Astals Cid <aacid at kde.org>
+ 2007-04-25 Albert Astals Cid <aacid at kde.org>
- * qt4/src/poppler-document.cc: remove a delete[] no longer
- needed
- * qt4/src/poppler-private: initilize m_hints
+ * qt4/src/poppler-document.cc: remove a delete[] no longer
+ needed
+ * qt4/src/poppler-private: initilize m_hints
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-document.cc | 1 -
qt4/src/poppler-private.h | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
@@ -50761,174 +52785,173 @@
commit bf7e0e980bf29994021cb1228f89f582adddf284
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 25 19:59:09 2007 +0000
+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
+ 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 => gmem.cc} | 126 +-
+ 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(-)
+ 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 -
+ 138 files changed, 14350 insertions(+), 6851 deletions(-)
commit ba74bb3b0632593d1937911d73709fc870480efd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Apr 16 21:25:46 2007 +0000
+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.
+ Add the information about the open/close item in the DOM tree
+ of the TOC.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-private.h | 5 ++++-
2 files changed, 11 insertions(+), 1 deletion(-)
commit 6c7969f37c85f326327aca98e0346f2ebc86ffda
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 14 23:19:46 2007 +0000
+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.
+ * utils/HtmlFonts.cc: Fix rendering of text colors on
+ complex mode.
+ * utils/pdftohtml.cc: Fix rendering of links.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
utils/HtmlFonts.cc | 8 ++++----
utils/pdftohtml.cc | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
@@ -50935,7 +52958,7 @@
commit add8515d7b3fba59c20ed1bbb058cea9e138c1a8
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Apr 14 07:29:04 2007 +0000
+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).
@@ -50947,144 +52970,144 @@
commit f3ded10305f6ac682640c37c21f569db0f830756
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Apr 7 21:12:35 2007 +0000
+Date: Sat Apr 7 21:12:35 2007 +0000
- 2007-04-07 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-04-07 Jeff Muizelaar <jeff at infidigm.net>
- * utils/pdftoabw.cc: Fixing passing the wrong type
- to fprintf. Patch by Kouhei Sutou. Fixes #10554.
+ * utils/pdftoabw.cc: Fixing passing the wrong type
+ to fprintf. Patch by Kouhei Sutou. Fixes #10554.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
utils/pdftoabw.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 2fcb76df955c143153fe4b273d0388fcb7f67d8a
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri Apr 6 15:27:52 2007 +0000
+Date: Fri Apr 6 15:27:52 2007 +0000
- 2007-04-06 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-04-06 Jeff Muizelaar <jeff at 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
+ * 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 ++++++
+ ChangeLog | 12 ++++++
poppler/ABWOutputDev.cc | 3 ++
- utils/pdftoabw.cc | 101
+ utils/pdftoabw.cc | 101
++++++++++++++++++++++++++++--------------------
3 files changed, 74 insertions(+), 42 deletions(-)
commit 29da65ec48b5ba91139084e197ce457d3cff3732
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Apr 5 12:13:51 2007 +0000
+Date: Thu Apr 5 12:13:51 2007 +0000
* poppler/PSOutputDev.cc: Readd code wrongly removed when doing the
GlobalParams cleaning
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/PSOutputDev.cc | 5 +++++
2 files changed, 10 insertions(+)
commit 722b2bd86f58f2d7a914571cccfa195485a70c47
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 4 02:42:29 2007 +0000
+Date: Wed Apr 4 02:42:29 2007 +0000
- 2007-04-03 Jeff Muizelaar <jeff at infidigm.net>
+ 2007-04-03 Jeff Muizelaar <jeff at 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.
+ * 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 +
+ 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 +++++
+ 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 at kde.org>
-Date: Thu Mar 22 20:56:24 2007 +0000
+Date: Thu Mar 22 20:56:24 2007 +0000
- * poppler/Gfx.cc: Accept reals for width and height of
- images. Fixes
- KDE bug 143322
+ * poppler/Gfx.cc: Accept reals for width and height of
+ images. Fixes
+ KDE bug 143322
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Gfx.cc | 14 ++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
commit ff8f8d44ef47a98f7dbdfaa4d27a720b1f37015f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 15 20:16:13 2007 +0000
+Date: Thu Mar 15 20:16:13 2007 +0000
- * glib/Makefile.am: Make it build with BSD/Make. Patch by
- Henry Precheur <henry at precheur.org>
+ * glib/Makefile.am: Make it build with BSD/Make. Patch by
+ Henry Precheur <henry at precheur.org>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/Makefile.am | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit bbf7e78b6b2509ecdc476d7f55151ef327470d9d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 7 19:15:32 2007 +0000
+Date: Wed Mar 7 19:15:32 2007 +0000
- 2007-03-07 Carlos Garcia Campos <carlosgc at gnome.org>
- reviewed by: Albert Astals Cid <aacid at kde.org>
+ 2007-03-07 Carlos Garcia Campos <carlosgc at gnome.org>
+ reviewed by: Albert Astals Cid <aacid at kde.org>
- * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes
- http://bugzilla.gnome.org/show_bug.cgi?id=408682
+ * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes
+ http://bugzilla.gnome.org/show_bug.cgi?id=408682
- 2007-03-06 Pino Toscano <pino at kde.org>
- reviewed by: Albert Astals Cid <aacid at kde.org>
+ 2007-03-06 Pino Toscano <pino at kde.org>
+ reviewed by: Albert Astals Cid <aacid at 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.
+ * 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 ++++++++++-
+ 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 at kde.org>
-Date: Tue Mar 6 22:27:18 2007 +0000
+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
+ * poppler/Annot.cc:
+ * poppler/Form.cc:
+ Fix uninitialized variables.
+ Properly escape parenthesis and slash in text field
- ChangeLog | 9 ++++++++-
+ ChangeLog | 9 ++++++++-
poppler/Annot.cc | 3 +++
poppler/Form.cc | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
@@ -51091,13 +53114,13 @@
commit e8d3b21d08a59ec8b62503b48504fe046d746bfa
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Mar 4 07:30:31 2007 +0000
+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
+ ChangeLog | 9 +++
+ configure.ac | 36 +++++------
+ m4/qt.m4 | 165
--------------------------------------------------
poppler/Makefile.am | 2 +-
qt4/src/Makefile.am | 3 +-
@@ -51106,19 +53129,19 @@
commit bd99616b9c06f96beadb68e015d2904b7fe2df1d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 25 00:34:21 2007 +0000
+Date: Sun Feb 25 00:34:21 2007 +0000
007-02-25 Julien Rebetez <julienr at svn.gnome.org>
- reviewed by: Albert Astals Cid <aacid at kde.org>
+ reviewed by: Albert Astals Cid <aacid at kde.org>
- * poppler/Annot.cc:
- * poppler/Annot.h:
- * poppler/Form.cc:
- * poppler/Form.h:
- Fix compilation warnings.
+ * poppler/Annot.cc:
+ * poppler/Annot.h:
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ Fix compilation warnings.
- ChangeLog | 10 ++++++++++
+ ChangeLog | 10 ++++++++++
poppler/Annot.cc | 30 +++++++++++++++++-------------
poppler/Annot.h | 5 ++++-
poppler/Form.cc | 37 ++++++++++++++-----------------------
@@ -51127,7 +53150,7 @@
commit d8d23b56332618d8c7d8198f55ec6efafd24187e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 25 00:00:20 2007 +0000
+Date: Sun Feb 25 00:00:20 2007 +0000
forgot to commit these
@@ -51138,162 +53161,162 @@
commit 984ce7f919aec27d5f4225376550cd6b58d4ae52
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 24 23:58:31 2007 +0000
+Date: Sat Feb 24 23:58:31 2007 +0000
- 2007-02-25 Pino Toscano <pino at kde.org>
- reviewed by: Albert Astals Cid <aacid at kde.org>
+ 2007-02-25 Pino Toscano <pino at kde.org>
+ reviewed by: Albert Astals Cid <aacid at 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.
+ * 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 ++
+ 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-page.cc | 36 +++++++++++++++++++++++++
+ qt4/src/poppler-private.h | 52
++++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-qt4.h | 7 +++++
+ qt4/src/poppler-qt4.h | 7 +++++
7 files changed, 120 insertions(+), 10 deletions(-)
commit de7a90fc724de14151ec994d18f860ada3be2ac8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 24 23:43:34 2007 +0000
+Date: Sat Feb 24 23:43:34 2007 +0000
- 2007-02-25 Albert Astals Cid <aacid at kde.org>
+ 2007-02-25 Albert Astals Cid <aacid at 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
+ * 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 +-
+ 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 +-
+ 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 at kde.org>
-Date: Sat Feb 24 23:32:22 2007 +0000
+Date: Sat Feb 24 23:32:22 2007 +0000
- 2007-02-25 Julien Rebetez <julienr at svn.gnome.org>
- reviewed by: <aacid at kde.org>
+ 2007-02-25 Julien Rebetez <julienr at svn.gnome.org>
+ reviewed by: <aacid at 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.
+ * 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 ++
+ ChangeLog | 35 ++
glib/poppler-document.cc | 192 +++++++
glib/poppler-document.h | 55 ++
- glib/poppler-page.cc | 120 +++++
- glib/poppler-page.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 +
+ 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/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 +
+ 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 at kde.org>
-Date: Sun Feb 18 21:44:24 2007 +0000
+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.
+ that i get /usr/local/share/poppler in config.h
+ instead of
+ ${prefix}/poppler Better fixes are welcome.
ChangeLog | 6 ++++++
configure.ac | 2 +-
@@ -51301,7 +53324,7 @@
commit dd140dd63de661303b578863af4d515d82117cca
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 4 00:19:25 2007 +0000
+Date: Sun Feb 4 00:19:25 2007 +0000
fix date
@@ -51310,14 +53333,14 @@
commit 3c1ed68bf4ee49b27275f7f65d49f42933b1cfa0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 4 00:16:43 2007 +0000
+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
+ * poppler/Lexer.cc:
+ * poppler/Lexer.h: Patch to fix regression introduced by
+ optimizations
+ in bugzilla issue 7808
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Lexer.cc | 30 ++++++++++++++++++++----------
poppler/Lexer.h | 2 +-
3 files changed, 27 insertions(+), 11 deletions(-)
@@ -51324,7 +53347,7 @@
commit 672408839de0deac4c6006b54df723336ee4be2d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 31 22:05:09 2007 +0000
+Date: Wed Jan 31 22:05:09 2007 +0000
* qt4/src/poppler-page.cc:
Patch by Pino Toscano <pino at kde.org> to remove a nonsense done
@@ -51333,14 +53356,14 @@
* qt4/tests/test-poppler-qt4.cpp:
Simply a bit. Patch by Pino Toscano <pino at kde.org>.
- ChangeLog | 8 ++++++++
- qt4/src/poppler-page.cc | 2 --
+ 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 at kde.org>
-Date: Wed Jan 31 18:48:16 2007 +0000
+Date: Wed Jan 31 18:48:16 2007 +0000
* m4/qt.m4: Fix Qt4 detection on Mac. Patch by Benjamin Reed
<ranger at befunk.com>
@@ -51351,69 +53374,69 @@
commit 1b81192ff2bb9fae4a7bbc685fafe1718f303a7b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 28 15:55:11 2007 +0000
+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 at gnome.org>
- * glib/poppler-action.cc: Fix link destination
- coordinates. Patch by
- Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-page.cc: Make link mapping coordinates
+ follow page
+ rotation. Patch by Carlos Garcia Campos <carlosgc at gnome.org>
+ * glib/poppler-action.cc: Fix link destination
+ coordinates. Patch by
+ Carlos Garcia Campos <carlosgc at gnome.org>
- ChangeLog | 4 ++
+ ChangeLog | 4 ++
glib/poppler-action.cc | 15 +++++-
- glib/poppler-page.cc | 124
+ glib/poppler-page.cc | 124
+++++++++++++++++++++++++++++++------------------
3 files changed, 97 insertions(+), 46 deletions(-)
commit 75dcf94f53c2d7241111f0d527ee4d3a2ef0b0cf
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 28 15:36:08 2007 +0000
+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 at gnome.org>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 30 ++++++++++++++----------------
2 files changed, 19 insertions(+), 16 deletions(-)
commit 682a15fc38a2c569d9b1f9871e3e949b62b33cf8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 21 22:35:23 2007 +0000
+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 at kde.org>.
+ * 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 at kde.org>.
- ChangeLog | 12 ++++++++++++
+ 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 +++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 25 +++++++++++++++++++++++++
5 files changed, 94 insertions(+), 6 deletions(-)
commit 7331bc46c1cb323316501f05ae1740bea5655596
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 17 20:06:29 2007 +0000
+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 at kde.org>.
+ * 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 at kde.org>.
- ChangeLog | 10 +++-
- poppler/Sound.cc | 80 +++++++++++++++++++++++++-
- poppler/Sound.h | 32 ++++++++++-
+ ChangeLog | 10 +++-
+ poppler/Sound.cc | 80 +++++++++++++++++++++++++-
+ poppler/Sound.h | 32 ++++++++++-
qt4/src/poppler-sound.cc | 144
+++++++++++++++++------------------------------
4 files changed, 167 insertions(+), 99 deletions(-)
@@ -51420,26 +53443,26 @@
commit 841bee94da7b6376d2e1fb3daaf8b727b90e42d8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 13 23:19:21 2007 +0000
+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.
+ * 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 -
+ 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-link.cc | 4 +--
qt4/src/poppler-page.cc | 34 ++++++++++-----------
qt4/src/poppler-private.h | 24 +++++++++------
7 files changed, 84 insertions(+), 69 deletions(-)
@@ -51446,51 +53469,51 @@
commit e1432fd7c4a6a2386789f450d39c6d954fd4e656
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 13 18:29:39 2007 +0000
+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 at kde.org>.
+ * 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 at kde.org>.
- ChangeLog | 12 ++++++++++++
- configure.ac | 5 -----
- poppler/Makefile.am | 5 +++--
- qt4/src/Makefile.am | 6 +++++-
+ 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-link.cc | 1 +
qt4/src/poppler-page.cc | 15 ++++++++++++---
- qt4/src/poppler-private.h | 8 +++++++-
- qt4/src/poppler-qt4.h | 6 ++++++
+ 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 at kde.org>
-Date: Sat Jan 13 17:56:07 2007 +0000
+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
+ * 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 +
+ 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 ++++++++++++++++
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++++
6 files changed, 67 insertions(+), 2 deletions(-)
commit 4e2a9c49ecab00b1f5d175570165cd490afdd31e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 11 22:28:03 2007 +0000
+Date: Thu Jan 11 22:28:03 2007 +0000
goo/gmem.c: Merge change from xpdf-3.01pl2
@@ -51500,13 +53523,13 @@
commit bce14b274fd788d728116950d6464a85e33a9966
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 11 22:12:11 2007 +0000
+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
+ * poppler/Catalog.h:
+ * poppler/Catalog.cc: Limit max depth of recursive calls on
+ readPageTree to fix MOAB-06-01-2007
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Catalog.cc | 20 +++++++++++++++-----
poppler/Catalog.h | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
@@ -51513,13 +53536,13 @@
commit 3f0679a336ffaf2aff149f8526fa11f8f8cbda59
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jan 6 21:53:08 2007 +0000
+Date: Sat Jan 6 21:53:08 2007 +0000
Patch by Pino Toscano <pino at kde.org> to fix some memory leaks when
dealing with sounds.
- ChangeLog | 9 +++++++++
- poppler/Sound.cc | 1 +
+ ChangeLog | 9 +++++++++
+ poppler/Sound.cc | 1 +
qt4/src/poppler-link.cc | 5 +++++
qt4/src/poppler-link.h | 1 +
qt4/src/poppler-page.cc | 4 ++++
@@ -51528,61 +53551,61 @@
commit d41cd2f567a955031cb7498d9089e70e14df4a42
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 4 19:10:16 2007 +0000
+Date: Thu Jan 4 19:10:16 2007 +0000
qt4/src/poppler-private.h: gmallocn -> new[]
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt4/src/poppler-private.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit f8edfb6832144cbbd1b234f6b35e33325269255c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 4 18:56:13 2007 +0000
+Date: Thu Jan 4 18:56:13 2007 +0000
qt/poppler-page-transition.cc: Fix memory leak. Patch by Tobias
Koenig <tokoe at kde.org>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt/poppler-page-transition.cc | 1 +
2 files changed, 6 insertions(+)
commit 250a9f4b429344e0968c7bd0c0cebe7af373ae0a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 30 14:50:25 2006 +0000
+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 at kde.org>
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-document.cc | 4 ++--
- qt4/src/poppler-qt4.h | 4 ++--
+ qt4/src/poppler-qt4.h | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
commit 250c1f94cc9a53f980fd08364d6cce29db9fd067
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 29 14:08:35 2006 +0000
+Date: Fri Dec 29 14:08:35 2006 +0000
* poppler/UGooString.cc: Patch by Pino Toscano <pino at kde.org> so
that QStringToUGooString does not crash.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/UGooString.cc | 1 +
2 files changed, 6 insertions(+)
commit 42770e5f07407b03dce31c73fd6956f9c8fc9a06
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri Dec 29 04:12:40 2006 +0000
+Date: Fri Dec 29 04:12:40 2006 +0000
- 2006-12-28 Brad Taylor <brad at getcoded.net>
+ 2006-12-28 Brad Taylor <brad at 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.
+ * 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 +++
+ ChangeLog | 6 +++
glib/poppler-document.cc | 113
++++++++++++++++++++++++++++++++++-------------
glib/poppler-document.h | 4 ++
@@ -51590,21 +53613,21 @@
commit 6fedd991b584e300b5710630fa7942d357fe7aaa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 28 17:22:36 2006 +0000
+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 +++-
+ 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 at kde.org>
-Date: Thu Dec 28 15:51:44 2006 +0000
+Date: Thu Dec 28 15:51:44 2006 +0000
* goo/GooString.cc
* goo/GooString.h
@@ -51619,29 +53642,29 @@
<kkowalczyk at gmail.com> to improve performance. See bug 7808 for
details.
- ChangeLog | 15 ++++
- goo/GooString.cc | 186
+ 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 +++
+ 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 ++++++++--
+ 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 at kde.org>
-Date: Wed Dec 27 23:15:06 2006 +0000
+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 at mac.com>
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Annot.cc | 48 +++++++++++++++++++++++++++++-------------------
poppler/Annot.h | 1 +
3 files changed, 36 insertions(+), 19 deletions(-)
@@ -51648,170 +53671,170 @@
commit dc6b372358ac629c43aa2faabd644942cb0ed98b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 27 15:23:04 2006 +0000
+Date: Wed Dec 27 15:23:04 2006 +0000
Remove , after last value of enum. Thanks to André Wöbbeking
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Catalog.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit c7d19539a95927eb277966a521f13393c9e116bb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Dec 27 12:38:58 2006 +0000
+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 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-qt4.h | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit b29429c702e6540b9f35689b0a164f30e747d5d9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 26 20:07:03 2006 +0000
+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 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-page.cc | 8 ++++++++
- qt4/src/poppler-qt4.h | 9 ++++++++-
+ qt4/src/poppler-qt4.h | 9 ++++++++-
3 files changed, 22 insertions(+), 1 deletion(-)
commit 62dfc58903b496c4cc720c8b2c759c6fb82fb443
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 26 19:56:28 2006 +0000
+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 at gnome.org>
+ * 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 at gnome.org>
- ChangeLog | 9 +++++++++
- glib/poppler-page.cc | 16 ++++++++++++++++
- glib/poppler-page.h | 1 +
+ 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 ++++++
+ poppler/Page.cc | 13 +++++++++++++
+ poppler/Page.h | 6 ++++++
6 files changed, 52 insertions(+)
commit 34e5aa62f4d3ba7a2d94a68a91c11a48277a4119
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 23 13:12:13 2006 +0000
+Date: Sat Dec 23 13:12:13 2006 +0000
- * poppler/PSTokenizer.cc: Enhance PSTokenizer::getToken
- performance.
- Patch by Scott Turner <scotty1024 at mac.com>. In a random pdf
- i tested
- the patchs improves PSTokenizer::getToken performance by 15%
+ * poppler/PSTokenizer.cc: Enhance PSTokenizer::getToken
+ performance.
+ Patch by Scott Turner <scotty1024 at mac.com>. In a random pdf
+ i tested
+ the patchs improves PSTokenizer::getToken performance by 15%
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/PSTokenizer.cc | 33 +++++++++++++++++++++------------
- poppler/PSTokenizer.h | 1 +
+ poppler/PSTokenizer.h | 1 +
3 files changed, 28 insertions(+), 12 deletions(-)
commit 1a5fa1d2ced62e7d027e085663e987cff625ce0b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 22 23:39:41 2006 +0000
+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 at mac.com>
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/Page.cc | 1 +
2 files changed, 4 insertions(+)
commit dd1c134dcf085338a85188c7f205fc300396dc86
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 22 23:27:53 2006 +0000
+Date: Fri Dec 22 23:27:53 2006 +0000
qt/poppler-page.cc: Fix memory leak in Page::textList. Patch by
Jerry Epplin <jepplin at globalvelocity.com>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt/poppler-page.cc | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 87e474a018c4808d6251fd79f9e9640e0f733551
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Dec 21 01:01:30 2006 +0000
+Date: Thu Dec 21 01:01:30 2006 +0000
- 2006-12-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-12-20 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 8 ++------
2 files changed, 8 insertions(+), 6 deletions(-)
commit 769a89623c680f51690db1751522b016b02b83a8
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Dec 20 19:55:55 2006 +0000
+Date: Wed Dec 20 19:55:55 2006 +0000
- 2006-12-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-12-20 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/GlobalParams.cc: Try to make zero-width lines as
- close to
- one pixel wide as we can. Fixes #9393.
+ * poppler/GlobalParams.cc: Try to make zero-width lines as
+ close to
+ one pixel wide as we can. Fixes #9393.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 10 ++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
commit 5c4bca18373528f293bd5e080efca572977fc1ff
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Dec 19 20:27:55 2006 +0000
+Date: Tue Dec 19 20:27:55 2006 +0000
poppler/SplashOutputDev.cc: Fix gray calculation. Patch by Scott
Turner <scotty1024 at mac.com>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/SplashOutputDev.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit fba99578f6001ae0c0df0442bb73040b55109b1d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Dec 12 05:23:59 2006 +0000
+Date: Tue Dec 12 05:23:59 2006 +0000
- 2006-12-12 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-12-12 Jeff Muizelaar <jeff at 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.
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/CairoOutputDev.cc | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 9a6ffa1c6e009f8606a055f873efdcd5829fcfa2
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Dec 10 05:24:56 2006 +0000
+Date: Sun Dec 10 05:24:56 2006 +0000
- 2006-12-09 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-12-09 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Function.cc: Initialize PostScriptFunction::codeString
- to
- NULL so that it can safely deleted if initialization fails.
- Fixes #9263.
+ * poppler/Function.cc: Initialize
+ PostScriptFunction::codeString to
+ NULL so that it can safely deleted if initialization fails.
+ Fixes #9263.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Function.cc | 1 +
2 files changed, 7 insertions(+)
commit e92d63a179ae022270156da4e396c15ff9236d89
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 23 19:01:44 2006 +0000
+Date: Thu Nov 23 19:01:44 2006 +0000
* m4/libjpeg.m4: Make JPEG library header search work under
MSYS. Patch by Alexis Wilke
@@ -51822,7 +53845,7 @@
commit 3913110f698fd006b394a395b5b0adfde30af31b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 22 21:55:27 2006 +0000
+Date: Wed Nov 22 21:55:27 2006 +0000
there should not be any whitespace after the \
@@ -51831,7 +53854,7 @@
commit c3ab7addec5a7990872949b813c2b727b1614d64
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 19 18:51:23 2006 +0000
+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 ;-)
@@ -51841,99 +53864,99 @@
commit 9e9b82da91abacb916b05302d40bf822af6ac7f1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Nov 19 12:59:48 2006 +0000
+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
+ * 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 ++++++++
+ ChangeLog | 8 ++++++++
qt4/src/poppler-link.cc | 6 ++++++
qt4/src/poppler-page.cc | 4 +++-
- qt4/src/poppler-qt4.h | 1 +
+ qt4/src/poppler-qt4.h | 1 +
qt4/src/poppler-textbox.cc | 5 +++++
- splash/Splash.cc | 2 +-
+ splash/Splash.cc | 2 +-
6 files changed, 24 insertions(+), 2 deletions(-)
commit b9faacc62182efcbc84df2471e4c5dcf2b03bda8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 18 17:08:04 2006 +0000
+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()
+ * 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 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-document.cc | 11 +++++++++--
- qt4/src/poppler-qt4.h | 6 +++++-
+ qt4/src/poppler-qt4.h | 6 +++++-
3 files changed, 20 insertions(+), 3 deletions(-)
commit da8e6d4c3e0afdaa031413649ae20545c8a1f845
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 16 21:03:27 2006 +0000
+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/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
+ qt4/src/poppler-qt4.h | 115
+++++++++++++++++++++++++++----------------
5 files changed, 171 insertions(+), 82 deletions(-)
commit 4f26e65096e3133a39fc0c9e82084c90cf77dda9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 16 21:00:10 2006 +0000
+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.
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
qt4/src/Mainpage.dox | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
commit e68b6f3f8fea1e4f036eba0f19bb7e0c423d408c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Nov 15 21:07:50 2006 +0000
+Date: Wed Nov 15 21:07:50 2006 +0000
- 2006-11-15 Albert Astals Cid <aacid at kde.org>
+ 2006-11-15 Albert Astals Cid <aacid at 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/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.
+ * 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 | 123
+ ChangeLog | 17 ++++++
+ qt4/src/poppler-document.cc | 14 +++++
+ qt4/src/poppler-link.cc | 2 +-
+ qt4/src/poppler-page.cc | 123
+++++++++++++++++++++------------------
- qt4/src/poppler-private.h | 32 ++++++----
- qt4/src/poppler-qt4.h | 75 +++++++-----------------
+ 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 +++---
@@ -51941,50 +53964,51 @@
commit 37088dd3335be6e7641c47bea9b1ddd689b07372
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 13 19:16:44 2006 +0000
+Date: Mon Nov 13 19:16:44 2006 +0000
- * poppler/ArthurOutputDev.cc: Small fix to get colors right
+ * poppler/ArthurOutputDev.cc: Small fix to get colors right
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/ArthurOutputDev.cc | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
commit 302e2cab9fd626222c69ad40f7e40be2e65d34a9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Nov 11 15:41:27 2006 +0000
+Date: Sat Nov 11 15:41:27 2006 +0000
Fix typo when outputing PS scale
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PSOutputDev.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit e3550fb286dae98992b30edbf4a9300fa58d2e77
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Nov 7 23:53:31 2006 +0000
+Date: Tue Nov 7 23:53:31 2006 +0000
- 2006-11-07 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-11-07 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: take horizontal scaling into account
- when updating the font. Also, cleanup some unused code. Fixes
- #8924.
+ * poppler/CairoOutputDev.cc: take horizontal scaling into
+ account
+ when updating the font. Also, cleanup some unused code. Fixes
+ #8924.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 9 ++-------
2 files changed, 7 insertions(+), 7 deletions(-)
commit f020b64a72ad5c82c3e7bdcf15039bb0037b1f22
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 18 18:43:59 2006 +0000
+Date: Wed Oct 18 18:43:59 2006 +0000
- 2006-10-18 Albert Astals Cid <aacid at kde.org>
+ 2006-10-18 Albert Astals Cid <aacid at 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.
+ * 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 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-document.cc | 41
++++++++++++++++-------------------------
qt4/src/poppler-private.h | 14 ++++++++++++++
@@ -51992,56 +54016,56 @@
commit 577330ee1d4d1021174cf1bd59557a83a017e06f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Oct 11 23:09:24 2006 +0000
+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
+ * 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 ++
+ ChangeLog | 7 +++++++
+ splash/Splash.cc | 2 ++
splash/SplashErrorCodes.h | 2 ++
3 files changed, 11 insertions(+)
commit 42c016c6d3c6de65fd92b51b9d6cc96d52404689
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 8 20:38:47 2006 +0000
+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.
+ * 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.
+ * 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 +
+ 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-qt4.h | 87 +++++++++++++++++++++++
qt4/src/poppler-sound.cc | 177
+++++++++++++++++++++++++++++++++++++++++++++++
14 files changed, 586 insertions(+), 1 deletion(-)
@@ -52048,28 +54072,28 @@
commit 1da064d7e7403ec7111eecb2b9613e27a2c4bb5d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Sep 30 16:28:35 2006 +0000
+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 ++++
+ ChangeLog | 4 ++++
qt4/src/poppler-page.cc | 15 +++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
commit 29366d8e470ab2207cdfdab115c2fa9618c4c74e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 25 20:43:18 2006 +0000
+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 at opensde.org. Fixes bug #8415
+ * 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 at opensde.org. Fixes bug #8415
- ChangeLog | 10 ++++++++++
+ ChangeLog | 10 ++++++++++
glib/Makefile.am | 2 ++
qt/Makefile.am | 6 ++++--
qt4/src/Makefile.am | 2 ++
@@ -52080,7 +54104,7 @@
commit 957c1e59df213a01ca87f03d067a8dab5dc09fb6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 25 20:05:28 2006 +0000
+Date: Mon Sep 25 20:05:28 2006 +0000
ignore poppler-features.h
@@ -52089,24 +54113,25 @@
commit 3158b54375bdfdc82779362cc9442aade87f84f6
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Sep 22 00:55:54 2006 +0000
+Date: Fri Sep 22 00:55:54 2006 +0000
- 2006-09-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-21 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Update list of bugs fixes, release 0.5.4.
+ * NEWS: Update list of bugs fixes, release 0.5.4.
ChangeLog | 2 ++
- NEWS | 2 +-
+ NEWS | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
commit 17dd1f60f9328ae68fbe262ae0745be976ff9f95
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 23:28:14 2006 +0000
+Date: Thu Sep 21 23:28:14 2006 +0000
- 2006-09-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-21 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
- help text for zlib option (#7788, #7661).
+ * 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 +++++-------
@@ -52114,103 +54139,106 @@
commit ddbbd697424b9122ce1f0541ddada3fe8bb38fb1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 22:58:31 2006 +0000
+Date: Thu Sep 21 22:58:31 2006 +0000
- 2006-09-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-21 Kristian Høgsberg <krh at redhat.com>
- * utils/pdftops.cc: Get duplex setting from GlobalParams.
+ * utils/pdftops.cc: Get duplex setting from GlobalParams.
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
utils/pdftops.cc | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 0d25592a1a5811ee8fffbd70307c7bcaaaacadf3
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 22:40:52 2006 +0000
+Date: Thu Sep 21 22:40:52 2006 +0000
- 2006-09-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-21 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage
- reference its document throughout the lifetime of the page
- (#7005).
+ * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage
+ reference its document throughout the lifetime of the page
+ (#7005).
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
glib/poppler-page.cc | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit b834755c7ae45eb4020e9cdbc3852eac0151fcdc
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 22:37:00 2006 +0000
+Date: Thu Sep 21 22:37:00 2006 +0000
- 2006-09-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-21 Kristian Høgsberg <krh at redhat.com>
- * poppler/Gfx.cc: Remove the right out->updateAll() call.
+ * poppler/Gfx.cc: Remove the right out->updateAll() call.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Gfx.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 181e2af1edf2cbc3c8edadad0dce215a64a990dd
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 01:05:23 2006 +0000
+Date: Thu Sep 21 01:05:23 2006 +0000
- 2006-09-20 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-20 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Sum up changes.
+ * NEWS: Sum up changes.
- * configure.ac: Bump release to 0.5.4.
+ * configure.ac: Bump release to 0.5.4.
ChangeLog | 4 ++++
- NEWS | 10 ++++++++++
+ NEWS | 10 ++++++++++
configure.ac | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
commit cc9c17a6730422be99ebcd69991fcf5d7b569640
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Sep 21 00:56:33 2006 +0000
+Date: Thu Sep 21 00:56:33 2006 +0000
- 2006-09-20 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-20 Kristian Høgsberg <krh at redhat.com>
- * poppler/Gfx.cc: Remove last remnant of erroneous type3 commit a
- while back, fixing #8182.
+ * poppler/Gfx.cc: Remove last remnant of erroneous type3
+ commit a
+ while back, fixing #8182.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 1 -
- poppler/Gfx.cc | 1 -
+ poppler/Gfx.cc | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
commit 83be722b56d9266b89946fe994023351e47eb4fd
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Sep 20 20:22:19 2006 +0000
+Date: Wed Sep 20 20:22:19 2006 +0000
- 2006-09-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-09-20 Jeff Muizelaar <jeff at 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
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/TextOutputDev.cc | 4 ++++
2 files changed, 10 insertions(+)
commit 1cf60015d7d78668c83737be6015dc880fd04ebf
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Sep 19 04:39:07 2006 +0000
+Date: Tue Sep 19 04:39:07 2006 +0000
- 2006-09-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-19 Kristian Høgsberg <krh at redhat.com>
- * poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
- scan in any encodings found under ${datadir}/poppler.
+ * 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.
+ * 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 ++++++++++++++
+ 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 ++-
@@ -52218,25 +54246,26 @@
commit 821c883f9df9cc0e5b81aa2e070727996cf3bc4e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Sep 18 15:40:50 2006 +0000
+Date: Mon Sep 18 15:40:50 2006 +0000
- 2006-09-13 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-13 Kristian Høgsberg <krh at redhat.com>
- * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
- link if configured.
+ * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo
+ libs to
+ link if configured.
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/Makefile.am | 4 ++++
2 files changed, 7 insertions(+)
commit d8ab8ebc94c32d32ad17ed54cede453de25d7dd5
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Sep 13 20:25:03 2006 +0000
+Date: Wed Sep 13 20:25:03 2006 +0000
- 2006-09-13 Kristian Høgsberg <krh at redhat.com>
+ 2006-09-13 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Tighten glib check (#7906), add check for C++
- compiler (#8048).
+ * configure.ac: Tighten glib check (#7906), add check for C++
+ compiler (#8048).
ChangeLog | 5 +++++
configure.ac | 3 ++-
@@ -52244,7 +54273,7 @@
commit 7c748075e18cfe95be6a56adf09ce7f2f032b86f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 12 19:48:47 2006 +0000
+Date: Tue Sep 12 19:48:47 2006 +0000
sorry Jeff
@@ -52253,17 +54282,17 @@
commit 6cdcfae0e1c6fbec07ee5273e6ad97ef04110868
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Sep 11 21:20:56 2006 +0000
+Date: Mon Sep 11 21:20:56 2006 +0000
- 2006-09-11 Albert Astals Cid <aacid at kde.org>
+ 2006-09-11 Albert Astals Cid <aacid at 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
+ * 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 +-
+ ChangeLog | 10 +-
qt4/src/poppler-annotation.cc | 230
+++++++++++++++++++++++++++++++++++++++-
qt4/src/poppler-annotation.h | 22 +++-
@@ -52273,82 +54302,86 @@
commit 8335c7eea2aa62a580170f47323d8674bd89e412
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri Sep 8 23:28:22 2006 +0000
+Date: Fri Sep 8 23:28:22 2006 +0000
- 2006-09-08 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-09-08 Jeff Muizelaar <jeff at 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.
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/CairoOutputDev.cc | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
commit 02d505aa0176b6e5a54ee82426d8333a9ef8f000
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Sep 7 04:01:39 2006 +0000
+Date: Thu Sep 7 04:01:39 2006 +0000
- 2006-09-06 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-09-06 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev if
- endString is called without a corresponding beginString. Fixes
- #4515.
+ * poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev
+ if
+ endString is called without a corresponding beginString. Fixes
+ #4515.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
commit 3ea0aada0434c9f815814253dd9d1374ae6643cc
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Sep 6 23:54:30 2006 +0000
+Date: Wed Sep 6 23:54:30 2006 +0000
- 2006-09-06 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-09-06 Jeff Muizelaar <jeff at 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.
+ * 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 +-
+ ChangeLog | 9 +++++++++
+ configure.ac | 2 +-
poppler/FlateStream.cc | 35 +++++++++++++++++++++++++----------
- poppler/FlateStream.h | 3 ++-
+ poppler/FlateStream.h | 3 ++-
4 files changed, 37 insertions(+), 12 deletions(-)
commit 1d2e6aedca0b8fcce6ac84ae2576ab067912886b
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Sep 5 01:21:50 2006 +0000
+Date: Tue Sep 5 01:21:50 2006 +0000
- 2006-09-04 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-09-04 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Initialize currentFont to NULL before
- use. Found by Pascal Terjan. Fixes #7924.
+ * poppler/CairoOutputDev.cc: Initialize currentFont to
+ NULL before
+ use. Found by Pascal Terjan. Fixes #7924.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 1 +
2 files changed, 6 insertions(+)
commit 7905adaa21f2347346927fa567c64be60e2bc69c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Sep 3 09:27:21 2006 +0000
+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.
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
poppler/Dict.cc | 4 ++--
poppler/Dict.h | 11 +++++++++--
poppler/Object.h | 12 ++++++++++++
@@ -52357,30 +54390,30 @@
commit 4da7c90a619002e54f436c4efee723b5bc42a112
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 24 22:32:31 2006 +0000
+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 at gmail.com>
+ Rafael RodrÃguez <rafael.rodriguez.tf at gmail.com>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-private.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 469202e117910beb4e0ad906d5c154a3bae5c98b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 16 14:35:14 2006 +0000
+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 +++++
+ ChangeLog | 5 +++++
qt/poppler-page.cc | 10 ++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
commit b881844e4d31009c5d54c9321a6daaf0f354cf6b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Aug 16 09:18:04 2006 +0000
+Date: Wed Aug 16 09:18:04 2006 +0000
did not want to commit that, thanks Brad for noticing!
@@ -52389,7 +54422,7 @@
commit f52380e6d569280839d7c37362bd7cc59f2573c3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Aug 15 22:27:31 2006 +0000
+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
@@ -52401,62 +54434,62 @@
commit 1caba84b1024f1fa7865deebbf70379855ce078d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Aug 11 13:12:11 2006 +0000
+Date: Fri Aug 11 13:12:11 2006 +0000
- 2006-08-11 Albert Astals Cid <aacid at kde.org>
+ 2006-08-11 Albert Astals Cid <aacid at kde.org>
- * poppler/Catalog.cc: Fix leak
+ * poppler/Catalog.cc: Fix leak
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Catalog.cc | 1 +
2 files changed, 5 insertions(+)
commit 9b6455f6530e273afaa5f948b67ceeec8a06f976
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 10 16:08:51 2006 +0000
+Date: Thu Aug 10 16:08:51 2006 +0000
- 2006-08-10 Albert Astals Cid <aacid at kde.org>
+ 2006-08-10 Albert Astals Cid <aacid at kde.org>
- * poppler/SplashOutputDev.cc: Try to fix refs to fonts
- yet again
+ * poppler/SplashOutputDev.cc: Try to fix refs to fonts
+ yet again
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/SplashOutputDev.cc | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
commit 305f60e0437dcfc5babd449123a1fe4cd062a219
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 5 17:10:07 2006 +0000
+Date: Sat Aug 5 17:10:07 2006 +0000
- 2006-08-05 Albert Astals Cid <aacid at kde.org>
+ 2006-08-05 Albert Astals Cid <aacid at 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
+ * 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 ++++++++++--
+ 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 at kde.org>
-Date: Fri Aug 4 22:48:09 2006 +0000
+Date: Fri Aug 4 22:48:09 2006 +0000
- 2006-08-05 Albert Astals Cid <aacid at kde.org>
+ 2006-08-05 Albert Astals Cid <aacid at kde.org>
- * utils/pdftotext.cc:
- * utils/pdfinfo.cc:
- * utils/pdffonts.cc: Add the posibility of reading a file
- from stdin.
- Patch by Dom Lachowicz
+ * utils/pdftotext.cc:
+ * utils/pdfinfo.cc:
+ * utils/pdffonts.cc: Add the posibility of reading a file
+ from stdin.
+ Patch by Dom Lachowicz
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
utils/pdffonts.cc | 11 ++++++++++-
utils/pdfinfo.cc | 11 ++++++++++-
utils/pdftotext.cc | 11 ++++++++++-
@@ -52464,11 +54497,11 @@
commit a418d844cf6baa797919796ceadaf21ef9b2e5b9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Aug 3 10:34:52 2006 +0000
+Date: Thu Aug 3 10:34:52 2006 +0000
- * configure.ac: Use the correct variable to output the
- utils status.
- Patch by Dom Lachowic
+ * configure.ac: Use the correct variable to output the
+ utils status.
+ Patch by Dom Lachowic
ChangeLog | 5 +++++
configure.ac | 2 +-
@@ -52476,30 +54509,30 @@
commit 1673b895656143a8a1f1a45e07f777f39995940d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 30 20:31:31 2006 +0000
+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
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/GfxState.cc | 12 +++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
commit e4561568d14e7b3b2aec6ecaf3cc09078bdf7a46
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 30 09:38:28 2006 +0000
+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
+ * splash/SplashFontEngine.cc:
+ * poppler/SplashOutputDev.cc: Fix memory leak when using
+ embedded
+ fonts in the pdf file. Patch by Krzysztof Kowalczyk
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/SplashOutputDev.cc | 8 ++++++--
splash/SplashFontEngine.cc | 12 ++++++++----
3 files changed, 20 insertions(+), 6 deletions(-)
@@ -52506,7 +54539,7 @@
commit 4a27502159a89992f54be2673b44bf7a8392b60d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jul 29 16:24:53 2006 +0000
+Date: Sat Jul 29 16:24:53 2006 +0000
push back thing i did not want to commit, sorry
@@ -52515,11 +54548,11 @@
commit ba448afc0e97a9e779409ff228adcd4f627971f5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jul 29 16:22:52 2006 +0000
+Date: Sat Jul 29 16:22:52 2006 +0000
- * configure.ac: Disable qt and qt4 frontends if splash
- backend is
- disabled
+ * configure.ac: Disable qt and qt4 frontends if splash
+ backend is
+ disabled
ChangeLog | 5 +++++
configure.ac | 18 ++++++++++++++----
@@ -52527,20 +54560,20 @@
commit 1e32d3baa5e8296caf55bd5853216a96618c74ac
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jul 28 18:17:45 2006 +0000
+Date: Fri Jul 28 18:17:45 2006 +0000
- 2006-07-28 Kristian Høgsberg <krh at redhat.com>
+ 2006-07-28 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc: Don't set font matrix translation
- (fix from Behdad Esfahbod).
+ * poppler/CairoOutputDev.cc: Don't set font matrix translation
+ (fix from Behdad Esfahbod).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit 0bc1b0f35c28cb80dd27d24110367348e52c143b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 27 18:21:28 2006 +0000
+Date: Thu Jul 27 18:21:28 2006 +0000
fix date, i don't live in the past
@@ -52549,103 +54582,107 @@
commit 2f27c3a0218608568f6cd1c718ef51b9879023a3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 27 18:17:50 2006 +0000
+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
+ * poppler/Stream.cc: If you are going to test a variable,
+ better
+ initialize it first ;-) Fixes bug 7646
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Stream.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit f39ab43ca824cb7e5db73137c4545b3e85134425
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 26 18:16:01 2006 +0000
+Date: Wed Jul 26 18:16:01 2006 +0000
- 2006-07-26 Albert Astals Cid <aacid at kde.org>
+ 2006-07-26 Albert Astals Cid <aacid at 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
+ * 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 ++++++
+ ChangeLog | 7 ++++++
qt/poppler-document.cc | 18 ++++++++++++++++
- qt/poppler-private.h | 58
+ qt/poppler-private.h | 58
++++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 16 ++++++++++++++
+ qt/poppler-qt.h | 16 ++++++++++++++
4 files changed, 99 insertions(+)
commit c3a9fd546b853c85b6be5fc8f4e5a78d8a7e7437
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 25 18:39:57 2006 +0000
+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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-document.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit edc0499644b8083600ced9a5087ec0b0189e615b
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jul 24 19:49:51 2006 +0000
+Date: Mon Jul 24 19:49:51 2006 +0000
- 2006-07-24 Kristian Høgsberg <krh at redhat.com>
+ 2006-07-24 Kristian Høgsberg <krh at redhat.com>
- * configure.ac:
- * poppler/Makefile.am: Move fontconfig dependency to libpoppler.
+ * configure.ac:
+ * poppler/Makefile.am: Move fontconfig dependency to
+ libpoppler.
- ChangeLog | 5 +++++
- configure.ac | 18 +++++++-----------
- poppler/Makefile.am | 6 ++++--
+ ChangeLog | 5 +++++
+ configure.ac | 18 +++++++-----------
+ poppler/Makefile.am | 6 ++++--
3 files changed, 16 insertions(+), 13 deletions(-)
commit 24b5a68a3f4cdba63fbcd01dc178a330b5f604a7
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 18 21:32:11 2006 +0000
+Date: Tue Jul 18 21:32:11 2006 +0000
- 2006-07-18 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-07-18 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/Gfx.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit c57ebd40fcf85432b2e5045086d158a63af12525
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jul 18 21:26:57 2006 +0000
+Date: Tue Jul 18 21:26:57 2006 +0000
- 2006-07-18 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-07-18 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/TextOutputDev.cc: call setDefaultCTM() after start page
- like in Gfx.cc. This fixes a regression caused by the fix
- to #6948.
+ * poppler/TextOutputDev.cc: call setDefaultCTM() after
+ start page
+ like in Gfx.cc. This fixes a regression caused by the fix
+ to #6948.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/TextOutputDev.cc | 1 +
2 files changed, 6 insertions(+)
commit 640d5d5a9d9e53f3f677eb05f3d18e6bfc74e95a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jul 16 18:22:23 2006 +0000
+Date: Sun Jul 16 18:22:23 2006 +0000
- 2006-07-16 Albert Astals Cid <aacid at kde.org>
+ 2006-07-16 Albert Astals Cid <aacid at kde.org>
- * poppler/GfxState.cc: Do not crash when we can not
- parse a GfxImageColorMap
- Fixes crash on pdf that can be found at
+ * poppler/GfxState.cc: Do not crash when we can not
+ parse a GfxImageColorMap
+ Fixes crash on pdf that can be found at
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/GfxState.cc | 4 ++++
qt4/src/Doxyfile | 4 ++--
3 files changed, 13 insertions(+), 2 deletions(-)
@@ -52652,14 +54689,14 @@
commit c6926d1d8ab04468f56f4687cdd3f06af206226b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jun 28 19:23:52 2006 +0000
+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
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/DCTStream.cc | 25 ++++++++++++++++++-------
poppler/DCTStream.h | 2 ++
3 files changed, 27 insertions(+), 7 deletions(-)
@@ -52666,7 +54703,7 @@
commit 96ac8dec591a0325a822c1f7b7bc7e78b867e3a0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 25 16:59:31 2006 +0000
+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
@@ -52673,16 +54710,16 @@
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 +++++++++-
+ 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 at kde.org>
-Date: Sun Jun 25 16:20:50 2006 +0000
+Date: Sun Jun 25 16:20:50 2006 +0000
put back a change that was not meant to be commited
@@ -52691,7 +54728,7 @@
commit 4995d09c91173d34a435112828aff21a63b147e9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 25 16:19:32 2006 +0000
+Date: Sun Jun 25 16:19:32 2006 +0000
rename poppler-link.h to poppler-link-qt3.h to not get conflicts
on install
@@ -52705,23 +54742,23 @@
commit 087921b134c2646e6d41960f471a1819c7c8790a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 25 10:29:22 2006 +0000
+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 +-
+ ChangeLog | 11 ++++
+ qt/Makefile.am | 4 +-
qt/poppler-document.cc | 19 ++++---
- qt/poppler-page.cc | 136
+ qt/poppler-page.cc | 136
++++++++++++++++++++++++++++++++++++++++++++++---
- qt/poppler-private.h | 33 +++++++++++-
- qt/poppler-qt.h | 14 +++--
+ qt/poppler-private.h | 33 +++++++++++-
+ qt/poppler-qt.h | 14 +++--
6 files changed, 196 insertions(+), 21 deletions(-)
commit 831bd8942ef3224354b128d5e14e68fdfc57168b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 11 16:14:32 2006 +0000
+Date: Sun Jun 11 16:14:32 2006 +0000
optimization by Mario Teijeiro Otero
@@ -52730,102 +54767,104 @@
commit 1223fd4b200f6c13996f8299f3563c818af0c21d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Jun 10 22:23:19 2006 +0000
+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
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
poppler/UGooString.cc | 8 ++++++++
2 files changed, 17 insertions(+)
commit b85a39ddfc7de8c0621e995c114885ecd08fcdc2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 1 21:03:38 2006 +0000
+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
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc: Add Rotation parameter that
+ is passed
+ to the respective output devs
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt4/src/poppler-page.cc | 22 ++++++++++++++--------
- qt4/src/poppler-qt4.h | 14 +++++++++-----
+ qt4/src/poppler-qt4.h | 14 +++++++++-----
3 files changed, 29 insertions(+), 13 deletions(-)
commit 2b5d3277f36864ff1ef44f1942f22de247d67ab6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jun 1 17:23:45 2006 +0000
+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 at math.uni-koeln.de>
+ * qt/poppler-document.cc:
+ * qt/poppler-qt.h: Add printing support, patch by
+ Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-document.cc | 18 ++++++++++++++++++
- qt/poppler-qt.h | 2 ++
+ qt/poppler-qt.h | 2 ++
3 files changed, 26 insertions(+)
commit 5380d005b7b54cc6587ce6e8c3bbb358da5cd9a5
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Jun 1 06:42:25 2006 +0000
+Date: Thu Jun 1 06:42:25 2006 +0000
- 2006-06-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-06-01 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/PSOutputDev.cc:
- * poppler/PSOutputDev.h: Change filename parameter to PSOutputDev
- constructor from char * to const char *.
+ * poppler/PSOutputDev.cc:
+ * poppler/PSOutputDev.h: Change filename parameter to
+ PSOutputDev
+ constructor from char * to const char *.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
commit c2a81ea8b01f3943a2eb737cf957acc0d05f7eed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed May 31 20:14:04 2006 +0000
+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
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/SplashOutputDev.cc | 10 ++++++++++
- splash/Splash.cc | 3 +++
+ splash/Splash.cc | 3 +++
3 files changed, 19 insertions(+)
commit 643b310cf51474b6dfc077fe086ea121e807f6e1
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed May 31 19:18:28 2006 +0000
+Date: Wed May 31 19:18:28 2006 +0000
- 2006-05-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-05-31 Jeff Muizelaar <jeff at infidigm.net>
- * TODO: Remove items's from my list that are done.
+ * TODO: Remove items's from my list that are done.
ChangeLog | 4 ++++
- TODO | 3 ---
+ TODO | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
commit 96e582721dcb15ea258b989c7c500084bff9f56d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed May 31 17:31:49 2006 +0000
+Date: Wed May 31 17:31:49 2006 +0000
- 2006-05-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-05-31 Jeff Muizelaar <jeff at 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.
+ * 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 ++
+ ChangeLog | 7 ++
poppler/CairoOutputDev.cc | 200
++++++++++++++++++++--------------------------
poppler/CairoOutputDev.h | 1 +
@@ -52833,58 +54872,60 @@
commit 00ffb9bf50b6b3b2e8eaa8af593aaa01d4a62a34
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 31 04:53:27 2006 +0000
+Date: Wed May 31 04:53:27 2006 +0000
- 2006-05-31 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-31 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Sum up changes.
+ * NEWS: Sum up changes.
- * configure.ac: Bump release to 0.5.3.
+ * configure.ac: Bump release to 0.5.3.
ChangeLog | 6 ++++++
- NEWS | 8 ++++++++
+ NEWS | 8 ++++++++
configure.ac | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
commit 223a4bf3a679f666b6c963a8787cf5b5ac75c4b6
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 31 02:02:54 2006 +0000
+Date: Wed May 31 02:02:54 2006 +0000
- 2006-05-30 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-30 Kristian Høgsberg <krh at redhat.com>
- * poppler-glib.pc.in:
- * configure.ac: Add poppler as a private requires if pkg-config
- supports it.
+ * poppler-glib.pc.in:
+ * configure.ac: Add poppler as a private requires if
+ pkg-config
+ supports it.
- ChangeLog | 6 ++++++
- configure.ac | 11 +++++++++++
+ ChangeLog | 6 ++++++
+ configure.ac | 11 +++++++++++
poppler-glib.pc.in | 3 ++-
3 files changed, 19 insertions(+), 1 deletion(-)
commit 7aaa4d3fbdb8ea2534d3cb80e68b2759b2e8fd2f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue May 30 21:46:06 2006 +0000
+Date: Tue May 30 21:46:06 2006 +0000
- 2006-05-30 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-30 Kristian Høgsberg <krh at redhat.com>
- * test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
+ * test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
test/gtk-cairo-test.cc | 21 ++++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
commit f7c1d519b9695ad8adfdcf3af696de746cdcf375
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon May 29 18:44:17 2006 +0000
+Date: Mon May 29 18:44:17 2006 +0000
- 2006-05-29 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-05-29 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h:
- * poppler/CairoOutputDev.cc: Allow CairoFont creation to fail more
- gracefully. Fixes #4030.
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h:
+ * poppler/CairoOutputDev.cc: Allow CairoFont creation to
+ fail more
+ gracefully. Fixes #4030.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/CairoFontEngine.cc | 27 +++++++++++++++++++++------
poppler/CairoFontEngine.h | 4 +++-
poppler/CairoOutputDev.cc | 5 +++++
@@ -52892,15 +54933,15 @@
commit 84861800dad3649d4757d5c5539b9e86e2b2c644
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat May 27 17:27:37 2006 +0000
+Date: Sat May 27 17:27:37 2006 +0000
- 2006-05-27 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-05-27 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Back out the rest of krh's type3
- font work. This fixes type3 fonts in CairoOutputDevice.
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Back out the rest of krh's type3
+ font work. This fixes type3 fonts in CairoOutputDevice.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 3 +++
poppler/CairoOutputDev.h | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
@@ -52907,18 +54948,18 @@
commit 6f5a89a0a2cf17d45d1c31ce105829be8c7ac456
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue May 23 20:49:16 2006 +0000
+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.
+ * 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!
@@ -52925,57 +54966,57 @@
/me hits himself
- ChangeLog | 11 +++
- poppler/SplashOutputDev.cc | 8 +++
- qt/poppler-private.h | 2 +-
- qt4/src/poppler-private.h | 2 +-
- splash/Splash.cc | 169
+ 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 +
+ splash/SplashTypes.h | 2 +
7 files changed, 216 insertions(+), 4 deletions(-)
commit 495d592c3ba7fe81e03774f5b2ed677e5aa560c7
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue May 23 19:16:37 2006 +0000
+Date: Tue May 23 19:16:37 2006 +0000
- 2006-05-23 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-23 Kristian Høgsberg <krh at redhat.com>
- * qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing
+ * qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/Makefile.am | 1 +
2 files changed, 6 insertions(+)
commit eecd06c86585bca05c99cd2e9a1b1ff3bbae3c72
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 22 20:19:35 2006 +0000
+Date: Mon May 22 20:19:35 2006 +0000
- 2006-05-22 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-22 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Bump release.
- * NEWS: Sum up changes.
+ * configure.ac: Bump release.
+ * NEWS: Sum up changes.
ChangeLog | 5 +++++
- NEWS | 11 ++++++++++-
+ NEWS | 11 ++++++++++-
configure.ac | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
commit 680f20dfd1cf0342d49516b3848a2aef5d2a3883
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 22 19:58:41 2006 +0000
+Date: Mon May 22 19:58:41 2006 +0000
- 2006-05-22 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-22 Kristian Høgsberg <krh at redhat.com>
- Patch from Rainer Keller to fix the ImageOutputDev (#6984).
+ Patch from Rainer Keller to fix the ImageOutputDev (#6984).
- * utils/ImageOutputDev.cc (drawImage): Upate to work with new
- 16-bit color representation.
+ * utils/ImageOutputDev.cc (drawImage): Upate to work with new
+ 16-bit color representation.
- * utils/ImageOutputDev.h: Return gTrue for needNonText().
+ * utils/ImageOutputDev.h: Return gTrue for needNonText().
- ChangeLog | 9 +++++++++
- NEWS | 4 ++++
+ ChangeLog | 9 +++++++++
+ NEWS | 4 ++++
utils/ImageOutputDev.cc | 6 +++---
utils/ImageOutputDev.h | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
@@ -52982,15 +55023,16 @@
commit e43a06bf6e953fa9af18476e2c9f27106398c09c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun May 21 23:26:45 2006 +0000
+Date: Sun May 21 23:26:45 2006 +0000
- 2006-05-21 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-21 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h: Back out type3 font work committed by
- accident.
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h: Back out type3 font work
+ committed by
+ accident.
- ChangeLog | 6 +
+ ChangeLog | 6 +
poppler/CairoFontEngine.cc | 347
+++++----------------------------------------
poppler/CairoFontEngine.h | 17 +--
@@ -52998,18 +55040,18 @@
commit 7d4bb0533f88f06449ebd64c1220d0b75001937d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 21 18:14:15 2006 +0000
+Date: Sun May 21 18:14:15 2006 +0000
fix all is blue issue on ppc machines
- ChangeLog | 7 +++++++
- qt/poppler-page.cc | 17 +++++++++++++++++
+ ChangeLog | 7 +++++++
+ qt/poppler-page.cc | 17 +++++++++++++++++
qt4/src/poppler-page.cc | 17 +++++++++++++++++
3 files changed, 41 insertions(+)
commit 655af1e0126ca96d75c9c718d7d8f928c898b1f6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 21 17:19:53 2006 +0000
+Date: Sun May 21 17:19:53 2006 +0000
hope to fix really Kouhei's name now
@@ -53018,7 +55060,7 @@
commit cc783a1ebe868ff75db5472775dabe0020ae501f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 21 11:54:30 2006 +0000
+Date: Sun May 21 11:54:30 2006 +0000
Fix Kouhei name
@@ -53027,7 +55069,7 @@
commit e4b6ad3bb873a6f334934921e6d56e9d26e06a9a
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:55:49 2006 +0000
+Date: Fri May 19 22:55:49 2006 +0000
Add bug number to ChangeLog entry.
@@ -53036,91 +55078,95 @@
commit 46f5f070cceb2c0f3b53537c8e33340b9f1bba38
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:26:03 2006 +0000
+Date: Fri May 19 22:26:03 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-action.h:
- * glib/poppler-action.cc: Add poppler_dest_get_type(), patch from
- Kouhei Souto (#6907).
+ * glib/poppler-action.h:
+ * glib/poppler-action.cc: Add poppler_dest_get_type(),
+ patch from
+ Kouhei Souto (#6907).
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-action.cc | 13 +++++++++++++
- glib/poppler-action.h | 4 ++++
+ glib/poppler-action.h | 4 ++++
3 files changed, 21 insertions(+)
commit 875dc5b112dfe2d4a48a7567b1ff79257447cc0d
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:21:35 2006 +0000
+Date: Fri May 19 22:21:35 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from
- Kouhei Souto (#6896).
+ * poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from
+ Kouhei Souto (#6896).
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler-glib.pc.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit b66dda2640c088bbe205f698a0c4028144027922
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:19:21 2006 +0000
+Date: Fri May 19 22:19:21 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.h (POPPLER_TYPE_INDEX_ITER)
- (POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei
- Souto (#6897).
+ * glib/poppler-document.h (POPPLER_TYPE_INDEX_ITER)
+ (POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei
+ Souto (#6897).
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-document.h | 2 ++
2 files changed, 6 insertions(+)
commit 095730456c0d8312067af10dd55a3b9165a83736
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:16:25 2006 +0000
+Date: Fri May 19 22:16:25 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN, from
- Kouhei Souto (#6899).
+ * glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN,
+ from
+ Kouhei Souto (#6899).
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
glib/Makefile.am | 1 +
2 files changed, 4 insertions(+)
commit b8d77633899c1dec5f3b9c9a0f075f39afa98965
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:12:38 2006 +0000
+Date: Fri May 19 22:12:38 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc (poppler_document_save): Memleak patch
- from Paolo Borelli (#6908).
+ * glib/poppler-document.cc (poppler_document_save):
+ Memleak patch
+ from Paolo Borelli (#6908).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 2 ++
2 files changed, 7 insertions(+)
commit 488f77298fee9eebbca5983c1c9fb186b3b67aa3
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 22:04:17 2006 +0000
+Date: Fri May 19 22:04:17 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at 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.
+ * 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 +
+ ChangeLog | 13 +
+ poppler/Makefile.am | 5 +
poppler/TextOutputDev.cc | 41 +-
poppler/TextOutputDev.h | 3 +
poppler/UnicodeCClassTables.h | 1827 +++++++++
@@ -53133,116 +55179,118 @@
commit ecb942e54a1ab0f7eded91b7d1278f0ac62e2071
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 21:42:54 2006 +0000
+Date: Fri May 19 21:42:54 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix the
- rotation bug for real.
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev):
+ Fix the
+ rotation bug for real.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 16 +++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
commit 28ae789afe0625a641525e4a0768d51fa8bd667c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 20:54:13 2006 +0000
+Date: Fri May 19 20:54:13 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- Patch from Kouhei Sutou (#6905).
+ 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.
+ * 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
+ ChangeLog | 11 +++++++
+ glib/poppler-document.cc | 51
++++++++++++++++++++++++++------
- glib/poppler-document.h | 4 +++
- glib/poppler-private.h | 2 ++
+ glib/poppler-document.h | 4 +++
+ glib/poppler-private.h | 2 ++
glib/reference/tmpl/poppler-private.sgml | 1 +
- glib/reference/tmpl/poppler.sgml | 1 +
+ glib/reference/tmpl/poppler.sgml | 1 +
6 files changed, 61 insertions(+), 9 deletions(-)
commit 02cf7fd7df0b2d8c2b1c6f108e581bc1c7a973b1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 20:35:43 2006 +0000
+Date: Fri May 19 20:35:43 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix
- rotation bug (#6913, #6926).
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix
+ rotation bug (#6913, #6926).
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
glib/poppler-page.cc | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
commit 78ae3efd9541d7b63ff5a2c4de3fde300806688f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 19 19:21:59 2006 +0000
+Date: Fri May 19 19:21:59 2006 +0000
- 2006-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-19 Kristian Høgsberg <krh at redhat.com>
- Memory leak patch from Carlos Garcia Campos (#6947).
+ 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.
+ * 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 +-
+ ChangeLog | 14 ++
+ glib/poppler-action.cc | 9 +-
glib/poppler-document.cc | 31 +++-
- glib/poppler-page.cc | 2 +
+ 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 ++
+ 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 at kde.org>
-Date: Fri May 19 17:24:19 2006 +0000
+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.
+ splashoutput is created when parsing the TOC.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-link.cc | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
commit 3c9a5f37704781c9a51e72edd18451870452b9a7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun May 14 16:11:54 2006 +0000
+Date: Sun May 14 16:11:54 2006 +0000
- * poppler/FontInfo.cc: Fix possible crash, half patch
- by Kouhei Sutou <kou at cozmixng.org>
+ * poppler/FontInfo.cc: Fix possible crash, half patch
+ by Kouhei Sutou <kou at cozmixng.org>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/FontInfo.cc | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit 436f578fe762e8ceccce95a0f2003406527dde64
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 13 16:01:57 2006 +0000
+Date: Sat May 13 16:01:57 2006 +0000
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Fix memleak, patch by
- Carlos Garcia Campos <carlosgc at gnome.org>
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Fix memleak, patch by
+ Carlos Garcia Campos <carlosgc at gnome.org>
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/GfxState.cc | 8 ++++++++
poppler/GfxState.h | 3 +--
3 files changed, 15 insertions(+), 2 deletions(-)
@@ -53249,21 +55297,21 @@
commit 906515769097f2e38f6b2c2aff598919b9d1ee0d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 13 15:58:37 2006 +0000
+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
+ * 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 ++++++++
+ 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 at kde.org>
-Date: Sat May 13 11:14:24 2006 +0000
+Date: Sat May 13 11:14:24 2006 +0000
numbers for easier casting
@@ -53272,7 +55320,7 @@
commit 35500375e3f790c444ab7e7d0a687d270c5a66b1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 12 21:02:01 2006 +0000
+Date: Fri May 12 21:02:01 2006 +0000
fixing compile problems for some people
@@ -53281,71 +55329,71 @@
commit 181f09829cf4831965059e3064114d83348c51b5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 12 20:40:05 2006 +0000
+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.
+ * 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 +
+ ChangeLog | 14 +
+ qt4/src/Makefile.am | 2 +
qt4/src/poppler-annotation-helper.h | 213 ++++++++++
- qt4/src/poppler-annotation.cc | 792
+ 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 +-
+ 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 at kde.org>
-Date: Tue May 9 20:07:06 2006 +0000
+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
+ * 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 +---
+ 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 +++-----------
+ 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 at kde.org>
-Date: Mon May 8 19:03:51 2006 +0000
+Date: Mon May 8 19:03:51 2006 +0000
memleak-- by carlos
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Catalog.cc | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 1fce6266564583d356817a21f43c6b1ad8ce3716
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat May 6 10:57:07 2006 +0000
+Date: Sat May 6 10:57:07 2006 +0000
fix code, i suck
@@ -53354,77 +55402,78 @@
commit be913b90d59da35a347498b86fdd3edb065aef23
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri May 5 20:51:01 2006 +0000
+Date: Fri May 5 20:51:01 2006 +0000
- * poppler/Function.cc: quick fix for KDE bug #126760
+ * poppler/Function.cc: quick fix for KDE bug #126760
Better solutions are of course accepted
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Function.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 2b085293bd73b4e77da848b3fe63a7e82e9ba5e5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu May 4 19:10:55 2006 +0000
+Date: Thu May 4 19:10:55 2006 +0000
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc: Implement search functionality
+ * 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 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-page.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 16 ++++++++++++++++
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++++
3 files changed, 64 insertions(+)
commit a9b0c7977aba7bc85a8673c7f95187ff17ee4173
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue May 2 04:38:39 2006 +0000
+Date: Tue May 2 04:38:39 2006 +0000
- 2006-05-02 Kristian Høgsberg <krh at redhat.com>
+ 2006-05-02 Kristian Høgsberg <krh at 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.
+ * 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 +++++++
+ 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 at kde.org>
-Date: Mon May 1 18:33:47 2006 +0000
+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
+ * 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 ++++++++
+ ChangeLog | 8 ++++++++
qt4/src/poppler-page.cc | 14 ++++++++++++++
qt4/src/poppler-private.h | 11 +++++++++++
- qt4/src/poppler-qt4.h | 8 ++++++++
+ 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 at kde.org>
-Date: Mon May 1 13:41:14 2006 +0000
+Date: Mon May 1 13:41:14 2006 +0000
revert thing that should not have gone in
@@ -53435,17 +55484,17 @@
commit f2424ef63e86d82b2be277e2b268b48aae29601e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon May 1 13:32:31 2006 +0000
+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
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/PageLabelInfo.cc | 43
-------------------------------------------
poppler/PageLabelInfo.h | 44
@@ -53452,47 +55501,48 @@
++++++++++++++++++++++++++++++++++++++++++++
qt4/src/poppler-document.cc | 10 ++++++++++
qt4/src/poppler-private.h | 22 +++++++++++++++++-----
- qt4/src/poppler-qt4.h | 6 ++++++
+ qt4/src/poppler-qt4.h | 6 ++++++
6 files changed, 84 insertions(+), 48 deletions(-)
commit 4147400e2b692df7f70c3772e8a4b576d4d85294
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 29 15:23:41 2006 +0000
+Date: Sat Apr 29 15:23:41 2006 +0000
Fix memory leak. Bug 6765
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/JBIG2Stream.cc | 1 +
2 files changed, 6 insertions(+)
commit 960d60467d62d28f20b127d07e8de1af42eec568
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Apr 27 17:26:36 2006 +0000
+Date: Thu Apr 27 17:26:36 2006 +0000
- 2006-04-27 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-04-27 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/CairoOutputDev.cc | 34 +++++++++++++++++++++++++---------
2 files changed, 31 insertions(+), 9 deletions(-)
commit 155112131c6e25bfde752cf5daa80a6c9712cfed
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 23 15:50:52 2006 +0000
+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
+ a destination or a namedDestination
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-private.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit c902a3a22bcceedc8ee8ca377064efcc8a9178ca
Author: Brad Hards <bradh at frogmouth.net>
-Date: Fri Apr 21 12:02:19 2006 +0000
+Date: Fri Apr 21 12:02:19 2006 +0000
Add another path to search for Qt4 libs and includes.
@@ -53503,39 +55553,39 @@
commit 18f8e1f1d213dbcda27cd0ec429273801f65e208
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 18 19:11:56 2006 +0000
+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 at hotmail.com>
+ Discovered by Reece Dunn <msclrhd at hotmail.com>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
goo/GooVector.h | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit cbbb28a5959343d20dffe945ea83272c0b2e287b
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Apr 16 22:59:44 2006 +0000
+Date: Sun Apr 16 22:59:44 2006 +0000
- 2006-04-16 Carlos Garcia Campos <carlosgc at gnome.org>
+ 2006-04-16 Carlos Garcia Campos <carlosgc at 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-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.
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ Allow to find named destinations in document.
- ChangeLog | 12 +++
- glib/poppler-action.cc | 152
+ 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/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(-)
@@ -53542,19 +55592,20 @@
commit 85687a1e0e4c6be2dbfb23ba00018b9c7c7454f5
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 12 06:52:07 2006 +0000
+Date: Wed Apr 12 06:52:07 2006 +0000
- 2006-04-12 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-04-12 Jeff Muizelaar <jeff at 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.
+ * 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 ++++
+ ChangeLog | 8 ++++
poppler/CairoOutputDev.cc | 118
++++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 8 ++++
@@ -53562,77 +55613,79 @@
commit 6039d4fc65cb25bef20efa29bc29d42086fc0854
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 12 05:46:44 2006 +0000
+Date: Wed Apr 12 05:46:44 2006 +0000
- 2006-04-12 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-04-12 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Fix breakage by krh by only calling
- cairo_destroy on non-null.
+ * poppler/CairoOutputDev.cc: Fix breakage by krh by only
+ calling
+ cairo_destroy on non-null.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
commit d839a0bd78361930e5e2fe889df12e1e853ffed3
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Apr 12 02:07:07 2006 +0000
+Date: Wed Apr 12 02:07:07 2006 +0000
- 2006-04-11 Kristian Høgsberg <krh at redhat.com>
+ 2006-04-11 Kristian Høgsberg <krh at 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).
+ * 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).
+ * 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.
+ * utils/Makefile.am (EXTRA_DIST): Fix warning where this was
+ assigned twice.
- ChangeLog | 23 ++++
- configure.ac | 8 ++
- glib/Makefile.am | 10 +-
+ 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 +-
+ 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 +-
+ poppler/CairoOutputDev.h | 6 +-
+ test/Makefile.am | 4 +-
test/gtk-cairo-test.cc | 286
++++++++++++++-------------------------------
- utils/Makefile.am | 6 +-
+ utils/Makefile.am | 6 +-
13 files changed, 221 insertions(+), 245 deletions(-)
commit b198c9801c668014c0979c57033a0637e7e046e2
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Apr 10 18:12:44 2006 +0000
+Date: Mon Apr 10 18:12:44 2006 +0000
- 2006-04-10 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-04-10 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: take originX and originY into
- account in
- drawChar() to draw vertical text properly. Fixes #6551.
+ * poppler/CairoOutputDev.cc: take originX and originY into
+ account in
+ drawChar() to draw vertical text properly. Fixes #6551.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit fd251f52efc7748fda91cc77fb9d3966e0f02ac8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 9 11:05:51 2006 +0000
+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ò
@@ -53643,7 +55696,7 @@
commit 36de9747153a2ea9b3cf86c41e75a521441a2e06
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Apr 8 10:44:43 2006 +0000
+Date: Sat Apr 8 10:44:43 2006 +0000
* poppler/Makefile.am:
* qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using
@@ -53650,57 +55703,57 @@
Qt4 frontend
Patch by Stefan Schweizer
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Makefile.am | 11 +++++------
- qt4/src/Makefile.am | 1 +
+ qt4/src/Makefile.am | 1 +
3 files changed, 12 insertions(+), 6 deletions(-)
commit bf7afe161d76c50fd1c480eb236607145782e59d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Apr 5 18:20:56 2006 +0000
+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 +++++
+ ChangeLog | 5 +++++
poppler/JBIG2Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
commit 315f8e488d3db848f88a06c7568b6583bbf0e432
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 5 17:20:56 2006 +0000
+Date: Wed Apr 5 17:20:56 2006 +0000
- 2006-04-05 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-04-05 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: use a separate matrix for the
- softmask.
- fixes #6492.
+ * poppler/CairoOutputDev.cc: use a separate matrix for
+ the softmask.
+ fixes #6492.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
commit 0d311518f678a479c1efeaec15011e0a34de80fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 4 21:01:01 2006 +0000
+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
+ * 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 ++++-------
+ ChangeLog | 9 ++++++
+ qt/poppler-page.cc | 18 ++++-------
qt4/src/poppler-page.cc | 15 ++++-----
- splash/Splash.cc | 81
+ splash/Splash.cc | 81
+++++++++++++++++++++++++------------------------
splash/SplashBitmap.cc | 10 +++---
5 files changed, 67 insertions(+), 66 deletions(-)
@@ -53707,76 +55760,77 @@
commit 888bd41b42507f0a1af55c55495d31d802ce7706
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Apr 4 20:42:08 2006 +0000
+Date: Tue Apr 4 20:42:08 2006 +0000
Fix crash when using fixedpoint math. Patch by Frank Meerkoetter
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
splash/SplashFTFont.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 56c98450160b639790931226a045ce4712e7d45e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Apr 2 18:07:59 2006 +0000
+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 +++++++++++++++++++++------
+ 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 ++++++++++++++++++++++++---
+ 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 at kde.org>
-Date: Sat Apr 1 11:25:57 2006 +0000
+Date: Sat Apr 1 11:25:57 2006 +0000
Fix bug 6454
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/XRef.cc | 22 +++++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
commit fe8142fbc12127682b8024673fe1af57b47bb5c9
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Mar 21 04:25:53 2006 +0000
+Date: Tue Mar 21 04:25:53 2006 +0000
- 2006-03-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-03-20 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-page.cc | 5 +----
2 files changed, 7 insertions(+), 4 deletions(-)
commit 4f961df2e6e91a0dc0a024ae5acdefa394179a05
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Mar 21 04:19:18 2006 +0000
+Date: Tue Mar 21 04:19:18 2006 +0000
- 2006-03-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-03-20 Jeff Muizelaar <jeff at infidigm.net>
- * glib/poppler-page.cc: Fix memory leak in poppler_page_get_text
- Patch by chpe.
+ * glib/poppler-page.cc: Fix memory leak in
+ poppler_page_get_text
+ Patch by chpe.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit ff4febab0a519732972c21bf76d7693c98265e0f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 20 20:07:36 2006 +0000
+Date: Mon Mar 20 20:07:36 2006 +0000
Use UGooString for dates, fixes KDE bug 123938
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-document.cc | 2 +-
qt4/src/poppler-document.cc | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
@@ -53783,34 +55837,34 @@
commit 75ac6de8cd651b1cbe2d6a7ffa4574097088041f
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Mar 20 19:12:29 2006 +0000
+Date: Mon Mar 20 19:12:29 2006 +0000
- 2006-03-20 Carlos Garcia Campos <calosgc at gnome.org>
+ 2006-03-20 Carlos Garcia Campos <calosgc at gnome.org>
- reviewed by: Jeff Muizelaar <jeff at infidigm.net>
+ reviewed by: Jeff Muizelaar <jeff at infidigm.net>
- * glib/poppler-document.cc: Fix memory leak in
- poppler_font_info_free
+ * glib/poppler-document.cc: Fix memory leak in
+ poppler_font_info_free
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-document.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 784f6d9a0888dab34c586ffe14db8e55b8a11f51
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Mon Mar 20 19:02:10 2006 +0000
+Date: Mon Mar 20 19:02:10 2006 +0000
- 2006-03-20 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-03-20 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoFontEngine.h: remove unused variables
+ * poppler/CairoFontEngine.h: remove unused variables
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/CairoFontEngine.h | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
commit 847436779d7c82b428acfd6339130228bfadca24
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 19 19:19:42 2006 +0000
+Date: Sun Mar 19 19:19:42 2006 +0000
fix date
@@ -53819,55 +55873,55 @@
commit 401bae69cc7ade676cacd89b483f0a93a653c7a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 19 17:01:05 2006 +0000
+Date: Sun Mar 19 17:01:05 2006 +0000
fix htmloutputdev
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
utils/HtmlOutputDev.cc | 2 +-
- utils/HtmlOutputDev.h | 2 +-
+ utils/HtmlOutputDev.h | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
commit d56330e688c0a40b4e206ed3bbddd06d7f3ee66c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 16 22:04:56 2006 +0000
+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
+ * 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 +++++++-
+ ChangeLog | 8 +++++++-
poppler/Page.cc | 2 --
2 files changed, 7 insertions(+), 3 deletions(-)
commit 7ed6737b00ece7ca00cee1d148752b11700370e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 16 19:21:11 2006 +0000
+Date: Thu Mar 16 19:21:11 2006 +0000
poppler/FontInfo.cc: Embedded fonts don't have a font file
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/FontInfo.cc | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
commit a34688ee29e1cdfcbaca232cf005af55af87f796
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Mar 14 19:34:10 2006 +0000
+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 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-qt4.h | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
commit 1a90b3aaf6be4ca3ebb47e904842b1e14a0e8dfc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Mar 11 15:19:02 2006 +0000
+Date: Sat Mar 11 15:19:02 2006 +0000
* poppler/FontInfo.cc:
* poppler/FontInfo.h: Add getFile() function that returns
@@ -53882,181 +55936,183 @@
May be interesting to have in the other frontends
- ChangeLog | 13 +++++++++++++
- poppler/FontInfo.cc | 10 ++++++++++
- poppler/FontInfo.h | 2 ++
+ 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 +++--
+ 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 at kde.org>
-Date: Thu Mar 9 21:56:07 2006 +0000
+Date: Thu Mar 9 21:56:07 2006 +0000
Build with cairo disabled, patch by Eduardo de Barros Lima
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/Makefile.am | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 50ecfadab36a9769b09e4c2c1670d86448a0e1ee
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Feb 28 23:24:59 2006 +0000
+Date: Tue Feb 28 23:24:59 2006 +0000
- 2006-02-28 Kristian Høgsberg <krh at redhat.com>
+ 2006-02-28 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Bump release to 0.5.1.
+ * configure.ac: Bump release to 0.5.1.
- * NEWS: Sum up 0.5.1 changes so far.
+ * NEWS: Sum up 0.5.1 changes so far.
- * TextOutputDev.h: add getters for a couple of attributes.
+ * TextOutputDev.h: add getters for a couple of attributes.
- * glib/Makefile.am:
- * poppler/Makefile.am: Move cairo link dependency to glib
- bindings.
+ * 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 ++++++++-----------
+ 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 +++++++++++++++++------------
+ 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 at redhat.com>
-Date: Tue Feb 28 19:59:58 2006 +0000
+Date: Tue Feb 28 19:59:58 2006 +0000
- 2006-02-28 Kristian Høgsberg <krh at redhat.com>
+ 2006-02-28 Kristian Høgsberg <krh at redhat.com>
- * goo/gmem.c: (gmalloc), (grealloc):
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc:
- * poppler/Stream.h:
- * splash/SplashXPathScanner.cc:
+ * 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).
+ More integer overflow fixes from Derek Noonburg (#5922).
- ChangeLog | 10 ++++++++++
- goo/gmem.c | 9 +++++----
+ ChangeLog | 10 ++++++++++
+ goo/gmem.c | 9 +++++----
poppler/JBIG2Stream.cc | 12 ++++++++++--
- poppler/Stream.cc | 7 +++++++
- poppler/Stream.h | 2 +-
+ poppler/Stream.cc | 7 +++++++
+ poppler/Stream.h | 2 +-
5 files changed, 33 insertions(+), 7 deletions(-)
commit 46db73a142d65a0c944910388d5971debc06ecbf
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Feb 28 18:31:59 2006 +0000
+Date: Tue Feb 28 18:31:59 2006 +0000
- 2006-02-28 Kristian Høgsberg <krh at redhat.com>
+ 2006-02-28 Kristian Høgsberg <krh at redhat.com>
- * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
- passed in paper size (#5946, #5749).
+ * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
+ passed in paper size (#5946, #5749).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/PSOutputDev.cc | 14 ++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
commit 0f7f2182b2abe965b382937f5569b65a8828fc93
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Feb 28 18:25:00 2006 +0000
+Date: Tue Feb 28 18:25:00 2006 +0000
- 2006-02-28 Kristian Høgsberg <krh at redhat.com>
+ 2006-02-28 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc (info_dict_get_string): Refactor
- _popper_goo_string_to_utf8() out into it's own function.
+ * 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_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.
+ * 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).
+ * 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 +
+ 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 +-
+ 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 at kde.org>
-Date: Sat Feb 25 12:30:30 2006 +0000
+Date: Sat Feb 25 12:30:30 2006 +0000
fix warning
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Object.cc | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
commit eb5642f396c8772c83b2cf27da437413b692c952
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 23 22:26:05 2006 +0000
+Date: Thu Feb 23 22:26:05 2006 +0000
Don't build pdftoppm when splashoutput is disabled as it does not link
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
utils/Makefile.am | 13 +++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
commit 7c5c1361045429a429a6f40d936f8c7c01fe0d07
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Feb 18 20:17:00 2006 +0000
+Date: Sat Feb 18 20:17:00 2006 +0000
- 2006-02-18 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-02-18 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Add support for drawSoftMaskedImage to
- CairoOutputDev. Ugly but works.
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add support for drawSoftMaskedImage to
+ CairoOutputDev. Ugly but works.
- ChangeLog | 8 ++++
+ ChangeLog | 8 ++++
poppler/CairoOutputDev.cc | 101
++++++++++++++++++++++++++++++++++++++++++++++
poppler/CairoOutputDev.h | 6 +++
- poppler/GfxState.cc | 50 +++++++++++++++++++++++
- poppler/GfxState.h | 2 +
+ poppler/GfxState.cc | 50 +++++++++++++++++++++++
+ poppler/GfxState.h | 2 +
5 files changed, 167 insertions(+)
commit dcb748f68112bd5f99fea8a3da06666be6cff0c5
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Feb 16 19:41:17 2006 +0000
+Date: Thu Feb 16 19:41:17 2006 +0000
- 2006-02-16 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-02-16 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Work around cairo bug when scaling
- 1x1 bitmaps. Fixes #3387. Also gives a performance improvement.
+ * poppler/CairoOutputDev.cc: Work around cairo bug when
+ scaling
+ 1x1 bitmaps. Fixes #3387. Also gives a performance
+ improvement.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 33 ++++++++++++++++++++++++---------
2 files changed, 29 insertions(+), 9 deletions(-)
commit ef1070f6ca2d1e74c5f94728f3aaae22f0990c17
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 16 19:28:54 2006 +0000
+Date: Thu Feb 16 19:28:54 2006 +0000
Update soname
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
glib/Makefile.am | 2 ++
poppler/Makefile.am | 2 ++
qt/Makefile.am | 2 ++
@@ -54065,12 +56121,12 @@
commit 24b9f5c33fb00ff80a79b34444282a57288f636c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 13 23:04:54 2006 +0000
+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 +++++
+ ChangeLog | 5 +++++
poppler/ArthurOutputDev.cc | 53
+++++++++++++++++-----------------------------
2 files changed, 24 insertions(+), 34 deletions(-)
@@ -54077,25 +56133,25 @@
commit 0bda90310b267d3a4963096293eb2bd29b120768
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 13 22:38:44 2006 +0000
+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 ++
+ ChangeLog | 5 ++
poppler/PSOutputDev.cc | 124
+++++++++++++++++++++++++++++++++++++++++++++----
- poppler/PSOutputDev.h | 4 +-
+ poppler/PSOutputDev.h | 4 +-
3 files changed, 123 insertions(+), 10 deletions(-)
commit cf9867fbbee2468a955b5845016585eeedf2debe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 6 20:49:21 2006 +0000
+Date: Mon Feb 6 20:49:21 2006 +0000
Various fixes from Frank Meerkötter to enable fixedpoint arithmetic
- ChangeLog | 8 ++++++++
- configure.ac | 2 +-
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
goo/FixedPoint.h | 2 +-
splash/Splash.cc | 4 ++--
splash/SplashTypes.h | 2 +-
@@ -54103,24 +56159,24 @@
commit f04e2c4f20f821ff8cb9465a715ccbb22091d449
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Feb 6 18:50:10 2006 +0000
+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 ++++-----
+ ChangeLog | 6 ++++++
+ poppler/Annot.cc | 9 ++++-----
poppler/JBIG2Stream.cc | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
commit 33e98f81cdfda0935ac7ea79a691976465ec790b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 5 15:46:10 2006 +0000
+Date: Sun Feb 5 15:46:10 2006 +0000
Some small fixes from kpdf
- ChangeLog | 8 ++++++++
- poppler/Gfx.cc | 1 +
- poppler/GfxFont.cc | 1 +
+ 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(-)
@@ -54127,17 +56183,18 @@
commit 6d9e6489d24b3105204ff4233f6493136e9b5715
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Feb 4 21:10:41 2006 +0000
+Date: Sat Feb 4 21:10:41 2006 +0000
- 2006-02-04 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-02-04 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Gfx.cc:
- * poppler/OutputDev.cc:
- * poppler/OutputDev.h: Let output devices know about pdf grouping
- operators.
- Patch by Thorkild Stray.
+ * poppler/Gfx.cc:
+ * poppler/OutputDev.cc:
+ * poppler/OutputDev.h: Let output devices know about pdf
+ grouping
+ operators.
+ Patch by Thorkild Stray.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
poppler/Gfx.cc | 14 ++++++++++++++
poppler/OutputDev.cc | 16 ++++++++++++++++
poppler/OutputDev.h | 10 ++++++++++
@@ -54145,15 +56202,16 @@
commit b4e34d905cd0ca5815a450de35b4c2774f4887c9
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Feb 4 20:48:25 2006 +0000
+Date: Sat Feb 4 20:48:25 2006 +0000
- 2006-02-04 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-02-04 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/GlobalParams.cc | 51
+++++++++++++++++++++++++++----------------------
2 files changed, 34 insertions(+), 23 deletions(-)
@@ -54160,22 +56218,22 @@
commit fd85a0afdd7b4cafc68df400d4f94fccaea18c76
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 4 20:34:13 2006 +0000
+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 +++
+ ChangeLog | 3 +++
poppler/SplashOutputDev.cc | 14 ++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
commit 67ca9d01f8badcf542f60b23521c384c9840ca1b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 4 20:31:00 2006 +0000
+Date: Sat Feb 4 20:31:00 2006 +0000
Added a DTD of the xml pdftohtml creates patch by Stefan Schweizer
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
utils/Makefile.am | 2 ++
utils/pdf2xml.dtd | 28 ++++++++++++++++++++++++++++
3 files changed, 32 insertions(+)
@@ -54182,7 +56240,7 @@
commit f4df23ca7f396883a906f16dfc8db1ebd528e04a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 4 20:24:03 2006 +0000
+Date: Sat Feb 4 20:24:03 2006 +0000
ignore++
@@ -54191,11 +56249,11 @@
commit 93ad488679f594e45547a67e2a7397f4c8bd2820
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Feb 4 20:07:07 2006 +0000
+Date: Sat Feb 4 20:07:07 2006 +0000
Actually create pdftoppm patch by Stefan Schweizer
- ChangeLog | 44 +++++++++++++++++++++++++-------------------
+ ChangeLog | 44 +++++++++++++++++++++++++-------------------
utils/Makefile.am | 10 ++++++++--
utils/pdftoppm.cc | 9 +++++----
3 files changed, 38 insertions(+), 25 deletions(-)
@@ -54202,17 +56260,17 @@
commit 7d2be955e6345a052590b06b29a6d2fb2111e2e6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 2 23:06:20 2006 +0000
+Date: Thu Feb 2 23:06:20 2006 +0000
CVE-2006-0301 fix by Derek though KDE security team
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
splash/SplashXPathScanner.cc | 32 ++++++++++++++++++++------------
2 files changed, 25 insertions(+), 12 deletions(-)
commit c191e7d0f13ea429017e4d4f79ce803e84c72e40
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 2 22:54:27 2006 +0000
+Date: Thu Feb 2 22:54:27 2006 +0000
i should learn on which day i live
@@ -54221,17 +56279,17 @@
commit 1ddeed60d07c3a7e011f3f594fa9299379d0b000
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Feb 2 22:50:01 2006 +0000
+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 +
+ 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
@@ -54251,159 +56309,159 @@
commit 34df4cfa5cd8788ccf2ea698cbedd05b209041f5
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Feb 1 03:52:12 2006 +0000
+Date: Wed Feb 1 03:52:12 2006 +0000
- 2006-01-31 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-31 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
- Allow ttc fonts to be used.
+ * poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
+ Allow ttc fonts to be used.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/GlobalParams.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 0184e7c928ec60c0aa3f8634d96ae0cf0ad6d157
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Jan 29 05:16:31 2006 +0000
+Date: Sun Jan 29 05:16:31 2006 +0000
- 2006-01-28 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-28 Jeff Muizelaar <jeff at infidigm.net>
- * glib/poppler-attachment.h: fix compile by adding <time.h>
- include.
- Acked-by: Jonathan Blanford <jrb at redhat.com>
+ * glib/poppler-attachment.h: fix compile by adding <time.h>
+ include.
+ Acked-by: Jonathan Blanford <jrb at redhat.com>
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-attachment.h | 1 +
2 files changed, 6 insertions(+)
commit c805e25f2f074640e4345f8b71eef8d7de677109
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jan 26 19:25:07 2006 +0000
+Date: Thu Jan 26 19:25:07 2006 +0000
- 2006-01-26 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-26 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc: Patch from Christian Krause;
- handle
- 0-width lines (#5545).
+ * poppler/CairoOutputDev.cc: Patch from Christian Krause;
+ handle
+ 0-width lines (#5545).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDev.cc | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
commit 4f48abcd4c21460d4c5b718a7ba18cdceb30c2d1
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Tue Jan 24 06:21:39 2006 +0000
+Date: Tue Jan 24 06:21:39 2006 +0000
Tue Jan 24 01:19:40 2006 Jonathan Blandford <jrb at 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.
+ * 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
+ 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/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 +++-
+ glib/test-poppler-glib.c | 26 +++-
12 files changed, 559 insertions(+), 133 deletions(-)
commit 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jan 23 18:52:48 2006 +0000
+Date: Mon Jan 23 18:52:48 2006 +0000
- 2006-01-23 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-23 Kristian Høgsberg <krh at 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.
+ * 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 -
+ ChangeLog | 9 +++++++++
+ configure.ac | 1 -
poppler/GlobalParams.cc | 23 ++---------------------
- poppler/poppler-config.h.in | 5 -----
- utils/pdftohtml.cc | 4 +---
- utils/pdftops.cc | 4 +++-
+ 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 at redhat.com>
-Date: Mon Jan 23 15:40:54 2006 +0000
+Date: Mon Jan 23 15:40:54 2006 +0000
- 2006-01-23 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-23 Kristian Høgsberg <krh at redhat.com>
- * glib/test-poppler-glib.c (print_document_info, print_index):
- Move variable declarations to top (#5692).
+ * 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).
+ * utils/*.cc: Move config.h #include to top of #include's
+ (#5693).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/test-poppler-glib.c | 5 +++--
- poppler/FontInfo.cc | 2 +-
+ 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 +-
+ 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 at redhat.com>
-Date: Mon Jan 23 14:45:30 2006 +0000
+Date: Mon Jan 23 14:45:30 2006 +0000
- 2006-01-23 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-23 Kristian Høgsberg <krh at redhat.com>
- * splash/SplashFTFont.cc: Don't use deprecated freetype
- include
- files.
+ * splash/SplashFTFont.cc: Don't use deprecated freetype
+ include
+ files.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
splash/SplashFTFont.cc | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 60e13bf84e4f020a264811e4a5bf85d67e15d6df
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Jan 21 21:56:40 2006 +0000
+Date: Sat Jan 21 21:56:40 2006 +0000
- 2006-01-21 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-21 Jeff Muizelaar <jeff at infidigm.net>
- * TODO: Add my todo list.
+ * TODO: Add my todo list.
ChangeLog | 4 ++++
- TODO | 10 ++++++++++
+ TODO | 10 ++++++++++
2 files changed, 14 insertions(+)
commit cebba06563d1b691a8bbb83828e47c9cc91e231a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 18 22:40:26 2006 +0000
+Date: Wed Jan 18 22:40:26 2006 +0000
ok, ok, lasts files, i promise :-/
@@ -54414,7 +56472,7 @@
commit 0b12e7cce6c6633b1d07e2902a9fa13ff52079e7
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 18 22:38:59 2006 +0000
+Date: Wed Jan 18 22:38:59 2006 +0000
YAMF = Yet Another Missing File
@@ -54424,7 +56482,7 @@
commit 38c8f3a53b3eb2be1fbfa360f77285037d89b719
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 18 22:36:01 2006 +0000
+Date: Wed Jan 18 22:36:01 2006 +0000
as usual i foget some files
@@ -54435,88 +56493,88 @@
commit ad6e7d862c8fa6e10a7dbbb3391cbb0b6c922375
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 18 22:32:13 2006 +0000
+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 +++++++++++++
+ ChangeLog | 42 +++++++++++++
glib/poppler-action.cc | 2 +-
glib/poppler-document.cc | 1 +
- poppler/Annot.cc | 1 +
- poppler/Catalog.cc | 133
+ 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/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/Page.cc | 1 +
poppler/PageLabelInfo.cc | 1 +
- poppler/Parser.cc | 2 +
+ poppler/Parser.cc | 2 +
poppler/SecurityHandler.cc | 1 +
- poppler/Stream.cc | 1 +
- poppler/XRef.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/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 ++++-
+ 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 +
+ 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 at kde.org>
-Date: Wed Jan 18 21:22:12 2006 +0000
+Date: Wed Jan 18 21:22:12 2006 +0000
Add some more documentation to PageTransition, patch by Stefan Kebekus
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-page-transition.h | 40
+++++++++++++++++++++++++++++++++-------
- qt4/src/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
3 files changed, 40 insertions(+), 8 deletions(-)
commit d66f3647ff1c38318d4cd056cb4d4c7a32eb6603
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jan 18 18:54:12 2006 +0000
+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
+ 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 ++++++++-
+ ChangeLog | 9 ++++++++-
poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++++++++++----
2 files changed, 35 insertions(+), 5 deletions(-)
commit d78b670339c8f92a32ab5f0a574d0e21690806f8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 17 21:35:31 2006 +0000
+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 ++++++++++
+ ChangeLog | 10 ++++++++++
poppler/Lexer.cc | 22 +++++++++++++++++++---
poppler/Lexer.h | 8 +++++---
poppler/Parser.cc | 6 +++---
@@ -54527,7 +56585,7 @@
commit f5db636af0cd6e05cd7ede37a8585001d51192a1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 17 20:33:08 2006 +0000
+Date: Tue Jan 17 20:33:08 2006 +0000
i suck
i suck
@@ -54541,97 +56599,99 @@
commit 9cc97908ea67ab431e58129f589e00f41f40a143
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Jan 12 23:54:08 2006 +0000
+Date: Thu Jan 12 23:54:08 2006 +0000
- 2006-01-12 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-12 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/GlobalParams.cc: Make buildFcPattern() static.
+ * poppler/GlobalParams.cc: Make buildFcPattern() static.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/GlobalParams.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit c7ce134fb1dadb46e2b3773d0976ea31da0a046f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Jan 11 16:52:58 2006 +0000
+Date: Wed Jan 11 16:52:58 2006 +0000
- 2006-01-11 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-11 Kristian Høgsberg <krh at redhat.com>
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc: Merge patch to fix CVE-2005-3624,
- CVE-2005-3625 and CVE-2005-3627 issues.
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc: Merge patch to fix CVE-2005-3624,
+ CVE-2005-3625 and CVE-2005-3627 issues.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/JBIG2Stream.cc | 32 +++++++++++++++++++++++++++++++-
- poppler/Stream.cc | 8 +++++---
+ poppler/Stream.cc | 8 +++++---
3 files changed, 42 insertions(+), 4 deletions(-)
commit ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jan 10 21:57:28 2006 +0000
+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
+ * 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 +++++
+ 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 +
+ 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 +
+ 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 at redhat.com>
-Date: Tue Jan 10 17:59:51 2006 +0000
+Date: Tue Jan 10 17:59:51 2006 +0000
- 2006-01-10 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-10 Kristian Høgsberg <krh at redhat.com>
- * splash/Makefile.am: Only install splash headers if
- --enable-xpdf-headers is given.
+ * splash/Makefile.am: Only install splash headers if
+ --enable-xpdf-headers is given.
- * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here.
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here.
- ChangeLog | 7 +++++++
- Makefile.am | 1 +
+ ChangeLog | 7 +++++++
+ Makefile.am | 1 +
splash/Makefile.am | 4 ++++
3 files changed, 12 insertions(+)
commit ea6d9b97cec6fabf8a5005c565bbdb378bed7f54
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Tue Jan 10 17:55:59 2006 +0000
+Date: Tue Jan 10 17:55:59 2006 +0000
- 2006-01-10 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-10 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- Fix the following fixme in CairoOutputDevice.
+ * 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.
+ // 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.
+ 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 ++++++++++++++
+ ChangeLog | 14 ++++++++++++++
poppler/CairoOutputDev.cc | 27 +++++++++++++++++++++++----
poppler/CairoOutputDev.h | 1 +
3 files changed, 38 insertions(+), 4 deletions(-)
@@ -54638,106 +56698,106 @@
commit 9e8a655a2bd3ca8cff1a150dce0dd378aeca047b
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Jan 8 22:59:48 2006 +0000
+Date: Sun Jan 8 22:59:48 2006 +0000
- 2006-01-08 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-08 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Don't try and load type3 fonts
- (#4030).
+ * poppler/CairoOutputDev.cc: Don't try and load type3 fonts
+ (#4030).
- ChangeLog | 6 +++++-
+ ChangeLog | 6 +++++-
poppler/CairoOutputDev.cc | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
commit 25fd8e1ea87c41855a4ee702fbe47f5661a54c22
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Jan 8 22:51:17 2006 +0000
+Date: Sun Jan 8 22:51:17 2006 +0000
- 2006-01-08 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-08 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Page.cc: use colToByte for reading thumbnails (#5420).
+ * poppler/Page.cc: use colToByte for reading thumbnails
+ (#5420).
- Patch by Nickolay V. Shmyrev.
+ Patch by Nickolay V. Shmyrev.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Page.cc | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
commit df73ee2ec4b65ccf611f0fd76fb456cc797693d4
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Jan 7 06:10:15 2006 +0000
+Date: Sat Jan 7 06:10:15 2006 +0000
- 2006-01-07 Jeff Muizelaar <jeff at infidigm.net>
+ 2006-01-07 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity.
+ * poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/CairoOutputDev.cc | 2 ++
2 files changed, 6 insertions(+)
commit 18eb8de66749082e4aa65cc6d369a533826fab33
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jan 6 10:05:58 2006 +0000
+Date: Fri Jan 6 10:05:58 2006 +0000
- 2006-01-06 Kristian Høgsberg <krh at redhat.com>
+ 2006-01-06 Kristian Høgsberg <krh at 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.
+ * 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.
+ * 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.
+ * 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.
+ * 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.
+ * 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.
+ * 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(-)
+ ChangeLog | 26 +++
+ 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 +
+ acinclude.m4 => m4/libjpeg.m4 | 7 +-
+ m4/qt.m4 | 206
+ +++++++++++++++++++
+ poppler/Makefile.am | 1 -
+ poppler/Private.h | 30 ---
+ poppler/TextOutputDev.cc | 2 -
+ qt/Makefile.am | 8 +-
+ qt/poppler-page-transition.cc | 187
+ +++++++++++++++++
+ .../poppler-page-transition.h | 3 +-
+ qt/poppler-page.cc | 1 -
+ qt/poppler-private.h | 9 +-
+ qt/poppler-qt.h | 2 +-
+ qt4/src/Makefile.am | 8 +-
+ utils/Makefile.am | 54 ++++-
+ 19 files changed, 634 insertions(+), 416 deletions(-)
commit 93921e77115ebe4d527f98675e438de485e84507
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 5 23:53:33 2006 +0000
+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
@@ -54744,69 +56804,69 @@
Might be worth backporting to 0.4.x
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/DCTStream.cc | 26 ++++++++++++++++----------
2 files changed, 21 insertions(+), 10 deletions(-)
commit 0dc16af02071350a0dc11af4106799378c99cdad
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jan 5 13:53:58 2006 +0000
+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 ++++++++++++++++++++-----
+ ChangeLog | 8 +++++++
+ qt/poppler-page.cc | 18 ++++++++++-----
+ qt/poppler-qt.h | 30 ++++++++++++++++++++-----
qt4/src/poppler-page.cc | 9 +++++++-
- qt4/src/poppler-qt4.h | 59
+ qt4/src/poppler-qt4.h | 59
+++++++++++++++++++++++++++----------------------
5 files changed, 85 insertions(+), 39 deletions(-)
commit 5c2cbf5d327c6cc75c073b56c3ab1748c0d24387
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jan 2 14:24:31 2006 +0000
+Date: Mon Jan 2 14:24:31 2006 +0000
Use error() instead std::cerr in PageTranstion.cc
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PageTransition.cc | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
commit da5a4233498b56df611e1c7bca0090306cb5dbe0
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Mon Jan 2 00:06:45 2006 +0000
+Date: Mon Jan 2 00:06:45 2006 +0000
Sun Jan 1 18:50:51 2006 Jonathan Blandford <jrb at redhat.com>
- * Makefile.am:
- * autogen.sh:
- * configure.ac:
- * gtk-doc.make:
- * glib/Makefile.am: enable gtk-doc support.
+ * 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 ++
+ ChangeLog | 8 +++
+ Makefile.am | 2 +
+ autogen.sh | 14 +++++
+ configure.ac | 4 ++
glib/Makefile.am | 1 +
- gtk-doc.make | 153
+ gtk-doc.make | 153
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4 | 53 +++++++++++++++++++
+ m4/gtk-doc.m4 | 53 +++++++++++++++++++
7 files changed, 235 insertions(+)
commit 372c34cc9728d7041bc4f6893c0bae50c9501c50
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 1 22:35:48 2006 +0000
+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
+ * 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 -
+ 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(-)
@@ -54813,13 +56873,13 @@
commit 6ff83474ac594368015334db9c6b33d3a552079f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jan 1 22:18:47 2006 +0000
+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.
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h: Don't create a SplashOutputDev for every
+ renderToPixmap.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-page.cc | 8 +-------
qt/poppler-private.h | 24 +++++++++++++++++++++++-
3 files changed, 30 insertions(+), 8 deletions(-)
@@ -54826,56 +56886,56 @@
commit 6942646d4c82327a80b021838a38aa55c1026883
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Sun Jan 1 20:34:36 2006 +0000
+Date: Sun Jan 1 20:34:36 2006 +0000
Sun Jan 1 15:32:08 2006 Jonathan Blandford <jrb at redhat.com>
- * glib/reference/*: More gtk-doc work. Not enabled for
- building
- by default, but filled in.
+ * 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-overrides.txt | 0
- glib/reference/poppler-sections.txt | 151 ++++++++++++
- glib/reference/poppler.types | 4 +
+ .cvsignore | 1 +
+ ChangeLog | 5 +
+ glib/reference/.cvsignore | 18 ++
+ glib/reference/Makefile.am | 87 +++++++
+ glib/reference/poppler-docs.sgml | 17 ++
+ glib/reference/poppler-overrides.txt | 0
+ 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-page.sgml | 243 ++++++++++++++++++
glib/reference/tmpl/poppler-private.sgml | 128 ++++++++++
glib/reference/tmpl/poppler-unused.sgml | 0
- glib/reference/tmpl/poppler.sgml | 216 ++++++++++++++++
+ glib/reference/tmpl/poppler.sgml | 216 ++++++++++++++++
glib/reference/tmpl/stamp-poppler-enums.sgml | 19 ++
16 files changed, 1584 insertions(+)
commit 0fab1b711f153859e113cb3b6d734ddcb58fb87a
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Sat Dec 31 02:10:33 2005 +0000
+Date: Sat Dec 31 02:10:33 2005 +0000
Fri Dec 30 21:08:33 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/*{cc,h}: Update inline doc comments. This is in
- preparation for gtk-doc support.
+ * glib/*{cc,h}: Update inline doc comments. This is in
+ preparation for gtk-doc support.
- ChangeLog | 5 ++
+ ChangeLog | 5 ++
glib/poppler-action.cc | 14 +++++
- glib/poppler-action.h | 2 -
+ 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/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 at kde.org>
-Date: Fri Dec 30 22:54:46 2005 +0000
+Date: Fri Dec 30 22:54:46 2005 +0000
A delete that slipped from the last patch-commit
@@ -54884,32 +56944,32 @@
commit cf6f8123af19aca4200b58a454652f68ce8132e2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 30 22:31:32 2005 +0000
+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/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 +-
+ 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 +++-
+ qt4/src/poppler-qt4.h | 14 +++-
10 files changed, 374 insertions(+), 181 deletions(-)
commit 56035ab199ac6deb5c1e07e745d120d1121a5960
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Dec 30 21:59:58 2005 +0000
+Date: Fri Dec 30 21:59:58 2005 +0000
* utils/HtmlOutputDev.cc:
* utils/ImageOutputDev.cc: Fix build when using --disable-libjpeg
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
utils/HtmlOutputDev.cc | 2 ++
utils/ImageOutputDev.cc | 2 ++
3 files changed, 9 insertions(+)
@@ -54916,28 +56976,28 @@
commit 8b64dafc7f1d198fb0052c0d6f0da6de97bbb48d
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Dec 28 09:23:43 2005 +0000
+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
+ 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_pagemode.cpp | 10 ++++++++
qt4/tests/check_permissions.cpp | 2 ++
- qt4/tests/check_version.cpp | 22 ------------------
- qt4/tests/poppler-fonts.cpp | 1 +
+ 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 at frogmouth.net>
-Date: Tue Dec 27 06:10:01 2005 +0000
+Date: Tue Dec 27 06:10:01 2005 +0000
qt4/src/poppler-qt4.h and qt4/src/poppler-document.cc: add
convertDate() function that
@@ -54949,19 +57009,19 @@
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 ++--
+ 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 +-
+ qt4/tests/check_metadata.cpp | 4 +-
7 files changed, 188 insertions(+), 36 deletions(-)
commit 4b2e3b5106b75f23c830837a886cd29beb1d1d1b
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Dec 27 05:08:34 2005 +0000
+Date: Tue Dec 27 05:08:34 2005 +0000
* qt4/src/Doxyfile (JAVADOC_AUTOBRIEF): Turned on automatic
\brief mode.
@@ -54969,7 +57029,7 @@
* qt4/src/poppler-qt4.h: Update API documentation. Patch from
Stefan Kebekus, with some changes. Removed \brief entries.
- ChangeLog | 8 +++++
+ ChangeLog | 8 +++++
qt4/src/Doxyfile | 2 +-
qt4/src/poppler-qt4.h | 81
++++++++++++++++++++++++++++++++++++++++-----------
@@ -54977,21 +57037,21 @@
commit 8d9cf43aaa73d5012428a6a4c5d7e2cccbd3036e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Dec 21 22:09:47 2005 +0000
+Date: Wed Dec 21 22:09:47 2005 +0000
- 2005-12-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-21 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Sum up 0.5 changes so far.
+ * NEWS: Sum up 0.5 changes so far.
- * acinclude.m4: Split jpeg macros out into this file.
+ * acinclude.m4: Split jpeg macros out into this file.
- * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
+ * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
- ChangeLog | 8 ++++
- NEWS | 8 ++++
- acinclude.m4 | 112
+ ChangeLog | 8 ++++
+ NEWS | 8 ++++
+ acinclude.m4 | 112
++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 114
+ configure.ac | 114
---------------------------------------------------
poppler/JPXStream.cc | 1 +
poppler/Stream.cc | 11 +++--
@@ -54999,39 +57059,39 @@
commit 97243286560cb4f264b875185c8768a6af09d554
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Dec 21 17:30:33 2005 +0000
+Date: Wed Dec 21 17:30:33 2005 +0000
- 2005-12-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-21 Kristian Høgsberg <krh at redhat.com>
- * utils/Makefile.am: Add parseargs.h to sources and add
- -I$(top_srcdir)/poppler to INCLUDES.
+ * 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.
+ * poppler/CairoFontEngine.cc: Apply patch from Hiroyuki
+ Ikezoe to
+ man non-embedded CJK fonts work.
- ChangeLog | 14 ++++++++++---
- configure.ac | 2 +-
+ ChangeLog | 14 ++++++++++---
+ configure.ac | 2 +-
poppler/CairoFontEngine.cc | 52
+++++++++++++++++++++++++++++++++++++++++-----
- utils/Makefile.am | 15 +++++++------
+ utils/Makefile.am | 15 +++++++------
4 files changed, 68 insertions(+), 15 deletions(-)
commit cf887a9a9fae7272165d3aae05c85444ff5ca604
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 18 22:03:30 2005 +0000
+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
+ * poppler/Page.cc: Only discard cropbox sizes one by one
+ and not
+ completely. Jeff and Martin were right
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
poppler/Page.cc | 13 ++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
commit 495890b9cef9d5d61bb47e789add1cf2c3b8f83d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 18 21:56:15 2005 +0000
+Date: Sun Dec 18 21:56:15 2005 +0000
+ .cvsignore
@@ -55040,23 +57100,23 @@
commit 5dca860bba6918e06fab3aa56a2c75f0ac9ecdfb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 18 21:08:48 2005 +0000
+Date: Sun Dec 18 21:08:48 2005 +0000
Fix utils building on Slackware
- ChangeLog | 3 +++
- configure.ac | 3 +++
+ ChangeLog | 3 +++
+ configure.ac | 3 +++
utils/Makefile.am | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
commit 03e3d9164ffd71f03136b57a9941ea14fadb21aa
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 18 17:12:28 2005 +0000
+Date: Sun Dec 18 17:12:28 2005 +0000
- 2005-12-18 Albert Astals Cid <aacid at kde.org>
+ 2005-12-18 Albert Astals Cid <aacid at kde.org>
- * configure.ac: Better jpeg detection, refer to ml PCbsd
- problem
+ * configure.ac: Better jpeg detection, refer to ml PCbsd
+ problem
ChangeLog | 4 ++
configure.ac | 131
@@ -55065,84 +57125,84 @@
commit 888d76a29c9c5ea6c90cc4299b230ca0c2c2944f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 12 20:21:08 2005 +0000
+Date: Mon Dec 12 20:21:08 2005 +0000
* poppler/Page.cc: Ignore cropBox if it seems incorrect
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Page.cc | 7 +++++++
2 files changed, 11 insertions(+)
commit bcc5e3afe27c8787ce7022a0701997c96eddb4fe
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Dec 12 20:15:11 2005 +0000
+Date: Mon Dec 12 20:15:11 2005 +0000
- 2005-12-12 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-12 Kristian Høgsberg <krh at 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.
+ * 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 ++
+ 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/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 ++++++++++
+ 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 at kde.org>
-Date: Sat Dec 10 10:52:15 2005 +0000
+Date: Sat Dec 10 10:52:15 2005 +0000
* qt4/src/poppler-page.cc:
* qt4/src/poppler-qt4.h:
@@ -55151,25 +57211,25 @@
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 +++++++++++++++++++++++--------
+ 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 at redhat.com>
-Date: Fri Dec 9 20:49:59 2005 +0000
+Date: Fri Dec 9 20:49:59 2005 +0000
- 2005-12-09 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-09 Kristian Høgsberg <krh at redhat.com>
- * poppler/GfxState.cc: Use colToByte() for converting
- GxfColorComp
- to bytes (really fix #5117).
+ * poppler/GfxState.cc: Use colToByte() for converting
+ GxfColorComp
+ to bytes (really fix #5117).
- * poppler/Stream.cc: Remove duplicated check (#5243).
+ * poppler/Stream.cc: Remove duplicated check (#5243).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/GfxState.cc | 6 +++---
poppler/Stream.cc | 4 ----
3 files changed, 8 insertions(+), 7 deletions(-)
@@ -55176,45 +57236,45 @@
commit 8a2464122455311c6d16ae62bb9ac9a0ae365a28
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Dec 9 19:40:40 2005 +0000
+Date: Fri Dec 9 19:40:40 2005 +0000
- 2005-12-09 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-09 Kristian Høgsberg <krh at redhat.com>
- * configure.ac:
- * poppler/Makefile.am (poppler_includedir):
- * goo/Makefile.am (poppler_goo_include_HEADERS): Make
- installation
- of xpdf header files optional.
+ * 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 ++++
+ ChangeLog | 10 +++++++++-
+ configure.ac | 8 ++++++++
+ goo/Makefile.am | 4 ++++
+ poppler/Makefile.am | 4 ++++
4 files changed, 25 insertions(+), 1 deletion(-)
commit 830b61bfd1c985fe14ec4d0f6724c8f70e924fc1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 8 18:17:42 2005 +0000
+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
+ * 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 ++++++
+ 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 +---
@@ -55222,12 +57282,12 @@
commit 0a1c33ed17fd7053ed455da3444856a5dab3c9b4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Dec 8 12:42:50 2005 +0000
+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 ++++++++
+ ChangeLog | 8 ++++++++
glib/Makefile.am | 3 +--
poppler/Makefile.am | 3 +--
qt/Makefile.am | 3 +--
@@ -55236,35 +57296,35 @@
commit adca042e666fd932f16213d0a4daba08b5021901
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Dec 7 08:42:21 2005 +0000
+Date: Wed Dec 7 08:42:21 2005 +0000
Remove the version check. OK'd by krh.
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
poppler/PDFDoc.cc | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
commit bc57f8dd73eef9a74e4a6e248ed6985c360db838
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Dec 7 08:31:09 2005 +0000
+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 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 7 +++++++
+ qt4/src/poppler-qt4.h | 7 +++++++
qt4/tests/check_metadata.cpp | 18 ++++++++++++++++++
4 files changed, 54 insertions(+)
commit 7ec41df91e6dbf792e11676d929acc2f634bd382
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Dec 6 09:58:04 2005 +0000
+Date: Tue Dec 6 09:58:04 2005 +0000
Add more unit tests for better coverage.
- ChangeLog | 6 ++++
+ ChangeLog | 6 ++++
qt4/tests/check_fonts.cpp | 24 ++++++++++++++++
qt4/tests/check_metadata.cpp | 66
++++++++++++++++++++++++++++++++++++++++++++
@@ -55272,39 +57332,39 @@
commit a92b10016306ac46775c9b95b52d249b233ff950
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Dec 5 20:46:22 2005 +0000
+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 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
commit 66096477d1a86f13fcb07ae25caff1cc02b1e7cd
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Dec 4 19:48:25 2005 +0000
+Date: Sun Dec 4 19:48:25 2005 +0000
Add checking for Type3 fonts in the unit test.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
qt4/tests/check_fonts.cpp | 24 ++++++++++++++++++++++++
2 files changed, 29 insertions(+)
commit 62345b0affed8e2e37728fca7f2b750879192c43
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 4 18:53:40 2005 +0000
+Date: Sun Dec 4 18:53:40 2005 +0000
Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz
for notifying
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/JPXStream.cc | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
commit ba4b3f88271892f197aa2ec076c80ff63a175887
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Dec 4 11:30:00 2005 +0000
+Date: Sun Dec 4 11:30:00 2005 +0000
* qt/poppler-qt.h:
* qt/poppler-fontinfo.h:
@@ -55313,26 +57373,26 @@
FontInfo needed
as Q[Value]List<FontInfo> uses it when appending
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
qt/poppler-fontinfo.cc | 9 +++++++++
- qt/poppler-qt.h | 2 ++
+ qt/poppler-qt.h | 2 ++
qt4/src/poppler-fontinfo.cc | 9 +++++++++
- qt4/src/poppler-qt4.h | 2 ++
+ qt4/src/poppler-qt4.h | 2 ++
5 files changed, 30 insertions(+)
commit e091231d98d12c19b0098ffbaec6ecda28097dff
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Dec 4 10:45:25 2005 +0000
+Date: Sun Dec 4 10:45:25 2005 +0000
Add new unit test to .cvsignore suppressions.
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
qt4/tests/.cvsignore | 1 +
2 files changed, 3 insertions(+)
commit 6a7b1eaaedbfdd3a8e6b4d899477350f2b485641
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Dec 4 10:05:21 2005 +0000
+Date: Sun Dec 4 10:05:21 2005 +0000
* qt4/src/poppler-qt4.h:
qt4/src/fontinfo.cc: add implementation for FontInfo::typeName()
@@ -55342,11 +57402,11 @@
* qt4/src/Mainpage.dox: Minor typo fixes.
- ChangeLog | 11 +++++++++++
- qt4/src/Mainpage.dox | 5 +++--
+ 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/src/poppler-qt4.h | 14 +++++++++++++-
+ qt4/tests/Makefile.am | 5 +++++
qt4/tests/check_fonts.cpp | 42
++++++++++++++++++++++++++++++++++++++++++
6 files changed, 98 insertions(+), 3 deletions(-)
@@ -55353,72 +57413,72 @@
commit 31b28b4c59f7820901e9cf893197f381acbae8ce
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Dec 4 02:24:25 2005 +0000
+Date: Sun Dec 4 02:24:25 2005 +0000
- 2005-12-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-03 Kristian Høgsberg <krh at 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().
+ * 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).
+ * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149),
+ a rerun of an old classic (#3340).
- ChangeLog | 7 +++++++
- glib/poppler-page.cc | 8 +++++++-
+ ChangeLog | 7 +++++++
+ glib/poppler-page.cc | 8 +++++++-
poppler/CairoFontEngine.cc | 2 ++
3 files changed, 16 insertions(+), 1 deletion(-)
commit 4d169c5c345cdac84a39026e759b928977643417
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Dec 4 01:42:29 2005 +0000
+Date: Sun Dec 4 01:42:29 2005 +0000
- 2005-12-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-03 Kristian Høgsberg <krh at redhat.com>
- * poppler/GfxState.cc: Fixing another problem with new GfxRGB
- representation causing images to show up as random pixels
- (#5117).
+ * poppler/GfxState.cc: Fixing another problem with new GfxRGB
+ representation causing images to show up as random pixels
+ (#5117).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/GfxState.cc | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
commit 58de0458e17b1639ce0bcae45a4b09b2c0a56618
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Dec 3 23:23:53 2005 +0000
+Date: Sat Dec 3 23:23:53 2005 +0000
- 2005-12-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-03 Kristian Høgsberg <krh at redhat.com>
- * qt/Makefile.am (noinst_PROGRAMS): Only build qt test
- program if
- splash is enabled.
+ * qt/Makefile.am (noinst_PROGRAMS): Only build qt test
+ program if
+ splash is enabled.
- * poppler/CairoOutputDev.cc: Remove unused grid snapping code,
- sidestepping #4507.
+ * 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).
+ * 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/Makefile.am (libpoppler_la_LIBADD): Add
+ FREETYPE_LIBS
+ (#4515).
- * poppler/TextOutputDev.cc:
- * qt/poppler-qt.h: GCC-4.1 fixes (#5031).
+ * poppler/TextOutputDev.cc:
+ * qt/poppler-qt.h: GCC-4.1 fixes (#5031).
- ChangeLog | 17 +++++++++++++++++
+ ChangeLog | 17 +++++++++++++++++
glib/poppler-document.h | 5 +----
poppler/CairoOutputDev.cc | 35 +++++++++--------------------------
poppler/CairoOutputDev.h | 2 +-
- poppler/Makefile.am | 3 ++-
+ poppler/Makefile.am | 3 ++-
poppler/TextOutputDev.cc | 2 +-
- qt/Makefile.am | 4 ++++
- qt/poppler-qt.h | 6 +++---
+ qt/Makefile.am | 4 ++++
+ qt/poppler-qt.h | 6 +++---
8 files changed, 38 insertions(+), 36 deletions(-)
commit df45483f1437d8a96519e1428d1f4b3ffc08c2cd
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 3 22:39:06 2005 +0000
+Date: Sat Dec 3 22:39:06 2005 +0000
remove another chagne should not have gone in
@@ -55427,12 +57487,12 @@
commit 7dfe02ee112dee51346525b62d877e6591135761
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 3 22:28:46 2005 +0000
+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 ++
+ ChangeLog | 3 ++
qt/poppler-fontinfo.cc | 75
++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+)
@@ -55439,7 +57499,7 @@
commit 655b9dd195ac9faf2f7ea0255880b8c83b249a06
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 3 22:26:07 2005 +0000
+Date: Sat Dec 3 22:26:07 2005 +0000
this should have not went in
@@ -55448,7 +57508,7 @@
commit ab45eb562159d5b006e658ec66723a0a47908f65
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 3 22:20:54 2005 +0000
+Date: Sat Dec 3 22:20:54 2005 +0000
* qt4/src/poppler-qt4.h:
* qt4/src/poppler-fontinfo.cc:
@@ -55455,49 +57515,49 @@
* qt4/src/poppler-textbox.cc: Remove implementation of that classes
from the header, use pimpl
- ChangeLog | 9 ++++-
+ ChangeLog | 9 ++++-
poppler/TextOutputDev.h | 10 +++---
- qt/Makefile.am | 1 +
+ qt/Makefile.am | 1 +
qt/poppler-document.cc | 29 ++++++++++++++++
- qt/poppler-private.h | 2 ++
- qt/poppler-qt.h | 80
+ qt/poppler-private.h | 2 ++
+ qt/poppler-qt.h | 80
++++++++++++++++++++++++++++++++++++++++++++-
- qt4/src/Makefile.am | 2 ++
+ qt4/src/Makefile.am | 2 ++
qt4/src/poppler-fontinfo.cc | 69 ++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 43 ++++++++++--------------
+ qt4/src/poppler-qt4.h | 43 ++++++++++--------------
qt4/src/poppler-textbox.cc | 49 +++++++++++++++++++++++++++
- test/pdf-inspector.cc | 9 +++--
+ test/pdf-inspector.cc | 9 +++--
11 files changed, 268 insertions(+), 35 deletions(-)
commit 64079ad81caf6d2cf66b1f3a3de9454146e15c6c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Dec 3 21:55:36 2005 +0000
+Date: Sat Dec 3 21:55:36 2005 +0000
- 2005-12-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-12-03 Kristian Høgsberg <krh at redhat.com>
- Fixes from Nickolay V. Shmyrev:
+ 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/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.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.
+ * 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.
+ * glib/poppler-page.cc (poppler_page_set_selection_alpha):
+ Zero
+ out pixbuf first.
- ChangeLog | 21 +++++++++++++++++
- glib/poppler-page.cc | 18 +++++++++------
+ ChangeLog | 21 +++++++++++++++++
+ glib/poppler-page.cc | 18 +++++++++------
poppler/CairoOutputDev.cc | 59
++++++++++++++++++++++++++++++++++-------------
poppler/CairoOutputDev.h | 6 ++---
@@ -55506,28 +57566,28 @@
commit f3da21a3ecdd2694290e64af86c8e35fcb61371b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Dec 3 21:35:45 2005 +0000
+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
+ 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/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 at kde.org>
-Date: Thu Dec 1 22:45:10 2005 +0000
+Date: Thu Dec 1 22:45:10 2005 +0000
Fix CAN-2005-3193 related bugs
Thanks Leonard for reporting
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/JPXStream.cc | 9 ++++++++-
poppler/Stream.cc | 33 ++++++++++++++++++++++++++++++++-
poppler/Stream.h | 3 +++
@@ -55535,7 +57595,7 @@
commit a90f076af9ebb188895e7b223bcb7e5c3f4309c4
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 28 22:50:19 2005 +0000
+Date: Mon Nov 28 22:50:19 2005 +0000
Fix QPixmap contents generation messed when doing the xpdf 3.01
transition in qt4 frontend
@@ -55542,9 +57602,9 @@
Use Splash backend by default in the qt4 test, added -arthur option
to use the Arthur backend
- ChangeLog | 12 ++++++++--
- qt4/src/poppler-page.cc | 47 ++++++++++++++++++++++++++++---------
- qt4/src/poppler-qt4.h | 17 ++++++++++----
+ ChangeLog | 12 ++++++++--
+ qt4/src/poppler-page.cc | 47 ++++++++++++++++++++++++++++---------
+ qt4/src/poppler-qt4.h | 17 ++++++++++----
qt4/tests/test-poppler-qt4.cpp | 53
++++++++++++++++++++++++++----------------
4 files changed, 91 insertions(+), 38 deletions(-)
@@ -55551,50 +57611,50 @@
commit b7e4f0e7d175abde7fafb1fcc7ba129468bc8c1a
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Nov 27 01:33:51 2005 +0000
+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
+ 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_pagemode.cpp | 22 ++++++++--------
qt4/tests/check_permissions.cpp | 18 ++++++-------
7 files changed, 78 insertions(+), 64 deletions(-)
commit d036fa022dbb6f4421ccc8b12b8f9e4f0c8d7406
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 25 22:52:56 2005 +0000
+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 +++++
+ ChangeLog | 5 +++++
qt4/src/poppler-page.cc | 44 ++++++++++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-qt4.h | 22 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 22 ++++++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)
commit 3c9f09d76dc70e4ba766930facee8b6f30bcd2da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 22 21:50:44 2005 +0000
+Date: Tue Nov 22 21:50:44 2005 +0000
Fix page range in the inspector
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
test/pdf-inspector.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit e64f63416dbce497cb2167272b95491664f213e8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 21 22:12:15 2005 +0000
+Date: Mon Nov 21 22:12:15 2005 +0000
PAtch to add some more functions to the qt binding by Stefan Kebekus
- ChangeLog | 5 ++++
+ ChangeLog | 5 ++++
qt/poppler-page.cc | 69
+++++++++++++++++++++++++++++++++++++++++++++++++++++-
qt/poppler-qt.h | 41 ++++++++++++++++++++++++++++++++
@@ -55602,27 +57662,27 @@
commit 8bd8cb4160b73da69d058783750352fbface66dc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Nov 21 19:44:09 2005 +0000
+Date: Mon Nov 21 19:44:09 2005 +0000
Fix a possible build problem
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt/Makefile.am | 1 +
2 files changed, 5 insertions(+)
commit fc59b79dc375544681032a1618e96c458515d724
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Nov 20 23:17:32 2005 +0000
+Date: Sun Nov 20 23:17:32 2005 +0000
- 2005-11-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-11-20 Kristian Høgsberg <krh at redhat.com>
- * poppler/GfxState.cc: Fix the byte_lookup initialization
- broken
- by the merges (#4350). Modify GfxColorSpace::getRGBLine()
- to work
- with new GfXColor type.
+ * poppler/GfxState.cc: Fix the byte_lookup initialization
+ broken
+ by the merges (#4350). Modify GfxColorSpace::getRGBLine()
+ to work
+ with new GfXColor type.
- ChangeLog | 13 +++++++++++-
+ ChangeLog | 13 +++++++++++-
poppler/GfxState.cc | 59
+++++++++++++++++++++++++++++++----------------------
2 files changed, 47 insertions(+), 25 deletions(-)
@@ -55629,106 +57689,106 @@
commit 6fe2cb0fcd53211143dcd0c47bf8c8c7a8c11a39
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Nov 17 21:37:34 2005 +0000
+Date: Thu Nov 17 21:37:34 2005 +0000
make it compile with freetype 2.2.0 preversions
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
splash/SplashFTFont.cc | 42 +++++++++++++++++++++++++++++++++++++-----
2 files changed, 41 insertions(+), 5 deletions(-)
commit 429d3521d788be702a3944bc290569f90ae04892
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Nov 4 19:03:55 2005 +0000
+Date: Fri Nov 4 19:03:55 2005 +0000
Make it compile using --disable-cairo-output
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-document.cc | 6 ++++--
- glib/poppler-page.cc | 27 +++++++++++++--------------
+ glib/poppler-page.cc | 27 +++++++++++++--------------
3 files changed, 21 insertions(+), 16 deletions(-)
commit b96c118eb08d478914c2981204d749a95957cbb3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Nov 1 15:29:32 2005 +0000
+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 +++
+ ChangeLog | 5 +++
poppler/OutputDev.h | 125
++++++++++++++++++++++++++--------------------------
- poppler/Stream.h | 24 +++++-----
+ poppler/Stream.h | 24 +++++-----
3 files changed, 80 insertions(+), 74 deletions(-)
commit 51670972777510a3ec64a56649716b31167b9d0e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 30 20:29:05 2005 +0000
+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 +-
+ 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/PSOutputDev.h | 48 +-
+ poppler/Page.cc | 115 +-
+ poppler/Page.h | 23 +-
poppler/SplashOutputDev.cc | 1525 ++++++++++++++++++++++---
- poppler/SplashOutputDev.h | 59 +-
+ 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
+ poppler/TextOutputDev.h | 16 +-
+ qt/poppler-page.cc | 34 +-
+ qt4/src/poppler-page.cc | 31 +-
+ splash/Splash.cc | 2656
+++++++++++++++++++++++++++++++++-----------
- splash/Splash.h | 75 +-
+ 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 +-
+ 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 at redhat.com>
-Date: Mon Oct 17 02:17:51 2005 +0000
+Date: Mon Oct 17 02:17:51 2005 +0000
- 2005-10-05 Kristian Høgsberg <krh at redhat.com>
+ 2005-10-05 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_render_to_ps):
- Fix another
- off-by-one page number error (#4555).
+ * glib/poppler-page.cc (poppler_page_render_to_ps):
+ Fix another
+ off-by-one page number error (#4555).
- ChangeLog | 6 +++++-
+ ChangeLog | 6 +++++-
poppler/poppler-config.h.in | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
commit 9830f0ea41f09fefada740e9429c491e067a5082
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 15:11:32 2005 +0000
+Date: Sun Oct 16 15:11:32 2005 +0000
GfxFont merges from xpdf 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/GfxFont.cc | 109
++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 75 insertions(+), 35 deletions(-)
@@ -55735,11 +57795,11 @@
commit 62b5ba221aca8c320e964916b0c0329efc8da572
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 15:04:39 2005 +0000
+Date: Sun Oct 16 15:04:39 2005 +0000
Stream[cc|h] merges from xpdf 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Stream.cc | 714
+++++++++++++++++++++++++++++++++++++++++++++++++-----
poppler/Stream.h | 19 +-
@@ -55747,11 +57807,11 @@
commit b9fab51179f38e9798b10366be672f0432c874da
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 14:58:14 2005 +0000
+Date: Sun Oct 16 14:58:14 2005 +0000
Function.cc|h merges from xpdf 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Function.cc | 76
++++++++++++++++++++++++++++++-----------------------
poppler/Function.h | 42 +++++++++++++++++++++++++++++
@@ -55759,26 +57819,26 @@
commit c6e0242200f818c67508041763ff317e79daadd6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 14:54:17 2005 +0000
+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
+ ChangeLog | 7 +-
+ poppler/Annot.cc | 234
+++++++++++++++++++++++++++++++++++++++++++------
- poppler/Annot.h | 20 ++---
- poppler/FontInfo.cc | 2 +-
+ poppler/Annot.h | 20 ++---
+ poppler/FontInfo.cc | 2 +-
poppler/PSOutputDev.cc | 2 +-
- poppler/Page.cc | 2 +-
+ poppler/Page.cc | 2 +-
6 files changed, 221 insertions(+), 46 deletions(-)
commit 65d574fdc009e45ad66d1d402d5e805e4e94f427
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 14:30:16 2005 +0000
+Date: Sun Oct 16 14:30:16 2005 +0000
Merge SplashFTFont.cc with xpdf 3.01 changes
- ChangeLog | 1 +
+ ChangeLog | 1 +
splash/SplashFTFont.cc | 64
++++++++++++++++++++++++++++++++++----------------
2 files changed, 45 insertions(+), 20 deletions(-)
@@ -55785,19 +57845,19 @@
commit f9d208e86433b213b21a75089f82fd00dcd746fc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 14:25:32 2005 +0000
+Date: Sun Oct 16 14:25:32 2005 +0000
Merge SplashScreen.[cc|h] from xpdf 3.01
- ChangeLog | 4 ++
+ ChangeLog | 4 ++
splash/SplashScreen.cc | 110
++++++++++++++++++++++++++++++++-----------------
- splash/SplashScreen.h | 12 +++++-
+ splash/SplashScreen.h | 12 +++++-
3 files changed, 87 insertions(+), 39 deletions(-)
commit 7d46ac000316566503a27b5e5c68621be9c081d0
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Oct 16 14:19:47 2005 +0000
+Date: Sun Oct 16 14:19:47 2005 +0000
Merging SplashXPathScanner.cc changes from xpdf 3.01
@@ -55807,65 +57867,65 @@
commit e34713a2187e05358f98e749ec2923210a40a862
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Oct 5 15:57:17 2005 +0000
+Date: Wed Oct 5 15:57:17 2005 +0000
- 2005-10-05 Kristian Høgsberg <krh at redhat.com>
+ 2005-10-05 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_render_to_ps):
- Fix another
- off-by-one page number error (#4555).
+ * glib/poppler-page.cc (poppler_page_render_to_ps):
+ Fix another
+ off-by-one page number error (#4555).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit fdd0934430ed251f9aeb45158b6ec95684b3e7b4
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Mon Sep 26 19:29:45 2005 +0000
+Date: Mon Sep 26 19:29:45 2005 +0000
- 2005-09-26 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-26 Marco Pesenti Gritti <mpg at redhat.com>
- * glib/poppler-action.cc:
+ * glib/poppler-action.cc:
- Initialize window title even if the action is unknown
+ Initialize window title even if the action is unknown
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-action.cc | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
commit e9753049ddfbdf28df7a222d35eccdbcbcbc848d
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Mon Sep 26 10:42:38 2005 +0000
+Date: Mon Sep 26 10:42:38 2005 +0000
- 2005-09-26 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-26 Marco Pesenti Gritti <mpg at redhat.com>
- * glib/poppler-action.cc:
- * glib/poppler-action.h:
+ * glib/poppler-action.cc:
+ * glib/poppler-action.h:
- Implement launch action
+ Implement launch action
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
glib/poppler-action.cc | 11 ++++++++---
- glib/poppler-action.h | 1 +
+ glib/poppler-action.h | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
commit ab18b2cb6d1c62bb91173d105e8631fe4ef1bcfb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 15:27:31 2005 +0000
+Date: Tue Sep 20 15:27:31 2005 +0000
Parser.cc merges from xpdf 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Parser.cc | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
commit cf6723caaed24615c3b8965cee9c433007f80d77
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 15:08:52 2005 +0000
+Date: Tue Sep 20 15:08:52 2005 +0000
TextPage *TextOutpudDev::takeText() from xpdf 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/TextOutputDev.cc | 8 ++++++++
poppler/TextOutputDev.h | 4 ++++
3 files changed, 13 insertions(+)
@@ -55872,33 +57932,33 @@
commit e0cbb0ca2c611ad5ac0267e46279c9d61450902a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 14:59:43 2005 +0000
+Date: Tue Sep 20 14:59:43 2005 +0000
more 3.00 -> 3.01 merging
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/XRef.cc | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
commit 9c7adb318d395ff674c6febf6406a8d47e9e5bf6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 14:43:15 2005 +0000
+Date: Tue Sep 20 14:43:15 2005 +0000
- * poppler/UnicodeMap.cc: More grealloc -> greallocn
- * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
+ * poppler/UnicodeMap.cc: More grealloc -> greallocn
+ * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
- ChangeLog | 2 ++
- poppler/UnicodeMap.cc | 4 ++--
+ ChangeLog | 2 ++
+ poppler/UnicodeMap.cc | 4 ++--
poppler/UnicodeTypeTable.cc | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
commit 2c4c9b855b0df1dc0836d4f44e9471215a419ea6
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 14:34:31 2005 +0000
+Date: Tue Sep 20 14:34:31 2005 +0000
Merge link.cc changes from xpdf 3.00 -> 3.01
- ChangeLog | 1 +
+ ChangeLog | 1 +
poppler/Link.cc | 64
++++++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 62 insertions(+), 3 deletions(-)
@@ -55905,7 +57965,7 @@
commit 4e9490c0219dd9c99ba0e5533c96663b8570a87b
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Sep 20 14:00:43 2005 +0000
+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
@@ -55913,62 +57973,62 @@
Remove a setEncryption from the Xref.h marco probably forgot to
remove when merging
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/GlobalParams.cc | 41 +++++++++++++++++++++++++++++++++++++++++
poppler/GlobalParams.h | 22 ++++++++++++++++------
- poppler/XRef.h | 4 ----
+ poppler/XRef.h | 4 ----
4 files changed, 60 insertions(+), 10 deletions(-)
commit 22da021bf69d83d641e3f30cc0e1bd62394e56a4
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Tue Sep 20 13:23:08 2005 +0000
+Date: Tue Sep 20 13:23:08 2005 +0000
- 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/XRef.cc:
+ * poppler/XRef.cc:
- Remove duplicated initialization
+ Remove duplicated initialization
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/XRef.cc | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
commit 2a8778147938e3ed2af177226a9c35655f898c95
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Tue Sep 20 10:18:57 2005 +0000
+Date: Tue Sep 20 10:18:57 2005 +0000
- 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/GlobalParams.cc:
+ * poppler/GlobalParams.cc:
- s/G/Goo in not yet compiled plugins code
+ s/G/Goo in not yet compiled plugins code
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/GlobalParams.cc | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
commit 16f720b87cfc491db585dbdc99236cf492ffe85b
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Tue Sep 20 09:57:41 2005 +0000
+Date: Tue Sep 20 09:57:41 2005 +0000
- 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-20 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/Makefile.am:
+ * poppler/Makefile.am:
- Add XPDFPlugin*. Thanks to TSDgeos that noticed this.
+ Add XPDFPlugin*. Thanks to TSDgeos that noticed this.
- * poppler/XpdfPluginAPI.cc:
+ * poppler/XpdfPluginAPI.cc:
- Fixup
+ Fixup
- ChangeLog | 10 ++++++++++
- poppler/Makefile.am | 4 +++-
+ ChangeLog | 10 ++++++++++
+ poppler/Makefile.am | 4 +++-
poppler/XpdfPluginAPI.cc | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
commit 5f30791c3d87315ad1f742de64d2c1351ca70cb7
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 19:33:28 2005 +0000
+Date: Fri Sep 16 19:33:28 2005 +0000
*** empty log message ***
@@ -55977,16 +58037,16 @@
commit db62e07fcf57f45951b21f8aab44b0d943efe5d0
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 19:33:05 2005 +0000
+Date: Fri Sep 16 19:33:05 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/PDFDoc.cc:
- * poppler/PDFDoc.h:
- * poppler/XRef.cc:
- * poppler/XRef.h:
+ * poppler/PDFDoc.cc:
+ * poppler/PDFDoc.h:
+ * poppler/XRef.cc:
+ * poppler/XRef.h:
- Merge more from 3.01
+ Merge more from 3.01
poppler/PDFDoc.cc | 20 ++++++++++++++++----
poppler/PDFDoc.h | 19 +++++++++----------
@@ -55996,44 +58056,44 @@
commit 3acc7be594712fd0ce7ac07b7188d5b38b382782
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 19:05:00 2005 +0000
+Date: Fri Sep 16 19:05:00 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/XRef.cc:
+ * poppler/XRef.cc:
- Merge some initialization that I lost before
+ Merge some initialization that I lost before
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/XRef.cc | 4 ++++
2 files changed, 10 insertions(+)
commit 3badd82b72b2768be27e309b048cd8dcb1c80038
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:46:37 2005 +0000
+Date: Fri Sep 16 18:46:37 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/XRef.cc:
+ * poppler/XRef.cc:
- Merge change from 3.01
+ Merge change from 3.01
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/XRef.cc | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
commit 5474583e20ca773befa17242d4ad7b8f81d5bf99
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:38:58 2005 +0000
+Date: Fri Sep 16 18:38:58 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/CharCodeToUnicode.cc:
- * poppler/CharCodeToUnicode.h:
+ * poppler/CharCodeToUnicode.cc:
+ * poppler/CharCodeToUnicode.h:
- Improvements from xpdf 3.01
+ Improvements from xpdf 3.01
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++------------
poppler/CharCodeToUnicode.h | 4 ++++
3 files changed, 30 insertions(+), 12 deletions(-)
@@ -56040,31 +58100,31 @@
commit b2a6eab113fecd3823885c64f3302bea4f372a9f
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:37:29 2005 +0000
+Date: Fri Sep 16 18:37:29 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/CMap.cc:
+ * poppler/CMap.cc:
- Improvements from xpdf 3.01
+ Improvements from xpdf 3.01
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/CMap.cc | 30 +++++++++++++++++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
commit 3f69f2158453b9dab9efc280ed1578ac3d0cebe8
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:35:29 2005 +0000
+Date: Fri Sep 16 18:35:29 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/NameToUnicodeTable.h:
- * poppler/UnicodeTypeTable.cc:
- * poppler/UnicodeTypeTable.h:
+ * poppler/NameToUnicodeTable.h:
+ * poppler/UnicodeTypeTable.cc:
+ * poppler/UnicodeTypeTable.h:
- Merge some unicode table changes from xpdf 3.01
+ Merge some unicode table changes from xpdf 3.01
- ChangeLog | 8 +
+ ChangeLog | 8 +
poppler/NameToUnicodeTable.h | 168 +++++------
poppler/UnicodeTypeTable.cc | 690
+++++++++++++++++++++++++++++++++++++++++--
@@ -56073,125 +58133,125 @@
commit 6cbe76bc55d557fe5fca0f8f1b33bda95acdc0e9
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:32:29 2005 +0000
+Date: Fri Sep 16 18:32:29 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/SplashOutputDev.h:
- * splash/Splash.cc:
- * splash/Splash.h:
+ * poppler/SplashOutputDev.h:
+ * splash/Splash.cc:
+ * splash/Splash.h:
- Modified region support from xpdf 3.01
+ Modified region support from xpdf 3.01
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
poppler/SplashOutputDev.h | 5 +++++
- splash/Splash.cc | 31 +++++++++++++++++++++++++++++++
- splash/Splash.h | 11 +++++++++++
+ splash/Splash.cc | 31 +++++++++++++++++++++++++++++++
+ splash/Splash.h | 11 +++++++++++
4 files changed, 55 insertions(+)
commit a9df3f3203c14161e5d6bc6048ec7e123536e6d3
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:29:18 2005 +0000
+Date: Fri Sep 16 18:29:18 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at 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:
+ * 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
+ 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 -
+ 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/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/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 -
+ poppler/poppler-config.h.in | 2 -
24 files changed, 1737 insertions(+), 221 deletions(-)
commit a777e5c26483b90d0910e85c2be666640835d0bf
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:21:38 2005 +0000
+Date: Fri Sep 16 18:21:38 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * configure.ac:
- * goo/Makefile.am:
- * splash/Makefile.am:
- * splash/SplashFTFont.cc:
- * splash/SplashMath.h:
- * splash/SplashTypes.h:
+ * configure.ac:
+ * goo/Makefile.am:
+ * splash/Makefile.am:
+ * splash/SplashFTFont.cc:
+ * splash/SplashMath.h:
+ * splash/SplashTypes.h:
- Merge support for fixed point
+ Merge support for fixed point
- ChangeLog | 11 +++++++++++
- configure.ac | 4 ++++
- splash/Makefile.am | 1 +
+ ChangeLog | 11 +++++++++++
+ configure.ac | 4 ++++
+ splash/Makefile.am | 1 +
splash/SplashFTFont.cc | 7 +++++++
- splash/SplashMath.h | 34 +++++++++++++++++++++++++++++++++-
- splash/SplashTypes.h | 5 +++++
+ splash/SplashMath.h | 34 +++++++++++++++++++++++++++++++++-
+ splash/SplashTypes.h | 5 +++++
6 files changed, 61 insertions(+), 1 deletion(-)
commit 00457c5f44a246c9f867a114a72be9f7b2dc1cf5
Author: Marco Pesenti Gritti <mpg at redhat.com>
-Date: Fri Sep 16 18:11:14 2005 +0000
+Date: Fri Sep 16 18:11:14 2005 +0000
- 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
+ 2005-09-16 Marco Pesenti Gritti <mpg at redhat.com>
- * poppler/ArthurOutputDev.cc:
- * poppler/CairoFontEngine.cc:
- * poppler/TextOutputDev.cc:
- * poppler/UnicodeMap.cc:
+ * poppler/ArthurOutputDev.cc:
+ * poppler/CairoFontEngine.cc:
+ * poppler/TextOutputDev.cc:
+ * poppler/UnicodeMap.cc:
- Use mallocn when possible
+ Use mallocn when possible
- ChangeLog | 9 +++++++++
+ ChangeLog | 9 +++++++++
poppler/ArthurOutputDev.cc | 2 +-
poppler/CairoFontEngine.cc | 4 ++--
poppler/TextOutputDev.cc | 2 +-
- poppler/UnicodeMap.cc | 2 +-
+ poppler/UnicodeMap.cc | 2 +-
5 files changed, 14 insertions(+), 5 deletions(-)
commit 09c9ff67ceae5753811a2f625e3ad810628c782e
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 16 18:00:43 2005 +0000
+Date: Fri Sep 16 18:00:43 2005 +0000
SplashXPath.cc merges from xpdf 3.00 -> 3.01
- ChangeLog | 3 ++
+ ChangeLog | 3 ++
splash/SplashXPath.cc | 81
+++++++++++++++++++++++++--------------------------
2 files changed, 42 insertions(+), 42 deletions(-)
@@ -56198,7 +58258,7 @@
commit 0555ba861d3b84d88c80da4fa247274338ff7817
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Sep 16 17:42:56 2005 +0000
+Date: Fri Sep 16 17:42:56 2005 +0000
SplashFontEngine.cc merge from xpdf 3.00 -> 3.01
@@ -56207,17 +58267,17 @@
commit ddc72bd8354168d992631d1ef8cd0939b428966c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 22:24:55 2005 +0000
+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 ++
+ splash/SplashT1Font.h | 2 ++
2 files changed, 20 insertions(+), 5 deletions(-)
commit ba409db3157105f326b4bbc342ca7af859a44ce9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 22:20:37 2005 +0000
+Date: Thu Sep 15 22:20:37 2005 +0000
Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files
@@ -56227,7 +58287,7 @@
commit 3ea00e853049d8c26ee88aaef8ea6c47c8d46956
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 22:15:47 2005 +0000
+Date: Thu Sep 15 22:15:47 2005 +0000
Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files
@@ -56237,13 +58297,13 @@
commit e571dcbfd0c77a28e41710577859f632cc989de5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 22:09:50 2005 +0000
+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 +++-----------
+ ChangeLog | 6 ++++++
+ configure.ac | 14 +++-----------
poppler/CairoFontEngine.cc | 21 ++++++++++++++-------
poppler/CairoFontEngine.h | 3 ++-
splash/SplashFTFontEngine.cc | 19 +++++++++++--------
@@ -56252,7 +58312,7 @@
commit 59fe2937db192dc7b59bf28c3f29909faf11aae3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 21:51:16 2005 +0000
+Date: Thu Sep 15 21:51:16 2005 +0000
Merge xpdf 3.00 -> 3.01 changes for that file
@@ -56261,7 +58321,7 @@
commit b2f94635249f2c5f0c876a1005826fe4c6eb6025
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 12:52:36 2005 +0000
+Date: Thu Sep 15 12:52:36 2005 +0000
Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h]
@@ -56271,17 +58331,17 @@
commit 0fc2e70576b1c48cf47a686e8aa7e202a802bc9d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 12:32:25 2005 +0000
+Date: Thu Sep 15 12:32:25 2005 +0000
Another small merge from xpdf 3.01
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/Outline.cc | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
commit f8983ceb3c55df72c94870806d71db139c11bdeb
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 12:28:34 2005 +0000
+Date: Thu Sep 15 12:28:34 2005 +0000
Another small xpdf 3.00 -> xpdf 3.01 merge
@@ -56290,7 +58350,7 @@
commit 52efe9845cf3eb1dd836f90bfa203760baa2f87c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Sep 15 11:46:56 2005 +0000
+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
@@ -56300,7 +58360,7 @@
commit 4b4fc5c017bf147c9069bbce32fc14467bd2a81a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Sep 14 21:20:36 2005 +0000
+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
@@ -56307,96 +58367,96 @@
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
+ ChangeLog | 4 +
+ fofi/FoFiTrueType.cc | 406
+++++++++++++++++++++++++++++++++++++++++++------
- fofi/FoFiTrueType.h | 15 +-
- fofi/FoFiType1.cc | 25 ++-
- fofi/FoFiType1C.cc | 134 +++++++++++++---
- fofi/FoFiType1C.h | 6 +
+ fofi/FoFiTrueType.h | 15 +-
+ fofi/FoFiType1.cc | 25 ++-
+ fofi/FoFiType1C.cc | 134 +++++++++++++---
+ fofi/FoFiType1C.h | 6 +
poppler/PSOutputDev.cc | 7 +-
- poppler/PSOutputDev.h | 3 +-
+ poppler/PSOutputDev.h | 3 +-
8 files changed, 515 insertions(+), 85 deletions(-)
commit a68e8e6330418b1f623867973b9c128a9a139c0c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Sep 7 03:00:36 2005 +0000
+Date: Wed Sep 7 03:00:36 2005 +0000
- 2005-09-06 Kristian Høgsberg <krh at redhat.com>
+ 2005-09-06 Kristian Høgsberg <krh at 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.
+ * 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
+ * test/Makefile.am (EXTRA_DIST): Add pdf-operators.c
- ChangeLog | 8 ++++++++
- configure.ac | 17 ++---------------
+ ChangeLog | 8 ++++++++
+ configure.ac | 17 ++---------------
test/Makefile.am | 3 +++
3 files changed, 13 insertions(+), 15 deletions(-)
commit b6490944c081ff53f623acea7ab7a600c3e54816
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Sep 3 11:53:44 2005 +0000
+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
+ 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_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 +++++++------------
+ 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 at redhat.com>
-Date: Fri Sep 2 14:47:24 2005 +0000
+Date: Fri Sep 2 14:47:24 2005 +0000
- 2005-09-02 Kristian Høgsberg <krh at redhat.com>
+ 2005-09-02 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc: Apply Marcos rotation fix.
+ * glib/poppler-page.cc: Apply Marcos rotation fix.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-page.cc | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
commit ecf3dcadb948013cbc987e464952933daf78e4bf
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Aug 31 15:28:46 2005 +0000
+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/Catalog.cc | 16 +--
+ poppler/JPXStream.cc | 380
+++++++++++++++++++++++++++++++++----------------
- poppler/JPXStream.h | 25 ++--
- poppler/Lexer.cc | 11 ++
- poppler/Lexer.h | 3 +
+ poppler/JPXStream.h | 25 ++--
+ poppler/Lexer.cc | 11 ++
+ poppler/Lexer.h | 3 +
poppler/PSOutputDev.cc | 31 ++--
- poppler/Stream.h | 7 +
+ poppler/Stream.h | 7 +
7 files changed, 309 insertions(+), 164 deletions(-)
commit de78738164319b733e54a9abfb5957870facd6cd
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Aug 31 09:51:41 2005 +0000
+Date: Wed Aug 31 09:51:41 2005 +0000
poppler/JArithmeticDecoder.cc
poppler/JArithmeticDecoder.h
@@ -56404,24 +58464,24 @@
poppler/JBIG2Stream.h: merge in some of the JBIG2 changes from
xpdf 3.0.1.
- ChangeLog | 9 ++
+ ChangeLog | 9 ++
poppler/JArithmeticDecoder.cc | 42 ++++++--
poppler/JArithmeticDecoder.h | 22 +++-
poppler/JBIG2Stream.cc | 227
+++++++++++++++++++++++++-----------------
- poppler/JBIG2Stream.h | 4 +-
+ poppler/JBIG2Stream.h | 4 +-
5 files changed, 201 insertions(+), 103 deletions(-)
commit 55952feb637e300b073691ae95d68e766521a769
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Aug 29 15:24:32 2005 +0000
+Date: Mon Aug 29 15:24:32 2005 +0000
- 2005-08-29 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-29 Kristian Høgsberg <krh at 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).
+ * 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 +-
@@ -56429,7 +58489,7 @@
commit 244e5c1f8f65da41ba6314028766dfe5973f6132
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Aug 28 09:43:18 2005 +0000
+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
@@ -56436,22 +58496,22 @@
tweaking
by me.
- ChangeLog | 13 ++++++++
+ ChangeLog | 13 ++++++++
fofi/FoFiTrueType.cc | 1 +
goo/GooHash.cc | 24 +++++++++++++++
- goo/GooHash.h | 2 ++
+ goo/GooHash.h | 2 ++
goo/GooList.cc | 5 ++++
- goo/GooList.h | 5 ++++
+ goo/GooList.h | 5 ++++
goo/GooString.cc | 85
+++++++++++++++++++++++++++++++++++++++++++++++++++-
goo/GooString.h | 11 +++----
- goo/gmem.c | 3 ++
+ goo/gmem.c | 3 ++
poppler/Decrypt.cc | 1 +
10 files changed, 142 insertions(+), 8 deletions(-)
commit eb91b274245b4f5f5389bc9ddfde2c2806557665
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Aug 28 09:31:53 2005 +0000
+Date: Sun Aug 28 09:31:53 2005 +0000
This part of my previous gmallocn merge patch was missing.
@@ -56461,7 +58521,7 @@
commit b3474fd5e0efc96b5814d86e0cdedf39387e7ae3
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Aug 28 03:26:53 2005 +0000
+Date: Sun Aug 28 03:26:53 2005 +0000
add note about related bug
@@ -56470,23 +58530,23 @@
commit ace2eb6ba518b970b96f30f61c4795c161e0cb79
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Aug 28 03:22:04 2005 +0000
+Date: Sun Aug 28 03:22:04 2005 +0000
- 2005-08-27 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-08-27 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/FlateStream.cc: Fix predictor leak.
+ * poppler/FlateStream.cc: Fix predictor leak.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/FlateStream.cc | 1 +
2 files changed, 5 insertions(+)
commit 96657c5480bf2ecf445ad5a105b8e7393ae53c8b
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Aug 28 03:19:55 2005 +0000
+Date: Sun Aug 28 03:19:55 2005 +0000
- 2005-08-27 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-08-27 Jeff Muizelaar <jeff at infidigm.net>
- * configure.ac: Disable the zlib-based decoder by default.
+ * configure.ac: Disable the zlib-based decoder by default.
ChangeLog | 4 ++++
configure.ac | 2 +-
@@ -56494,7 +58554,7 @@
commit d1d715158223c7ca3ae279cea420a948cfdb0428
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Aug 27 08:43:42 2005 +0000
+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
@@ -56501,47 +58561,47 @@
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 +-
+ 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/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/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/Link.cc | 6 ++---
poppler/NameToCharCode.cc | 4 ++--
- poppler/Outline.cc | 4 ++--
+ poppler/Outline.cc | 4 ++--
poppler/SplashOutputDev.cc | 8 +++----
- poppler/Stream.cc | 12 +++++-----
+ poppler/Stream.cc | 12 +++++-----
poppler/TextOutputDev.cc | 48 +++++++++++++++++++-------------------
- poppler/XRef.cc | 18 +++++++--------
- splash/SplashClip.cc | 12 +++++-----
+ poppler/XRef.cc | 18 +++++++--------
+ splash/SplashClip.cc | 12 +++++-----
splash/SplashFTFontFile.cc | 2 +-
- splash/SplashFont.cc | 6 ++---
- splash/SplashPath.cc | 8 +++----
+ splash/SplashFont.cc | 6 ++---
+ splash/SplashPath.cc | 8 +++----
splash/SplashScreen.cc | 4 ++--
- splash/SplashState.cc | 4 ++--
+ splash/SplashState.cc | 4 ++--
splash/SplashT1FontFile.cc | 4 ++--
- splash/SplashXPath.cc | 4 ++--
+ splash/SplashXPath.cc | 4 ++--
splash/SplashXPathScanner.cc | 4 ++--
35 files changed, 214 insertions(+), 176 deletions(-)
commit feb82c60b1f86a9d1260db57534d98c54ee615c4
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Wed Aug 24 19:41:27 2005 +0000
+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
@@ -56549,29 +58609,29 @@
* test/.cvsignore: ignore pdf_inspector binary.
- ChangeLog | 8 ++++++++
- configure.ac | 2 +-
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
test/.cvsignore | 7 ++++---
3 files changed, 13 insertions(+), 4 deletions(-)
commit 8dce80eb74f24f07ac7668905f1631e04a9c5841
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Aug 24 18:57:46 2005 +0000
+Date: Wed Aug 24 18:57:46 2005 +0000
- 2005-08-24 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-24 Kristian Høgsberg <krh at redhat.com>
- * poppler/TextOutputDev.cc: Push rotation argument down to
- GfxState constructor. This is still not completely
- functional yet.
+ * 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.
+ * 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 +
+ 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(-)
@@ -56578,74 +58638,74 @@
commit b909b5ae98bc3e557ef6e658e2b9120e82951259
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Wed Aug 24 03:21:20 2005 +0000
+Date: Wed Aug 24 03:21:20 2005 +0000
Tue Aug 23 17:21:02 2005 Jonathan Blandford <jrb at redhat.com>
- * test/Makefile.am (gtk_cairo_test_LDADD): add
- FREETYPE_{CFLAGS,LIBS} to the cairo deps
+ * test/Makefile.am (gtk_cairo_test_LDADD): add
+ FREETYPE_{CFLAGS,LIBS} to the cairo deps
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
test/Makefile.am | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
commit da3aac379f07ffedd6078707ec9923800fc0c0a5
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Tue Aug 23 18:20:45 2005 +0000
+Date: Tue Aug 23 18:20:45 2005 +0000
Tue Aug 23 13:38:01 2005 Jonathan Blandford <jrb at 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.
+ * 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 +
+ 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/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 ++++++++++++++++++++++++++++++++++++++
+ poppler/ProfileData.h | 41 +++++
+ test/Makefile.am | 13 +-
+ test/pdf-inspector.cc | 358 ++++++++++++++++++++++++++++++++++++++
test/pdf-inspector.glade | 434
+++++++++++++++++++++++++++++++++++++++++++++++
- test/pdf-operators.c | 81 +++++++++
+ test/pdf-operators.c | 81 +++++++++
15 files changed, 1068 insertions(+), 4 deletions(-)
commit 1aad886c6c19a964a3fc9e18f31acc8e115478e0
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Aug 22 18:20:12 2005 +0000
+Date: Mon Aug 22 18:20:12 2005 +0000
- 2005-08-22 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-22 Kristian Høgsberg <krh at 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.
+ * 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
+ ChangeLog | 8 +++
+ glib/poppler-page.cc | 136
+++++++----------------------------------------
- glib/poppler-page.h | 4 +-
+ glib/poppler-page.h | 4 +-
glib/poppler-private.h | 1 -
glib/test-poppler-glib.c | 2 +-
5 files changed, 28 insertions(+), 123 deletions(-)
@@ -56652,57 +58712,57 @@
commit 6070b1dc4b76c236f3100fbd255c2d906e61c3c2
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Aug 21 23:14:04 2005 +0000
+Date: Sun Aug 21 23:14:04 2005 +0000
- 2005-08-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-21 Kristian Høgsberg <krh at redhat.com>
- * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.
+ * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.
- * configure.ac: Make freetype check use pkg-config if
- possible.
+ * configure.ac: Make freetype check use pkg-config if
+ possible.
- ChangeLog | 6 ++++++
- configure.ac | 34 ++++++++++++++++++++++++----------
- poppler/Makefile.am | 1 +
+ ChangeLog | 6 ++++++
+ configure.ac | 34 ++++++++++++++++++++++++----------
+ poppler/Makefile.am | 1 +
3 files changed, 31 insertions(+), 10 deletions(-)
commit 2698ca6fa107ea91dc01eb8cfb0c93383fbca125
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Aug 17 16:54:01 2005 +0000
+Date: Wed Aug 17 16:54:01 2005 +0000
- 2005-08-17 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-17 Kristian Høgsberg <krh at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
poppler/GfxFont.cc | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
commit 5dc9b14b99f2efa2fe018e9267dd363d1bcd78b1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Aug 7 23:58:12 2005 +0000
+Date: Sun Aug 7 23:58:12 2005 +0000
Fix EOF checking
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PDFDoc.cc | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
commit 155d019d7b474f244a3e4bf64d192015f6a266c4
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Aug 6 18:09:51 2005 +0000
+Date: Sat Aug 6 18:09:51 2005 +0000
- 2005-08-06 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-06 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc:
- * glib/poppler-page.h: Use GdkColor for specifying selection
- colors, we alreay depend on GDK anyway.
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h: Use GdkColor for specifying selection
+ colors, we alreay depend on GDK anyway.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-page.cc | 20 +++++++++-----------
glib/poppler-page.h | 5 +++--
3 files changed, 18 insertions(+), 13 deletions(-)
@@ -56709,7 +58769,7 @@
commit c710b645c8297d356c101b13a9889bcaba691176
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 6 11:58:59 2005 +0000
+Date: Sat Aug 6 11:58:59 2005 +0000
Update comment
@@ -56718,44 +58778,44 @@
commit de7953c8a8360d8bfc99298906c5fc1094684fc3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sat Aug 6 11:47:37 2005 +0000
+Date: Sat Aug 6 11:47:37 2005 +0000
Increase EOF searching up to last 1024 characters
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/PDFDoc.cc | 23 +++++++++++++----------
2 files changed, 20 insertions(+), 10 deletions(-)
commit 5dd72618688763b50d5f5738d857c9294ef1b1c2
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Aug 6 02:15:58 2005 +0000
+Date: Sat Aug 6 02:15:58 2005 +0000
Add password arguments to document constructor.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt4/src/poppler-document.cc | 8 ++++++--
- qt4/src/poppler-qt4.h | 4 +++-
+ qt4/src/poppler-qt4.h | 4 +++-
3 files changed, 13 insertions(+), 3 deletions(-)
commit edbd7957b393eb63f48df7db6b220b355d4fc461
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Aug 6 02:07:55 2005 +0000
+Date: Sat Aug 6 02:07:55 2005 +0000
Make API extraction work again.
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
qt4/src/Doxyfile | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit f43a6f1d1c27c042f5736746c94430083baa4c1d
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sat Aug 6 01:53:06 2005 +0000
+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 ++-
+ ChangeLog | 5 ++
+ qt4/tests/.cvsignore | 1 +
+ qt4/tests/Makefile.am | 7 ++-
qt4/tests/test-password-qt4.cpp | 135
++++++++++++++++++++++++++++++++++++++++
4 files changed, 147 insertions(+), 1 deletion(-)
@@ -56762,39 +58822,39 @@
commit 2ec26afaf80864b023899b890b8e229448da9bed
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Aug 5 22:30:20 2005 +0000
+Date: Fri Aug 5 22:30:20 2005 +0000
- 2005-08-05 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-05 Kristian Høgsberg <krh at redhat.com>
- * poppler/TextOutputDev.cc (visitLine): Round selection
- coordinates in device space, so selection isn't fuzzy.
+ * 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.
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add simple Matrix class.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
poppler/CairoOutputDev.cc | 6 +++---
- poppler/GfxState.cc | 26 ++++++++++++++++++++++++++
- poppler/GfxState.h | 10 ++++++++++
+ 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 at redhat.com>
-Date: Fri Aug 5 19:04:36 2005 +0000
+Date: Fri Aug 5 19:04:36 2005 +0000
- 2005-08-05 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-05 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * poppler/TextOutputDev.cc:
- * poppler/TextOutputDev.h: Propagate selection colors to
- the glib API.
+ * 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
+ ChangeLog | 7 ++++++
+ glib/poppler-page.cc | 63
++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 4 ++-
+ glib/poppler-page.h | 4 ++-
poppler/TextOutputDev.cc | 25 +++++++++----------
poppler/TextOutputDev.h | 7 ++++--
5 files changed, 82 insertions(+), 24 deletions(-)
@@ -56801,18 +58861,18 @@
commit 43e97129393f403c41f191ceae9a54793ece005f
Author: Brad Hards <bradh at frogmouth.net>
-Date: Thu Aug 4 10:15:23 2005 +0000
+Date: Thu Aug 4 10:15:23 2005 +0000
Fix problem with drawing filled objects that was introduced in
Rev 1.4.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/ArthurOutputDev.cc | 13 +++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
commit a75d80333a70d2e1ac7c9032d316034eebed9dd6
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Aug 3 11:44:55 2005 +0000
+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.
@@ -56822,7 +58882,7 @@
What more could you want from a PDF viewer :-)
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt4/tests/test-poppler-qt4.cpp | 47
+++++++++++++++++++++++++++++++++---------
2 files changed, 43 insertions(+), 10 deletions(-)
@@ -56829,11 +58889,11 @@
commit f3e0a163b098da1cc389c2c4f47e28358b1bec77
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Aug 1 19:15:40 2005 +0000
+Date: Mon Aug 1 19:15:40 2005 +0000
Fix problem in the patch to fix #3299
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/DCTStream.cc | 15 ++++++++++-----
poppler/DCTStream.h | 1 +
3 files changed, 15 insertions(+), 5 deletions(-)
@@ -56840,23 +58900,23 @@
commit 5f7bd81bedd8c90e3312190256488ff0c15502e1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Aug 1 15:21:19 2005 +0000
+Date: Mon Aug 1 15:21:19 2005 +0000
- 2005-08-01 Kristian Høgsberg <krh at redhat.com>
+ 2005-08-01 Kristian Høgsberg <krh at redhat.com>
- Patch from Dan Winship <danw at novell.com>
+ Patch from Dan Winship <danw at novell.com>
- * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Set
- alpha to
- 0xff (opaque), not 0x00.
+ * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Set
+ alpha to
+ 0xff (opaque), not 0x00.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
glib/poppler-page.cc | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 22f509e60f60ccaea1f91d9ec1ef7ba8200bee8a
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Aug 1 08:09:00 2005 +0000
+Date: Mon Aug 1 08:09:00 2005 +0000
Fix up the fill problem with drawing text, where the "middle"
of glyphs
@@ -56864,13 +58924,13 @@
debugging
code. The glyphs are still ugly though.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/ArthurOutputDev.cc | 13 +------------
2 files changed, 8 insertions(+), 12 deletions(-)
commit 7bf5d10c1f6edd538769c3a83a3b3d5df56d604b
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Jul 31 09:54:04 2005 +0000
+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
@@ -56877,30 +58937,30 @@
SplashPath. In the longer term, Arthur should use FreeType paths
directly - hopefully that will be less ugly, and not fill everything.
- ChangeLog | 8 +
+ ChangeLog | 8 +
poppler/ArthurOutputDev.cc | 401
++++++++++++++++++++++++++++++++-------------
poppler/ArthurOutputDev.h | 15 +-
- qt4/src/poppler-page.cc | 2 +-
- splash/SplashPath.h | 2 +
+ qt4/src/poppler-page.cc | 2 +-
+ splash/SplashPath.h | 2 +
5 files changed, 314 insertions(+), 114 deletions(-)
commit 8567b794628786b82e8db2a7daf75e4ad2398960
Author: Brad Hards <bradh at frogmouth.net>
-Date: Fri Jul 29 12:15:19 2005 +0000
+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 +++++++++-
+ ChangeLog | 4 ++++
+ qt4/tests/.cvsignore | 4 ++++
+ qt4/tests/Makefile.am | 10 +++++++++-
qt4/tests/check_pagelayout_facing.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_version.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_version.cpp | 22 ++++++++++++++++++++++
5 files changed, 61 insertions(+), 1 deletion(-)
commit 59d660cf4d614fdea09d6a62b8889f7682c2b4f9
Author: Brad Hards <bradh at frogmouth.net>
-Date: Fri Jul 29 11:41:14 2005 +0000
+Date: Fri Jul 29 11:41:14 2005 +0000
Compile fix associated with last change.
@@ -56909,40 +58969,40 @@
commit 88c57c73f57820d6a57e26825093fbc688845e67
Author: Brad Hards <bradh at frogmouth.net>
-Date: Fri Jul 29 11:24:42 2005 +0000
+Date: Fri Jul 29 11:24:42 2005 +0000
A couple of minor changes to the Arthur backend.
- ChangeLog | 9 +++++++++
+ ChangeLog | 9 +++++++++
poppler/ArthurOutputDev.cc | 18 ++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
commit 481db9d9eae5ea16e5b382f4ad21e6e624a70dcf
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jul 29 05:48:33 2005 +0000
+Date: Fri Jul 29 05:48:33 2005 +0000
- 2005-07-29 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-29 Kristian Høgsberg <krh at 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.
+ * 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-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.
+ * 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 +++++
+ ChangeLog | 16 +++++
glib/poppler-document.cc | 2 +-
- glib/poppler-page.cc | 31 +++++----
+ glib/poppler-page.cc | 31 +++++----
poppler/TextOutputDev.cc | 164
+++++++++++++++++++++++++++++++++++------------
poppler/TextOutputDev.h | 8 +++
@@ -56950,11 +59010,11 @@
commit ad312dbded4e8f70c3a2eac9a0964fa00ecb6b2c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 28 22:56:17 2005 +0000
+Date: Thu Jul 28 22:56:17 2005 +0000
Fix memory leaks in PageLabelInfo.cc
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/PageLabelInfo.cc | 11 +++++++++++
poppler/PageLabelInfo.h | 2 ++
3 files changed, 17 insertions(+)
@@ -56961,10 +59021,10 @@
commit b45ad9f3409d7b1ed147135a70553e5255913c61
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 28 20:53:36 2005 +0000
+Date: Thu Jul 28 20:53:36 2005 +0000
- - delete family;
- + delete[] family;
+ - delete family;
+ + delete[] family;
as family is new[]'ed
When assigning family if the font had "the proper info" and family
@@ -56975,7 +59035,7 @@
commit f93dfc5c5133e0b1bd9f4786cfe18bd796cbac2a
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 28 18:51:17 2005 +0000
+Date: Thu Jul 28 18:51:17 2005 +0000
Remove the debugging
@@ -56984,7 +59044,7 @@
commit 8022315004e1623c0be320f7671fcd72c15c0de3
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 28 18:37:17 2005 +0000
+Date: Thu Jul 28 18:37:17 2005 +0000
Wonder how that slipped here
@@ -56993,48 +59053,48 @@
commit 82638babe89e402c0348619ec3205059b977c7e9
Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Jul 28 17:34:19 2005 +0000
+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 -
+ 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/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 -
+ 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 at redhat.com>
-Date: Thu Jul 28 06:31:57 2005 +0000
+Date: Thu Jul 28 06:31:57 2005 +0000
- 2005-07-28 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-28 Kristian Høgsberg <krh at redhat.com>
- * poppler/poppler-config.h.in: Add GCC_PRINTF_FORMAT macro to
- annotate printf-like functions (#3638).
+ * 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/Error.h: Add GCC_PRINTF_FORMAT to error().
- * poppler/PSOutputDev.h: Add GCC_PRINTF_FORMAT to
- PSOutputDev::writePSFmt().
+ * poppler/PSOutputDev.h: Add GCC_PRINTF_FORMAT to
+ PSOutputDev::writePSFmt().
- * poppler/PSOutputDev.cc, poppler/GlobalParams.cc: Quiet new
- printf warnings.
+ * 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 +-
+ 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(-)
@@ -57041,22 +59101,22 @@
commit 9df89c495683e229b771b3d008ed25d478465c35
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jul 28 05:52:43 2005 +0000
+Date: Thu Jul 28 05:52:43 2005 +0000
- 2005-07-28 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-28 Kristian Høgsberg <krh at 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.
+ * 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.
+ (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 +++++
+ ChangeLog | 12 +++++
poppler/CairoOutputDev.cc | 2 +-
poppler/TextOutputDev.cc | 113
++++++++++++++++++++++------------------------
@@ -57064,7 +59124,7 @@
commit a3d9b5849cedf1316c6fc5859872e957f3f7b593
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Wed Jul 27 19:21:08 2005 +0000
+Date: Wed Jul 27 19:21:08 2005 +0000
* poppler/PSOutputDev.cc (PSOutputDev): change the constructor to
take paper size and duplex setting parameters.
@@ -57087,69 +59147,69 @@
* glib/poppler-document.h: add prototypes.
- ChangeLog | 23 +++++++++++++++++++++++
+ ChangeLog | 23 +++++++++++++++++++++++
glib/poppler-document.cc | 49
+++++++++++++++++++++++++++++++++++++++++-------
glib/poppler-document.h | 15 ++++++++++-----
- glib/poppler-page.cc | 10 ++++++++++
+ glib/poppler-page.cc | 10 ++++++++++
glib/poppler-private.h | 6 ++++++
poppler/PSOutputDev.cc | 23 ++++++++++++++---------
- poppler/PSOutputDev.h | 9 +++++++--
+ poppler/PSOutputDev.h | 9 +++++++--
7 files changed, 112 insertions(+), 23 deletions(-)
commit 7be920ecf13698c3cf4ab8df09c8c67f1a04bfa2
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 26 21:52:09 2005 +0000
+Date: Tue Jul 26 21:52:09 2005 +0000
Fix mem leak in qt test app
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt/test-poppler-qt.cpp | 2 ++
2 files changed, 6 insertions(+)
commit 2bc26dffd9f296799617d319055648c20f748c8a
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Jul 26 20:34:13 2005 +0000
+Date: Tue Jul 26 20:34:13 2005 +0000
- 2005-07-26 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-26 Kristian Høgsberg <krh at 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).
+ * 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 +++++
+ ChangeLog | 5 +++++
fofi/FoFiType1.cc | 21 +++++++--------------
2 files changed, 12 insertions(+), 14 deletions(-)
commit 07911274e4e850a628b1e587cafc2a73c05f93fe
Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Jul 25 20:40:37 2005 +0000
+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 +++++
+ ChangeLog | 5 +++++
poppler/DCTStream.cc | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
commit a1869eca39172fcb42f036a5846b19548be53568
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 22 11:01:25 2005 +0000
+Date: Fri Jul 22 11:01:25 2005 +0000
Fix bug #3586
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 2 ++
2 files changed, 7 insertions(+)
commit 95529b41272484f08fb54393e1886bf7ff3e02c8
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 22 10:45:19 2005 +0000
+Date: Fri Jul 22 10:45:19 2005 +0000
Make it possible to browse pages in test-poppler-qt
- ChangeLog | 13 +++++++++----
+ ChangeLog | 13 +++++++++----
qt/test-poppler-qt.cpp | 49
++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 49 insertions(+), 13 deletions(-)
@@ -57156,7 +59216,7 @@
commit 2d52650864eab0e9385ed1fe8fb594daac9d8322
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Fri Jul 22 10:35:56 2005 +0000
+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.
@@ -57167,7 +59227,7 @@
* glib/poppler-document.h (PopplerFontType): new enum.
Update prototypes.
- ChangeLog | 11 ++++++++++
+ ChangeLog | 11 ++++++++++
glib/poppler-document.cc | 54
+++++++++++++++++++++++++++++++++++++++++++++++-
glib/poppler-document.h | 38 ++++++++++++++++++++++++----------
@@ -57175,31 +59235,31 @@
commit 43bed4aafcf1d291dc96fa5070efbd7936a6122f
Author: Albert Astals Cid <aacid at kde.org>
-Date: Fri Jul 22 10:33:54 2005 +0000
+Date: Fri Jul 22 10:33:54 2005 +0000
Fix bugs #3728 and #3750
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
splash/Splash.cc | 10 ++++++++++
2 files changed, 14 insertions(+)
commit c7bcef87493d354a077dd223d76f86640acc0ce3
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Fri Jul 15 19:55:30 2005 +0000
+Date: Fri Jul 15 19:55:30 2005 +0000
update for 2005-06-27 change to actually display something again.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
test/gtk-cairo-test.cc | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
commit 6623711d2d50dc52454904ee16b25337f0aab130
Author: Brad Hards <bradh at frogmouth.net>
-Date: Sun Jul 10 09:34:03 2005 +0000
+Date: Sun Jul 10 09:34:03 2005 +0000
A general cleanup of the Arthur output renderer.
- ChangeLog | 5 +++
+ ChangeLog | 5 +++
poppler/ArthurOutputDev.cc | 105
++++++++++++++++-----------------------------
2 files changed, 41 insertions(+), 69 deletions(-)
@@ -57206,19 +59266,19 @@
commit ea1cc9a7b12db9c44b89896c41d07e3ba932d054
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jul 8 04:59:41 2005 +0000
+Date: Fri Jul 8 04:59:41 2005 +0000
- 2005-07-08 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-08 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_set_selection_alpha): Add
- this function to initialize the alpha channel when using the
- splash backend.
+ * 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.
+ * poppler/TextOutputDev.cc (visitLine): Add missing scaling of
+ intra-line selection edges.
- ChangeLog | 9 ++++++++
- glib/poppler-page.cc | 59
+ ChangeLog | 9 ++++++++
+ glib/poppler-page.cc | 59
+++++++++++++++++++++++++++++++++++++++++++++++-
poppler/TextOutputDev.cc | 17 ++++++++------
3 files changed, 77 insertions(+), 8 deletions(-)
@@ -57225,15 +59285,15 @@
commit 1cd915397c9532ed80b4f905b6ed9c0126aa38f2
Author: Brad Hards <bradh at frogmouth.net>
-Date: Thu Jul 7 21:15:09 2005 +0000
+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 +++++++++-
+ 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(-)
@@ -57240,66 +59300,66 @@
commit 4e050aef7ba132900f84205be221fd48808848c3
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jul 7 17:19:36 2005 +0000
+Date: Thu Jul 7 17:19:36 2005 +0000
- 2005-07-07 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-07 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_prepare_output_dev):
- Account
- for page rotation when creating the cairo surface.
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev):
+ Account
+ for page rotation when creating the cairo surface.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 17 +++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
commit 2eeab0b8afeb4897806df2de6e496889c25dda5e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jul 7 15:58:43 2005 +0000
+Date: Thu Jul 7 15:58:43 2005 +0000
- 2005-07-06 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-06 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Add
- out of
- bounds checking (from Marco).
+ * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Add
+ out of
+ bounds checking (from Marco).
- ChangeLog | 6 +++++-
+ ChangeLog | 6 +++++-
glib/poppler-page.cc | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
commit b1015f6bdbd93b2a2574a9f0e0e1cd7dbae9af78
Author: Brad Hards <bradh at frogmouth.net>
-Date: Thu Jul 7 11:13:24 2005 +0000
+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 ++++
+ ChangeLog | 4 ++++
glib/poppler-document.cc | 2 ++
2 files changed, 6 insertions(+)
commit 8bf787031e7a2e93b4e1202918bd1aee86675082
Author: Brad Hards <bradh at frogmouth.net>
-Date: Thu Jul 7 11:04:08 2005 +0000
+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 ++++++++++++++++++++++
+ 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 ++++++++++++++++++++++
+ 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 at frogmouth.net>
-Date: Thu Jul 7 11:01:27 2005 +0000
+Date: Thu Jul 7 11:01:27 2005 +0000
Suppress noise from new test files.
@@ -57308,11 +59368,11 @@
commit 8a8d57bdcf11ed2903913d938b9711053b9bb9f1
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 6 17:12:36 2005 +0000
+Date: Wed Jul 6 17:12:36 2005 +0000
Extract family, stretch and weight from the font descriptor
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++++++++++++++++
poppler/GfxFont.h | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
@@ -57319,11 +59379,11 @@
commit 3a1646c2f776f5a07b0e830fcb8e1b0a80efb41c
Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Jul 6 13:29:00 2005 +0000
+Date: Wed Jul 6 13:29:00 2005 +0000
Add checkFooter to check the document ends with %%EOF
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/PDFDoc.cc | 28 ++++++++++++++++++++++++++++
poppler/PDFDoc.h | 1 +
3 files changed, 34 insertions(+)
@@ -57330,30 +59390,30 @@
commit 377c023d31cf74d8240aa5be9dba8e3838459a8c
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Jul 6 11:15:16 2005 +0000
+Date: Wed Jul 6 11:15:16 2005 +0000
Add unit tests for the isLinearized() property.
- ChangeLog | 4 ++++
- qt4/tests/Makefile.am | 6 +++++-
+ ChangeLog | 4 ++++
+ qt4/tests/Makefile.am | 6 +++++-
qt4/tests/check_linearised.cpp | 23 +++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
commit 5fa869887a840a585340993718df0841010666cf
Author: Brad Hards <bradh at frogmouth.net>
-Date: Wed Jul 6 09:52:30 2005 +0000
+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 +-------------
+ 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 at frogmouth.net>
-Date: Wed Jul 6 09:00:39 2005 +0000
+Date: Wed Jul 6 09:00:39 2005 +0000
Update to reflect recent changes.
@@ -57362,23 +59422,23 @@
commit 6cea437208f913085a6a8c7183b0826a107cefb5
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jul 5 21:15:48 2005 +0000
+Date: Tue Jul 5 21:15:48 2005 +0000
Don't crash with files that have fonts with no name
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
qt4/src/poppler-document.cc | 13 ++++++++++---
- qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
3 files changed, 18 insertions(+), 4 deletions(-)
commit 1323c74479848f5b87a3a13fa26e8b9e096e9f6a
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Jul 5 12:31:59 2005 +0000
+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/Makefile.am | 10 ++++++-
+ qt4/tests/check_author.cpp | 25 +++++++++++++++++
qt4/tests/check_permissions.cpp | 59
+++++++++++++++++++++++++++++++++++++++++
3 files changed, 93 insertions(+), 1 deletion(-)
@@ -57385,25 +59445,25 @@
commit 839a798ec3725427185de5a48c58ac448596b25d
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Jul 5 12:25:00 2005 +0000
+Date: Tue Jul 5 12:25:00 2005 +0000
Add Qt4 bindings for new user permission properties.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt4/src/poppler-document.cc | 25 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 51
+ qt4/src/poppler-qt4.h | 51
++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 75 insertions(+), 5 deletions(-)
commit e10f6990d3339e3a7adeaa50b1754cf7ecf82f87
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Jul 5 12:15:04 2005 +0000
+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 ++++++++
+ ChangeLog | 8 ++++++++
poppler/PDFDoc.h | 9 +++++++++
poppler/XRef.cc | 55
+++++++++++++++++++++++++++++++++++++++++++++++++++----
@@ -57412,7 +59472,7 @@
commit 3a8e1ba03cdec6412dd0b79f0cc59a4cd97dd4e7
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 11:38:22 2005 +0000
+Date: Mon Jul 4 11:38:22 2005 +0000
A couple more little changes.
@@ -57421,7 +59481,7 @@
commit a44bd0b45bb89f29ddca5d0e8986a8de50f9db39
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 11:37:21 2005 +0000
+Date: Mon Jul 4 11:37:21 2005 +0000
Change path to sample file to point to test module
@@ -57430,7 +59490,7 @@
commit 2a7079087c35651c242d3843c94703a3199e61ca
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 11:36:13 2005 +0000
+Date: Mon Jul 4 11:36:13 2005 +0000
Fix typo causing failure to pick up upside down pages.
@@ -57439,22 +59499,22 @@
commit 529a548044ae721a414c5b8e768c0498b1e6830b
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 08:30:29 2005 +0000
+Date: Mon Jul 4 08:30:29 2005 +0000
Update to reflect recent changes
- ChangeLog | 30 +++++++++++++++++++++++++++++-
+ ChangeLog | 30 +++++++++++++++++++++++++++++-
qt4/tests/.cvsignore | 2 ++
2 files changed, 31 insertions(+), 1 deletion(-)
commit 08cca4670f8ae65333beacda85834112e76489d1
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 08:21:27 2005 +0000
+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/Makefile.am | 9 +++++-
qt4/tests/poppler-fonts.cpp | 76
+++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+), 1 deletion(-)
@@ -57461,7 +59521,7 @@
commit 52af89d8303b50c45d5e4584d19ec8b7d7ebcf9b
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 08:18:52 2005 +0000
+Date: Mon Jul 4 08:18:52 2005 +0000
Update to reflect changes to rendering API.
@@ -57471,25 +59531,27 @@
commit d42998d0fc32b1e21a2aeef1311e0baf508ade3f
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 08:16:17 2005 +0000
+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-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-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
+ 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 at frogmouth.net>
-Date: Mon Jul 4 08:10:16 2005 +0000
+Date: Mon Jul 4 08:10:16 2005 +0000
Change FontInfo::type() to return an enumerated value,
rather than a GooString.
@@ -57500,7 +59562,7 @@
commit 1303020b2e97bc110ccf045cd2811daf59ec72ce
Author: Brad Hards <bradh at frogmouth.net>
-Date: Mon Jul 4 07:42:32 2005 +0000
+Date: Mon Jul 4 07:42:32 2005 +0000
Fix up the unit test, now that I have a real sample
file.
@@ -57510,16 +59572,16 @@
commit 96fc0ea3fc6c9c7d933e9e0c02a622b2aeef7617
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jul 1 04:57:49 2005 +0000
+Date: Fri Jul 1 04:57:49 2005 +0000
- 2005-07-01 Kristian Høgsberg <krh at redhat.com>
+ 2005-07-01 Kristian Høgsberg <krh at 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.
+ * 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 +++
+ ChangeLog | 6 +++
poppler/TextOutputDev.cc | 129
++++++++++++++++++++++++++++++++++++++---------
2 files changed, 111 insertions(+), 24 deletions(-)
@@ -57526,69 +59588,69 @@
commit 06c49c496f28aba608101adcecd8cec34937ac78
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jun 30 19:44:33 2005 +0000
+Date: Thu Jun 30 19:44:33 2005 +0000
- 2005-06-30 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-30 Kristian Høgsberg <krh at 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/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.
+ * glib/test-poppler-glib.c (main): Update test case.
- ChangeLog | 11 +++++++++++
- NEWS | 6 ++++++
- glib/poppler-page.cc | 27 ++++++++++-----------------
- glib/poppler-page.h | 4 +---
+ 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 at redhat.com>
-Date: Thu Jun 30 00:36:01 2005 +0000
+Date: Thu Jun 30 00:36:01 2005 +0000
- 2005-06-29 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-29 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-private.h: Move TextOutputDev.h include
- here from
- poppler-page.cc
+ * glib/poppler-private.h: Move TextOutputDev.h include
+ here from
+ poppler-page.cc
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 1 -
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 1 -
glib/poppler-private.h | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
commit b15a8caf003d7d0631d4f78db5ab54e55a5a000a
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Jun 29 21:24:48 2005 +0000
+Date: Wed Jun 29 21:24:48 2005 +0000
- 2005-06-29 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-29 Kristian Høgsberg <krh at 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).
+ * 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 ++++----
+ 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/Page.cc | 59 +++++--
+ poppler/Page.h | 12 ++
poppler/TextOutputDev.cc | 414
+++++++++++++++++++++++++++++++++++++++++++++-
poppler/TextOutputDev.h | 38 ++++-
@@ -57596,7 +59658,7 @@
commit 3b5e20465e482eb0e75a106697ee94d60aea2fdc
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 28 22:51:29 2005 +0000
+Date: Tue Jun 28 22:51:29 2005 +0000
Forgot assigning type on copy constructor
@@ -57605,11 +59667,11 @@
commit e512cd1832a0e6d15149e12e8e67a39d335efc86
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 28 22:49:14 2005 +0000
+Date: Tue Jun 28 22:49:14 2005 +0000
Add FontInfo::getType()
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/FontInfo.cc | 4 ++++
poppler/FontInfo.h | 2 ++
3 files changed, 9 insertions(+)
@@ -57616,22 +59678,22 @@
commit 8aeb5205f2876a9dc36eb1dc1e361bb87adf4e31
Author: Albert Astals Cid <aacid at kde.org>
-Date: Tue Jun 28 22:00:05 2005 +0000
+Date: Tue Jun 28 22:00:05 2005 +0000
use transformation matrix for image rendering in Arthur backend
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/ArthurOutputDev.cc | 12 +++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
commit a221d06fdc7b0688ca0744a1d6ad49d472c7f12c
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Jun 28 10:59:14 2005 +0000
+Date: Tue Jun 28 10:59:14 2005 +0000
Reduce cvs up noise
- .cvsignore | 1 +
- ChangeLog | 7 +++++++
+ .cvsignore | 1 +
+ ChangeLog | 7 +++++++
qt4/.cvsignore | 3 +++
qt4/src/.cvsignore | 7 +++++++
qt4/tests/.cvsignore | 8 ++++++++
@@ -57639,7 +59701,7 @@
commit ea58a20bbcf450a1ecb8fe00e8162cfdf76105f1
Author: Brad Hards <bradh at frogmouth.net>
-Date: Tue Jun 28 10:00:09 2005 +0000
+Date: Tue Jun 28 10:00:09 2005 +0000
Initial import of Qt4 bindings, and for a Qt4 "Arthur" (QPainter)
backend renderer.
@@ -57655,22 +59717,22 @@
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
+ 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/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 ++++
@@ -57678,55 +59740,55 @@
commit 61e9bc76eb2fcb0b4b899ebfad1cc71c59fc8274
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Jun 28 03:44:12 2005 +0000
+Date: Tue Jun 28 03:44:12 2005 +0000
- 2005-06-27 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-27 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Change CairoOutputDev to render
- to a
- given surface and let the user create that surface.
+ * 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.
+ * 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.
+ * 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 +-
+ 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/CairoOutputDevImage.h | 44 ---------
+ poppler/CairoOutputDevX.cc | 216
-----------------------------------------
- poppler/CairoOutputDevX.h | 117 ----------------------
- poppler/Makefile.am | 8 +-
+ poppler/CairoOutputDevX.h | 117 ----------------------
+ poppler/Makefile.am | 8 +-
11 files changed, 54 insertions(+), 487 deletions(-)
commit 8079dce3f0ed91dd531465f45c6d3c568ab4ecd1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 27 01:04:32 2005 +0000
+Date: Mon Jun 27 01:04:32 2005 +0000
- 2005-06-26 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-26 Kristian Høgsberg <krh at 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.
+ * 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 +++
+ ChangeLog | 7 +++
poppler/CairoOutputDev.cc | 107
++++++++++++++--------------------------------
poppler/CairoOutputDev.h | 12 +++++-
@@ -57734,13 +59796,13 @@
commit 1aa48d6b7907a1d53830f0cf28085041f685368d
Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Jun 26 23:35:26 2005 +0000
+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 +++
+ ChangeLog | 5 +++
qt/poppler-page.cc | 121
+++++++++++++++++++++++++++++++++++++++++++++++++++++
qt/poppler-qt.h | 78 ++++++++++++++++++++++++++++++++++
@@ -57748,17 +59810,17 @@
commit 9d4327eecd94299a3629b0814e84f981a4be1dfb
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Sun Jun 26 15:54:16 2005 +0000
+Date: Sun Jun 26 15:54:16 2005 +0000
add poppler-enums.[ch].
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
glib/.cvsignore | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
commit 768186514b9fc175cf330344408bb89ab4c909f3
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Sun Jun 26 11:40:35 2005 +0000
+Date: Sun Jun 26 11:40:35 2005 +0000
require glib 2.4+ for g_value_take_string and G_DEFINE_TYPE.
@@ -57768,59 +59830,59 @@
commit 5d40e34a367212c39af06332879f26824d6d62d2
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Jun 26 00:01:39 2005 +0000
+Date: Sun Jun 26 00:01:39 2005 +0000
- 2005-06-25 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-06-25 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Error.h: Maybe fix build on Solaris.
+ * poppler/Error.h: Maybe fix build on Solaris.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Error.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit c2780a3b3f4615bb28bfe394d649b388db4ccf4d
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 20 21:33:09 2005 +0000
+Date: Mon Jun 20 21:33:09 2005 +0000
- 2005-06-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-20 Kristian Høgsberg <krh at redhat.com>
- * NEWS:
- * configure.ac: Bump version to 0.3.3 and sum up changes since
- last release.
+ * 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).
+ * 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 +-
+ ChangeLog | 9 +++++++++
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
glib/poppler-page.cc | 2 ++
4 files changed, 22 insertions(+), 1 deletion(-)
commit 9023891f314ac37811b5c973be2e36b6de353cf2
Author: Martin Kretzschmar <martink at gnome.org>
-Date: Mon Jun 20 18:45:41 2005 +0000
+Date: Mon Jun 20 18:45:41 2005 +0000
(info_dict_get_string): convert from PDFDocEncoding to UTF-8.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 16 +++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
commit bbf2fe757f0fd08d0e90e3810709ab7152c779c0
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 20 17:58:38 2005 +0000
+Date: Mon Jun 20 17:58:38 2005 +0000
- 2005-06-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-20 Kristian Høgsberg <krh at 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.
+ * 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 ++++++
+ ChangeLog | 7 ++++++
glib/poppler-page.cc | 69
+++++++++++++++++++++++++++++-----------------------
glib/poppler-page.h | 57 ++++++++++++++++++++++---------------------
@@ -57829,46 +59891,46 @@
commit c264d8a9f84587cd0f2ef67683a01fc8dd9395af
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 20 17:38:27 2005 +0000
+Date: Mon Jun 20 17:38:27 2005 +0000
- 2005-06-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-20 Kristian Høgsberg <krh at 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.
+ * 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 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-document.cc | 8 +++++++-
- poppler/FontInfo.cc | 13 ++++++++++---
+ poppler/FontInfo.cc | 13 ++++++++++---
3 files changed, 23 insertions(+), 4 deletions(-)
commit 4746e63a793a2881e904ac54d58b7d3e48b07dcf
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 20 17:22:35 2005 +0000
+Date: Mon Jun 20 17:22:35 2005 +0000
- 2005-06-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-20 Kristian Høgsberg <krh at 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).
+ * 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 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-page.cc | 6 ++++++
2 files changed, 12 insertions(+)
commit bada3d03583ef6ed34d2aa743de8fd9ca4a5c748
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Jun 17 05:30:56 2005 +0000
+Date: Fri Jun 17 05:30:56 2005 +0000
- 2005-06-17 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-17 Kristian Høgsberg <krh at redhat.com>
- * autogen.sh: Patch from Emil Soleyman-Zomalan to enable
- checks
- for automake >= 1.7 (#3554).
+ * autogen.sh: Patch from Emil Soleyman-Zomalan to enable
+ checks
+ for automake >= 1.7 (#3554).
- ChangeLog | 5 +++
+ ChangeLog | 5 +++
autogen.sh | 104
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+)
@@ -57875,17 +59937,17 @@
commit 25db42831ddde500697126352458e092a9b0ab9b
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Jun 15 15:02:46 2005 +0000
+Date: Wed Jun 15 15:02:46 2005 +0000
- 2005-06-15 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-15 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc:
- * glib/poppler-document.h: Patch from Marco to get initial
- status
- (open or closed) for bookmark subtrees.
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h: Patch from Marco to get initial
+ status
+ (open or closed) for bookmark subtrees.
-----------------------------------------------------------
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/poppler-document.cc | 9 +++++++++
glib/poppler-document.h | 1 +
3 files changed, 16 insertions(+)
@@ -57892,101 +59954,101 @@
commit e54e306ac5d603001fefda3b9ecd81821e4bd09e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 13 17:18:32 2005 +0000
+Date: Mon Jun 13 17:18:32 2005 +0000
Forgot to add new files.
poppler/FontInfo.cc | 197
++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FontInfo.h | 51 ++++++++++++++
+ poppler/FontInfo.h | 51 ++++++++++++++
2 files changed, 248 insertions(+)
commit 23e8ed5cbf4d7d999a8a1dcf714aaddaf339ceff
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Jun 13 16:09:33 2005 +0000
+Date: Mon Jun 13 16:09:33 2005 +0000
- 2005-06-13 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-13 Kristian Høgsberg <krh at 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.
+ * 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 ++++
+ ChangeLog | 10 ++++
glib/poppler-document.cc | 131
+++++++++++++++++++++++++++++++++++++++++++++++
glib/poppler-document.h | 13 +++++
glib/poppler-private.h | 7 +++
- glib/poppler.h | 2 +
+ glib/poppler.h | 2 +
glib/test-poppler-glib.c | 14 +++++
- poppler/Makefile.am | 2 +
+ poppler/Makefile.am | 2 +
7 files changed, 179 insertions(+)
commit fbb86d2983a28ad2c46b8c5d475a2df1f0f0e4b9
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Jun 8 14:35:46 2005 +0000
+Date: Wed Jun 8 14:35:46 2005 +0000
- 2005-06-08 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-08 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoFontEngine.cc: Remember to delete tmpFileName.
- Patch from Nikolai Weibull (#3491).
+ * poppler/CairoFontEngine.cc: Remember to delete tmpFileName.
+ Patch from Nikolai Weibull (#3491).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 37 +++++++++++++++++++------------------
2 files changed, 24 insertions(+), 18 deletions(-)
commit 699b03025c1d38a42a49e39017097c5d0315fd6f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Jun 7 20:25:48 2005 +0000
+Date: Tue Jun 7 20:25:48 2005 +0000
- 2005-06-07 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-07 Kristian Høgsberg <krh at redhat.com>
- * qt/test-poppler-qt.cpp: Add stdlib.h include for exit().
+ * qt/test-poppler-qt.cpp: Add stdlib.h include for exit().
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
qt/test-poppler-qt.cpp | 1 +
2 files changed, 5 insertions(+)
commit 0017b1a72c58e2d016d22451079c466abdfff15c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jun 2 19:14:45 2005 +0000
+Date: Thu Jun 2 19:14:45 2005 +0000
- 2005-06-02 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-02 Kristian Høgsberg <krh at redhat.com>
- * poppler/TextOutputDev.h:
- * qt/poppler-qt.h: Patch from Stanislav Brabec
- <sbrabec at suse.cz>
- to fix gcc 4.0.1 warnings on undeclared friend classes.
+ * poppler/TextOutputDev.h:
+ * qt/poppler-qt.h: Patch from Stanislav Brabec
+ <sbrabec at suse.cz>
+ to fix gcc 4.0.1 warnings on undeclared friend classes.
- * test/gtk-splash-test.cc: Fix from Martin Kretzschmar
- <martink at gnome.org> to compile with OPI enabled (#2911).
+ * test/gtk-splash-test.cc: Fix from Martin Kretzschmar
+ <martink at gnome.org> to compile with OPI enabled (#2911).
- ChangeLog | 9 +++++++++
+ ChangeLog | 9 +++++++++
poppler/TextOutputDev.h | 3 +++
- qt/poppler-qt.h | 2 ++
+ qt/poppler-qt.h | 2 ++
test/gtk-splash-test.cc | 2 +-
4 files changed, 15 insertions(+), 1 deletion(-)
commit 47c3b4ec2c7691e44f5100b1f5956df0005467c8
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Jun 2 18:49:55 2005 +0000
+Date: Thu Jun 2 18:49:55 2005 +0000
- 2005-06-02 Kristian Høgsberg <krh at redhat.com>
+ 2005-06-02 Kristian Høgsberg <krh at redhat.com>
- Patch from Stanislav Brabec <sbrabec at suse.cz>:
+ Patch from Stanislav Brabec <sbrabec at 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.
+ * 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 ++++--
+ ChangeLog | 10 ++++++++++
+ configure.ac | 6 ++++--
poppler-cairo.pc.in | 3 +--
poppler-glib.pc.in | 4 ++--
poppler-qt.pc.in | 1 +
@@ -57995,17 +60057,18 @@
commit 9f0da96dd005defd5d82dd05b627ff1925430215
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Jun 2 00:35:44 2005 +0000
+Date: Thu Jun 2 00:35:44 2005 +0000
- 2005-06-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-06-01 Jeff Muizelaar <jeff at infidigm.net>
- * poppler/Error.cc:
- * poppler/Error.h: Make error handling function setable through
- setErrorFunction.
+ * poppler/Error.cc:
+ * poppler/Error.h: Make error handling function setable
+ through
+ setErrorFunction.
- Based on a patch by Albert Astals Cid.
+ Based on a patch by Albert Astals Cid.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
poppler/Error.cc | 29 ++++++++++++++++++++---------
poppler/Error.h | 2 ++
3 files changed, 30 insertions(+), 9 deletions(-)
@@ -58012,43 +60075,43 @@
commit f688aa11d066f1c6f4115cbdb604ac61fb8b5146
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun May 29 14:59:34 2005 +0000
+Date: Sun May 29 14:59:34 2005 +0000
- 2005-05-29 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-29 Kristian Høgsberg <krh at redhat.com>
- * glib/*: Add more meta data properties to poppler document.
- Patch by Emil Soleyman-Zomalan (#3359).
+ * glib/*: Add more meta data properties to poppler document.
+ Patch by Emil Soleyman-Zomalan (#3359).
- ChangeLog | 5 ++
+ ChangeLog | 5 ++
glib/poppler-document.cc | 155
++++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler.gidl | 5 ++
+ glib/poppler.gidl | 5 ++
glib/test-poppler-glib.c | 46 +++++++++-----
4 files changed, 194 insertions(+), 17 deletions(-)
commit 9e6eeec574d48d2341ee620e16360d3b21c40103
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu May 26 13:03:35 2005 +0000
+Date: Thu May 26 13:03:35 2005 +0000
- 2005-05-26 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-26 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc (clip): Remove snapToGrid
- so clip()
- prototype matches what Gfx actually calls (fixes clipping).
+ * 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: 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: Comment out tolerance setting
+ until
+ we figure out how cairo settings relate to pdf settings.
- * poppler/CairoOutputDev.cc: Support fill and stroke opacity.
+ * poppler/CairoOutputDev.cc: Support fill and stroke opacity.
- ChangeLog | 12 ++++++++++++
+ ChangeLog | 12 ++++++++++++
poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++-----------
poppler/CairoOutputDev.h | 6 +++++-
3 files changed, 47 insertions(+), 12 deletions(-)
@@ -58055,33 +60118,33 @@
commit 89a633edd860e3c6ded1e468edf6f28cfcb43d0e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu May 26 12:52:38 2005 +0000
+Date: Thu May 26 12:52:38 2005 +0000
- 2005-05-26 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-26 Kristian Høgsberg <krh at redhat.com>
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Add GfxColorSpace::getRGBLine here and
- implement in subclasses.
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add GfxColorSpace::getRGBLine here and
+ implement in subclasses.
- * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here.
+ * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here.
- ChangeLog | 8 +++
+ ChangeLog | 8 +++
poppler/CairoOutputDev.cc | 66 +++++++++----------
- poppler/GfxState.cc | 160
+ poppler/GfxState.cc | 160
+++++++++++++++++++++++++++++++++++++++++++++-
- poppler/GfxState.h | 14 ++++
+ poppler/GfxState.h | 14 ++++
4 files changed, 212 insertions(+), 36 deletions(-)
commit 4d8224819da7a85e4d99f96c9bbb047ece58130a
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Mon May 23 04:23:53 2005 +0000
+Date: Mon May 23 04:23:53 2005 +0000
Mon May 23 00:22:41 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler-document.h: Add a permissions flag to the glib
- bindings.
+ * glib/poppler-document.h: Add a permissions flag to the glib
+ bindings.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 24 ++++++++++++++++++++++++
glib/poppler-document.h | 16 +++++++++-------
3 files changed, 38 insertions(+), 7 deletions(-)
@@ -58088,49 +60151,49 @@
commit 1f677e2f60634a7d0c5e0e0d2125ab15c2722979
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat May 21 21:33:06 2005 +0000
+Date: Sat May 21 21:33:06 2005 +0000
- 2005-05-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-21 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc (poppler_ps_file_new): Fix
- off-by-one
- error spotted by Jürg Billeter.
+ * glib/poppler-document.cc (poppler_ps_file_new): Fix
+ off-by-one
+ error spotted by Jürg Billeter.
-----------------------------------------------------
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 0bbf2f08173866cde9b097eeeb1f4218a396588d
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 20 20:48:52 2005 +0000
+Date: Fri May 20 20:48:52 2005 +0000
- 2005-05-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-20 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc: Account for different row
- vs. column
- vector conventions between cairo and poppler.
+ * poppler/CairoOutputDev.cc: Account for different row
+ vs. column
+ vector conventions between cairo and poppler.
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/CairoOutputDev.cc | 18 +++++++++---------
2 files changed, 12 insertions(+), 9 deletions(-)
commit da44ec7e8de58e55e55b1f780bc3f4bc8307874f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 20 18:38:10 2005 +0000
+Date: Fri May 20 18:38:10 2005 +0000
- 2005-05-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-20 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoFontEngine.cc: Only get the code to gid map if
- we're using freetype 2.1.7 or older (#3340).
+ * poppler/CairoFontEngine.cc: Only get the code to gid map if
+ we're using freetype 2.1.7 or older (#3340).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 13 ++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
commit 6fe29cf0a7e54b8d294471a0f94eb9e989ad1d7f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu May 19 05:18:04 2005 +0000
+Date: Thu May 19 05:18:04 2005 +0000
Add bugzilla number.
@@ -58139,36 +60202,36 @@
commit 42de1348622cf86a87bc22941bd48bffa943dac9
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu May 19 05:16:22 2005 +0000
+Date: Thu May 19 05:16:22 2005 +0000
- 2005-05-19 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-19 Kristian Høgsberg <krh at 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.
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/CairoFontEngine.cc | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit afc05387c94a76ff0ed69b3f5d9a69ddd1448e83
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 18 17:39:59 2005 +0000
+Date: Wed May 18 17:39:59 2005 +0000
- 2005-05-18 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-18 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Require cairo 0.5.0, bump release to 0.3.2.
+ * configure.ac: Require cairo 0.5.0, bump release to 0.3.2.
- * NEWS: Sum up latest changes.
+ * NEWS: Sum up latest changes.
- * glib/poppler-document.cc (poppler_ps_file_new): Take a page
- range here instead of just number of pages.
+ * 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 +++---
+ ChangeLog | 9 +++++++++
+ NEWS | 7 +++++++
+ configure.ac | 6 +++---
glib/poppler-document.cc | 15 ++++++++++-----
glib/poppler-document.h | 1 +
5 files changed, 30 insertions(+), 8 deletions(-)
@@ -58175,15 +60238,15 @@
commit 420134a194af9161282ccfe329d17adef8d325f2
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue May 17 23:38:27 2005 +0000
+Date: Tue May 17 23:38:27 2005 +0000
- 2005-05-17 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-17 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDevX.cc:
- * test/gtk-cairo-test.cc: Chase the cairo xlib constructor
- again.
+ * poppler/CairoOutputDevX.cc:
+ * test/gtk-cairo-test.cc: Chase the cairo xlib constructor
+ again.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDevX.cc | 5 +++--
test/gtk-cairo-test.cc | 5 +++--
3 files changed, 11 insertions(+), 4 deletions(-)
@@ -58190,7 +60253,7 @@
commit 6fd62953a910dcfb4abd9de5ea18285b8fa5d202
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 16 23:16:15 2005 +0000
+Date: Mon May 16 23:16:15 2005 +0000
Add bug number and attribution to ChangeLog entry.
@@ -58199,20 +60262,20 @@
commit 6d7f624c13e8a9a8251ac97388cd80e418c70250
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 16 21:56:31 2005 +0000
+Date: Mon May 16 21:56:31 2005 +0000
- 2005-05-16 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-16 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Check for glib-mkenums.
+ * configure.ac: Check for glib-mkenums.
- * glib/Makefile.am (poppler-enums.h): Generate glib enums at
- compile time.
+ * glib/Makefile.am (poppler-enums.h): Generate glib enums at
+ compile time.
- * glib/poppler-enums.c:
- * glib/poppler-enums.h: Removed.
+ * glib/poppler-enums.c:
+ * glib/poppler-enums.h: Removed.
- ChangeLog | 8 +++
- configure.ac | 3 +
+ ChangeLog | 8 +++
+ configure.ac | 3 +
glib/.cvsignore | 1 +
glib/Makefile.am | 67 ++++++++++++------
glib/poppler-enums.c | 189
@@ -58222,31 +60285,31 @@
commit 2801b54a944fc9e1072c5dcb9f1153a0c9f42de5
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 16 20:27:51 2005 +0000
+Date: Mon May 16 20:27:51 2005 +0000
- 2005-05-16 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-16 Kristian Høgsberg <krh at redhat.com>
- * test/gtk-cairo-test.cc: Update this test case also.
+ * test/gtk-cairo-test.cc: Update this test case also.
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
test/gtk-cairo-test.cc | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
commit 8753ae8ba20fcceaef3ef1dda89129f0456fccf6
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 16 19:06:00 2005 +0000
+Date: Mon May 16 19:06:00 2005 +0000
- 2005-05-16 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-16 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib
- surface
- constructors.
+ * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib
+ surface
+ constructors.
- * poppler/CairoFontEngine.cc (cairo_font_face_destroy):
- Make this
- static.
+ * poppler/CairoFontEngine.cc (cairo_font_face_destroy):
+ Make this
+ static.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
poppler/CairoFontEngine.cc | 2 +-
poppler/CairoOutputDevX.cc | 5 +++--
3 files changed, 12 insertions(+), 3 deletions(-)
@@ -58253,7 +60316,7 @@
commit 2e17106ef4711097104a561d5be49980f8b2f5ab
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Fri May 13 03:47:36 2005 +0000
+Date: Fri May 13 03:47:36 2005 +0000
whoops! commit the right file.
@@ -58264,100 +60327,100 @@
commit 19b62e1c8ea8ce042ac089defe94f756dcaf194e
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Fri May 13 03:25:32 2005 +0000
+Date: Fri May 13 03:25:32 2005 +0000
Thu May 12 23:10:45 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler.gidl: add metadata file.
+ * glib/poppler.gidl: add metadata file.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/test.gidl | 23 +++++++++++++++++++++++
2 files changed, 27 insertions(+)
commit bef5a548f3b21e7220079155e9b5054fb0c6c3c7
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu May 12 21:26:25 2005 +0000
+Date: Thu May 12 21:26:25 2005 +0000
- 2005-05-12 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-12 Kristian Høgsberg <krh at 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)
+ * 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 +++++++++++-----------
+ ChangeLog | 8 ++++++++
+ poppler/CairoOutputDev.cc | 22 +++++++++++-----------
poppler/CairoOutputDevImage.cc | 11 ++++++-----
- poppler/CairoOutputDevX.cc | 7 +++++--
- test/gtk-cairo-test.cc | 8 +++++---
+ poppler/CairoOutputDevX.cc | 7 +++++--
+ test/gtk-cairo-test.cc | 8 +++++---
5 files changed, 35 insertions(+), 21 deletions(-)
commit c10ea2dd9bffaf9af023612ef196bab2b204d3e1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 11 20:01:43 2005 +0000
+Date: Wed May 11 20:01:43 2005 +0000
- 2005-05-11 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-11 Kristian Høgsberg <krh at 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/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.
+ * 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 +++++++++++
+ 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 deletion(-)
commit 7d189e33cfa68e722561e9398ad85a77b538ab14
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri May 6 16:38:57 2005 +0000
+Date: Fri May 6 16:38:57 2005 +0000
- 2005-05-06 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-06 Kristian Høgsberg <krh at redhat.com>
- * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link
- poppler-glib
- against poppler.
+ * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link
+ poppler-glib
+ against poppler.
- * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.
+ * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.
- * poppler-glib.pc (Libs): Drop -lpoppler from link.
+ * poppler-glib.pc (Libs): Drop -lpoppler from link.
- * poppler-qt.pc (Libs): Ditto for qt.
+ * poppler-qt.pc (Libs): Ditto for qt.
- * configure.ac: Test for both libqt-mt.la and libqt-mt.so
- in that
- order.
+ * 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 +
+ 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 at redhat.com>
-Date: Wed May 4 20:08:41 2005 +0000
+Date: Wed May 4 20:08:41 2005 +0000
- 2005-05-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-04 Kristian Høgsberg <krh at 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.
+ * 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 +++
+ ChangeLog | 6 +++
poppler/CairoOutputDev.cc | 98
++++++++++++++++++++++++-----------------------
2 files changed, 57 insertions(+), 47 deletions(-)
@@ -58364,111 +60427,112 @@
commit c142773ad30b409d8169a53921e731305de46e50
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 4 19:28:07 2005 +0000
+Date: Wed May 4 19:28:07 2005 +0000
- 2005-05-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-04 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoOutputDev.cc: Fix matrix convention confusion.
+ * poppler/CairoOutputDev.cc: Fix matrix convention confusion.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/CairoOutputDev.cc | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
commit 28760927d724231d0137ca7ecc66c6c2250dff0d
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed May 4 19:11:11 2005 +0000
+Date: Wed May 4 19:11:11 2005 +0000
- 2005-05-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-04 Kristian Høgsberg <krh at redhat.com>
- Patches from Albert Astals Cid:
+ Patches from Albert Astals Cid:
- * qt/poppler-page.cc (getText): Use QString::fromUtf8()
- instead of
- implicit latin1 cast constructor.
+ * 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.
+ * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
+ instead of qDebug.
- ChangeLog | 10 ++++++++++
- qt/poppler-page.cc | 5 ++---
+ 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 at redhat.com>
-Date: Wed May 4 06:32:38 2005 +0000
+Date: Wed May 4 06:32:38 2005 +0000
Wed May 4 02:31:05 2005 Jonathan Blandford <jrb at 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:
+ * 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()' (-:
+ Register a bunch of boxed types to test introspection, and for
+ LBs. Also, remove unused 'popper_document_save()' (-:
- ChangeLog | 13 ++++++++
+ 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-enums.c | 19 +++++++++++
+ glib/poppler-enums.h | 2 ++
+ glib/poppler-page.cc | 83
++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 36 ++++++++++++++-------
- glib/poppler.h | 12 ++++---
+ glib/poppler-page.h | 36 ++++++++++++++-------
+ glib/poppler.h | 12 ++++---
8 files changed, 193 insertions(+), 38 deletions(-)
commit 132647f8311c07b1f95ee4fca185e9774aae4913
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon May 2 05:39:11 2005 +0000
+Date: Mon May 2 05:39:11 2005 +0000
- 2005-05-01 Kristian Høgsberg <krh at redhat.com>
+ 2005-05-01 Kristian Høgsberg <krh at 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.
+ * 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
+ ChangeLog | 7 +++++
+ configure.ac | 4 +--
+ poppler/CairoFontEngine.cc | 67
+++++++++++++++++-------------------------
- poppler/CairoFontEngine.h | 12 ++++----
- poppler/CairoOutputDev.cc | 39 ++++++++++++++----------
+ 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 at infidigm.net>
-Date: Mon May 2 00:44:26 2005 +0000
+Date: Mon May 2 00:44:26 2005 +0000
- 2005-05-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-05-01 Jeff Muizelaar <jeff at 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.
+ * 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.
+ Patch from Albert Astals Cid.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
splash/SplashFTFont.cc | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 49d89ca0ed3986bec7468f6c0ed295e84ba67239
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun May 1 21:54:55 2005 +0000
+Date: Sun May 1 21:54:55 2005 +0000
- 2005-05-01 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-05-01 Jeff Muizelaar <jeff at infidigm.net>
- * goo/gmem.c: (gmalloc), (grealloc), (gfree):
- * goo/gmem.h: make memory functions use size_t instead of int.
+ * 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.
+ Patch from Takashi Iwai through Albert Astals Cid.
ChangeLog | 7 +++++++
goo/gmem.c | 10 +++++-----
@@ -58477,151 +60541,152 @@
commit 14d618bece894e4c6bed0f179a8fda4db5a67c9d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Apr 30 19:53:57 2005 +0000
+Date: Sat Apr 30 19:53:57 2005 +0000
- 2005-04-30 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-04-30 Jeff Muizelaar <jeff at infidigm.net>
- * qt/poppler-document.cc (Document::unlock) :
- * qt/poppler-qt.h (Document::unlock):
- Add const to the password argument.
+ * qt/poppler-document.cc (Document::unlock) :
+ * qt/poppler-qt.h (Document::unlock):
+ Add const to the password argument.
- Patch from Albert Astals Cid.
+ Patch from Albert Astals Cid.
- ChangeLog | 8 ++++++++
+ ChangeLog | 8 ++++++++
qt/poppler-document.cc | 2 +-
- qt/poppler-qt.h | 2 +-
+ qt/poppler-qt.h | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
commit 1e66da32964cc76c6ed3773574f422b4608cb0e1
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Apr 30 17:31:47 2005 +0000
+Date: Sat Apr 30 17:31:47 2005 +0000
- 2005-04-30 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-04-30 Jeff Muizelaar <jeff at 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)
+ * 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.
+ Patch from Albert Astals Cid.
- ChangeLog | 13 +++++++++++++
+ ChangeLog | 13 +++++++++++++
fofi/FoFiType1.cc | 14 +++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
commit 0b532db77ef41937dd5be30d15c96557d81eceb2
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Fri Apr 29 19:37:07 2005 +0000
+Date: Fri Apr 29 19:37:07 2005 +0000
Fri Apr 29 14:54:44 2005 Jonathan Blandford <jrb at redhat.com>
- * goo/GooTimer.h: New class to do simple timing checks.
+ * 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.
+ * glib/poppler-document.c: Patch from Martin Kretzschmar
+ to really
+ set the PDF version correct. Third time's the charm.
- ChangeLog | 7 ++++++
+ ChangeLog | 7 ++++++
glib/poppler-document.cc | 4 ++-
- goo/GooTimer.cc | 63
+ goo/GooTimer.cc | 63
++++++++++++++++++++++++++++++++++++++++++++++++
- goo/GooTimer.h | 40 ++++++++++++++++++++++++++++++
- goo/Makefile.am | 2 ++
+ goo/GooTimer.h | 40 ++++++++++++++++++++++++++++++
+ goo/Makefile.am | 2 ++
5 files changed, 115 insertions(+), 1 deletion(-)
commit 38948ea6f9ef76dae9b8a7156fe1ef32a0457380
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 29 03:57:16 2005 +0000
+Date: Fri Apr 29 03:57:16 2005 +0000
- 2005-04-29 Kristian Høgsberg <krh at bitplanet.net>
+ 2005-04-29 Kristian Høgsberg <krh at bitplanet.net>
- * configure.ac: Bump release to 0.3.1.
+ * configure.ac: Bump release to 0.3.1.
- * NEWS: Write up news for 0.3.1 release.
+ * NEWS: Write up news for 0.3.1 release.
ChangeLog | 6 ++++++
- NEWS | 6 ++++++
+ NEWS | 6 ++++++
configure.ac | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
commit af65146c92682a3af06e9d3147426445c78309de
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Apr 28 23:03:06 2005 +0000
+Date: Thu Apr 28 23:03:06 2005 +0000
- 2005-04-28 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-28 Kristian Høgsberg <krh at redhat.com>
- Patch from Martin Kretzschmar:
+ Patch from Martin Kretzschmar:
- * poppler/GlobalParams.cc: use UTF-8 as the default text
- encoding.
- Fixes Bug 2934.
+ * poppler/GlobalParams.cc: use UTF-8 as the default text
+ encoding.
+ Fixes Bug 2934.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/GlobalParams.cc | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit c2db3e1b297a9dc0accd0d8a1366970d45705c8f
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 27 20:56:18 2005 +0000
+Date: Wed Apr 27 20:56:18 2005 +0000
- 2005-04-27 Jeff Muizelaar <jeff at infidigm.net>
+ 2005-04-27 Jeff Muizelaar <jeff at 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.
+ * 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 ++++++++++++++
+ 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 +
+ 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 at redhat.com>
-Date: Wed Apr 27 18:53:20 2005 +0000
+Date: Wed Apr 27 18:53:20 2005 +0000
- 2005-04-27 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-27 Kristian Høgsberg <krh at redhat.com>
- * poppler/Catalog.cc (NameTree::lookup): Fix bsearch return
- value
- NULL check. Found by Albert Astals Cid.
+ * poppler/Catalog.cc (NameTree::lookup): Fix bsearch return
+ value
+ NULL check. Found by Albert Astals Cid.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Catalog.cc | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
commit 3c37dc350d54e5a1035aecfba5bfa394f931cf51
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Tue Apr 26 17:17:05 2005 +0000
+Date: Tue Apr 26 17:17:05 2005 +0000
Tue Apr 26 13:13:42 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/test-poppler-glib.c (main): add a quick dump-to-text
- test.
+ * glib/test-poppler-glib.c (main): add a quick dump-to-text
+ test.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/test-poppler-glib.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
commit 44b800d520f90ffd143255d2c23835ea357c195b
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Apr 25 18:04:32 2005 +0000
+Date: Mon Apr 25 18:04:32 2005 +0000
Actually commit the qt/Makefile.am change advertised in the ChangeLog.
@@ -58630,13 +60695,13 @@
commit 437bec03dd2ab3cdf6215f9ad443b7f21ce84e18
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Apr 24 19:56:17 2005 +0000
+Date: Sun Apr 24 19:56:17 2005 +0000
- 2005-04-24 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-24 Kristian Høgsberg <krh at redhat.com>
- * qt/Makefile.am (libpoppler_qt_la_SOURCES): Add
- poppler-private.h
- to SOURCES.
+ * qt/Makefile.am (libpoppler_qt_la_SOURCES): Add
+ poppler-private.h
+ to SOURCES.
ChangeLog | 5 +++++
1 file changed, 5 insertions(+)
@@ -58643,61 +60708,61 @@
commit 9b2b1244ed5f30a99120aaee49c72f7cb6a4f556
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Apr 23 20:16:02 2005 +0000
+Date: Sat Apr 23 20:16:02 2005 +0000
- 2005-04-23 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-23 Kristian Høgsberg <krh at redhat.com>
- * poppler/CairoFontEngine.cc: Use the right fileName for
- loading
- CID fonts (#3114).
+ * poppler/CairoFontEngine.cc: Use the right fileName for
+ loading
+ CID fonts (#3114).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 11 +++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
commit e4516d728a4d1bc85831d5d00b6d6b8d49c79308
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Apr 23 00:09:05 2005 +0000
+Date: Sat Apr 23 00:09:05 2005 +0000
- 2005-04-22 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-22 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Actually commit version number bump.
+ * configure.ac: Actually commit version number bump.
ChangeLog | 4 ++++
- NEWS | 2 +-
+ NEWS | 2 +-
configure.ac | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 22 17:29:49 2005 +0000
+Date: Fri Apr 22 17:29:49 2005 +0000
- 2005-04-22 Martin Kretzschmar <martink at gnome.org>
+ 2005-04-22 Martin Kretzschmar <martink at gnome.org>
- * poppler/CairoFontEngine.cc: declare matrix variable
- before the
- first goto. Fixes build with gcc 3.3.
+ * poppler/CairoFontEngine.cc: declare matrix variable
+ before the
+ first goto. Fixes build with gcc 3.3.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoFontEngine.cc | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 42ecccf9b454893797e3d62f0f1c0a3276689e51
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 22 04:09:23 2005 +0000
+Date: Fri Apr 22 04:09:23 2005 +0000
Fri Apr 22 00:01:40 2005 Kristian Høgsberg <krh at 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.
+ * 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 +++++
+ ChangeLog | 8 +++++
poppler/CairoFontEngine.cc | 79
++++++++++++++++++++--------------------------
poppler/CairoFontEngine.h | 23 ++++++--------
@@ -58706,16 +60771,16 @@
commit 7a703616d9497eba4d7d318da9918dae9cbe8f12
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Apr 21 19:50:45 2005 +0000
+Date: Thu Apr 21 19:50:45 2005 +0000
Thu Apr 21 15:43:52 2005 Kristian Høgsberg <krh at 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).
+ * 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 +++++++
+ ChangeLog | 7 +++++++
poppler/Outline.cc | 6 ++++++
poppler/Outline.h | 7 ++++---
3 files changed, 17 insertions(+), 3 deletions(-)
@@ -58722,36 +60787,36 @@
commit 5c89902c5ee2cf13536225c141768b29505815ce
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Apr 21 06:35:33 2005 +0000
+Date: Thu Apr 21 06:35:33 2005 +0000
Thu Apr 21 02:25:20 2005 Kristian Høgsberg <krh at 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.
+ * 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-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.
+ * 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-glib.pc.in (Requires): Add Requires: field.
- * poppler/Page.cc (loadThumb): Remove unecessary and buggy
- call to
- Stream::addFilters(), reported by Ryan Lortie (#3046).
+ * poppler/Page.cc (loadThumb): Remove unecessary and buggy
+ call to
+ Stream::addFilters(), reported by Ryan Lortie (#3046).
- ChangeLog | 7 ++++++-
- NEWS | 12 +++---------
+ ChangeLog | 7 ++++++-
+ NEWS | 12 +++---------
poppler/CairoFontEngine.cc | 45
+++++++++++++++++++++++++++++++++++++++------
poppler/CairoFontEngine.h | 9 ++++++++-
@@ -58760,245 +60825,245 @@
commit 71c1563bb0462154cb7caa4356d8f8d049073ac4
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Apr 21 05:20:24 2005 +0000
+Date: Thu Apr 21 05:20:24 2005 +0000
Thu Apr 21 00:15:30 2005 Kristian Høgsberg <krh at 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-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.
+ * 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-glib.pc.in (Requires): Add Requires: field.
- * poppler/Page.cc (loadThumb): Remove unecessary and buggy
- call to
- Stream::addFilters(), reported by Ryan Lortie (#3046).
+ * poppler/Page.cc (loadThumb): Remove unecessary and buggy
+ call to
+ Stream::addFilters(), reported by Ryan Lortie (#3046).
- ChangeLog | 15 +++++++++++++++
- NEWS | 15 +++++++++++++++
+ ChangeLog | 15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
glib/poppler-document.cc | 10 ++++++++++
- glib/poppler-page.cc | 22 ++--------------------
+ glib/poppler-page.cc | 22 ++--------------------
glib/poppler-private.h | 13 +++++++++++++
- poppler-glib.pc.in | 1 +
+ poppler-glib.pc.in | 1 +
poppler/CairoFontEngine.cc | 2 +-
- poppler/Page.cc | 2 --
+ poppler/Page.cc | 2 --
8 files changed, 57 insertions(+), 23 deletions(-)
commit c6328cbc6cea05890b52a8302f8deba443959c03
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 20 22:48:52 2005 +0000
+Date: Wed Apr 20 22:48:52 2005 +0000
- 2005-04-13 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-13 Jeff Muizelaar <jrmuizel at nit.ca>
- * qt/poppler-page.cc (Page::getText):
- * qt/poppler-qt.h: add a getText method for getting
- the text on a page
+ * 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
+ * qt/test-poppler-qt.c (PDFDisplay::PDFDisplay):
+ add the option to display the text on a page
- Patch from Albert Astals Cid.
+ Patch from Albert Astals Cid.
- ChangeLog | 11 +++++++++++
- qt/poppler-page.cc | 37 +++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 20 ++++++++++++++++++++
+ 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 at redhat.com>
-Date: Tue Apr 19 21:22:26 2005 +0000
+Date: Tue Apr 19 21:22:26 2005 +0000
Tue Apr 19 17:21:19 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler-document.cc (poppler_document_get_property):
- Use
- %.2g instead.
+ * glib/poppler-document.cc (poppler_document_get_property):
+ Use
+ %.2g instead.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 4e81624dcc2d5218f2f8bb4eaa992e724014a853
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Tue Apr 19 21:13:22 2005 +0000
+Date: Tue Apr 19 21:13:22 2005 +0000
Tue Apr 19 17:11:52 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler-document.cc (poppler_document_get_property):
- Use %g
- instead of %f to avoid versioning like PDF-1.50000
+ * glib/poppler-document.cc (poppler_document_get_property):
+ Use %g
+ instead of %f to avoid versioning like PDF-1.50000
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-document.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 6ef9d30f06be2bd8a9e1470d70f49843a7e432ac
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Apr 19 19:48:49 2005 +0000
+Date: Tue Apr 19 19:48:49 2005 +0000
Tue Apr 19 15:43:35 2005 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-action.cc (_poppler_action_new): Handle
- NULL links
- gracefully (fix from Jeff).
+ * glib/poppler-action.cc (_poppler_action_new): Handle
+ NULL links
+ gracefully (fix from Jeff).
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-action.cc | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
commit 770b7310ce8b07f95960c2014bf3f6040c060ac4
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Apr 19 04:28:15 2005 +0000
+Date: Tue Apr 19 04:28:15 2005 +0000
Tue Apr 19 00:20:08 2005 Kristian Høgsberg <krh at redhat.com>
- * poppler/Catalog.cc: Fix from Marco to make sure we always
- initialize Catalog::pageLabelInfo.
+ * poppler/Catalog.cc: Fix from Marco to make sure we always
+ initialize Catalog::pageLabelInfo.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/Catalog.cc | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
commit 49c10d9f2c4e0cef031f96929e38a14d7ce5af19
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Sat Apr 16 18:57:43 2005 +0000
+Date: Sat Apr 16 18:57:43 2005 +0000
Sat Apr 16 14:53:15 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/Makefile.am: Create poppler-enums.[ch]
+ * 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.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-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/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.
+ * 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.
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Extend to support PageLayout.
- ChangeLog | 22 ++++++
- glib/Makefile.am | 32 +++++++-
- glib/poppler-action.h | 15 ++--
+ 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/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 +++
+ poppler/Catalog.cc | 17 ++++
+ poppler/Catalog.h | 11 +++
13 files changed, 529 insertions(+), 42 deletions(-)
commit f35c76cd3528f1e1de594e85e734ca23624b3a62
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 15 02:25:10 2005 +0000
+Date: Fri Apr 15 02:25:10 2005 +0000
- 2005-04-14 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-14 Kristian Høgsberg <krh at 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.
+ * 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
+ ChangeLog | 8 ++++
+ glib/poppler-page.cc | 109
+++++++++++++++++++++++++++++++++++++++++++++----
- glib/poppler-page.h | 45 ++++++++++----------
+ glib/poppler-page.h | 45 ++++++++++----------
glib/poppler-private.h | 1 +
- glib/poppler.h | 9 ++++
+ glib/poppler.h | 9 ++++
5 files changed, 142 insertions(+), 30 deletions(-)
commit 538408a8845e167cc2d796ac8b8129d0a2e6a894
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Apr 14 01:34:38 2005 +0000
+Date: Thu Apr 14 01:34:38 2005 +0000
- 2005-04-13 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-13 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler/CairoOutputDevImage.cc (getBitmap): remove unused
- SplashBitmap. Patch from Albert Astals Cid.
+ * poppler/CairoOutputDevImage.cc (getBitmap): remove unused
+ SplashBitmap. Patch from Albert Astals Cid.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/CairoOutputDevImage.cc | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
commit 2903530492c24f3c7cb3bf3b993500694aaa27a8
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Apr 12 15:37:39 2005 +0000
+Date: Tue Apr 12 15:37:39 2005 +0000
- 2005-04-12 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-12 Kristian Høgsberg <krh at 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.
+ * 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.
+ * 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 +
+ ChangeLog | 10 ++++++++++
+ configure.ac | 4 ++--
+ poppler/Makefile.am | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
commit 0f7dd9a0512ff97293ee3f8a762b0049393b3cc1
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Apr 9 18:14:39 2005 +0000
+Date: Sat Apr 9 18:14:39 2005 +0000
- 2005-04-09 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-09 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler-qt.h:
- * poppler-document.cc (okToPrint, okToChange, okToCopy):
- Patch from Albert Astals Cid adding more metadata exports
+ * poppler-qt.h:
+ * poppler-document.cc (okToPrint, okToChange, okToCopy):
+ Patch from Albert Astals Cid adding more metadata exports
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-document.cc | 20 ++++++++++++++++++++
- qt/poppler-qt.h | 4 ++++
+ qt/poppler-qt.h | 4 ++++
3 files changed, 30 insertions(+)
commit dee72b531dab83a29c7675ae06ffe376e4498a4e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 8 21:09:27 2005 +0000
+Date: Fri Apr 8 21:09:27 2005 +0000
- 2005-04-08 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-08 Kristian Høgsberg <krh at redhat.com>
- * poppler-qt.pc.in (Libs): Add -lpoppler to Libs.
+ * poppler-qt.pc.in (Libs): Add -lpoppler to Libs.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler-qt.pc.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit df59ce3b1d5ca8cd46aaf5f189bc78953e21e1a9
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri Apr 8 03:30:33 2005 +0000
+Date: Fri Apr 8 03:30:33 2005 +0000
- 2005-04-07 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-07 Jeff Muizelaar <jrmuizel at nit.ca>
- * configure.ac: redo the qt tests from Albert Astals Cid
+ * configure.ac: redo the qt tests from Albert Astals Cid
ChangeLog | 4 ++++
configure.ac | 78
@@ -59007,53 +61072,54 @@
commit 3f9dde10e4778255c468895942e45d1a2637af3a
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Fri Apr 8 03:11:00 2005 +0000
+Date: Fri Apr 8 03:11:00 2005 +0000
- 2005-04-07 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-07 Jeff Muizelaar <jrmuizel at 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.
+ * 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 ++++++++
+ ChangeLog | 8 ++++++++
qt/poppler-document.cc | 21 ++++++++++++++++++---
- qt/poppler-page.cc | 6 +++---
- qt/poppler-qt.h | 15 +++++++++------
+ qt/poppler-page.cc | 6 +++---
+ qt/poppler-qt.h | 15 +++++++++------
4 files changed, 38 insertions(+), 12 deletions(-)
commit e79a8b946e0d04b32da0b4ceea1649efd203cb07
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Apr 7 22:01:51 2005 +0000
+Date: Thu Apr 7 22:01:51 2005 +0000
- 2005-04-07 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-07 Kristian Høgsberg <krh at 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.
+ * 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 +++++++++
+ ChangeLog | 9 +++++++++
glib/poppler-document.cc | 45
+++++++++++++++++++++++++++++++++++++++++++++
glib/poppler-document.h | 8 ++++++--
- glib/poppler-page.cc | 19 +++++++++++++++++++
- glib/poppler-page.h | 40 +++++++++++++++++++++-------------------
+ 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 at redhat.com>
-Date: Thu Apr 7 16:26:15 2005 +0000
+Date: Thu Apr 7 16:26:15 2005 +0000
Thu Apr 7 12:25:39 2005 Jonathan Blandford <jrb at redhat.com>
- * configure.ac: check for qt, not glib, when enabling the qt
- subdir
+ * configure.ac: check for qt, not glib, when enabling the qt
+ subdir
ChangeLog | 5 +++++
configure.ac | 2 +-
@@ -59061,31 +61127,31 @@
commit e258ed0cb42d524ee39451f680ad4c067e7721da
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 6 20:49:19 2005 +0000
+Date: Wed Apr 6 20:49:19 2005 +0000
- 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
- * .cvsignore, glib/.cvsignore, qt/.cvsignore:
- Add more things to .cvsignore.
- Patch from Martin Kretzschmar.
+ * .cvsignore, glib/.cvsignore, qt/.cvsignore:
+ Add more things to .cvsignore.
+ Patch from Martin Kretzschmar.
- .cvsignore | 2 ++
- ChangeLog | 6 ++++++
+ .cvsignore | 2 ++
+ ChangeLog | 6 ++++++
glib/.cvsignore | 7 +++++++
- qt/.cvsignore | 7 +++++++
+ qt/.cvsignore | 7 +++++++
4 files changed, 22 insertions(+)
commit 2a5624a81aa84677a57e098d7d4045f44e3b6f3a
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 6 20:35:03 2005 +0000
+Date: Wed Apr 6 20:35:03 2005 +0000
- 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler-page.cc (Page::Page, Page::~Page):
- Construct and deconstruct the PageData object.
- Patch from Albert Astals Cid.
+ * poppler-page.cc (Page::Page, Page::~Page):
+ Construct and deconstruct the PageData object.
+ Patch from Albert Astals Cid.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
qt/poppler-page.cc | 6 ++++++
qt/poppler-qt.h | 1 +
3 files changed, 13 insertions(+)
@@ -59092,74 +61158,74 @@
commit f983e3d317660653f2bfc56f9b06e2cec675beca
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Apr 6 14:39:40 2005 +0000
+Date: Wed Apr 6 14:39:40 2005 +0000
- 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-06 Jeff Muizelaar <jrmuizel at nit.ca>
- * Makefile.am, configure.ac: Add configuration for qt wrapper.
+ * 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.
+ * 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 +++++++
+ 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/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 at redhat.com>
-Date: Tue Apr 5 17:46:44 2005 +0000
+Date: Tue Apr 5 17:46:44 2005 +0000
- 2005-04-05 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-05 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Attempt to sum up changes since 0.1.2.
+ * 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.
+ * configure.ac: Bump release to 0.2.0, add AC_DEFINEs
+ for cairo
+ and splash availability.
- * poppler/CairoFontEngine.cc: Disable hinting.
+ * 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.
+ * 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
+ ChangeLog | 16 +++++
+ NEWS | 6 +-
+ configure.ac | 16 +++--
+ glib/Makefile.am | 17 ++++-
+ glib/poppler-page.cc | 152
+++++++++++++++++++++++++++++++++--------
- poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
poppler/CairoOutputDevImage.cc | 20 ++----
- poppler/CairoOutputDevImage.h | 3 +-
+ poppler/CairoOutputDevImage.h | 3 +-
8 files changed, 179 insertions(+), 53 deletions(-)
commit b62b0cec2335d987b31fbb0043cb33db29cc6a13
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Apr 5 02:56:32 2005 +0000
+Date: Tue Apr 5 02:56:32 2005 +0000
- 2005-04-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-04 Kristian Høgsberg <krh at redhat.com>
- * ChangeLog: Add this entry to test commit mailer script.
+ * ChangeLog: Add this entry to test commit mailer script.
ChangeLog | 2 ++
1 file changed, 2 insertions(+)
@@ -59166,39 +61232,39 @@
commit 50b494266ce197fe88468ca2917b9910d77e5f98
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Apr 5 02:49:18 2005 +0000
+Date: Tue Apr 5 02:49:18 2005 +0000
- 2005-04-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-04 Kristian Høgsberg <krh at redhat.com>
- * TODO: Add reminder about using PDF font descriptors with
- fontconfig.
+ * TODO: Add reminder about using PDF font descriptors with
+ fontconfig.
ChangeLog | 3 +++
- TODO | 2 ++
+ TODO | 2 ++
2 files changed, 5 insertions(+)
commit d3d12235bf4de48363571b3d992ea3bfc29e6529
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Apr 4 21:50:56 2005 +0000
+Date: Mon Apr 4 21:50:56 2005 +0000
- 2005-04-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-04 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Add checks for mkstemp() and mkstemps().
+ * 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.
+ * glib/poppler-page.cc (poppler_page_find_text): Reverse
+ y-coordinates so we return PDF style coordinates.
- From Maro Pesenti Gritti <mpgritti at gmail.com>:
+ From Maro Pesenti Gritti <mpgritti at gmail.com>:
- * configure.ac, poppler/Makefile.am: Check for fontconfig when
- we're building the splash backend.
+ * 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.
+ * glib/poppler-page.cc (poppler_page_get_text): New
+ function to
+ select text on page.
- ChangeLog | 15 +++++++++++++++
- configure.ac | 5 ++++-
+ ChangeLog | 15 +++++++++++++++
+ configure.ac | 5 ++++-
glib/poppler-page.cc | 48
+++++++++++++++++++++++++++++++++++++++++++++---
glib/poppler-page.h | 3 +++
@@ -59207,42 +61273,42 @@
commit 2cb9d70678e33504246cbfbe0525c33f5e3b7736
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Apr 4 05:56:29 2005 +0000
+Date: Mon Apr 4 05:56:29 2005 +0000
- 2005-04-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-04-04 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_find_text): Reverse
- list of
- matches so we get them in the right order.
+ * glib/poppler-page.cc (poppler_page_find_text): Reverse
+ list of
+ matches so we get them in the right order.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 8c2a5ffb73c0f2d84adebcfbd43f8347ae8c8bbc
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sun Apr 3 18:17:55 2005 +0000
+Date: Sun Apr 3 18:17:55 2005 +0000
- 2005-04-03 Martin Kretzschmar <martink at gnome.org>
+ 2005-04-03 Martin Kretzschmar <martink at gnome.org>
- * poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C"
- Fixes build with unpatched libjpeg.
+ * poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C"
+ Fixes build with unpatched libjpeg.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/DCTStream.h | 2 ++
2 files changed, 7 insertions(+)
commit 1879d82d9088aa36ef5e677f4bae44c84f90caa6
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Sat Apr 2 22:16:38 2005 +0000
+Date: Sat Apr 2 22:16:38 2005 +0000
- 2005-04-02 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-04-02 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler/Page.h:
- * poppler/Page.cc (Page::Page):
- Some initial infrastructure for supporting transitions.
+ * poppler/Page.h:
+ * poppler/Page.cc (Page::Page):
+ Some initial infrastructure for supporting transitions.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
poppler/Page.cc | 10 ++++++++++
poppler/Page.h | 4 ++++
3 files changed, 20 insertions(+)
@@ -59249,52 +61315,52 @@
commit fa4efbed51e12811070798a7cfb6b1f9e8d57abc
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Apr 1 00:32:34 2005 +0000
+Date: Fri Apr 1 00:32:34 2005 +0000
- 2005-03-31 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-31 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip
- output to destination pixbuf and fix RGB order.
+ * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip
+ output to destination pixbuf and fix RGB order.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/poppler-page.cc | 38 +++++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 15 deletions(-)
commit bb508ded0b8c5806a9db1ec73e57b14268896911
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Mar 31 22:45:05 2005 +0000
+Date: Thu Mar 31 22:45:05 2005 +0000
- 2005-03-31 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-31 Kristian Høgsberg <krh at 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 (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.
+ * glib/poppler-page.cc: Add g_return_if_fail() checks to
+ a couple
+ of functions.
- ChangeLog | 8 +++++
- glib/poppler-page.cc | 82
+ ChangeLog | 8 +++++
+ glib/poppler-page.cc | 82
++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 18 ++++++++---
+ glib/poppler-page.h | 18 ++++++++---
glib/test-poppler-glib.c | 19 +++++++++--
4 files changed, 109 insertions(+), 18 deletions(-)
commit 0b4d481e9c79cb18cf41b503970801bbf4b95b3c
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Thu Mar 31 05:29:42 2005 +0000
+Date: Thu Mar 31 05:29:42 2005 +0000
Thu Mar 31 00:26:20 2005 Jonathan Blandford <jrb at 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.
+ * 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 +++++
+ ChangeLog | 7 +++++
glib/poppler-page.cc | 85
++++++++++++++++++++++++++++++++++++++++++++++++----
glib/poppler-page.h | 15 ++++++++++
@@ -59302,32 +61368,32 @@
commit c4e18f5a454794bd5e226f1106a54ccf807c6c3d
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Thu Mar 31 02:28:46 2005 +0000
+Date: Thu Mar 31 02:28:46 2005 +0000
- 2005-03-30 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-03-30 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler/DCTStream.h: change x to unsigned int to eliminate
- comparision warning
+ * poppler/DCTStream.h: change x to unsigned int to eliminate
+ comparision warning
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
poppler/DCTStream.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit e6a2a588305b4797af901599eb6854028f2be476
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Mar 30 18:43:44 2005 +0000
+Date: Wed Mar 30 18:43:44 2005 +0000
- 2005-03-30 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-03-30 Jeff Muizelaar <jrmuizel at nit.ca>
- * poppler/Catalog.cc: delete pageLabelInfo on deconstruction
+ * poppler/Catalog.cc: delete pageLabelInfo on deconstruction
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
poppler/Catalog.cc | 1 +
2 files changed, 5 insertions(+)
commit a52905c0f0bf4d10d2103b80924a4de204d03836
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Wed Mar 30 04:08:26 2005 +0000
+Date: Wed Mar 30 04:08:26 2005 +0000
add this
@@ -59337,7 +61403,7 @@
commit 9542860a74076020b5727d4b761c08cdab42d69e
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Wed Mar 30 04:07:57 2005 +0000
+Date: Wed Mar 30 04:07:57 2005 +0000
add these
@@ -59347,168 +61413,168 @@
commit 07720f98eca8736695f7d0d8e98465d301e6b7cf
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Wed Mar 30 04:07:39 2005 +0000
+Date: Wed Mar 30 04:07:39 2005 +0000
Tue Mar 29 23:07:17 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler-page.h: Reformat.
+ * glib/poppler-page.h: Reformat.
- ChangeLog | 4 ++++
+ ChangeLog | 4 ++++
glib/poppler-page.h | 34 +++++++++++++++++-----------------
2 files changed, 21 insertions(+), 17 deletions(-)
commit 3437b9e122aa05f4ede24664ee5a9b2d423ef9c4
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Wed Mar 30 04:04:53 2005 +0000
+Date: Wed Mar 30 04:04:53 2005 +0000
Tue Mar 29 22:49:15 2005 Jonathan Blandford <jrb at 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.
+ * 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 ++
+ 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/poppler.h | 1 +
glib/test-poppler-glib.c | 4 +++-
7 files changed, 39 insertions(+), 52 deletions(-)
commit cab0ec4d011c34b571050a446c6e3286cc8749c8
Author: Jonathan Blandford <jrb at redhat.com>
-Date: Tue Mar 29 18:49:26 2005 +0000
+Date: Tue Mar 29 18:49:26 2005 +0000
Tue Mar 29 02:36:00 2005 Jonathan Blandford <jrb at redhat.com>
- * glib/poppler-document.[ch] (PopplerIndexIter): Add an
- iter to
- extract the index from the doc. Includes a bad hack, for now.
+ * 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 at 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.
+ * 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 ++++
+ 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 +-
+ 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 at redhat.com>
-Date: Mon Mar 28 07:49:54 2005 +0000
+Date: Mon Mar 28 07:49:54 2005 +0000
- 2005-03-28 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-28 Kristian Høgsberg <krh at redhat.com>
- * poppler/Page.cc (loadThumb): Backend agnostic method for
- extracting an embedded thumbnail iamge.
+ * poppler/Page.cc (loadThumb): Backend agnostic method for
+ extracting an embedded thumbnail iamge.
- * poppler/Dict.cc (lookupInt): New convenience method.
+ * 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.
+ * 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 +++++++-------
+ 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/Dict.cc | 20 +++++++++
+ poppler/Dict.h | 1 +
+ poppler/Page.cc | 109
+++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Page.h | 1 +
+ poppler/Page.h | 1 +
8 files changed, 196 insertions(+), 24 deletions(-)
commit 591055d1fbcd0b9c2bb11f14040568051c5976d1
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Mar 26 00:34:21 2005 +0000
+Date: Sat Mar 26 00:34:21 2005 +0000
- 2005-03-25 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-25 Kristian Høgsberg <krh at redhat.com>
- * glib/Makefile.am (libpoppler_glib_la_SOURCES): Add
+ * glib/Makefile.am (libpoppler_glib_la_SOURCES): Add
- * configure.ac: Check for fontconfig for glib bindings.
+ * configure.ac: Check for fontconfig for glib bindings.
- ChangeLog | 4 ++++
- configure.ac | 4 ++--
+ ChangeLog | 4 ++++
+ configure.ac | 4 ++--
glib/Makefile.am | 7 +++++--
3 files changed, 11 insertions(+), 4 deletions(-)
commit 1e30abe94a96b91df05716ea079c58782d767951
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Mar 24 22:24:41 2005 +0000
+Date: Thu Mar 24 22:24:41 2005 +0000
- 2005-03-24 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-24 Kristian Høgsberg <krh at redhat.com>
- * glib/Makefile.am: Use POPPLER_GLIB_CFLAGS and
- POPPLER_GLIB_LIBS
- instead of GTK_TEST_*. Reported by Adam Jackson
- <ajax at nwnk.net>.
+ * glib/Makefile.am: Use POPPLER_GLIB_CFLAGS and
+ POPPLER_GLIB_LIBS
+ instead of GTK_TEST_*. Reported by Adam Jackson
+ <ajax at nwnk.net>.
- ChangeLog | 5 +++++
+ ChangeLog | 5 +++++
glib/Makefile.am | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
commit 1d9fcaa34222b2ccd53280148561917dbb8d95d9
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Mar 23 05:53:08 2005 +0000
+Date: Wed Mar 23 05:53:08 2005 +0000
File Edit Options Buffers Tools Help
- 2005-03-23 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-23 Kristian Høgsberg <krh at redhat.com>
- * poppler/Catalog.cc (indexToLabel, labelToIndex): Add
- stricter
- checking of incoming labels and indices.
+ * 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.
+ * glib/test-poppler-glib.c (main): Change test program to
+ take the
+ page label from the command line.
- ChangeLog | 6 ++++++
+ ChangeLog | 6 ++++++
glib/test-poppler-glib.c | 5 ++++-
- poppler/Catalog.cc | 31 +++++++++++++++++++++++++++++--
+ poppler/Catalog.cc | 31 +++++++++++++++++++++++++++++--
3 files changed, 39 insertions(+), 3 deletions(-)
commit a9bbb465a0ee6ab320f76d322a3f575327ad1148
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Mar 23 05:38:34 2005 +0000
+Date: Wed Mar 23 05:38:34 2005 +0000
- 2005-03-23 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-23 Kristian Høgsberg <krh at 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()
+ * 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 +++++++++++++++++---------------
+ 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 at redhat.com>
-Date: Wed Mar 23 04:14:28 2005 +0000
+Date: Wed Mar 23 04:14:28 2005 +0000
- 2005-03-22 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-22 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc: Implement poppler_document_save().
+ * glib/poppler-document.cc: Implement poppler_document_save().
- * glib/poppler-document.h: Add prototype and format headers
- properly.
+ * glib/poppler-document.h: Add prototype and format headers
+ properly.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
glib/poppler-document.cc | 20 ++++++++++++++++++++
glib/poppler-document.h | 30 +++++++++++++-----------------
3 files changed, 40 insertions(+), 17 deletions(-)
@@ -59515,12 +61581,12 @@
commit e40c6f69c9466df4cc70840b959f72cb0809c777
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Mar 23 01:30:04 2005 +0000
+Date: Wed Mar 23 01:30:04 2005 +0000
- 2005-03-22 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-22 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Fix --disable-popper typo reported by Albert.
- Require exactly cairo 0.4 since CVS cairo has API changes.
+ * 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 +++---
@@ -59528,19 +61594,19 @@
commit 2a1e4f6f6dd87dc59b3579175a87215fd7350ee0
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Mar 22 22:46:37 2005 +0000
+Date: Tue Mar 22 22:46:37 2005 +0000
- 2005-03-22 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-22 Kristian Høgsberg <krh at redhat.com>
- * poppler/Array.cc:
- * poppler/Array.h: Add getString() convenience method.
+ * poppler/Array.cc:
+ * poppler/Array.h: Add getString() convenience method.
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Optimize lookup of named destinations.
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Optimize lookup of named destinations.
- ChangeLog | 8 +++
+ ChangeLog | 8 +++
poppler/Array.cc | 15 ++++++
- poppler/Array.h | 1 +
+ poppler/Array.h | 1 +
poppler/Catalog.cc | 142
++++++++++++++++++++++++++++++++++-------------------
poppler/Catalog.h | 32 +++++++++++-
@@ -59548,31 +61614,31 @@
commit 4dfe0ce4a1ca09d632943f0f6315e31135957ada
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Mar 22 01:50:05 2005 +0000
+Date: Tue Mar 22 01:50:05 2005 +0000
- 2005-03-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-21 Kristian Høgsberg <krh at redhat.com>
- * NEWS, TODO: Update these.
+ * NEWS, TODO: Update these.
ChangeLog | 4 ++++
- NEWS | 1 +
- TODO | 29 ++++++++++++++++++++---------
+ NEWS | 1 +
+ TODO | 29 ++++++++++++++++++++---------
3 files changed, 25 insertions(+), 9 deletions(-)
commit c158de90a5a8c6514d8aa22efa0b891a1801e822
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Mar 21 07:53:19 2005 +0000
+Date: Mon Mar 21 07:53:19 2005 +0000
- 2005-03-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-21 Kristian Høgsberg <krh at redhat.com>
- From Albert Astals Cid <tsdgeos at yahoo.es>:
+ From Albert Astals Cid <tsdgeos at yahoo.es>:
- * poppler/Catalog.cc, poppler/Catalog.h: Parse PageMode
- setting
- from the Catalog dict and expose it through getPageMode()
- method.
+ * poppler/Catalog.cc, poppler/Catalog.h: Parse PageMode
+ setting
+ from the Catalog dict and expose it through getPageMode()
+ method.
- ChangeLog | 10 ++++++++--
+ ChangeLog | 10 ++++++++--
poppler/Catalog.cc | 16 ++++++++++++++++
poppler/Catalog.h | 12 ++++++++++++
3 files changed, 36 insertions(+), 2 deletions(-)
@@ -59579,41 +61645,41 @@
commit 9887679ca195714d71cbedde9297e9dcea04eb13
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Mon Mar 21 07:36:11 2005 +0000
+Date: Mon Mar 21 07:36:11 2005 +0000
- 2005-03-21 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-21 Kristian Høgsberg <krh at redhat.com>
- * glib/poppler-document.cc:
+ * glib/poppler-document.cc:
- * glib/poppler-document.h: Expose the documenttitle as
- a GObject
- property.
+ * 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-page.cc: Expose the page label as a GObject
+ property.
- * glib/poppler-private.h: Add the page index to PopplerPage.
+ * glib/poppler-private.h: Add the page index to PopplerPage.
- * glib/test-poppler-glib.c: Print out page label and document
- title.
+ * glib/test-poppler-glib.c: Print out page label and document
+ title.
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Add page label accessors.
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Add page label accessors.
- * poppler/PageLabelInfo.cc:
- * poppler/PageLabelInfo.h: New files.
+ * poppler/PageLabelInfo.cc:
+ * poppler/PageLabelInfo.h: New files.
- * poppler/Makefile.am: Add new files to sources.
+ * poppler/Makefile.am: Add new files to sources.
- ChangeLog | 23 ++++
+ ChangeLog | 23 ++++
glib/poppler-document.cc | 95 ++++++++++++-
glib/poppler-document.h | 3 +
- glib/poppler-page.cc | 37 ++++-
+ 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/Catalog.cc | 15 ++
+ poppler/Catalog.h | 6 +
+ poppler/Makefile.am | 4 +-
poppler/PageLabelInfo.cc | 346
+++++++++++++++++++++++++++++++++++++++++++++++
poppler/PageLabelInfo.h | 37 +++++
@@ -59621,116 +61687,116 @@
commit 2cfe917de909254bc3a114a6add68a14b5885fd0
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sun Mar 20 05:44:06 2005 +0000
+Date: Sun Mar 20 05:44:06 2005 +0000
- 2005-03-20 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-20 Kristian Høgsberg <krh at 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.
+ * 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 ++++++++++
+ 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 +-
+ 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 at redhat.com>
-Date: Sun Mar 20 00:35:21 2005 +0000
+Date: Sun Mar 20 00:35:21 2005 +0000
- 2005-03-19 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-19 Kristian Høgsberg <krh at redhat.com>
- Land the first bits of the glib wrapper.
+ Land the first bits of the glib wrapper.
- * Makefile.am:
- * configure.ac: Add new glib subdirectory and configure
- options
- for 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.
+ * 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 ++++++++++
+ 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.cc | 158
+++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 50 ++++++++++++++
+ glib/poppler-page.h | 50 ++++++++++++++
glib/poppler-private.h | 20 ++++++
- glib/poppler.cc | 29 +++++++++
- glib/poppler.h | 42 ++++++++++++
+ glib/poppler.cc | 29 +++++++++
+ glib/poppler.h | 42 ++++++++++++
glib/test-poppler-glib.c | 43 ++++++++++++
- poppler-glib.pc.in | 11 ++++
+ poppler-glib.pc.in | 11 ++++
14 files changed, 661 insertions(+), 17 deletions(-)
commit 2a31446b227b5cdc8334e672a71835b6ea14713a
Author: Jeff Muizelaar <jeff at infidigm.net>
-Date: Wed Mar 16 15:51:36 2005 +0000
+Date: Wed Mar 16 15:51:36 2005 +0000
- 2005-03-16 Jeff Muizelaar <jrmuizel at nit.ca>
+ 2005-03-16 Jeff Muizelaar <jrmuizel at nit.ca>
- From Dan Sheridan <dan.sheridan at postman.org.uk>
+ From Dan Sheridan <dan.sheridan at postman.org.uk>
- * poppler/XRef.cc (XRef::checkEncrypted):
- The key length should be 5 for revision 2 documents.
+ * poppler/XRef.cc (XRef::checkEncrypted):
+ The key length should be 5 for revision 2 documents.
- ChangeLog | 7 +++++++
+ ChangeLog | 7 +++++++
poppler/XRef.cc | 6 ++++++
2 files changed, 13 insertions(+)
commit e632a1d4b2f685993bda407458c34ef8e6b74136
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 11 22:43:29 2005 +0000
+Date: Fri Mar 11 22:43:29 2005 +0000
- 2005-03-11 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-11 Kristian Høgsberg <krh at redhat.com>
- From Jeff Muizelaar <jrmuizel at nit.ca>:
+ From Jeff Muizelaar <jrmuizel at nit.ca>:
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask):
- Use
- getLine instead of getPixel.
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask):
+ Use
+ getLine instead of getPixel.
- ChangeLog | 3 +++
+ ChangeLog | 3 +++
poppler/CairoOutputDev.cc | 18 ++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
commit 83e904452f205a2c0cd2723cb12b7fd4640ce342
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 11 21:42:52 2005 +0000
+Date: Fri Mar 11 21:42:52 2005 +0000
- 2005-03-11 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-11 Kristian Høgsberg <krh at redhat.com>
- From Jeff Muizelaar <jrmuizel at nit.ca>:
+ From Jeff Muizelaar <jrmuizel at nit.ca>:
- * configure.ac: Add checks for libjpeg.
+ * configure.ac: Add checks for libjpeg.
- * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am:
- Conditionally use libjpeg instead of xpdf jpeg decoder.
+ * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am:
+ Conditionally use libjpeg instead of xpdf jpeg decoder.
- ChangeLog | 9 +++++
- configure.ac | 34 +++++++++++++++-
+ ChangeLog | 9 +++++
+ configure.ac | 34 +++++++++++++++-
poppler/DCTStream.cc | 110
+++++++++++++++++++++++++++++++++++++++++++++++++++
poppler/DCTStream.h | 70 ++++++++++++++++++++++++++++++++
@@ -59741,23 +61807,23 @@
commit e2af71338fd89760c4ac76999985efc5eb92817f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 11 16:42:20 2005 +0000
+Date: Fri Mar 11 16:42:20 2005 +0000
- 2005-03-10 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-10 Kristian Høgsberg <krh at redhat.com>
- From Jeff Muizelaar <jrmuizel at nit.ca>:
+ From Jeff Muizelaar <jrmuizel at nit.ca>:
- * poppler/CairoFontEngine.cc (CairoFontEngine::getFont):
- Don't print "Type 3 font!" message.
+ * 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.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
+ * poppler/CairoOutputDev.h
+ (CairoOutputDev::interpretType3Chars): Return true so that
+ Gfx.cc turns type3 characters into calls to drawImageMask
- ChangeLog | 14 ++++++++++++++
+ ChangeLog | 14 ++++++++++++++
poppler/CairoFontEngine.cc | 1 -
poppler/CairoOutputDev.cc | 25 ++++++++++---------------
poppler/CairoOutputDev.h | 2 +-
@@ -59765,26 +61831,26 @@
commit 3dc52373346e448077d2539163e873eef6406ed7
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Mar 9 15:47:00 2005 +0000
+Date: Wed Mar 9 15:47:00 2005 +0000
- 2005-03-09 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-09 Kristian Høgsberg <krh at redhat.com>
- * NEWS: Describe 0.1.2 (and 0.1.1) release.
+ * NEWS: Describe 0.1.2 (and 0.1.1) release.
- * configure.ac: Bump poppler version to 0.1.2
+ * configure.ac: Bump poppler version to 0.1.2
ChangeLog | 6 ++++++
- NEWS | 12 ++++++++++++
+ NEWS | 12 ++++++++++++
configure.ac | 2 +-
3 files changed, 19 insertions(+), 1 deletion(-)
commit 5c6a2d34fc25df28ca5326e6910d7cf664f0c3d7
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Wed Mar 9 15:35:31 2005 +0000
+Date: Wed Mar 9 15:35:31 2005 +0000
- 2005-03-09 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-09 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Bump cairo requirement to 0.4.
+ * configure.ac: Bump cairo requirement to 0.4.
ChangeLog | 4 ++++
configure.ac | 4 ++--
@@ -59792,26 +61858,26 @@
commit 5b2d9a61e79cefd819888c8c89231a5fafccd114
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Mar 5 04:57:49 2005 +0000
+Date: Sat Mar 5 04:57:49 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- Patch from Jeff Muizelaar <jrmuizel at nit.ca>. Changed to
- allocate
- glyphs using gmalloc.
+ Patch from Jeff Muizelaar <jrmuizel at 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.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.
+ * poppler/CairoOutputDev.h (CairoOutputDev::useDrawChar):
+ Tell Gfx.cc that it should use drawString instead of drawChar.
- ChangeLog | 14 ++++++
- TODO | 3 ++
+ ChangeLog | 14 ++++++
+ TODO | 3 ++
poppler/CairoOutputDev.cc | 110
++++++++++++++++++++++++++++++++++------------
poppler/CairoOutputDev.h | 7 +--
@@ -59819,25 +61885,25 @@
commit 60d190ef80a0dcd9cc3a67306e2c65c5dd482f24
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Mar 5 04:37:14 2005 +0000
+Date: Sat Mar 5 04:37:14 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- * test/gtk-cairo-test.cc (view_load):
- * test/gtk-splash-test.cc (view_load): Fix missing return
- statement, and remove unused variables.
+ * 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 at yahoo.es>.
+ * configure.ac: Add configure option to enable the default KDE
+ flags as described by Albert Astals Cid <tsdgeos at yahoo.es>.
- * TODO: Update with Jeff's items.
+ * TODO: Update with Jeff's items.
- * .cvsignore:
- * */.cvsignore: Add these to silence CVS.
+ * .cvsignore:
+ * */.cvsignore: Add these to silence CVS.
- ChangeLog | 9 +++++++++
- TODO | 15 +++++++++++----
- configure.ac | 21 +++++++++++++++++++++
+ 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(-)
@@ -59844,15 +61910,15 @@
commit e6706e505c1675724c8870f7c58079932661db5f
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Sat Mar 5 02:19:50 2005 +0000
+Date: Sat Mar 5 02:19:50 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- * .cvsignore:
- * */.cvsignore: Add these to silence CVS.
+ * .cvsignore:
+ * */.cvsignore: Add these to silence CVS.
- .cvsignore | 21 +++++++++++++++++++++
- ChangeLog | 3 +++
+ .cvsignore | 21 +++++++++++++++++++++
+ ChangeLog | 3 +++
fofi/.cvsignore | 8 ++++++++
goo/.cvsignore | 8 ++++++++
poppler/.cvsignore | 10 ++++++++++
@@ -59862,12 +61928,12 @@
commit 932edfc3c5c61e3b3e98957b717abbf8055e1c5e
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 4 19:47:13 2005 +0000
+Date: Fri Mar 4 19:47:13 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Implement same check for gtk+-2.0 tests as for
- cairo.
+ * configure.ac: Implement same check for gtk+-2.0 tests as for
+ cairo.
ChangeLog | 5 +++++
configure.ac | 11 ++++++++---
@@ -59875,18 +61941,18 @@
commit c632b35ad9345f280d78c268f84ae3fd5a3921b9
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 4 16:33:43 2005 +0000
+Date: Fri Mar 4 16:33:43 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- * configure.ac: Only fail hard in check for cairo if the user
- specified --enable-cairo-output (from Brad Hards
- <bradh at frogmouth.net>). Print summary of configure results
- at the
- end of configure script.
+ * configure.ac: Only fail hard in check for cairo if the user
+ specified --enable-cairo-output (from Brad Hards
+ <bradh at 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 at frogmouth.net>).
+ * poppler/poppler-config.h: Remove this file (noticed by Brad
+ Hards <bradh at frogmouth.net>).
ChangeLog | 5 +++++
configure.ac | 17 ++++++++++++++---
@@ -59894,14 +61960,14 @@
commit 80f9c90273eb31ac349c46bf86dedff7daf21db4
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 4 15:32:32 2005 +0000
+Date: Fri Mar 4 15:32:32 2005 +0000
- 2005-03-04 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-04 Kristian Høgsberg <krh at redhat.com>
- * poppler/poppler-config.h: Remove this file (noticed by Brad
- Hards <bradh at frogmouth.net>).
+ * poppler/poppler-config.h: Remove this file (noticed by Brad
+ Hards <bradh at frogmouth.net>).
- ChangeLog | 5 ++
+ ChangeLog | 5 ++
poppler/poppler-config.h | 146
-----------------------------------------------
2 files changed, 5 insertions(+), 146 deletions(-)
@@ -59908,28 +61974,28 @@
commit 338b83b6f08a7212fdde2bbce94385e9a71a3d23
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Fri Mar 4 02:46:44 2005 +0000
+Date: Fri Mar 4 02:46:44 2005 +0000
- 2005-03-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-03 Kristian Høgsberg <krh at redhat.com>
- Patch from Jeff Muizelaar <jrmuizel at nit.ca>:
+ Patch from Jeff Muizelaar <jrmuizel at nit.ca>:
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImage,
- CairoOutputDev::drawImageMask): destroy the image surface and
- free the image buffer.
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImage,
+ CairoOutputDev::drawImageMask): destroy the image surface and
+ free the image buffer.
- ChangeLog | 10 ++++++++++
- autogen.sh | 2 +-
+ ChangeLog | 10 ++++++++++
+ autogen.sh | 2 +-
poppler/CairoOutputDev.cc | 8 +++++---
3 files changed, 16 insertions(+), 4 deletions(-)
commit 062aa51487f539406b54458885b4c9501da3c44d
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Mar 3 20:01:14 2005 +0000
+Date: Thu Mar 3 20:01:14 2005 +0000
- 2005-03-03 Kristian Høgsberg <krh at redhat.com>
+ 2005-03-03 Kristian Høgsberg <krh at redhat.com>
- * autogen.sh: Add to CVS.
+ * autogen.sh: Add to CVS.
ChangeLog | 4 ++++
autogen.sh | 4 ++++
@@ -59937,187 +62003,187 @@
commit cb02d5d0e770e2a8cbe5a8ac810820a2ce5fec0c
Author: Kristian Høgsberg <krh at redhat.com>
-Date: Thu Mar 3 19:45:58 2005 +0000
+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
+ 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/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/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 +++
+ 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(+)
Modified: branches/stable/source/src/libs/poppler/poppler-src/ConfigureChecks.cmake
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/ConfigureChecks.cmake 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/ConfigureChecks.cmake 2017-02-16 16:38:15 UTC (rev 766)
@@ -30,6 +30,7 @@
check_function_exists(pread64 HAVE_PREAD64)
check_function_exists(lseek64 HAVE_LSEEK64)
check_function_exists(gmtime_r HAVE_GMTIME_R)
+check_function_exists(timegm HAVE_TIMEGM)
check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
check_function_exists(localtime_r HAVE_LOCALTIME_R)
check_function_exists(popen HAVE_POPEN)
Modified: branches/stable/source/src/libs/poppler/poppler-src/NEWS
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/NEWS 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/NEWS 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,169 @@
-Release 0.41.0
+Release 0.51.0
core:
+ * Check for error from NSS in SignatureHandler construct. Bug #99363
+ * Add Form[Field|Widget]::setPartialName
+ * Fix memory leak in PDFDoc::markAnnotations
+
+ qt5:
+ * Implement digital signature support. Bug #94378
+ * Add Poppler::FormField::setName
+ * Fix segfault/assert if LinkDestination is constructed with invalid input string. Bug #99357
+
+ utils:
+ * pdfunite: add fields to AcroForm dict. Bug #99141
+
+Release 0.50.0
+ core:
+ * PSOutputDev: Fix PS conversion for some files. Bug #63963
+ * Fix Outline parsing on broken documents. Bug #98732
+ * Fix PDFDoc::saveIncrementalUpdate()'s detection of document being modified. Bug #96561
+ * SplashOutputDev: Read softmask into memstrean in case of matte. Bug #97803
+ * Bail out if Hints nBitsNumObjects or nBitsDiffGroupLength are greater than 32. Bug #94941
+ * CairoOutputDev: initialize CairoOutputDev::antialias. Bug #98983
+ * Fix crash when loading some thumbnails. Bug #97870
+
+ utils:
+ * pdftoppm: Fix -tiff -gray/-mono incorrect output.
+ * pdftops: add -passlevel1customcolor. Bug #97193
+
+
+ build system:
+ * Default to libopenjpeg2 instead of libopenjpeg1
+
+ qt:
+ * Support OCG state change links
+
+ glib:
+ * Use g_slice_new0 for PopplerActionLayer. Bug #98786
+
+Release 0.49.0
+ core:
+ * Merge type3 glyph handling from xpdf 3.04. Bug #96667
+ * Continue rendering in case of 'Singular matrix in shading pattern fill. Bug #98623
+ * Fix memory leak in parametrized gouraudTriangleShadedFill
+ * Fix crash on broken files
+ * PDFDoc::setDocInfoStringEntry(): treat value consisting of just the unicode marker as an empty string
+ * Fix UBSAN warning
+ * Misc compile fixes
+
+ utils:
+ * pdfseparate: remove extra '%' in error message
+
+ build system:
+ * configure: Fix typo in disable nss help string
+
+Release 0.48.0
+ core:
+ * Fix crashes and memory leaks in invalid files.
+ * Small memory usage improvements.
+ * TextOutputDev: Remove null characters from PDF text. Bug #97144
+ * TextOutputDev: Break words on all whitespace characters. Bug #97399
+ * Fix UTF16 decoding of document outline title. Bug #97156
+ * Add functions for named destination name in name-tree/dict
+
+ glib:
+ * Increase glib requirement to 2.41
+
+Release 0.47.0
+ core:
+ * Fix abort on documents where the docinfo obj is not a dict. Bug #97134
+ * Check for XRefEntry existing before using it. Bug #97005
+ * Fix memory leak on PDFDoc::setDocInfoStringEntry() with empty string
+ * Don't presume that DocInfo is a dictionary in XRef::createDocInfoIfNoneExists()
+
+ build system:
+ * configure: Work with non gnu greps
+
+Release 0.46.0
+ core:
+ * cairo: fix bug in setAntialias()
+ * cairo: Fix tiling patterns with BBox with non-zero x,y
+ * cairo: try finding glyphs in substitute fonts by unicode value. Bug #96994
+ * Added XRef modification flag
+ * Added DocInfo setters & getters
+ * Be less strict when parsing FitH Link destinations. Bug #96661
+
+ utils:
+ * pdftocairo: revert the use of groups for blending into white page
+ * pdftocairo: Use fprintf for printing errors
+ * pdfinfo: Don't print pdf info when printing metadata, javascript, or structure. Bug #96801
+
+ glib:
+ * Added document property setters & simplified getters
+ * make document metatag gobject properties writeable
+
+ cpp:
+ * pass len to GooString constructor in detail::ustring_to_unicode_GooString(). Bug #96426
+ * Added functions to save a document
+ * Added document property setters & getters
+
+ qt4:
+ * Added document property setters & simplified getters
+
+ qt5:
+ * Added document property setters & simplified getters
+
+ build system:
+ * configure: Don't use -fPIC on cygwin
+ * configure: Work with non gnu greps
+
+Release 0.45.0
+ core:
+ * SplashOutputDev: Fix iccTransform + splashModeXBGR8
+ * Fix memory leaks
+ * Fix crash in broken files. Bug #95567. Bug #96027
+ * Emulate some non portable glibc functions when not available
+
+ utils:
+ * pdftohtml: Fix crash in broken files. Bug #95563
+ * pdfinfo: convert dates to local time zone
+ * pdfinfo: add -isodates for printing dates in ISO-8601 format
+ * pdfinfo: Fix memory leaks
+
+ glib:
+ * return date in UTC instead of local time. Bug #94173
+
+ cpp:
+ * switched from detail::convert_date() to core's dateStringToTime()
+
+Release 0.44.0
+ core:
+ * Fix Compile in 32bit linux. Bug #95492
+ * Splash: type 3 chars. restore the current position also in output device. Bug #95344
+ * Splash: Improve rendering of some dotted lines. Bug #84693
+ * Refactor GooString::Set(). Bug #94201
+ * Fix typo in GfxPatchMeshShading::parse
+ * Fix memory leak in PSOutputDev::filterPSLabel
+ * Fix memory leak in SignatureHandler::getDefaultFirefoxCertDB_Linux
+ * Fix potential crash in SplashOutputDev::doUpdateFont
+ * Fix potential crash in TextPage::coalesce
+ * Remove call that does nothing
+
+ utils:
+ * pdftocairo: add -antialias option. Bug #94977
+
+Release 0.43.0
+ core:
+ * Implement sanity check for linearization usage. Bug #92482
+ * Add SymbolMT as an alias for the Symbol font. Bug #93168
+ * Fix some blank files. Bug #94756
+ * cairo: fix fillToStrokePathClip crash and rendering. Bug #62905
+ * cairo: Check if PDF knows the width of 'm' in case of substituted font. Bug #94054
+ * cairo: save mask state and don't extend image mask. bug #94234
+ * SplashOuputDev: Compile with C++11 compilers that don't define isinfinite. Bug #94761
+ * typo fixes
+
+ utils:
+ * pdftocairo: Calculate rotation before scaling. Bug #94655
+
+ qt4:
+ * Fix crash on certain PDF form item activation actions. Bug #94873
+
+ qt5:
+ * Fix crash on certain PDF form item activation actions. Bug #94873
+
+Release 0.42.0
+ core:
* Add the support for version 5 + revision 6 documents. Bug #85368
* Add initial support for Signature handling
* Initialize gamut mapping multipliers in ::copy() functions. Bug #90697
Modified: branches/stable/source/src/libs/poppler/poppler-src/config.h.cmake
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/config.h.cmake 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/config.h.cmake 2017-02-16 16:38:15 UTC (rev 766)
@@ -64,6 +64,9 @@
/* Defines if gmtime_r is available on your system */
#cmakedefine HAVE_GMTIME_R 1
+/* Defines if timegm is available on your system */
+#cmakedefine HAVE_TIMEGM 1
+
/* Define if you have the iconv() function and it works. */
#cmakedefine HAVE_ICONV 1
Modified: branches/stable/source/src/libs/poppler/poppler-src/config.h.in
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/config.h.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/config.h.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -150,6 +150,9 @@
/* Define to 1 if you have the <tiffio.h> header file. */
#undef HAVE_TIFFIO_H
+/* Defines if timegm is available on your system */
+#undef HAVE_TIMEGM
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
Modified: branches/stable/source/src/libs/poppler/poppler-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/configure.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/configure.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[42])
+m4_define([poppler_version_minor],[51])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -178,14 +178,10 @@
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]))
+AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM, 1, [Defines if timegm is available on your system]))
AC_CHECK_FUNC(rand_r, AC_DEFINE(HAVE_RAND_R, 1, [Defines if rand_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
- AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
-fi
-
AC_CHECK_FUNC(nanosleep,,)
dnl try in librt if not found in current LIBS
if test x$ac_cv_func_nanosleep = xno
@@ -211,25 +207,26 @@
openjpeg_header=yes
-dnl test for libopenjpeg1
-if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
- PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
- [openjpeg1="yes"],
- [AC_CHECK_LIB([openjpeg], [opj_cio_open],
- [openjpeg1="yes"
- LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
- AC_CHECK_HEADERS([openjpeg.h],,
- [openjpeg_header="no"])])
+dnl test for libopenjpeg2
+if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
+ PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
+ [openjpeg2=yes],[openjpeg2=no])
fi
-dnl test for libopenjpeg2
-if test x$openjpeg1 = xno; then
- if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
- PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
- [openjpeg2=yes],[openjpeg2=no])
+dnl test for libopenjpeg1
+if test x$openjpeg2 = xno; then
+ if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
+ PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
+ [openjpeg1="yes"],
+ [AC_CHECK_LIB([openjpeg], [opj_cio_open],
+ [openjpeg1="yes"
+ LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
+ AC_CHECK_HEADERS([openjpeg.h],,
+ [openjpeg_header="no"])])
fi
fi
+
if test x$enable_libopenjpeg = xopenjpeg1 && test x$openjpeg1 = xno; then
if test x$openjpeg_header = xno; then
AC_MSG_ERROR("*** libopenjpeg headers not found ***")
@@ -266,7 +263,7 @@
dnl Test for NSS
AC_ARG_ENABLE(libnss,
- AC_HELP_STRING([--disable-nss],
+ AC_HELP_STRING([--disable-libnss],
[Do not build against libnss3.]),
enable_libnss=$enableval,
enable_libnss="try")
@@ -643,7 +640,7 @@
POPPLER_GLIB_DISABLE_DEPRECATED=""
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
- GLIB_REQUIRED=2.18
+ GLIB_REQUIRED=2.41
AC_SUBST(GLIB_REQUIRED)
AC_ARG_ENABLE(poppler-glib,
AC_HELP_STRING([--disable-poppler-glib],
@@ -776,7 +773,7 @@
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_MSG_RESULT([no])
# moc was not the qt5 one, try with moc-qt5
@@ -783,13 +780,13 @@
AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser])
qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt5tooldir/moc -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found
enable_poppler_qt5=no;
@@ -961,8 +958,8 @@
esac
case "$host_os" in
- mingw*)
- # mingw prints "warning: -fPIC ignored for target (all code is position independent)"
+ mingw*|cygwin*)
+ # mingw and cygwin print "warning: -fPIC ignored for target (all code is position independent)"
# for every file
;;
*)
@@ -1089,5 +1086,5 @@
fi
if test x$enable_libopenjpeg != xyes; then
- echo " Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained."
+ echo " Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained."
fi
Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiBase.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiBase.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiBase.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,6 +15,7 @@
//
// Copyright (C) 2008 Ed Avis <eda at waniasset.com>
// Copyright (C) 2011 Jim Meyering <jim at meyering.net>
+// Copyright (C) 2016 Albert Astals Cid <aacid at 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
@@ -196,6 +197,8 @@
GBool FoFiBase::checkRegion(int pos, int size) {
return pos >= 0 &&
+ pos < INT_MAX - size &&
+ size < INT_MAX - pos &&
pos + size >= pos &&
pos + size <= len;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -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) 2016 Albert Astals Cid <aacid at 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
@@ -19,7 +33,7 @@
// Type 1 and 1C font data
//------------------------------------------------------------------------
-const char *fofiType1StandardEncoding[256] = {
+const char * const fofiType1StandardEncoding[256] = {
NULL,
NULL,
NULL,
@@ -278,7 +292,7 @@
NULL
};
-const char *fofiType1ExpertEncoding[256] = {
+const char * const fofiType1ExpertEncoding[256] = {
NULL,
NULL,
NULL,
Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiEncodings.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -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) 2016 Albert Astals Cid <aacid at 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 FOFIENCODINGS_H
#define FOFIENCODINGS_H
@@ -19,8 +33,8 @@
// Type 1 and 1C font data
//------------------------------------------------------------------------
-extern const char *fofiType1StandardEncoding[256];
-extern const char *fofiType1ExpertEncoding[256];
+extern const char * const fofiType1StandardEncoding[256];
+extern const char * const fofiType1ExpertEncoding[256];
//------------------------------------------------------------------------
// Type 1C font data
Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -16,13 +16,13 @@
// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright (C) 2008, 2009, 2012, 2014, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2009, 2012, 2014-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2008 Tomas Are Haavet <tomasare at gmail.com>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2014 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2015 Aleksei Volkov <Aleksei Volkov>
-// Copyright (C) 2015 William Bader <williambader at hotmail.com>
+// Copyright (C) 2015, 2016 William Bader <williambader at 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
@@ -727,6 +727,7 @@
void FoFiTrueType::convertToType0(char *psName, int *cidMap, int nCIDs,
GBool needVerticalMetrics,
+ int *maxValidGlyph,
FoFiOutputFunc outputFunc,
void *outputStream) {
GooString *buf;
@@ -733,6 +734,8 @@
GooString *sfntsName;
int maxUsedGlyph, n, i, j;
+ *maxValidGlyph = -1;
+
if (openTypeCFF) {
return;
}
@@ -754,6 +757,13 @@
// that refers to one of the unused glyphs -- this results in PS
// errors if we simply use maxUsedGlyph+1 for the Type 0 font. So
// we compromise by always defining at least 256 glyphs.)
+ // Some fonts have a large nGlyphs but maxUsedGlyph of 0.
+ // These fonts might reference any glyph.
+ // Return the last written glyph number in maxValidGlyph.
+ // PSOutputDev::drawString() can use maxValidGlyph to avoid
+ // referencing zero-length glyphs that we trimmed.
+ // This allows pdftops to avoid writing huge files while still
+ // handling the rare PDF that uses a zero-length glyph.
if (cidMap) {
n = nCIDs;
} else if (nGlyphs > maxUsedGlyph + 256) {
@@ -765,6 +775,7 @@
} else {
n = nGlyphs;
}
+ *maxValidGlyph = n-1;
for (i = 0; i < n; i += 256) {
(*outputFunc)(outputStream, "10 dict begin\n", 14);
(*outputFunc)(outputStream, "/FontName /", 11);
@@ -1359,8 +1370,11 @@
tables[j].checksum = getU32BE(pos + 4, &parsedOk);
tables[j].offset = (int)getU32BE(pos + 8, &parsedOk);
tables[j].len = (int)getU32BE(pos + 12, &parsedOk);
- if (tables[j].offset + tables[j].len >= tables[j].offset &&
- tables[j].offset + tables[j].len <= len) {
+ if (unlikely((tables[j].offset < 0) ||
+ (tables[j].len < 0) ||
+ (tables[j].offset < INT_MAX - tables[j].len) ||
+ (tables[j].len > INT_MAX - tables[j].offset) ||
+ (tables[j].offset + tables[j].len >= tables[j].offset && tables[j].offset + tables[j].len <= len))) {
// ignore any bogus entries in the table directory
++j;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/fofi/FoFiTrueType.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,6 +17,7 @@
// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
// Copyright (C) 2011, 2012 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2016 William Bader <williambader at 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
@@ -144,6 +145,7 @@
// <nCIDs> entries. (Not useful for OpenType CFF fonts.)
void convertToType0(char *psName, int *cidMap, int nCIDs,
GBool needVerticalMetrics,
+ int *maxValidGlyph,
FoFiOutputFunc outputFunc, void *outputStream);
// Convert to a Type 0 (but non-CID) composite font, suitable for
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -18,7 +18,7 @@
// Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2008-2011 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008-2011, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2011 Kenji Uno <ku at digitaldolphins.jp>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
@@ -25,6 +25,7 @@
// Copyright (C) 2012 Pino Toscano <pino at kde.org>
// Copyright (C) 2013 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 William Bader <williambader at hotmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -162,7 +163,7 @@
// assert(s != s1) the roundedSize condition ensures this
if (newLength < length) {
memcpy(s1, s, newLength);
- } else {
+ } else if (length > 0) {
memcpy(s1, s, length);
}
if (s != sStatic)
@@ -176,37 +177,22 @@
s[length] = '\0';
}
-GooString* GooString::Set(const char *s1, int s1Len, const char *s2, int s2Len)
+GooString* GooString::Set(const char *newStr, int newLen)
{
- int newLen = 0;
- char *p;
-
- if (s1) {
- if (CALC_STRING_LEN == s1Len) {
- s1Len = strlen(s1);
- } else
- assert(s1Len >= 0);
- newLen += s1Len;
+ if (!newStr) {
+ clear();
+ return this;
}
- if (s2) {
- if (CALC_STRING_LEN == s2Len) {
- s2Len = strlen(s2);
- } else
- assert(s2Len >= 0);
- newLen += s2Len;
+ if (newLen == CALC_STRING_LEN) {
+ newLen = strlen(newStr);
+ } else {
+ assert(newLen >= 0);
}
resize(newLen);
- p = s;
- if (s1) {
- memcpy(p, s1, s1Len);
- p += s1Len;
- }
- if (s2) {
- memcpy(p, s2, s2Len);
- p += s2Len;
- }
+ memmove(s, newStr, newLen);
+
return this;
}
@@ -214,6 +200,10 @@
s = NULL;
length = 0;
Set(NULL);
+
+#if __cplusplus >= 201103L
+ static_assert(sizeof(GooString) == GooString::STR_FINAL_SIZE, "You should check memory alignment or STR_STATIC_SIZE calculation.");
+#endif
}
GooString::GooString(const char *sA) {
@@ -244,7 +234,9 @@
GooString::GooString(GooString *str1, GooString *str2) {
s = NULL;
length = 0;
- Set(str1->getCString(), str1->length, str2->getCString(), str2->length);
+ resize(str1->length + str2->length);
+ memcpy(s, str1->getCString(), str1->length);
+ memcpy(s + str1->length, str2->getCString(), str2->length);
}
GooString *GooString::fromInt(int x) {
@@ -920,7 +912,7 @@
return strcmp(s + length - suffixLen, suffix) == 0;
}
-GBool GooString::hasUnicodeMarker(void)
+GBool GooString::hasUnicodeMarker(void) const
{
return length > 1 && (s[0] & 0xff) == 0xfe && (s[1] & 0xff) == 0xff;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,6 +21,7 @@
// Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2013 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 Adam Reichold <adam.reichold at t-online.de>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -80,11 +81,10 @@
// Create a string from <lengthA> chars at <idx> in <str>.
GooString(GooString *str, int idx, int lengthA);
- // Set content of a string to concatination of <s1> and <s2>. They can both
- // be NULL. if <s1Len> or <s2Len> is CALC_STRING_LEN, then length of the string
- // will be calculated with strlen(). Otherwise we assume they are a valid
- // length of string (or its substring)
- GooString* Set(const char *s1, int s1Len=CALC_STRING_LEN, const char *s2=NULL, int s2Len=CALC_STRING_LEN);
+ // Set content of a string to <newStr>. If <newLen> is CALC_STRING_LEN, then
+ // length of the string will be calculated with strlen(). Otherwise we assume
+ // this is a valid length of <newStr> (or its substring)
+ GooString* Set(const char *newStr, int newLen=CALC_STRING_LEN);
// Copy a string.
explicit GooString(const GooString *str);
@@ -175,7 +175,8 @@
// Return true if string ends with suffix
GBool endsWith(const char *suffix) const;
- GBool hasUnicodeMarker(void);
+ GBool hasUnicodeMarker(void) const;
+ GBool hasJustUnicodeMarker(void) const { return length == 2 && hasUnicodeMarker(); }
// Sanitizes the string so that it does
// not contain any ( ) < > [ ] { } / %
@@ -190,14 +191,8 @@
// You can tweak the final object size for different time/space tradeoffs.
// In libc malloc(), rounding is 16 so it's best to choose a value that
// is a multiple of 16.
- class MemoryLayout {
- char c[sizeof(char*)];
- int i;
- char* s;
- };
-
static const int STR_FINAL_SIZE = 32;
- static const int STR_STATIC_SIZE = STR_FINAL_SIZE - sizeof(MemoryLayout) + sizeof(char*);
+ static const int STR_STATIC_SIZE = STR_FINAL_SIZE - sizeof(int) - sizeof(char*);
int roundedSize(int len);
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/Makefile.am
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -40,7 +40,8 @@
ImgWriter.cc \
gtypes_p.h \
gstrtod.cc \
- grandom.cc
+ grandom.cc \
+ glibc.cc
if BUILD_LIBJPEG
libjpeg_includes = $(LIBJPEG_CFLAGS)
@@ -64,3 +65,5 @@
$(libtiff_includes) \
$(libjpeg2000_includes) \
$(libpng_includes)
+
+EXTRA_DIST = glibc.h
\ No newline at end of file
Added: branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.cc (rev 0)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// glibc.h
+//
+// Emulate various non-portable glibc functions.
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2016 Adrian Johnson <ajohnson at redneon.com>
+//
+//========================================================================
+
+#include "glibc.h"
+
+#ifndef HAVE_GMTIME_R
+struct tm *gmtime_r(const time_t *timep, struct tm *result)
+{
+ struct tm *gt;
+ gt = gmtime(timep);
+ if (gt)
+ *result = *gt;
+ return gt;
+}
+#endif
+
+#ifndef HAVE_LOCALTIME_R
+struct tm *localtime_r(const time_t *timep, struct tm *result)
+{
+ struct tm *lt;
+ lt = localtime(timep);
+ *result = *lt;
+ return lt;
+}
+#endif
+
+#ifndef HAVE_TIMEGM
+// Get offset of local time from UTC in seconds. DST is ignored.
+static time_t getLocalTimeZoneOffset()
+{
+ time_t utc, local;
+ struct tm tm_utc;
+ time (&utc);
+ gmtime_r(&utc, &tm_utc);
+ local = mktime(&tm_utc);
+ return difftime(utc, local);
+}
+
+time_t timegm(struct tm *tm)
+{
+ tm->tm_isdst = 0;
+ time_t t = mktime(tm);
+ if (t == -1)
+ return t;
+
+ t += getLocalTimeZoneOffset();
+ return t;
+}
+#endif
Property changes on: branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.h (rev 0)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,37 @@
+//========================================================================
+//
+// glibc.h
+//
+// Emulate various non-portable glibc functions.
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2016 Adrian Johnson <ajohnson at redneon.com>
+//
+//========================================================================
+
+#ifndef GLIBC_H
+#define GLIBC_H
+
+#include "config.h"
+
+#include <time.h>
+
+extern "C" {
+
+#ifndef HAVE_GMTIME_R
+struct tm *gmtime_r(const time_t *timep, struct tm *result);
+#endif
+
+#ifndef HAVE_LOCALTIME_R
+struct tm *localtime_r(const time_t *timep, struct tm *result);
+#endif
+
+#ifndef HAVE_TIMEGM
+time_t timegm(struct tm *tm);
+#endif
+
+};
+
+#endif // GLIBC_H
+
Property changes on: branches/stable/source/src/libs/poppler/poppler-src/goo/glibc.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/poppler/poppler-src/gtk-doc.make
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/gtk-doc.make 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/gtk-doc.make 2017-02-16 16:38:15 UTC (rev 766)
@@ -142,7 +142,7 @@
GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XML_0=@echo " DOC Building XML";
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
$(GTK_DOC_V_XML)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
-// Copyright (C) 2007-2013, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2013, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2007, 2008 Iñigo MartÃnez <inigomartinez at gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
@@ -6849,6 +6849,7 @@
obj2.free();
}
} else {
+ nConfigurations = 0;
configurations = NULL;
}
obj1.free();
@@ -6879,6 +6880,7 @@
obj2.free();
} else {
+ nAssets = 0;
assets = NULL;
}
obj1.free();
@@ -7064,6 +7066,7 @@
} else {
params = NULL;
}
+ obj1.free();
}
AnnotRichMedia::Instance::~Instance()
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,7 +21,7 @@
// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
// Copyright (C) 2008 Pino Toscano <pino at kde.org>
// Copyright (C) 2008 Tomas Are Haavet <tomasare at gmail.com>
-// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009-2011, 2013, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2012, 2015 Tobias Koenig <tokoe at kdab.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
@@ -651,9 +651,9 @@
// Delete appearance streams and reset appearance state
void invalidateAppearance();
+ Object annotObj;
+
int refCnt;
-
- Object annotObj;
// required data
AnnotSubtype type; // Annotation type
@@ -661,9 +661,9 @@
// optional data
GooString *contents; // Contents
- int page; // P
GooString *name; // NM
GooString *modified; // M
+ int page; // P
Guint flags; // F (must be a 32 bit unsigned int)
AnnotAppearance *appearStreams; // AP
Object appearance; // a reference to the Form XObject stream
@@ -847,8 +847,8 @@
GooString* getTitle() { return title; }
AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
- LinkAction* getAction() { return action; }
- LinkAction *getAdditionalAction(AdditionalActionsType type);
+ LinkAction* getAction() { return action; } // The caller should now delete the result
+ LinkAction *getAdditionalAction(AdditionalActionsType type); // The caller should delete the result
private:
void initialize(PDFDoc *docA, Dict *dict);
@@ -1322,9 +1322,9 @@
AnnotWidgetHighlightMode getMode() { return mode; }
AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
- LinkAction *getAction() { return action; }
- LinkAction *getAdditionalAction(AdditionalActionsType type);
- LinkAction *getFormAdditionalAction(FormAdditionalActionsType type);
+ LinkAction *getAction() { return action; } // The caller should not delete the result
+ LinkAction *getAdditionalAction(AdditionalActionsType type); // The caller should delete the result
+ LinkAction *getFormAdditionalAction(FormAdditionalActionsType type); // The caller should delete the result
Dict *getParent() { return parent; }
private:
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoFontEngine.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoFontEngine.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoFontEngine.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -27,7 +27,7 @@
// Copyright (C) 2010 Jan Kümmel <jan+freedesktop at snorc.org>
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
-// Copyright (C) 2015 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2015, 2016 Jason Crain <jason at aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -113,7 +113,7 @@
double
CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
{
- double w1, w2;
+ double w1, w2, w3;
CharCode code;
char *name;
@@ -143,7 +143,8 @@
cairo_font_options_destroy(options);
w2 = extents.x_advance;
}
- if (!gfxFont->isSymbolic()) {
+ w3 = ((Gfx8BitFont *)gfxFont)->getWidth(0);
+ if (!gfxFont->isSymbolic() && w2 > 0 && w1 > w3) {
// if real font is substantially narrower than substituted
// font, reduce the font size accordingly
if (w1 > 0.01 && w1 < 0.9 * w2) {
@@ -466,6 +467,11 @@
if ((name = enc[i])) {
codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
if (codeToGID[i] == 0) {
+ Unicode u;
+ u = globalParams->mapNameToUnicodeText (name);
+ codeToGID[i] = FT_Get_Char_Index (face, u);
+ }
+ if (codeToGID[i] == 0) {
name = GfxFont::getAlternateName(name);
if (name) {
codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -20,7 +20,7 @@
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
// Copyright (C) 2006-2011, 2013, 2014 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2008 Carl Worth <cworth at cworth.org>
-// Copyright (C) 2008-2015 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008-2016 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
// Copyright (C) 2008, 2009 Chris Wilson <chris at chris-wilson.co.uk>
// Copyright (C) 2008, 2012 Hib Eris <hib at hiberis.nl>
@@ -27,7 +27,7 @@
// Copyright (C) 2009, 2010 David Benjamin <davidben at mit.edu>
// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2012 Patrick Pfeifer <p2000 at mailinator.com>
-// Copyright (C) 2012, 2015 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2012, 2015, 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
//
// To see a description of the changes please see the Changelog file that
@@ -150,6 +150,7 @@
inType3Char = gFalse;
t3_glyph_has_bbox = gFalse;
text_matrix_valid = gTrue;
+ antialias = CAIRO_ANTIALIAS_DEFAULT;
groupColorSpaceStack = NULL;
maskStack = NULL;
@@ -206,6 +207,7 @@
/* save the initial matrix so that we can use it for type3 fonts. */
//XXX: is this sufficient? could we miss changes to the matrix somehow?
cairo_get_matrix(cairo, &orig_matrix);
+ setContextAntialias(cairo, antialias);
} else {
this->cairo = NULL;
this->cairo_shape = NULL;
@@ -228,6 +230,26 @@
}
}
+void CairoOutputDev::setAntialias(cairo_antialias_t antialias)
+{
+ this->antialias = antialias;
+ if (cairo)
+ setContextAntialias (cairo, antialias);
+ if (cairo_shape)
+ setContextAntialias (cairo_shape, antialias);
+}
+
+void CairoOutputDev::setContextAntialias(cairo_t *cr, cairo_antialias_t antialias)
+{
+ cairo_font_options_t *font_options;
+ cairo_set_antialias (cr, antialias);
+ font_options = cairo_font_options_create ();
+ cairo_get_font_options (cr, font_options);
+ cairo_font_options_set_antialias (font_options, antialias);
+ cairo_set_font_options (cr, font_options);
+ cairo_font_options_destroy (font_options);
+}
+
void CairoOutputDev::startDoc(PDFDoc *docA,
CairoFontEngine *parentFontEngine) {
doc = docA;
@@ -278,6 +300,9 @@
ms->mask_matrix = mask_matrix;
ms->next = maskStack;
maskStack = ms;
+
+ if (strokePathClip)
+ strokePathClip->ref_count++;
}
void CairoOutputDev::restoreState(GfxState *state) {
@@ -305,6 +330,14 @@
maskStack = ms->next;
delete ms;
}
+
+ if (strokePathClip && --strokePathClip->ref_count == 0) {
+ delete strokePathClip->path;
+ if (strokePathClip->dashes)
+ gfree (strokePathClip->dashes);
+ gfree (strokePathClip);
+ strokePathClip = NULL;
+ }
}
void CairoOutputDev::updateAll(GfxState *state) {
@@ -780,7 +813,14 @@
align_stroke_coords = gFalse;
cairo_set_source (cairo, stroke_pattern);
LOG(printf ("stroke\n"));
- cairo_stroke (cairo);
+ if (strokePathClip) {
+ cairo_push_group (cairo);
+ cairo_stroke (cairo);
+ cairo_pop_group_to_source (cairo);
+ fillToStrokePathClip (state);
+ } else {
+ cairo_stroke (cairo);
+ }
if (cairo_shape) {
doPath (cairo_shape, state, state->getPath());
cairo_stroke (cairo_shape);
@@ -803,6 +843,11 @@
if (mask) {
cairo_save (cairo);
cairo_clip (cairo);
+ if (strokePathClip) {
+ cairo_push_group (cairo);
+ fillToStrokePathClip (state);
+ cairo_pop_group_to_source (cairo);
+ }
cairo_set_matrix (cairo, &mask_matrix);
cairo_mask (cairo, mask);
cairo_restore (cairo);
@@ -856,9 +901,11 @@
cairo_t *old_cairo;
double xMin, yMin, xMax, yMax;
double width, height;
+ double scaleX, scaleY;
int surface_width, surface_height;
StrokePathClip *strokePathTmp;
GBool adjusted_stroke_width_tmp;
+ cairo_pattern_t *maskTmp;
width = bbox[2] - bbox[0];
height = bbox[3] - bbox[1];
@@ -879,6 +926,8 @@
double heightX = 0, heightY = height;
cairo_matrix_transform_distance (&matrix, &heightX, &heightY);
surface_height = ceil (sqrt (heightX * heightX + heightY * heightY));
+ scaleX = surface_width / width;
+ scaleY = surface_height / height;
surface = cairo_surface_create_similar (cairo_get_target (cairo),
CAIRO_CONTENT_COLOR_ALPHA,
@@ -889,13 +938,18 @@
old_cairo = cairo;
cairo = cairo_create (surface);
cairo_surface_destroy (surface);
- cairo_scale (cairo, surface_width / width, surface_height / height);
+ setContextAntialias(cairo, antialias);
box.x1 = bbox[0]; box.y1 = bbox[1];
box.x2 = bbox[2]; box.y2 = bbox[3];
+ cairo_scale (cairo, scaleX, scaleY);
+ cairo_translate (cairo, -box.x1, -box.y1);
+
strokePathTmp = strokePathClip;
strokePathClip = NULL;
adjusted_stroke_width_tmp = adjusted_stroke_width;
+ maskTmp = mask;
+ mask = NULL;
gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef());
if (paintType == 2)
inUncoloredPattern = gTrue;
@@ -905,6 +959,7 @@
delete gfx;
strokePathClip = strokePathTmp;
adjusted_stroke_width = adjusted_stroke_width_tmp;
+ mask = maskTmp;
pattern = cairo_pattern_create_for_surface (cairo_get_target (cairo));
cairo_destroy (cairo);
@@ -915,7 +970,8 @@
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_matrix_init_scale (&matrix, scaleX, scaleY);
+ cairo_matrix_translate (&matrix, -box.x1, -box.y1);
cairo_pattern_set_matrix (pattern, &matrix);
cairo_transform (cairo, &pattern_matrix);
@@ -1296,6 +1352,7 @@
strokePathClip->cap = cairo_get_line_cap (cairo);
strokePathClip->join = cairo_get_line_join (cairo);
strokePathClip->miter = cairo_get_miter_limit (cairo);
+ strokePathClip->ref_count = 1;
}
void CairoOutputDev::fillToStrokePathClip(GfxState *state) {
@@ -1303,7 +1360,6 @@
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);
@@ -1312,12 +1368,6 @@
cairo_stroke (cairo);
cairo_restore (cairo);
-
- delete strokePathClip->path;
- if (strokePathClip->dashes)
- gfree (strokePathClip->dashes);
- gfree (strokePathClip);
- strokePathClip = NULL;
}
void CairoOutputDev::beginString(GfxState *state, GooString *s)
@@ -1590,6 +1640,7 @@
cairo_surface_t *cairo_shape_surface = cairo_surface_create_similar_clip (cairo, CAIRO_CONTENT_ALPHA);
cairo_shape = cairo_create (cairo_shape_surface);
cairo_surface_destroy (cairo_shape_surface);
+ setContextAntialias(cairo_shape, antialias);
/* the color doesn't matter as long as it is opaque */
cairo_set_source_rgb (cairo_shape, 0, 0, 0);
@@ -1744,6 +1795,7 @@
cairo_surface_t *source = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
cairo_t *maskCtx = cairo_create(source);
+ setContextAntialias(maskCtx, antialias);
//XXX: hopefully this uses the correct color space */
if (!alpha && groupColorSpaceStack->cs) {
@@ -2396,7 +2448,6 @@
* 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);
if (state->getFillColorSpace()->getMode() == csPattern) {
cairo_matrix_init_translate (&matrix, 0, scaledHeight);
@@ -2425,6 +2476,11 @@
cairo_rectangle (cairo, 0., 0., scaledWidth, scaledHeight);
cairo_clip (cairo);
+ if (strokePathClip) {
+ cairo_push_group (cairo);
+ fillToStrokePathClip (state);
+ cairo_pop_group_to_source (cairo);
+ }
cairo_mask (cairo, pattern);
//cairo_get_matrix(cairo, &matrix);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -18,10 +18,11 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright (C) 2008, 2009, 2011-2015 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008, 2009, 2011-2016 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -265,6 +266,7 @@
void setCairo (cairo_t *cr);
void setTextPage (TextPage *text);
void setPrinting (GBool printing) { this->printing = printing; needFontUpdate = gTrue; }
+ void setAntialias(cairo_antialias_t antialias);
void setInType3Char(GBool inType3Char) { this->inType3Char = inType3Char; }
void getType3GlyphWidth (double *wx, double *wy) { *wx = t3_glyph_wx; *wy = t3_glyph_wy; }
@@ -287,6 +289,7 @@
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
GBool setMimeDataForJBIG2Globals (Stream *str, cairo_surface_t *image);
#endif
+ static void setContextAntialias(cairo_t *cr, cairo_antialias_t antialias);
GfxRGB fill_color, stroke_color;
cairo_pattern_t *fill_pattern, *stroke_pattern;
@@ -308,6 +311,7 @@
cairo_line_cap_t cap;
cairo_line_join_t join;
double miter;
+ int ref_count;
} *strokePathClip;
PDFDoc *doc; // the current document
@@ -338,7 +342,7 @@
double t3_glyph_wx, t3_glyph_wy;
GBool t3_glyph_has_bbox;
double t3_glyph_bbox[4];
-
+ cairo_antialias_t antialias;
GBool prescaleImages;
TextPage *text; // text for the current page
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -32,6 +32,7 @@
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
// Copyright (C) 2014 Ed Porras <ed at moto-research.com>
// Copyright (C) 2015 Even Rouault <even.rouault at spatialys.com>
+// Copyright (C) 2016 Masamichi Hosoda <trueroad at trueroad.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
@@ -451,7 +452,7 @@
LinkDest *Catalog::findDest(GooString *name) {
LinkDest *dest;
- Object obj1, obj2;
+ Object obj1;
GBool found;
// try named destination dictionary then name tree
@@ -472,12 +473,22 @@
if (!found)
return NULL;
- // construct LinkDest
+ dest = createLinkDest(&obj1);
+ obj1.free();
+
+ return dest;
+}
+
+LinkDest *Catalog::createLinkDest(Object *obj)
+{
+ LinkDest *dest;
+ Object obj2;
+
dest = NULL;
- if (obj1.isArray()) {
- dest = new LinkDest(obj1.getArray());
- } else if (obj1.isDict()) {
- if (obj1.dictLookup("D", &obj2)->isArray())
+ if (obj->isArray()) {
+ dest = new LinkDest(obj->getArray());
+ } else if (obj->isDict()) {
+ if (obj->dictLookup("D", &obj2)->isArray())
dest = new LinkDest(obj2.getArray());
else
error(errSyntaxWarning, -1, "Bad named destination value");
@@ -485,7 +496,6 @@
} else {
error(errSyntaxWarning, -1, "Bad named destination value");
}
- obj1.free();
if (dest && !dest->isOk()) {
delete dest;
dest = NULL;
@@ -494,6 +504,57 @@
return dest;
}
+int Catalog::numDests()
+{
+ Object *obj;
+
+ obj= getDests();
+ if (!obj->isDict()) {
+ return 0;
+ }
+ return obj->dictGetLength();
+}
+
+char *Catalog::getDestsName(int i)
+{
+ Object *obj;
+
+ obj= getDests();
+ if (!obj->isDict()) {
+ return NULL;
+ }
+ return obj->dictGetKey(i);
+}
+
+LinkDest *Catalog::getDestsDest(int i)
+{
+ LinkDest *dest;
+ Object *obj, obj1;
+
+ obj= getDests();
+ if (!obj->isDict()) {
+ return NULL;
+ }
+ obj->dictGetVal(i, &obj1);
+ dest = createLinkDest(&obj1);
+ obj1.free();
+
+ return dest;
+}
+
+LinkDest *Catalog::getDestNameTreeDest(int i)
+{
+ LinkDest *dest;
+ Object obj;
+
+ catalogLocker();
+ getDestNameTree()->getValue(i).fetch(xref, &obj);
+ dest = createLinkDest(&obj);
+ obj.free();
+
+ return dest;
+}
+
FileSpec *Catalog::embeddedFile(int i)
{
Object efDict;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -25,6 +25,7 @@
// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
+// Copyright (C) 2016 Masamichi Hosoda <trueroad at trueroad.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
@@ -150,6 +151,24 @@
Object *getDests();
+ // Get the number of named destinations in name-dict
+ int numDests();
+
+ // Get the i'th named destination name in name-dict
+ char *getDestsName(int i);
+
+ // Get the i'th named destination link destination in name-dict
+ LinkDest *getDestsDest(int i);
+
+ // Get the number of named destinations in name-tree
+ int numDestNameTree() { return getDestNameTree()->numEntries(); }
+
+ // Get the i'th named destination name in name-tree
+ GooString *getDestNameTreeName(int i) { return getDestNameTree()->getName(i); }
+
+ // Get the i'th named destination link destination in name-tree
+ LinkDest *getDestNameTreeDest(int i);
+
// Get the number of embedded files
int numEmbeddedFiles() { return getEmbeddedFileNameTree()->numEntries(); }
@@ -263,6 +282,7 @@
NameTree *getDestNameTree();
NameTree *getEmbeddedFileNameTree();
NameTree *getJSNameTree();
+ LinkDest *createLinkDest(Object *obj);
#if MULTITHREADED
GooMutex mutex;
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -6,6 +6,7 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
+// Copyright (C) 2016 Adrian Johnson <ajohnson at 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
@@ -22,6 +23,7 @@
#include <config.h>
+#include "glibc.h"
#include "DateInfo.h"
#include <stdio.h>
@@ -74,7 +76,7 @@
return gFalse;
}
-
+// Convert time to PDF date string
GooString *timeToDateString(time_t *timet) {
GooString *dateString;
char s[5];
@@ -81,13 +83,9 @@
struct tm *gt;
size_t len;
time_t timep = timet ? *timet : time(NULL);
-
-#ifdef HAVE_GMTIME_R
struct tm t;
+
gt = gmtime_r (&timep, &t);
-#else
- gt = gmtime (&timep);
-#endif
dateString = new GooString ("D:");
@@ -118,27 +116,35 @@
return dateString;
}
-time_t pdfTimeToInteger(GooString *time_str)
-{
+// Convert PDF date string to time. Returns -1 if conversion fails.
+time_t dateStringToTime(GooString *dateString) {
int year, mon, day, hour, min, sec, tz_hour, tz_minute;
char tz;
- struct tm time_struct;
+ struct tm tm;
+ time_t time;
- if (!parseDateString (time_str->getCString(), &year,
- &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute))
- return 0;
+ if (!parseDateString (dateString->getCString(), &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute))
+ return -1;
- time_struct.tm_year = year - 1900;
- time_struct.tm_mon = mon - 1;
- time_struct.tm_mday = day;
- time_struct.tm_hour = hour;
- time_struct.tm_min = min;
- time_struct.tm_sec = sec;
- time_struct.tm_wday = -1;
- time_struct.tm_yday = -1;
- time_struct.tm_isdst = -1;
+ tm.tm_year = year - 1900;
+ tm.tm_mon = mon - 1;
+ tm.tm_mday = day;
+ tm.tm_hour = hour;
+ tm.tm_min = min;
+ tm.tm_sec = sec;
+ tm.tm_wday = -1;
+ tm.tm_yday = -1;
+ tm.tm_isdst = -1; /* 0 = DST off, 1 = DST on, -1 = don't know */
- time_t unix_time = mktime(&time_struct);
+ /* compute tm_wday and tm_yday and check date */
+ time = timegm (&tm);
+ if (time == (time_t)-1)
+ return time;
- return unix_time;
+ time_t offset = (tz_hour*60 + tz_minute)*60;
+ if (tz == '-')
+ offset *= -1;
+ time -= offset;
+
+ return time;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -6,6 +6,7 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
+// Copyright (C) 2016 Adrian Johnson <ajohnson at 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
@@ -33,6 +34,10 @@
* If timet is NULL, current time is used.
*/
GooString *timeToDateString(time_t *timet);
-time_t pdfTimeToInteger(GooString *time_str);
+/* Convert PDF date string to time.
+ * Returns -1 if conversion fails.
+ */
+time_t dateStringToTime(GooString *dateString);
+
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Decrypt.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Decrypt.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Decrypt.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,12 +14,13 @@
// under GPL version 2 or later
//
// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
-// Copyright (C) 2008, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2010, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Matthias Franz <matthias at ktug.or.kr>
// Copyright (C) 2009 David Benjamin <davidben at mit.edu>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2016 Alok Anand <alok4nand at gmail.com>
+// Copyright (C) 2016 Thomas Freitag <Thomas.Freitag at 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
@@ -348,6 +349,8 @@
case cryptAES256:
objKeyLength = keyLength;
break;
+ case cryptNone:
+ break;
}
charactersRead = 0;
@@ -432,6 +435,8 @@
state.aes256.bufIdx = 0;
state.aes256.paddingReached = gFalse;
break;
+ case cryptNone:
+ break;
}
}
@@ -472,6 +477,8 @@
c = state.aes256.buf[state.aes256.bufIdx++];
}
break;
+ case cryptNone:
+ break;
}
return (nextCharBuff = c);
}
@@ -512,6 +519,8 @@
}
state.aes256.bufIdx = 16;
break;
+ case cryptNone:
+ break;
}
}
@@ -553,6 +562,8 @@
c = state.aes256.buf[state.aes256.bufIdx++];
}
break;
+ case cryptNone:
+ break;
}
return (nextCharBuff = c);
}
@@ -1444,22 +1455,22 @@
//------------------------------------------------------------------------
// SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words.
static const uint64_t K[80] = {
- 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL,
- 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
- 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
- 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
- 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, 0x983e5152ee66dfabULL,
- 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
- 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL,
- 0x53380d139d95b3dfULL, 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
- 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
- 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
- 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL,
- 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
- 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, 0xca273eceea26619cULL,
- 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
- 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
- 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+ 0x428a2f98d728ae22ull, 0x7137449123ef65cdull, 0xb5c0fbcfec4d3b2full, 0xe9b5dba58189dbbcull, 0x3956c25bf348b538ull,
+ 0x59f111f1b605d019ull, 0x923f82a4af194f9bull, 0xab1c5ed5da6d8118ull, 0xd807aa98a3030242ull, 0x12835b0145706fbeull,
+ 0x243185be4ee4b28cull, 0x550c7dc3d5ffb4e2ull, 0x72be5d74f27b896full, 0x80deb1fe3b1696b1ull, 0x9bdc06a725c71235ull,
+ 0xc19bf174cf692694ull, 0xe49b69c19ef14ad2ull, 0xefbe4786384f25e3ull, 0x0fc19dc68b8cd5b5ull, 0x240ca1cc77ac9c65ull,
+ 0x2de92c6f592b0275ull, 0x4a7484aa6ea6e483ull, 0x5cb0a9dcbd41fbd4ull, 0x76f988da831153b5ull, 0x983e5152ee66dfabull,
+ 0xa831c66d2db43210ull, 0xb00327c898fb213full, 0xbf597fc7beef0ee4ull, 0xc6e00bf33da88fc2ull, 0xd5a79147930aa725ull,
+ 0x06ca6351e003826full, 0x142929670a0e6e70ull, 0x27b70a8546d22ffcull, 0x2e1b21385c26c926ull, 0x4d2c6dfc5ac42aedull,
+ 0x53380d139d95b3dfull, 0x650a73548baf63deull, 0x766a0abb3c77b2a8ull, 0x81c2c92e47edaee6ull, 0x92722c851482353bull,
+ 0xa2bfe8a14cf10364ull, 0xa81a664bbc423001ull, 0xc24b8b70d0f89791ull, 0xc76c51a30654be30ull, 0xd192e819d6ef5218ull,
+ 0xd69906245565a910ull, 0xf40e35855771202aull, 0x106aa07032bbd1b8ull, 0x19a4c116b8d2d0c8ull, 0x1e376c085141ab53ull,
+ 0x2748774cdf8eeb99ull, 0x34b0bcb5e19b48a8ull, 0x391c0cb3c5c95a63ull, 0x4ed8aa4ae3418acbull, 0x5b9cca4f7763e373ull,
+ 0x682e6ff3d6b2b8a3ull, 0x748f82ee5defb2fcull, 0x78a5636f43172f60ull, 0x84c87814a1f0ab72ull, 0x8cc702081a6439ecull,
+ 0x90befffa23631e28ull, 0xa4506cebde82bde9ull, 0xbef9a3f7b2c67915ull, 0xc67178f2e372532bull, 0xca273eceea26619cull,
+ 0xd186b8c721c0c207ull, 0xeada7dd6cde0eb1eull, 0xf57d4f7fee6ed178ull, 0x06f067aa72176fbaull, 0x0a637dc5a2c898a6ull,
+ 0x113f9804bef90daeull, 0x1b710b35131c471bull, 0x28db77f523047d84ull, 0x32caab7b40c72493ull, 0x3c9ebe0a15c9bebcull,
+ 0x431d67c49c100d4cull, 0x4cc5d4becb3e42b6ull, 0x597f299cfc657e2aull, 0x5fcb6fab3ad6faecull, 0x6c44198c4a475817ull
};
static inline uint64_t rotr(uint64_t x, uint64_t n) {
@@ -1548,14 +1559,14 @@
uint64_t H[8];
int blkLen = 0, i;
// setting the initial hash value.
- H[0] = 0x6a09e667f3bcc908ULL;
- H[1] = 0xbb67ae8584caa73bULL;
- H[2] = 0x3c6ef372fe94f82bULL;
- H[3] = 0xa54ff53a5f1d36f1ULL;
- H[4] = 0x510e527fade682d1ULL;
- H[5] = 0x9b05688c2b3e6c1fULL;
- H[6] = 0x1f83d9abfb41bd6bULL;
- H[7] = 0x5be0cd19137e2179ULL;
+ H[0] = 0x6a09e667f3bcc908ull;
+ H[1] = 0xbb67ae8584caa73bull;
+ H[2] = 0x3c6ef372fe94f82bull;
+ H[3] = 0xa54ff53a5f1d36f1ull;
+ H[4] = 0x510e527fade682d1ull;
+ H[5] = 0x9b05688c2b3e6c1full;
+ H[6] = 0x1f83d9abfb41bd6bull;
+ H[7] = 0x5be0cd19137e2179ull;
for (i = 0; i + 128 <= msgLen; i += 128) {
sha512HashBlock(msg + i, H);
@@ -1620,14 +1631,14 @@
uint64_t H[8];
int blkLen, i;
//setting initial hash values
- H[0] = 0xcbbb9d5dc1059ed8ULL;
- H[1] = 0x629a292a367cd507ULL;
- H[2] = 0x9159015a3070dd17ULL;
- H[3] = 0x152fecd8f70e5939ULL;
- H[4] = 0x67332667ffc00b31ULL;
- H[5] = 0x8eb44a8768581511ULL;
- H[6] = 0xdb0c2e0d64f98fa7ULL;
- H[7] = 0x47b5481dbefa4fa4ULL;
+ H[0] = 0xcbbb9d5dc1059ed8ull;
+ H[1] = 0x629a292a367cd507ull;
+ H[2] = 0x9159015a3070dd17ull;
+ H[3] = 0x152fecd8f70e5939ull;
+ H[4] = 0x67332667ffc00b31ull;
+ H[5] = 0x8eb44a8768581511ull;
+ H[6] = 0xdb0c2e0d64f98fa7ull;
+ H[7] = 0x47b5481dbefa4fa4ull;
//SHA 384 will use the same sha512HashBlock function.
blkLen = 0;
for (i = 0; i + 128 <= msgLen; i += 128) {
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -7,7 +7,7 @@
// Copyright 2006-2008 Julien Rebetez <julienr at svn.gnome.org>
// Copyright 2007-2012, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2007-2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2007, 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright 2007, 2013, 2016 Adrian Johnson <ajohnson at redneon.com>
// Copyright 2007 Iñigo MartÃnez <inigomartinez at gmail.com>
// Copyright 2008, 2011 Pino Toscano <pino at kde.org>
// Copyright 2008 Michael Vrable <mvrable at cs.ucsd.edu>
@@ -147,6 +147,11 @@
return field->getPartialName();
}
+void FormWidget::setPartialName(const GooString &name)
+{
+ field->setPartialName(name);
+}
+
GooString *FormWidget::getAlternateUiName() const {
return field->getAlternateUiName();
}
@@ -171,7 +176,6 @@
FormWidget(docA, aobj, num, ref, p)
{
type = formButton;
- parent = static_cast<FormFieldButton*>(field);
onStr = NULL;
Object obj1, obj2;
@@ -200,7 +204,7 @@
// 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;
+ return parent()->getButtonType() == formButtonCheck ? (char *)"Yes" : NULL;
}
FormWidgetButton::~FormWidgetButton ()
@@ -210,7 +214,7 @@
FormButtonType FormWidgetButton::getButtonType () const
{
- return parent->getButtonType ();
+ return parent()->getButtonType ();
}
void FormWidgetButton::setAppearanceState(const char *state) {
@@ -227,7 +231,7 @@
void FormWidgetButton::setState (GBool astate)
{
//pushButtons don't have state
- if (parent->getButtonType() == formButtonPush)
+ if (parent()->getButtonType() == formButtonPush)
return;
// Silently return if can't set ON state
@@ -234,31 +238,35 @@
if (astate && !onStr)
return;
- parent->setState(astate ? onStr->getCString() : (char *)"Off");
+ parent()->setState(astate ? onStr->getCString() : (char *)"Off");
// Parent will call setAppearanceState()
}
GBool FormWidgetButton::getState ()
{
- return onStr ? parent->getState(onStr->getCString()) : gFalse;
+ return onStr ? parent()->getState(onStr->getCString()) : gFalse;
}
+FormFieldButton *FormWidgetButton::parent() const
+{
+ return static_cast<FormFieldButton*>(field);
+}
+
FormWidgetText::FormWidgetText (PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
FormWidget(docA, aobj, num, ref, p)
{
type = formText;
- parent = static_cast<FormFieldText*>(field);
}
GooString* FormWidgetText::getContent ()
{
- return parent->getContent();
+ return parent()->getContent();
}
GooString* FormWidgetText::getContentCopy ()
{
- return parent->getContentCopy();
+ return parent()->getContentCopy();
}
void FormWidgetText::updateWidgetAppearance()
@@ -269,42 +277,42 @@
bool FormWidgetText::isMultiline () const
{
- return parent->isMultiline();
+ return parent()->isMultiline();
}
bool FormWidgetText::isPassword () const
{
- return parent->isPassword();
+ return parent()->isPassword();
}
bool FormWidgetText::isFileSelect () const
{
- return parent->isFileSelect();
+ return parent()->isFileSelect();
}
bool FormWidgetText::noSpellCheck () const
{
- return parent->noSpellCheck();
+ return parent()->noSpellCheck();
}
bool FormWidgetText::noScroll () const
{
- return parent->noScroll();
+ return parent()->noScroll();
}
bool FormWidgetText::isComb () const
{
- return parent->isComb();
+ return parent()->isComb();
}
bool FormWidgetText::isRichText () const
{
- return parent->isRichText();
+ return parent()->isRichText();
}
int FormWidgetText::getMaxLen () const
{
- return parent->getMaxLen ();
+ return parent()->getMaxLen ();
}
void FormWidgetText::setContent(GooString* new_content)
@@ -314,14 +322,18 @@
return;
}
- parent->setContentCopy(new_content);
+ parent()->setContentCopy(new_content);
}
+FormFieldText *FormWidgetText::parent() const
+{
+ return static_cast<FormFieldText*>(field);
+}
+
FormWidgetChoice::FormWidgetChoice(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
FormWidget(docA, aobj, num, ref, p)
{
type = formChoice;
- parent = static_cast<FormFieldChoice*>(field);
}
FormWidgetChoice::~FormWidgetChoice()
@@ -330,7 +342,7 @@
bool FormWidgetChoice::_checkRange (int i)
{
- if (i < 0 || i >= parent->getNumChoices()) {
+ if (i < 0 || i >= parent()->getNumChoices()) {
error(errInternal, -1, "FormWidgetChoice::_checkRange i out of range : {0:d}", i);
return false;
}
@@ -344,7 +356,7 @@
return;
}
if (!_checkRange(i)) return;
- parent->select(i);
+ parent()->select(i);
}
void FormWidgetChoice::toggle (int i)
@@ -354,7 +366,7 @@
return;
}
if (!_checkRange(i)) return;
- parent->toggle(i);
+ parent()->toggle(i);
}
void FormWidgetChoice::deselectAll ()
@@ -363,7 +375,7 @@
error(errInternal, -1, "FormWidgetChoice::deselectAll called on a read only field\n");
return;
}
- parent->deselectAll();
+ parent()->deselectAll();
}
GooString* FormWidgetChoice::getEditChoice ()
@@ -372,7 +384,7 @@
error(errInternal, -1, "FormFieldChoice::getEditChoice called on a non-editable choice\n");
return NULL;
}
- return parent->getEditChoice();
+ return parent()->getEditChoice();
}
void FormWidgetChoice::updateWidgetAppearance()
@@ -384,7 +396,7 @@
bool FormWidgetChoice::isSelected (int i)
{
if (!_checkRange(i)) return false;
- return parent->isSelected(i);
+ return parent()->isSelected(i);
}
void FormWidgetChoice::setEditChoice (GooString* new_content)
@@ -398,59 +410,63 @@
return;
}
- parent->setEditChoice(new_content);
+ parent()->setEditChoice(new_content);
}
int FormWidgetChoice::getNumChoices()
{
- return parent->getNumChoices();
+ return parent()->getNumChoices();
}
GooString* FormWidgetChoice::getChoice(int i)
{
- return parent->getChoice(i);
+ return parent()->getChoice(i);
}
bool FormWidgetChoice::isCombo () const
{
- return parent->isCombo();
+ return parent()->isCombo();
}
bool FormWidgetChoice::hasEdit () const
{
- return parent->hasEdit();
+ return parent()->hasEdit();
}
bool FormWidgetChoice::isMultiSelect () const
{
- return parent->isMultiSelect();
+ return parent()->isMultiSelect();
}
bool FormWidgetChoice::noSpellCheck () const
{
- return parent->noSpellCheck();
+ return parent()->noSpellCheck();
}
bool FormWidgetChoice::commitOnSelChange () const
{
- return parent->commitOnSelChange();
+ return parent()->commitOnSelChange();
}
bool FormWidgetChoice::isListBox () const
{
- return parent->isListBox();
+ return parent()->isListBox();
}
+FormFieldChoice *FormWidgetChoice::parent() const
+{
+ return static_cast<FormFieldChoice*>(field);
+}
+
FormWidgetSignature::FormWidgetSignature(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
FormWidget(docA, aobj, num, ref, p)
{
type = formSignature;
- parent = static_cast<FormFieldSignature*>(field);
}
SignatureInfo *FormWidgetSignature::validateSignature(bool doVerifyCert, bool forceRevalidation)
{
- return parent->validateSignature(doVerifyCert, forceRevalidation);
+ return static_cast<FormFieldSignature*>(field)->validateSignature(doVerifyCert, forceRevalidation);
}
void FormWidgetSignature::updateWidgetAppearance()
@@ -518,6 +534,8 @@
if (terminal) {
error(errSyntaxWarning, -1, "Field can't have both Widget AND Field as kids\n");
+ childObj.free();
+ childRef.free();
continue;
}
@@ -530,6 +548,8 @@
error(errSyntaxWarning, -1, "Field can't have both Widget AND Field as kids\n");
obj2.free();
obj3.free();
+ childObj.free();
+ childRef.free();
continue;
}
_createWidget(&childObj, ref);
@@ -596,6 +616,17 @@
obj1.free();
}
+void FormField::setPartialName(const GooString &name)
+{
+ delete partialName;
+ partialName = name.copy();
+
+ Object obj1;
+ obj1.initString(name.copy());
+ obj.getDict()->set("T", &obj1);
+ xref->setModifiedObject(&obj, ref);
+}
+
FormField::~FormField()
{
if (!terminal) {
@@ -1421,7 +1452,7 @@
sig_dict.dictLookup("M", &time_of_signing);
if (time_of_signing.isString()) {
GooString *time_str = time_of_signing.getString();
- signature_info->setSigningTime(pdfTimeToInteger(time_str)); // Put this information directly in SignatureInfo object
+ signature_info->setSigningTime(dateStringToTime(time_str)); // Put this information directly in SignatureInfo object
time_of_signing.free();
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -6,7 +6,7 @@
//
// Copyright 2006 Julien Rebetez <julienr at svn.gnome.org>
// Copyright 2007, 2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2007-2010, 2012, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright 2007-2010, 2012, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2010 Mark Riedesel <mark at klowner.com>
// Copyright 2011 Pino Toscano <pino at kde.org>
// Copyright 2012 Fabio D'Urso <fabiodurso at hotmail.it>
@@ -98,6 +98,7 @@
double getFontSize() const;
GooString *getPartialName() const;
+ void setPartialName(const GooString &name);
GooString *getAlternateUiName() const;
GooString *getMappingName() const;
GooString *getFullyQualifiedName();
@@ -106,8 +107,8 @@
bool isReadOnly() const;
- LinkAction *getActivationAction();
- LinkAction *getAdditionalAction(Annot::FormAdditionalActionsType type);
+ LinkAction *getActivationAction(); // The caller should not delete the result
+ LinkAction *getAdditionalAction(Annot::FormAdditionalActionsType type); // The caller should delete the result
// return the unique ID corresponding to pageNum/fieldNum
static int encodeID (unsigned pageNum, unsigned fieldNum);
@@ -167,8 +168,8 @@
void updateWidgetAppearance();
protected:
+ FormFieldButton *parent() const;
GooString *onStr;
- FormFieldButton *parent;
};
//------------------------------------------------------------------------
@@ -197,7 +198,7 @@
bool isRichText () const;
int getMaxLen () const;
protected:
- FormFieldText *parent;
+ FormFieldText *parent() const;
};
//------------------------------------------------------------------------
@@ -238,7 +239,7 @@
bool isListBox () const;
protected:
bool _checkRange (int i);
- FormFieldChoice *parent;
+ FormFieldChoice *parent() const;
};
//------------------------------------------------------------------------
@@ -251,9 +252,6 @@
void updateWidgetAppearance();
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
-
-protected:
- FormFieldSignature *parent;
};
//------------------------------------------------------------------------
@@ -282,6 +280,7 @@
VariableTextQuadding getTextQuadding() const { return quadding; }
GooString *getPartialName() const { return partialName; }
+ void setPartialName(const GooString &name);
GooString *getAlternateUiName() const { return alternateUiName; }
GooString *getMappingName() const { return mappingName; }
GooString *getFullyQualifiedName();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -2348,6 +2348,7 @@
det = ctm[0] * ctm[3] - ctm[1] * ctm[2];
if (fabs(det) < 0.000001) {
error(errSyntaxError, getPos(), "Singular matrix in shading pattern fill");
+ restoreStateStack(savedState);
return;
}
det = 1 / det;
@@ -4046,6 +4047,7 @@
curX += tdx;
curY += tdy;
state->moveTo(curX, curY);
+ out->updateCTM(state, 0, 0, 0, 0, 0, 0);
p += n;
len -= n;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -30,7 +30,7 @@
// Copyright (C) 2012 Yi Yang <ahyangyi at gmail.com>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
-// Copyright (C) 2013-2015 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2013-2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2014 Olly Betts <olly at survex.com>
//
// To see a description of the changes please see the Changelog file that
@@ -118,6 +118,10 @@
{ "Symbol,Bold", "Symbol" },
{ "Symbol,BoldItalic", "Symbol" },
{ "Symbol,Italic", "Symbol" },
+ { "SymbolMT", "Symbol" },
+ { "SymbolMT,Bold", "Symbol" },
+ { "SymbolMT,BoldItalic", "Symbol" },
+ { "SymbolMT,Italic", "Symbol" },
{ "Times-Bold", "Times-Bold" },
{ "Times-BoldItalic", "Times-BoldItalic" },
{ "Times-Italic", "Times-Italic" },
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -16,7 +16,7 @@
// Copyright (C) 2005 Kristian Høgsberg <krh at redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright (C) 2006-2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009, 2012 Koji Otani <sho at bbr.jp>
// Copyright (C) 2009, 2011-2016 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2009 Christian Persch <chpe at gnome.org>
@@ -28,6 +28,7 @@
// Copyright (C) 2013 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2015 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2016 Marek Kasik <mkasik at redhat.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
@@ -2013,6 +2014,12 @@
}
}
obj2.free();
+ if (altA->getNComps() != nCompsA) {
+ error(errSyntaxWarning, -1, "Bad ICCBased color space - N doesn't match alt color space");
+ delete altA;
+ obj1.free();
+ return NULL;
+ }
cs = new GfxICCBasedColorSpace(nCompsA, altA, &iccProfileStreamA);
if (dict->lookup("Range", &obj2)->isArray() &&
obj2.arrayGetLength() == 2 * nCompsA) {
@@ -2033,7 +2040,6 @@
#ifdef USE_CMS
arr->get(1, &obj1);
- dict = obj1.streamGetDict();
Guchar *profBuf;
Stream *iccStream = obj1.getStream();
int length = 0;
@@ -2045,7 +2051,12 @@
error(errSyntaxWarning, -1, "read ICCBased color space profile error");
} else {
cmsHPROFILE dhp = (state != NULL && state->getDisplayProfile() != NULL) ? state->getDisplayProfile() : displayProfile;
- if (dhp == NULL) dhp = RGBProfile;
+ if (dhp == NULL) {
+ if (unlikely(RGBProfile == NULL)) {
+ GfxColorSpace::setupColorProfiles();
+ }
+ dhp = RGBProfile;
+ }
unsigned int cst = getCMSColorSpaceType(cmsGetColorSpace(hp));
unsigned int dNChannels = getCMSNChannels(cmsGetColorSpace(dhp));
unsigned int dcst = getCMSColorSpaceType(cmsGetColorSpace(dhp));
@@ -5548,7 +5559,7 @@
p->x[1][0] = x[7];
p->y[1][0] = y[7];
for (j = 0; j < nComps; ++j) {
- p->color[0][1].c[j] = patchesA[nPatchesA-1].color[1][0].c[j];
+ p->color[0][0].c[j] = patchesA[nPatchesA-1].color[1][0].c[j];
p->color[0][1].c[j] = patchesA[nPatchesA-1].color[0][0].c[j];
p->color[1][1].c[j] = c[0][j];
p->color[1][0].c[j] = c[1][j];
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,7 +17,7 @@
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
// Copyright (C) 2006 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009 Koji Otani <sho at bbr.jp>
-// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009-2011, 2013, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
// Copyright (C) 2011 Andrea Canciani <ranma42 at gmail.com>
// Copyright (C) 2011-2014, 2016 Thomas Freitag <Thomas.Freitag at alfa.de>
@@ -861,11 +861,11 @@
GBool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
int type;
+ GBool hasBackground;
+ GBool hasBBox;
GfxColorSpace *colorSpace;
GfxColor background;
- GBool hasBackground;
double xMin, yMin, xMax, yMax;
- GBool hasBBox;
};
//------------------------------------------------------------------------
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,10 +5,11 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010, 2012 Hib Eris <hib at hiberis.nl>
-// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <aacid at kde.org>
+// Copyright 2010, 2011, 2013, 2014, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2010, 2013 Pino Toscano <pino at kde.org>
// Copyright 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright 2014 Fabio D'Urso <fabiodurso at hotmail.it>
+// Copyright 2016 Jeffrey Morlan <jmmorlan at sonic.net>
//
//========================================================================
@@ -26,6 +27,73 @@
#include <limits.h>
+class StreamBitReader {
+public:
+ StreamBitReader(Stream *strA)
+ : str(strA)
+ , inputBits(0)
+ , isAtEof(gFalse)
+ {
+ }
+
+ void resetInputBits()
+ {
+ inputBits = 0;
+ }
+
+ GBool atEOF() const
+ {
+ return isAtEof;
+ }
+
+ Guint readBit()
+ {
+ Guint bit;
+ int c;
+
+ if (inputBits == 0) {
+ if ((c = str->getChar()) == EOF) {
+ isAtEof = gTrue;
+ return (Guint) -1;
+ }
+ bitsBuffer = c;
+ inputBits = 8;
+ }
+ bit = (bitsBuffer >> (inputBits - 1)) & 1;
+ --inputBits;
+ return bit;
+ }
+
+ Guint readBits(int n)
+ {
+ Guint bit, bits;
+
+ if (n < 0) return -1;
+ if (n == 0) return 0;
+
+ if (n == 1)
+ return readBit();
+
+ bit = readBit();
+ if (bit == (Guint) -1)
+ return -1;
+
+ bit = bit << (n-1);
+
+ bits = readBits(n - 1);
+ if (bits == (Guint) -1)
+ return -1;
+
+ return bit | bits;
+ }
+
+private:
+ Stream *str;
+ int inputBits;
+ char bitsBuffer;
+ GBool isAtEof;
+};
+
//------------------------------------------------------------------------
// Hints
//------------------------------------------------------------------------
@@ -43,7 +111,13 @@
pageObjectFirst);
pageObjectFirst = 0;
}
- pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset;
+ XRefEntry *pageObjectFirstXRefEntry = xref->getEntry(pageObjectFirst);
+ if (!pageObjectFirstXRefEntry) {
+ error(errSyntaxWarning, -1, "No XRef entry for first page object");
+ pageOffsetFirst = 0;
+ } else {
+ pageOffsetFirst = pageObjectFirstXRefEntry->offset;
+ }
if (nPages >= INT_MAX / (int)sizeof(Guint)) {
error(errSyntaxWarning, -1, "Invalid number of pages ({0:d}) for hints table", nPages);
@@ -67,7 +141,6 @@
memset(numSharedObject, 0, nPages * sizeof(Guint));
memset(pageObjectNum, 0, nPages * sizeof(int));
- nSharedGroups = 0;
groupLength = NULL;
groupOffset = NULL;
groupHasSignature = NULL;
@@ -74,6 +147,7 @@
groupNumObjects = NULL;
groupXRefOffset = NULL;
+ ok = gTrue;
readTables(str, linearization, xref, secHdlr);
}
@@ -151,11 +225,13 @@
sharedStreamOffset > 0) {
hintsStream->reset();
- readPageOffsetTable(hintsStream);
+ ok = readPageOffsetTable(hintsStream);
- hintsStream->reset();
- for (int i=0; i<sharedStreamOffset; i++) hintsStream->getChar();
- readSharedObjectsTable(hintsStream);
+ if (ok) {
+ hintsStream->reset();
+ for (int i=0; i<sharedStreamOffset; i++) hintsStream->getChar();
+ ok = readSharedObjectsTable(hintsStream);
+ }
} else {
error(errSyntaxWarning, -1, "Invalid shared object hint table offset");
}
@@ -167,50 +243,52 @@
delete parser;
}
-void Hints::readPageOffsetTable(Stream *str)
+GBool Hints::readPageOffsetTable(Stream *str)
{
if (nPages < 1) {
error(errSyntaxWarning, -1, "Invalid number of pages reading page offset hints table");
- return;
+ return gFalse;
}
- inputBits = 0; // reset on byte boundary.
+ StreamBitReader sbr(str);
- nObjectLeast = readBits(32, str);
+ nObjectLeast = sbr.readBits(32);
if (nObjectLeast < 1) {
error(errSyntaxWarning, -1, "Invalid least number of objects reading page offset hints table");
nPages = 0;
- return;
+ return gFalse;
}
- objectOffsetFirst = readBits(32, str);
+ objectOffsetFirst = sbr.readBits(32);
if (objectOffsetFirst >= hintsOffset) objectOffsetFirst += hintsLength;
- nBitsDiffObjects = readBits(16, str);
+ nBitsDiffObjects = sbr.readBits(16);
- pageLengthLeast = readBits(32, str);
+ pageLengthLeast = sbr.readBits(32);
- nBitsDiffPageLength = readBits(16, str);
+ nBitsDiffPageLength = sbr.readBits(16);
- OffsetStreamLeast = readBits(32, str);
+ OffsetStreamLeast = sbr.readBits(32);
- nBitsOffsetStream = readBits(16, str);
+ nBitsOffsetStream = sbr.readBits(16);
- lengthStreamLeast = readBits(32, str);
+ lengthStreamLeast = sbr.readBits(32);
- nBitsLengthStream = readBits(16, str);
+ nBitsLengthStream = sbr.readBits(16);
- nBitsNumShared = readBits(16, str);
+ nBitsNumShared = sbr.readBits(16);
- nBitsShared = readBits(16, str);
+ nBitsShared = sbr.readBits(16);
- nBitsNumerator = readBits(16, str);
+ nBitsNumerator = sbr.readBits(16);
- denominator = readBits(16, str);
+ denominator = sbr.readBits(16);
- for (int i=0; i<nPages; i++) {
- nObjects[i] = nObjectLeast + readBits(nBitsDiffObjects, str);
+ for (int i = 0; i < nPages && !sbr.atEOF(); i++) {
+ nObjects[i] = nObjectLeast + sbr.readBits(nBitsDiffObjects);
}
+ if (sbr.atEOF())
+ return gFalse;
nObjects[0] = 0;
xRefOffset[0] = mainXRefEntriesOffset + 20;
@@ -224,34 +302,38 @@
}
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);
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ for (int i = 0; i < nPages && !sbr.atEOF(); i++) {
+ pageLength[i] = pageLengthLeast + sbr.readBits(nBitsDiffPageLength);
}
+ if (sbr.atEOF())
+ return gFalse;
- inputBits = 0; // reset on byte boundary. Not in specs!
- numSharedObject[0] = readBits(nBitsNumShared, str);
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ numSharedObject[0] = sbr.readBits(nBitsNumShared);
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);
+ for (int i = 1; i < nPages && !sbr.atEOF(); i++) {
+ numSharedObject[i] = sbr.readBits(nBitsNumShared);
if (numSharedObject[i] >= INT_MAX / (int)sizeof(Guint)) {
error(errSyntaxWarning, -1, "Invalid number of shared objects");
numSharedObject[i] = 0;
- return;
+ return gFalse;
}
sharedObjectId[i] = (Guint *) gmallocn_checkoverflow(numSharedObject[i], sizeof(Guint));
if (numSharedObject[i] && !sharedObjectId[i]) {
error(errSyntaxWarning, -1, "Failed to allocate memory for shared object IDs");
numSharedObject[i] = 0;
- return;
+ return gFalse;
}
}
+ if (sbr.atEOF())
+ return gFalse;
- inputBits = 0; // reset on byte boundary. Not in specs!
+ sbr.resetInputBits(); // 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);
+ for (Guint j = 0; j < numSharedObject[i] && !sbr.atEOF(); j++) {
+ sharedObjectId[i][j] = sbr.readBits(nBitsShared);
}
}
@@ -261,37 +343,39 @@
pageOffset[i] = pageOffset[i-1] + pageLength[i-1];
}
+ return !sbr.atEOF();
}
-void Hints::readSharedObjectsTable(Stream *str)
+GBool Hints::readSharedObjectsTable(Stream *str)
{
- inputBits = 0; // reset on byte boundary.
+ StreamBitReader sbr(str);
- Guint firstSharedObjectNumber = readBits(32, str);
+ const Guint firstSharedObjectNumber = sbr.readBits(32);
- Guint firstSharedObjectOffset = readBits(32, str);
- firstSharedObjectOffset += hintsLength;
+ const Guint firstSharedObjectOffset = sbr.readBits(32) + hintsLength;
- Guint nSharedGroupsFirst = readBits(32, str);
+ const Guint nSharedGroupsFirst = sbr.readBits(32);
- Guint nSharedGroups = readBits(32, str);
+ const Guint nSharedGroups = sbr.readBits(32);
- Guint nBitsNumObjects = readBits(16, str);
+ const Guint nBitsNumObjects = sbr.readBits(16);
- Guint groupLengthLeast = readBits(32, str);
+ const Guint groupLengthLeast = sbr.readBits(32);
- Guint nBitsDiffGroupLength = readBits(16, str);
+ const Guint nBitsDiffGroupLength = sbr.readBits(16);
if ((!nSharedGroups) || (nSharedGroups >= INT_MAX / (int)sizeof(Guint))) {
error(errSyntaxWarning, -1, "Invalid number of shared object groups");
- nSharedGroups = 0;
- return;
+ return gFalse;
}
if ((!nSharedGroupsFirst) || (nSharedGroupsFirst > nSharedGroups)) {
error(errSyntaxWarning, -1, "Invalid number of first page shared object groups");
- nSharedGroups = 0;
- return;
+ return gFalse;
}
+ if (nBitsNumObjects > 32 || nBitsDiffGroupLength > 32) {
+ error(errSyntaxWarning, -1, "Invalid shared object groups bit length");
+ return gFalse;
+ }
groupLength = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
groupOffset = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
@@ -301,14 +385,15 @@
if (!groupLength || !groupOffset || !groupHasSignature ||
!groupNumObjects || !groupXRefOffset) {
error(errSyntaxWarning, -1, "Failed to allocate memory for shared object groups");
- nSharedGroups = 0;
- return;
+ return gFalse;
}
- inputBits = 0; // reset on byte boundary. Not in specs!
- for (Guint i=0; i<nSharedGroups; i++) {
- groupLength[i] = groupLengthLeast + readBits(nBitsDiffGroupLength, str);
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ for (Guint i = 0; i < nSharedGroups && !sbr.atEOF(); i++) {
+ groupLength[i] = groupLengthLeast + sbr.readBits(nBitsDiffGroupLength);
}
+ if (sbr.atEOF())
+ return gFalse;
groupOffset[0] = objectOffsetFirst;
for (Guint i=1; i<nSharedGroupsFirst; i++) {
@@ -321,22 +406,26 @@
}
}
- inputBits = 0; // reset on byte boundary. Not in specs!
- for (Guint i=0; i<nSharedGroups; i++) {
- groupHasSignature[i] = readBits(1, str);
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ for (Guint i = 0; i < nSharedGroups && !sbr.atEOF(); i++) {
+ groupHasSignature[i] = sbr.readBits(1);
}
+ if (sbr.atEOF())
+ return gFalse;
- inputBits = 0; // reset on byte boundary. Not in specs!
- for (Guint i=0; i<nSharedGroups; i++) {
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ for (Guint i = 0; i < nSharedGroups && !sbr.atEOF(); i++) {
if (groupHasSignature[i]) {
- readBits(128, str);
+ sbr.readBits(128);
}
}
+ if (sbr.atEOF())
+ return gFalse;
- inputBits = 0; // reset on byte boundary. Not in specs!
- for (Guint i=0; i<nSharedGroups; i++) {
+ sbr.resetInputBits(); // reset on byte boundary. Not in specs!
+ for (Guint i = 0; i < nSharedGroups && !sbr.atEOF(); i++) {
groupNumObjects[i] =
- nBitsNumObjects ? 1 + readBits(nBitsNumObjects, str) : 1;
+ nBitsNumObjects ? 1 + sbr.readBits(nBitsNumObjects) : 1;
}
for (Guint i=0; i<nSharedGroupsFirst; i++) {
@@ -350,8 +439,15 @@
groupXRefOffset[i] = groupXRefOffset[i-1] + 20*groupNumObjects[i-1];
}
}
+
+ return !sbr.atEOF();
}
+GBool Hints::isOk() const
+{
+ return ok;
+}
+
Goffset Hints::getPageOffset(int page)
{
if ((page < 1) || (page > nPages)) return 0;
@@ -402,44 +498,6 @@
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 -1;
- if (n == 0) return 0;
-
- if (n == 1)
- return readBit(str);
-
- bit = (readBit(str) << (n-1));
- if (bit == (Guint) -1)
- return -1;
-
- bits = readBits(n-1, str);
- if (bits == (Guint) -1)
- return -1;
-
- return bit | bits;
-}
-
int Hints::getPageObjectNum(int page) {
if ((page < 1) || (page > nPages)) return 0;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Hints.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010 Hib Eris <hib at hiberis.nl>
-// Copyright 2010, 2013 Albert Astals Cid <aacid at kde.org>
+// Copyright 2010, 2013, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2013 Adrian Johnson <ajohnson at redneon.com>
//
//========================================================================
@@ -33,6 +33,8 @@
Hints(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr);
~Hints();
+ GBool isOk() const;
+
int getPageObjectNum(int page);
Goffset getPageOffset(int page);
std::vector<ByteRange>* getPageRanges(int page);
@@ -40,12 +42,9 @@
private:
void readTables(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr);
- void readPageOffsetTable(Stream *str);
- void readSharedObjectsTable(Stream *str);
+ GBool readPageOffsetTable(Stream *str);
+ GBool readSharedObjectsTable(Stream *str);
- Guint readBit(Stream *str);
- Guint readBits(int n, Stream *str);
-
Guint hintsOffset;
Guint hintsLength;
Guint hintsOffset2;
@@ -80,16 +79,12 @@
Guint *numSharedObject;
Guint **sharedObjectId;
- Guint nSharedGroups;
Guint *groupLength;
Guint *groupOffset;
Guint *groupHasSignature;
Guint *groupNumObjects;
Guint *groupXRefOffset;
-
- int inputBits;
- char bitsBuffer;
-
+ GBool ok;
};
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/JBIG2Stream.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Raj Kumar <rkumar at archive.org>
// Copyright (C) 2006 Paul Walmsley <paul at booyaka.com>
-// Copyright (C) 2006-2010, 2012, 2014, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012, 2014-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 David Benjamin <davidben at mit.edu>
// Copyright (C) 2011 Edward Jiang <ejiang at google.com>
// Copyright (C) 2012 William Bader <williambader at hotmail.com>
@@ -892,6 +892,8 @@
oneByte = x0 == ((x1 - 1) & ~7);
for (yy = y0; yy < y1; ++yy) {
+ if (unlikely(y + yy) >= h)
+ continue;
// one byte per line -- need to mask both left and right side
if (oneByte) {
@@ -2770,6 +2772,9 @@
if (!(enableSkip && skipBitmap->getPixel(n, m))) {
patternBitmap = patternDict->getBitmap(grayImg[i]);
if (unlikely(patternBitmap == NULL)) {
+ delete skipBitmap;
+ delete bitmap;
+ gfree(grayImg);
error(errSyntaxError, curStr->getPos(), "Bad pattern bitmap");
return;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -16,7 +16,7 @@
// Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
// Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
-// Copyright (C) 2008-2010, 2012-2014 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008-2010, 2012-2014, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
// Copyright (C) 2012 Tobias Koening <tobias.koenig at kdab.com>
@@ -231,30 +231,26 @@
// Fit link
} else if (obj1.isName("Fit")) {
- if (a->getLength() < 2) {
- error(errSyntaxWarning, -1, "Annotation destination array is too short");
- goto err2;
- }
kind = destFit;
// FitH link
} else if (obj1.isName("FitH")) {
+ kind = destFitH;
if (a->getLength() < 3) {
- error(errSyntaxWarning, -1, "Annotation destination array is too short");
- goto err2;
- }
- kind = destFitH;
- a->get(2, &obj2);
- if (obj2.isNull()) {
changeTop = gFalse;
- } else if (obj2.isNum()) {
- changeTop = gTrue;
- top = obj2.getNum();
} else {
- error(errSyntaxWarning, -1, "Bad annotation destination position");
- kind = destFit;
+ a->get(2, &obj2);
+ if (obj2.isNull()) {
+ changeTop = gFalse;
+ } else if (obj2.isNum()) {
+ changeTop = gTrue;
+ top = obj2.getNum();
+ } else {
+ error(errSyntaxWarning, -1, "Bad annotation destination position");
+ kind = destFit;
+ }
+ obj2.free();
}
- obj2.free();
// FitV link
} else if (obj1.isName("FitV")) {
@@ -313,10 +309,6 @@
// FitB link
} else if (obj1.isName("FitB")) {
- if (a->getLength() < 2) {
- error(errSyntaxWarning, -1, "Annotation destination array is too short");
- goto err2;
- }
kind = destFitB;
// FitBH link
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Makefile.am
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -327,7 +327,7 @@
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 59:0:0 \
+ -version-info 66:0:0 \
@create_shared_lib@ \
@auto_import_flags@
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,6 +21,7 @@
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -235,6 +236,7 @@
int dictGetLength();
void dictAdd(char *key, Object *val);
void dictSet(const char *key, Object *val);
+ void dictRemove(const char *key);
GBool dictIs(const char *dictType);
Object *dictLookup(const char *key, Object *obj, int recursion = 0);
Object *dictLookupNF(const char *key, Object *obj);
@@ -318,8 +320,11 @@
{ OBJECT_TYPE_CHECK(objDict); dict->add(key, val); }
inline void Object::dictSet(const char *key, Object *val)
- { OBJECT_TYPE_CHECK(objDict); dict->set(key, val); }
+ { OBJECT_TYPE_CHECK(objDict); dict->set(key, val); }
+inline void Object::dictRemove(const char *key)
+ { OBJECT_TYPE_CHECK(objDict); dict->remove(key); }
+
inline GBool Object::dictIs(const char *dictType)
{ OBJECT_TYPE_CHECK(objDict); return dict->is(dictType); }
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,8 +14,9 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
-// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Nick Jones <nick.jones at network-box.com>
+// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -35,6 +36,7 @@
#include "Link.h"
#include "PDFDocEncoding.h"
#include "Outline.h"
+#include "UTF.h"
//------------------------------------------------------------------------
@@ -45,9 +47,7 @@
if (!outlineObj->isDict()) {
return;
}
- items = OutlineItem::readItemList(outlineObj->dictLookupNF("First", &first),
- outlineObj->dictLookupNF("Last", &last),
- xref);
+ items = OutlineItem::readItemList(outlineObj->dictLookupNF("First", &first), xref);
first.free();
last.free();
}
@@ -63,7 +63,6 @@
OutlineItem::OutlineItem(Dict *dict, XRef *xrefA) {
Object obj1;
GooString *s;
- int i;
xref = xrefA;
title = NULL;
@@ -72,21 +71,7 @@
if (dict->lookup("Title", &obj1)->isString()) {
s = obj1.getString();
- if ((s->getChar(0) & 0xff) == 0xfe &&
- (s->getChar(1) & 0xff) == 0xff) {
- titleLen = (s->getLength() - 2) / 2;
- title = (Unicode *)gmallocn(titleLen, sizeof(Unicode));
- for (i = 0; i < titleLen; ++i) {
- title[i] = ((s->getChar(2 + 2*i) & 0xff) << 8) |
- (s->getChar(3 + 2*i) & 0xff);
- }
- } else {
- titleLen = s->getLength();
- title = (Unicode *)gmallocn(titleLen, sizeof(Unicode));
- for (i = 0; i < titleLen; ++i) {
- title[i] = pdfDocEncoding[s->getChar(i) & 0xff];
- }
- }
+ titleLen = TextStringToUCS4(s, &title);
} else {
titleLen = 0;
}
@@ -128,8 +113,7 @@
nextRef.free();
}
-GooList *OutlineItem::readItemList(Object *firstItemRef, Object *lastItemRef,
- XRef *xrefA) {
+GooList *OutlineItem::readItemList(Object *firstItemRef, XRef *xrefA) {
GooList *items;
char* alreadyRead;
OutlineItem *item;
@@ -136,9 +120,6 @@
Object obj;
Object *p;
- if (!lastItemRef->isRef())
- return NULL;
-
items = new GooList();
alreadyRead = (char *)gmalloc(xrefA->getNumObjects());
@@ -157,10 +138,6 @@
item = new OutlineItem(obj.getDict(), xrefA);
obj.free();
items->append(item);
- if (p->getRef().num == lastItemRef->getRef().num &&
- p->getRef().gen == lastItemRef->getRef().gen) {
- break;
- }
p = &item->nextRef;
}
@@ -176,7 +153,7 @@
void OutlineItem::open() {
if (!kids) {
- kids = readItemList(&firstRef, &lastRef, xref);
+ kids = readItemList(&firstRef, xref);
}
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+// Copyright (C) 2016 Albert Astals Cid <aacid at 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
@@ -59,8 +60,7 @@
OutlineItem(Dict *dict, XRef *xrefA);
~OutlineItem();
- static GooList *readItemList(Object *firstItemRef, Object *lastItemRef,
- XRef *xrefA);
+ static GooList *readItemList(Object *firstItemRef, XRef *xrefA);
void open();
void close();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
-// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2007-2009, 2011-2017 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2008 Julien Rebetez <julienr at svn.gnome.org>
// Copyright (C) 2008, 2010 Pino Toscano <pino at kde.org>
// Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -34,6 +34,7 @@
// Copyright (C) 2015 Li Junling <lijunling at sina.com>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -544,10 +545,54 @@
{
if (!linearization) {
linearization = new Linearization(str);
+ linearizationState = 0;
}
return linearization;
}
+GBool PDFDoc::checkLinearization() {
+ if (linearization == NULL)
+ return gFalse;
+ if (linearizationState == 1)
+ return gTrue;
+ if (linearizationState == 2)
+ return gFalse;
+ if (!hints) {
+ hints = new Hints(str, linearization, getXRef(), secHdlr);
+ }
+ if (!hints->isOk()) {
+ linearizationState = 2;
+ return gFalse;
+ }
+ for (int page = 1; page <= linearization->getNumPages(); page++) {
+ Object obj;
+ Ref pageRef;
+
+ pageRef.num = hints->getPageObjectNum(page);
+ if (!pageRef.num) {
+ linearizationState = 2;
+ return gFalse;
+ }
+
+ // check for bogus ref - this can happen in corrupted PDF files
+ if (pageRef.num < 0 || pageRef.num >= xref->getNumObjects()) {
+ linearizationState = 2;
+ return gFalse;
+ }
+
+ pageRef.gen = xref->getEntry(pageRef.num)->gen;
+ xref->fetch(pageRef.num, pageRef.gen, &obj);
+ if (!obj.isDict("Page")) {
+ obj.free();
+ linearizationState = 2;
+ return gFalse;
+ }
+ obj.free();
+ }
+ linearizationState = 1;
+ return gTrue;
+}
+
GBool PDFDoc::isLinearized(GBool tryingToReconstruct) {
if ((str->getLength()) &&
(getLinearization()->getLength() == str->getLength()))
@@ -560,6 +605,75 @@
}
}
+void PDFDoc::setDocInfoModified(Object *infoObj)
+{
+ Object infoObjRef;
+ getDocInfoNF(&infoObjRef);
+ xref->setModifiedObject(infoObj, infoObjRef.getRef());
+ infoObjRef.free();
+}
+
+void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value)
+{
+ GBool removeEntry = !value || value->getLength() == 0 || value->hasJustUnicodeMarker();
+ if (removeEntry) {
+ delete value;
+ }
+
+ Object infoObj;
+ getDocInfo(&infoObj);
+
+ if (infoObj.isNull() && removeEntry) {
+ // No info dictionary, so no entry to remove.
+ return;
+ }
+
+ createDocInfoIfNoneExists(&infoObj);
+
+ Object gooStrObj;
+ if (removeEntry) {
+ gooStrObj.initNull();
+ } else {
+ gooStrObj.initString(value);
+ }
+
+ // gooStrObj is set to value or null by now. The latter will cause a removal.
+ infoObj.dictSet(key, &gooStrObj);
+
+ if (infoObj.dictGetLength() == 0) {
+ // Info dictionary is empty. Remove it altogether.
+ removeDocInfo();
+ } else {
+ setDocInfoModified(&infoObj);
+ }
+
+ infoObj.free();
+}
+
+GooString *PDFDoc::getDocInfoStringEntry(const char *key) {
+ Object infoObj;
+ getDocInfo(&infoObj);
+ if (!infoObj.isDict()) {
+ return NULL;
+ }
+
+ Object entryObj;
+ infoObj.dictLookup(key, &entryObj);
+
+ GooString *result;
+
+ if (entryObj.isString()) {
+ result = entryObj.takeString();
+ } else {
+ result = NULL;
+ }
+
+ entryObj.free();
+ infoObj.free();
+
+ return result;
+}
+
static GBool
get_id (GooString *encodedidstring, GooString *id) {
const char *encodedid = encodedidstring->getCString();
@@ -825,17 +939,7 @@
}
int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
-
- // find if we have updated objects
- GBool updated = gFalse;
- for(int i=0; i<xref->getNumObjects(); i++) {
- if (xref->getEntry(i)->getFlag(XRefEntry::Updated)) {
- updated = gTrue;
- break;
- }
- }
-
- if (!updated && mode == writeStandard) {
+ if (!xref->isModified() && mode == writeStandard) {
// simply copy the original file
saveWithoutChangesAs (outStr);
} else if (mode == writeForceRewrite) {
@@ -924,7 +1028,9 @@
}
}
xref->unlock();
- if (uxref->getNumObjects() == 0) { //we have nothing to update
+ // because of "uxref->add(0, 65535, 0, gFalse);" uxref->getNumObjects() will
+ // always be >= 1; if it is 1, it means there is nothing to update
+ if (uxref->getNumObjects() == 1) {
delete uxref;
return;
}
@@ -1629,9 +1735,9 @@
Object obj3;
array->getNF(i, &obj3);
if (obj3.isRef()) {
- Object *newRef = new Object();
- newRef->initRef(newPageNum, 0);
- dict->set("P", newRef);
+ Object newRef;
+ newRef.initRef(newPageNum, 0);
+ dict->set("P", &newRef);
getXRef()->setModifiedObject(&obj1, obj3.getRef());
}
obj3.free();
@@ -1963,7 +2069,7 @@
{
if ((page < 1) || page > getNumPages()) return NULL;
- if (isLinearized()) {
+ if (isLinearized() && checkLinearization()) {
pdfdocLocker();
if (!pageCache) {
pageCache = (Page **) gmallocn(getNumPages(), sizeof(Page *));
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -22,7 +22,7 @@
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
// Copyright (C) 2010, 2014 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla at geodesic.com>
-// Copyright (C) 2011, 2013, 2014 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2011, 2013, 2014, 2016 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
@@ -29,6 +29,7 @@
// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -111,6 +112,7 @@
// Get the linearization table.
Linearization *getLinearization();
+ GBool checkLinearization();
// Get the xref table.
XRef *getXRef() { return xref; }
@@ -230,6 +232,43 @@
Object *getDocInfo(Object *obj) { return xref->getDocInfo(obj); }
Object *getDocInfoNF(Object *obj) { return xref->getDocInfoNF(obj); }
+ // Create and return the document's Info dictionary if none exists.
+ // Otherwise return the existing one.
+ Object *createDocInfoIfNoneExists(Object *obj) { return xref->createDocInfoIfNoneExists(obj); }
+
+ // Remove the document's Info dictionary and update the trailer dictionary.
+ void removeDocInfo() { xref->removeDocInfo(); }
+
+ // Set doc info string entry. NULL or empty value will cause a removal.
+ // Takes ownership of value.
+ void setDocInfoStringEntry(const char *key, GooString *value);
+
+ // Set document's properties in document's Info dictionary.
+ // NULL or empty value will cause a removal.
+ // Takes ownership of value.
+ void setDocInfoTitle(GooString *title) { setDocInfoStringEntry("Title", title); }
+ void setDocInfoAuthor(GooString *author) { setDocInfoStringEntry("Author", author); }
+ void setDocInfoSubject(GooString *subject) { setDocInfoStringEntry("Subject", subject); }
+ void setDocInfoKeywords(GooString *keywords) { setDocInfoStringEntry("Keywords", keywords); }
+ void setDocInfoCreator(GooString *creator) { setDocInfoStringEntry("Creator", creator); }
+ void setDocInfoProducer(GooString *producer) { setDocInfoStringEntry("Producer", producer); }
+ void setDocInfoCreatDate(GooString *creatDate) { setDocInfoStringEntry("CreationDate", creatDate); }
+ void setDocInfoModDate(GooString *modDate) { setDocInfoStringEntry("ModDate", modDate); }
+
+ // Get document's properties from document's Info dictionary.
+ // Returns NULL on fail.
+ // Returned GooStrings should be freed by the caller.
+ GooString *getDocInfoStringEntry(const char *key);
+
+ GooString *getDocInfoTitle() { return getDocInfoStringEntry("Title"); }
+ GooString *getDocInfoAuthor() { return getDocInfoStringEntry("Author"); }
+ GooString *getDocInfoSubject() { return getDocInfoStringEntry("Subject"); }
+ GooString *getDocInfoKeywords() { return getDocInfoStringEntry("Keywords"); }
+ GooString *getDocInfoCreator() { return getDocInfoStringEntry("Creator"); }
+ GooString *getDocInfoProducer() { return getDocInfoStringEntry("Producer"); }
+ GooString *getDocInfoCreatDate() { return getDocInfoStringEntry("CreationDate"); }
+ GooString *getDocInfoModDate() { return getDocInfoStringEntry("ModDate"); }
+
// Return the PDF version specified by the file.
int getPDFMajorVersion() { return pdfMajorVersion; }
int getPDFMinorVersion() { return pdfMinorVersion; }
@@ -314,6 +353,9 @@
Goffset getMainXRefEntriesOffset(GBool tryingToReconstruct = gFalse);
long long strToLongLong(char *s);
+ // Mark the document's Info dictionary as modified.
+ void setDocInfoModified(Object *infoObj);
+
GooString *fileName;
#ifdef _WIN32
wchar_t *fileNameU;
@@ -324,6 +366,10 @@
int pdfMajorVersion;
int pdfMinorVersion;
Linearization *linearization;
+ // linearizationState = 0: unchecked
+ // linearizationState = 1: checked and valid
+ // linearizationState = 2: checked and invalid
+ int linearizationState;
XRef *xref;
SecurityHandler *secHdlr;
Catalog *catalog;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2006-2009, 2011-2013, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2009, 2011-2013, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
// Copyright (C) 2007, 2008 Brad Hards <bradh at kde.org>
// Copyright (C) 2008, 2009 Koji Otani <sho at bbr.jp>
@@ -30,6 +30,7 @@
// Copyright (C) 2012 Lu Wang <coolwanglu at gmail.com>
// Copyright (C) 2014 Till Kamppeter <till.kamppeter at gmail.com>
// Copyright (C) 2015 Marek Kasik <mkasik at redhat.com>
+// Copyright (C) 2016 Caolán McNamara <caolanm at redhat.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
@@ -48,6 +49,7 @@
#include <signal.h>
#include <math.h>
#include <limits.h>
+#include <algorithm>
#include "goo/GooString.h"
#include "goo/GooList.h"
#include "goo/GooHash.h"
@@ -1101,6 +1103,7 @@
fontIDs = NULL;
fontNames = new GooHash(gTrue);
+ fontMaxValidGlyph = new GooHash(gTrue);
t1FontNames = NULL;
font8Info = NULL;
font16Enc = NULL;
@@ -1169,6 +1172,7 @@
fontIDs = NULL;
fontNames = new GooHash(gTrue);
+ fontMaxValidGlyph = new GooHash(gTrue);
t1FontNames = NULL;
font8Info = NULL;
font16Enc = NULL;
@@ -1245,6 +1249,7 @@
embedCIDTrueType = gTrue;
fontPassthrough = gFalse;
optimizeColorSpace = gFalse;
+ passLevel1CustomColor = gFalse;
preloadImagesForms = gFalse;
generateOPI = gFalse;
useASCIIHex = gFalse;
@@ -1494,6 +1499,7 @@
gfree(fontIDs);
}
delete fontNames;
+ delete fontMaxValidGlyph;
if (t1FontNames) {
for (i = 0; i < t1FontNameLen; ++i) {
delete t1FontNames[i].psName;
@@ -1647,6 +1653,7 @@
}
} else if ((level == psLevel1 && lev1 && nonSep) ||
(level == psLevel1Sep && lev1 && sep) ||
+ (level == psLevel1Sep && lev2 && sep && getPassLevel1CustomColor()) ||
(level == psLevel2 && lev2 && nonSep) ||
(level == psLevel2Sep && lev2 && sep) ||
(level == psLevel3 && lev3 && nonSep) ||
@@ -2606,10 +2613,15 @@
outputFunc, outputStream);
} else {
// otherwise: use a non-CID composite font
+ int maxValidGlyph = -1;
ffTT->convertToType0(psName->getCString(),
codeToGID, codeToGIDLen,
needVerticalMetrics,
+ &maxValidGlyph,
outputFunc, outputStream);
+ if (maxValidGlyph >= 0 && font->getName()) {
+ fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
+ }
}
gfree(codeToGID);
} else {
@@ -2702,11 +2714,16 @@
outputFunc, outputStream);
} else {
// otherwise: use a non-CID composite font
+ int maxValidGlyph = -1;
ffTT->convertToType0(psName->getCString(),
((GfxCIDFont *)font)->getCIDToGID(),
((GfxCIDFont *)font)->getCIDToGIDLen(),
needVerticalMetrics,
+ &maxValidGlyph,
outputFunc, outputStream);
+ if (maxValidGlyph > 0 && font->getName()) {
+ fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
+ }
}
delete ffTT;
}
@@ -3346,6 +3363,10 @@
}
nStripes = (int)ceil((double)(sliceW * sliceH) /
(double)rasterizationSliceSize);
+ if (unlikely(nStripes == 0)) {
+ delete splashOut;
+ return gFalse;
+ }
stripeH = (sliceH + nStripes - 1) / nStripes;
// render the stripes
@@ -4117,15 +4138,6 @@
state->getFillGray(&gray);
writePSFmt("{0:.4g} g\n", colToDbl(gray));
break;
- case psLevel1Sep:
- state->getFillCMYK(&cmyk);
- c = colToDbl(cmyk.c);
- m = colToDbl(cmyk.m);
- y = colToDbl(cmyk.y);
- k = colToDbl(cmyk.k);
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} k\n", c, m, y, k);
- addProcessColor(c, m, y, k);
- break;
case psLevel2:
case psLevel3:
if (state->getFillColorSpace()->getMode() != csPattern) {
@@ -4140,9 +4152,10 @@
writePS("] sc\n");
}
break;
+ case psLevel1Sep:
case psLevel2Sep:
case psLevel3Sep:
- if (state->getFillColorSpace()->getMode() == csSeparation) {
+ if (state->getFillColorSpace()->getMode() == csSeparation && (level > psLevel1Sep || getPassLevel1CustomColor())) {
sepCS = (GfxSeparationColorSpace *)state->getFillColorSpace();
color.c[0] = gfxColorComp1;
sepCS->getCMYK(&color, &cmyk);
@@ -4183,15 +4196,6 @@
state->getStrokeGray(&gray);
writePSFmt("{0:.4g} G\n", colToDbl(gray));
break;
- case psLevel1Sep:
- state->getStrokeCMYK(&cmyk);
- c = colToDbl(cmyk.c);
- m = colToDbl(cmyk.m);
- y = colToDbl(cmyk.y);
- k = colToDbl(cmyk.k);
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} K\n", c, m, y, k);
- addProcessColor(c, m, y, k);
- break;
case psLevel2:
case psLevel3:
if (state->getStrokeColorSpace()->getMode() != csPattern) {
@@ -4206,9 +4210,10 @@
writePS("] SC\n");
}
break;
+ case psLevel1Sep:
case psLevel2Sep:
case psLevel3Sep:
- if (state->getStrokeColorSpace()->getMode() == csSeparation) {
+ if (state->getStrokeColorSpace()->getMode() == csSeparation && (level > psLevel1Sep || getPassLevel1CustomColor())) {
sepCS = (GfxSeparationColorSpace *)state->getStrokeColorSpace();
color.c[0] = gfxColorComp1;
sepCS->getCMYK(&color, &cmyk);
@@ -5059,6 +5064,8 @@
char buf[8];
double *dxdy;
int dxdySize, len, nChars, uLen, n, m, i, j;
+ int maxGlyphInt;
+ CharCode maxGlyph;
// for pdftohtml, output PS without text
if( displayText == gFalse )
@@ -5078,6 +5085,9 @@
if (!(font = state->getFont())) {
return;
}
+ maxGlyphInt = (font->getName()? fontMaxValidGlyph->lookupInt(font->getName()): 0);
+ if (maxGlyphInt < 0) maxGlyphInt = 0;
+ maxGlyph = (CharCode) maxGlyphInt;
wMode = font->getWMode();
// check for a subtitute 16-bit font
@@ -5152,6 +5162,14 @@
dxdy[2 * nChars + 1] = dy;
++nChars;
}
+ } else if (maxGlyph > 0 && code > maxGlyph) {
+ // Ignore this code.
+ // Using it will exceed the number of glyphs in the font and generate
+ // /rangecheck in --xyshow--
+ if (nChars > 0) {
+ dxdy[2 * (nChars-1) ] += dx;
+ dxdy[2 * (nChars-1) + 1 ] += dy;
+ }
} else {
if (nChars + 1 > dxdySize) {
dxdySize *= 2;
@@ -5882,7 +5900,11 @@
// color space
if (colorMap) {
- dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
+ // Do not update the process color list for custom colors
+ GBool isCustomColor =
+ (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) &&
+ colorMap->getColorSpace()->getMode() == csDeviceN;
+ dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, !isCustomColor, gFalse);
writePS(" setcolorspace\n");
}
@@ -6281,7 +6303,11 @@
// color space
if (colorMap) {
- dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
+ // Do not update the process color list for custom colors
+ GBool isCustomColor =
+ (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) &&
+ colorMap->getColorSpace()->getMode() == csDeviceN;
+ dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, !isCustomColor, gFalse);
writePS(" setcolorspace\n");
}
@@ -7656,8 +7682,10 @@
} else if (c == '(') {
label2->append("\\(");
} else if (c < 0x20 || c > 0x7e) {
- label2->append(GooString::format("\\{0:03o}", c));
+ GooString *aux = GooString::format("\\{0:03o}", c);
+ label2->append(aux);
j += 4;
+ delete aux;
} else {
label2->append(c);
++j;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -320,6 +320,7 @@
GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
GBool getFontPassthrough() const { return fontPassthrough; }
GBool getOptimizeColorSpace() const { return optimizeColorSpace; }
+ GBool getPassLevel1CustomColor() const { return passLevel1CustomColor; }
GBool getEnableLZW() const { return enableLZW; };
GBool getEnableFlate() const
#if ENABLE_ZLIB
@@ -333,6 +334,7 @@
void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
void setFontPassthrough(GBool b) { fontPassthrough = b; }
void setOptimizeColorSpace(GBool b) { optimizeColorSpace = b; }
+ void setPassLevel1CustomColor(GBool b) { passLevel1CustomColor = b; }
void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
void setGenerateOPI(GBool b) { generateOPI = b; }
void setUseASCIIHex(GBool b) { useASCIIHex = b; }
@@ -471,6 +473,7 @@
int fontIDSize; // size of fontIDs array
std::set<int> resourceIDs; // list of object IDs of objects containing Resources we've already set up
GooHash *fontNames; // all used font names
+ GooHash *fontMaxValidGlyph; // max valid glyph of each font
PST1FontName *t1FontNames; // font names for Type 1/1C fonts
int t1FontNameLen; // number of entries in t1FontNames array
int t1FontNameSize; // size of t1FontNames array
@@ -536,6 +539,9 @@
GBool fontPassthrough; // pass all fonts through as-is?
GBool optimizeColorSpace; // false to keep gray RGB images in their original color space
// true to optimize gray images to DeviceGray color space
+ GBool passLevel1CustomColor; // false to convert all custom colors to CMYK
+ // true to pass custom colors
+ // has effect only when doing a level1sep
GBool preloadImagesForms; // preload PostScript images and forms into
// memory
GBool generateOPI; // generate PostScript OPI comments?
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Kristian Høgsberg <krh at redhat.com>
// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2013, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006-2008 Pino Toscano <pino at kde.org>
// Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
@@ -325,6 +325,7 @@
if (!(thumb.isStream() || thumb.isNull() || thumb.isRef())) {
error(errSyntaxError, -1, "Page thumb object (page {0:d}) is wrong type ({1:s})",
num, thumb.getTypeName());
+ thumb.free();
thumb.initNull();
}
@@ -333,6 +334,7 @@
if (!(actions.isDict() || actions.isNull())) {
error(errSyntaxError, -1, "Page additional action object (page {0:d}) is wrong type ({1:s})",
num, actions.getTypeName());
+ actions.free();
actions.initNull();
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -75,7 +75,7 @@
const char *wh;
if (number >= 4000) {
- error(errUnimplemented, -1, "Conversion to roman numberals of numbers >= 4000 not implemented");
+ error(errUnimplemented, -1, "Conversion to roman numerals of numbers >= 4000 not implemented");
return;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SignatureHandler.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -6,8 +6,9 @@
//
// Copyright 2015, 2016 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright 2015 André Esser <bepandre at hotmail.com>
-// Copyright 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2015 Markus Kilås <digital at markuspage.com>
+// Copyright 2017 Sebastian Rasmussen <sebras at gmail.com>
//
//========================================================================
@@ -82,6 +83,7 @@
} while (subFolder != NULL);
closedir(toSearchIn);
+ delete homePath;
return NULL;
}
@@ -104,7 +106,8 @@
SignatureHandler::SignatureHandler(unsigned char *p7, int p7_length)
- : CMSMessage(NULL),
+ : hash_context(NULL),
+ CMSMessage(NULL),
CMSSignedData(NULL),
CMSSignerInfo(NULL),
temp_certs(NULL)
@@ -114,8 +117,10 @@
CMSitem.len = p7_length;
CMSMessage = CMS_MessageCreate(&CMSitem);
CMSSignedData = CMS_SignedDataCreate(CMSMessage);
- CMSSignerInfo = CMS_SignerInfoCreate(CMSSignedData);
- hash_context = initHashContext();
+ if (CMSSignedData) {
+ CMSSignerInfo = CMS_SignerInfoCreate(CMSSignedData);
+ hash_context = initHashContext();
+ }
}
HASHContext * SignatureHandler::initHashContext()
@@ -130,7 +135,9 @@
void SignatureHandler::updateHash(unsigned char * data_block, int data_len)
{
- HASH_Update(hash_context, data_block, data_len);
+ if (hash_context) {
+ HASH_Update(hash_context, data_block, data_len);
+ }
}
SignatureHandler::~SignatureHandler()
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
// Copyright (C) 2006 Stefan Schweizer <genstef at gentoo.org>
-// Copyright (C) 2006-2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
@@ -36,6 +36,7 @@
// Copyright (C) 2014 Richard PALO <richard at netbsd.org>
// Copyright (C) 2015 Tamas Szekeres <szekerest at gmail.com>
// Copyright (C) 2015 Kenji Uno <ku at digitaldolphins.jp>
+// Copyright (C) 2016 Takahiro Hashimoto <kenya888.en at 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
@@ -94,6 +95,13 @@
#endif
#endif
+#if __cplusplus > 199711L
+#include <cmath>
+#ifndef isfinite
+#define isfinite(x) std::isfinite(x)
+#endif
+#endif
+
static inline void convertGfxColor(SplashColorPtr dest,
SplashColorMode colorMode,
GfxColorSpace *colorSpace,
@@ -1315,6 +1323,10 @@
struct T3GlyphStack {
Gushort code; // character code
+ GBool haveDx; // set after seeing a d0/d1 operator
+ GBool doNotCache; // set if we see a gsave/grestore before
+ // the d0/d1
+
//----- cache info
T3FontCache *cache; // font cache for the current font
T3FontCacheTag *cacheTag; // pointer to cache tag for the glyph
@@ -1592,11 +1604,21 @@
void SplashOutputDev::saveState(GfxState *state) {
splash->saveState();
+ if (t3GlyphStack && !t3GlyphStack->haveDx) {
+ t3GlyphStack->doNotCache = gTrue;
+ error(errSyntaxWarning, -1,
+ "Save (q) operator before d0/d1 in Type 3 glyph");
+ }
}
void SplashOutputDev::restoreState(GfxState *state) {
splash->restoreState();
needFontUpdate = gTrue;
+ if (t3GlyphStack && !t3GlyphStack->haveDx) {
+ t3GlyphStack->doNotCache = gTrue;
+ error(errSyntaxWarning, -1,
+ "Restore (Q) operator before d0/d1 in Type 3 glyph");
+ }
}
void SplashOutputDev::updateAll(GfxState *state) {
@@ -2052,6 +2074,7 @@
reload:
delete id;
delete fontLoc;
+ fontLoc = NULL;
if (fontsrc && !fontsrc->isFile)
fontsrc->unref();
@@ -2659,9 +2682,9 @@
t3GlyphStack->cache = t3Font;
t3GlyphStack->cacheTag = NULL;
t3GlyphStack->cacheData = NULL;
+ t3GlyphStack->haveDx = gFalse;
+ t3GlyphStack->doNotCache = gFalse;
- haveT3Dx = gFalse;
-
return gFalse;
}
@@ -2690,7 +2713,7 @@
}
void SplashOutputDev::type3D0(GfxState *state, double wx, double wy) {
- haveT3Dx = gTrue;
+ t3GlyphStack->haveDx = gTrue;
}
void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
@@ -2702,10 +2725,14 @@
int i, j;
// ignore multiple d0/d1 operators
- if (haveT3Dx) {
+ if (t3GlyphStack->haveDx) {
return;
}
- haveT3Dx = gTrue;
+ t3GlyphStack->haveDx = gTrue;
+ // don't cache if we got a gsave/grestore before the d1
+ if (t3GlyphStack->doNotCache) {
+ return;
+ }
if (unlikely(t3GlyphStack == NULL)) {
error(errSyntaxWarning, -1, "t3GlyphStack was null in SplashOutputDev::type3D1");
@@ -3269,17 +3296,17 @@
Guchar *q;
Guchar *b = p;
int x;
- for (x = 0, q = rgbxLine; x < bitmap->getWidth(); ++x, ++b) {
- *q++ = *b++;
- *q++ = *b++;
- *q++ = *b++;
+ for (x = 0, q = rgbxLine; x < bitmap->getWidth(); ++x, b+=4) {
+ *q++ = b[2];
+ *q++ = b[1];
+ *q++ = b[0];
}
imgData->colorMap->getRGBLine(rgbxLine, colorLine, bitmap->getWidth());
b = p;
- for (x = 0, q = colorLine; x < bitmap->getWidth(); ++x, ++b) {
- *b++ = *q++;
- *b++ = *q++;
- *b++ = *q++;
+ for (x = 0, q = colorLine; x < bitmap->getWidth(); ++x, b+=4) {
+ b[2] = *q++;
+ b[1] = *q++;
+ b[0] = *q++;
}
break;
}
@@ -3988,6 +4015,16 @@
//----- set up the soft mask
+ if (maskColorMap->getMatteColor() != NULL) {
+ Guchar *data = (Guchar *) gmalloc(maskWidth * maskHeight);
+ maskStr->reset();
+ maskStr->doGetChars(maskWidth * maskHeight, data);
+ maskStr->close();
+ Object *maskDict = new Object();
+ maskDict->initDict(maskStr->getDict());
+ maskStr = new MemStream((char *)data, 0, maskWidth * maskHeight, maskDict);
+ ((MemStream *) maskStr)->setNeedFree(gTrue);
+ }
imgMaskData.imgStr = new ImageStream(maskStr, maskWidth,
maskColorMap->getNumPixelComps(),
maskColorMap->getBits());
@@ -4015,6 +4052,9 @@
maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, splashModeMono8, gFalse,
maskWidth, maskHeight, mat, maskInterpolate);
delete imgMaskData.imgStr;
+ if (maskColorMap->getMatteColor() == NULL) {
+ maskStr->close();
+ }
gfree(imgMaskData.lookup);
delete maskSplash;
splash->setSoftMask(maskBitmap);
@@ -4114,7 +4154,10 @@
gfree(imgData.lookup);
delete imgData.maskStr;
delete imgData.imgStr;
- maskStr->close();
+ if (maskColorMap->getMatteColor() != NULL) {
+ maskStr->close();
+ delete maskStr;
+ }
str->close();
}
@@ -4753,17 +4796,17 @@
default:
break;
}
- SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
// restore vector antialias because we support it here
if (shading->isParameterized()) {
+ SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
GBool vaa = getVectorAntialias();
GBool retVal = gFalse;
setVectorAntialias(gTrue);
retVal = splash->gouraudTriangleShadedFill(splashShading);
setVectorAntialias(vaa);
+ delete splashShading;
return retVal;
}
- delete splashShading;
return gFalse;
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -459,7 +459,6 @@
t3FontCache[splashOutT3FontCacheSize];
int nT3Fonts; // number of valid entries in t3FontCache
T3GlyphStack *t3GlyphStack; // Type 3 glyph context stack
- GBool haveT3Dx; // set after seeing a d0/d1 operator
SplashFont *font; // current font
GBool needFontUpdate; // set when the font needs to be updated
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2006-2010, 2012-2014 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012-2014, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -178,12 +178,12 @@
dict->dictLookup("Filter", &obj, recursion);
if (obj.isNull()) {
obj.free();
- dict->dictLookup("F", &obj);
+ dict->dictLookup("F", &obj, recursion);
}
dict->dictLookup("DecodeParms", ¶ms, recursion);
if (params.isNull()) {
params.free();
- dict->dictLookup("DP", ¶ms);
+ dict->dictLookup("DP", ¶ms, recursion);
}
if (obj.isName()) {
str = makeFilter(obj.getName(), str, ¶ms, recursion, dict);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
-// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2010, 2011, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
@@ -81,7 +81,8 @@
enum CryptAlgorithm {
cryptRC4,
cryptAES,
- cryptAES256
+ cryptAES256,
+ cryptNone
};
//------------------------------------------------------------------------
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -20,7 +20,7 @@
// Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
// Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
-// Copyright (C) 2008, 2010-2012, 2014, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2010-2012, 2014-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2008 Pino Toscano <pino at kde.org>
// Copyright (C) 2008, 2010 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2009 Ross Moore <ross at maths.mq.edu.au>
@@ -2607,10 +2607,14 @@
}
// break words at space character
- if (uLen == 1 && u[0] == (Unicode)0x20) {
+ if (uLen == 1 && UnicodeIsWhitespace(u[0])) {
charPos += nBytes;
endWord();
return;
+ } else if (uLen == 1 && u[0] == (Unicode)0x0) {
+ // ignore null characters
+ charPos += nBytes;
+ return;
}
state->getFontTransMat(&mat.m[0], &mat.m[1], &mat.m[2], &mat.m[3]);
@@ -3763,12 +3767,12 @@
// build the flows
//~ this needs to be adjusted for writing mode (vertical text)
//~ this also needs to account for right-to-left column ordering
- flow = NULL;
while (flows) {
flow = flows;
flows = flows->next;
delete flow;
}
+ flow = NULL;
flows = lastFlow = NULL;
// assume blocks are already in reading order,
// and construct flows accordingly.
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,7 +17,7 @@
// Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
// Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
-// Copyright (C) 2008, 2010, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2010, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2010 Brian Ewins <brian.ewins at gmail.com>
// Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
@@ -194,6 +194,7 @@
int rot; // rotation, multiple of 90 degrees
// (0, 1, 2, or 3)
+ int wMode; // horizontal (0) or vertical (1) writing mode
double xMin, xMax; // bounding box x coordinates
double yMin, yMax; // bounding box y coordinates
double base; // baseline x or y coordinate
@@ -211,8 +212,8 @@
double fontSize; // font size
GBool spaceAfter; // set if there is a space between this
// word and the next word on the line
+ GBool underlined;
TextWord *next; // next word in line
- int wMode; // horizontal (0) or vertical (1) writing mode
#if TEXTOUT_WORD_LIST
double colorR, // word color
@@ -220,7 +221,6 @@
colorB;
#endif
- GBool underlined;
AnnotLink *link;
friend class TextPool;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -16,6 +16,8 @@
// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2016 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -25,6 +27,7 @@
#include "goo/gmem.h"
#include "PDFDocEncoding.h"
#include "UTF.h"
+#include <algorithm>
bool UnicodeIsValid(Unicode ucs4)
{
@@ -89,8 +92,10 @@
len = textStr->getLength();
s = textStr->getCString();
- if (len == 0)
+ if (len == 0) {
+ *ucs4 = 0;
return 0;
+ }
if (textStr->hasUnicodeMarker()) {
Unicode *utf16;
@@ -114,3 +119,14 @@
*ucs4 = u;
return len;
}
+
+bool UnicodeIsWhitespace(Unicode ucs4)
+{
+ static Unicode const spaces[] = { 0x0009, 0x000A, 0x000B, 0x000C, 0x000D,
+ 0x0020, 0x0085, 0x00A0, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
+ 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F,
+ 0x3000 };
+ Unicode const *end = spaces + sizeof(spaces) / sizeof(spaces[0]);
+ Unicode const *i = std::lower_bound(spaces, end, ucs4);
+ return (i != end && *i == ucs4);
+}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,6 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
//
//========================================================================
@@ -35,5 +36,7 @@
// check if UCS-4 character is valid
bool UnicodeIsValid(Unicode ucs4);
+// is a unicode whitespace character
+bool UnicodeIsWhitespace(Unicode ucs4);
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006, 2007 Ed Catmur <ed at catmur.co.uk>
// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2016 Khaled Hosny <khaledhosny at eglug.org>
//
@@ -1028,16 +1028,19 @@
int midpoint = (start + end) / 2;
if (u == decomp_table[midpoint].character) {
int offset = decomp_table[midpoint].offset;
- if (offset == -1)
+ if (offset == -1) {
break;
- else {
+ } else {
int length = decomp_table[midpoint].length, i;
- if (buf)
- for (i = 0; i < length; ++i)
- if (unicodeTypeR(u) && reverseRTL)
- buf[i] = decomp_expansion[offset + length - i - 1];
- else
- buf[i] = decomp_expansion[offset + i];
+ if (buf) {
+ for (i = 0; i < length; ++i) {
+ if (unicodeTypeR(u) && reverseRTL) {
+ buf[i] = decomp_expansion[offset + length - i - 1];
+ } else {
+ buf[i] = decomp_expansion[offset + i];
+ }
+ }
+ }
return length;
}
} else if (midpoint == start)
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Dan Sheridan <dan.sheridan at postman.org.uk>
// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
-// Copyright (C) 2006, 2008, 2010, 2012-2014 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2008, 2010, 2012-2014, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007-2008 Julien Rebetez <julienr at svn.gnome.org>
// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009, 2010 Ilya Gorenbein <igorenbein at finjan.com>
@@ -24,6 +24,7 @@
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Pino Toscano <pino at kde.org>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -286,6 +287,7 @@
entries = NULL;
capacity = 0;
size = 0;
+ modified = gFalse;
streamEnds = NULL;
streamEndsLen = 0;
objStrs = new PopplerCache(5);
@@ -298,6 +300,7 @@
rootNum = -1;
strOwner = gFalse;
xrefReconstructed = gFalse;
+ encAlgorithm = cryptNone;
}
XRef::XRef() {
@@ -973,7 +976,12 @@
do {
++p;
} while (*p && isdigit(*p & 0xff));
- if (isspace(*p & 0xff)) {
+ if ((*p & 0xff) == 0 || isspace(*p & 0xff)) {
+ if ((*p & 0xff) == 0) {
+ //new line, continue with next line!
+ str->getLine(buf, 256);
+ p = buf - 1;
+ }
do {
++p;
} while (*p && isspace(*p & 0xff));
@@ -982,7 +990,12 @@
do {
++p;
} while (*p && isdigit(*p & 0xff));
- if (isspace(*p & 0xff)) {
+ if ((*p & 0xff) == 0 || isspace(*p & 0xff)) {
+ if ((*p & 0xff) == 0) {
+ //new line, continue with next line!
+ str->getLine(buf, 256);
+ p = buf - 1;
+ }
do {
++p;
} while (*p && isspace(*p & 0xff));
@@ -1251,6 +1264,7 @@
err:
if (!xRefStream && !xrefReconstructed) {
+ error(errInternal, -1, "xref num {0:d} not found but needed, try to reconstruct\n", num);
rootNum = -1;
constructXRef(&xrefReconstructed);
return fetch(num, gen, obj, ++recursion);
@@ -1279,6 +1293,44 @@
return trailerDict.dictLookupNF("Info", obj);
}
+Object *XRef::createDocInfoIfNoneExists(Object *obj) {
+ getDocInfo(obj);
+
+ if (obj->isDict()) {
+ return obj;
+ } else if (!obj->isNull()) {
+ // DocInfo exists, but isn't a dictionary (doesn't comply with the PDF reference)
+ obj->free();
+ removeDocInfo();
+ }
+
+ obj->initDict(this);
+
+ Ref ref = addIndirectObject(obj);
+
+ Object objRef;
+ objRef.initRef(ref.num, ref.gen);
+
+ trailerDict.dictSet("Info", &objRef);
+
+ objRef.free();
+
+ return obj;
+}
+
+void XRef::removeDocInfo() {
+ Object infoObjRef;
+ getDocInfoNF(&infoObjRef);
+ if (infoObjRef.isNull()) {
+ return;
+ }
+
+ trailerDict.dictRemove("Info");
+
+ removeIndirectObject(infoObjRef.getRef());
+ infoObjRef.free();
+}
+
GBool XRef::getStreamEnd(Goffset streamStart, Goffset *streamEnd) {
int a, b, m;
@@ -1362,6 +1414,7 @@
e->obj.free();
o->copy(&(e->obj));
e->setFlag(XRefEntry::Updated, gTrue);
+ setModified();
}
Ref XRef::addIndirectObject (Object* o) {
@@ -1387,6 +1440,7 @@
e->type = xrefEntryUncompressed;
o->copy(&e->obj);
e->setFlag(XRefEntry::Updated, gTrue);
+ setModified();
Ref r;
r.num = entryIndexToUse;
@@ -1408,6 +1462,7 @@
e->type = xrefEntryFree;
e->gen++;
e->setFlag(XRefEntry::Updated, gTrue);
+ setModified();
}
void XRef::writeXRef(XRef::XRefWriter *writer, GBool writeAllEntries) {
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/XRef.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -22,6 +22,7 @@
// Copyright (C) 2012, 2013, 2016 Thomas Freitag <Thomas.Freitag at kabelmail.de>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba at 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
@@ -149,6 +150,13 @@
Object *getDocInfo(Object *obj);
Object *getDocInfoNF(Object *obj);
+ // Create and return the document's Info dictionary if none exists.
+ // Otherwise return the existing one.
+ Object *createDocInfoIfNoneExists(Object *obj);
+
+ // Remove the document's Info dictionary and update the trailer dictionary.
+ void removeDocInfo();
+
// Return the number of objects in the xref table.
int getNumObjects() { return size; }
@@ -175,6 +183,11 @@
XRefEntry *getEntry(int i, GBool complainIfMissing = gTrue);
Object *getTrailerDict() { return &trailerDict; }
+ // Was the XRef modified?
+ GBool isModified() { return modified; }
+ // Set the modification flag for XRef to true.
+ void setModified() { modified = gTrue; }
+
// Write access
void setModifiedObject(Object* o, Ref r);
Ref addIndirectObject (Object* o);
@@ -203,6 +216,7 @@
int errCode; // error code (if <ok> is false)
GBool xrefReconstructed; // marker, true if xref was already reconstructed
Object trailerDict; // trailer dictionary
+ GBool modified;
Goffset *streamEnds; // 'endstream' positions - only used in
// damaged files
int streamEndsLen; // number of valid entries in streamEnds
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.cmake
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.cmake 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.cmake 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,6 +15,7 @@
//
// Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
// Copyright (C) 2014 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2016 Tor Lillqvist <tml at collabora.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
@@ -134,7 +135,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
@@ -186,7 +187,7 @@
#define GCC_PRINTF_FORMAT(fmt_index, va_index)
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
#define fmax(a, b) std::max(a, b)
#define fmin(a, b) std::min(a, b)
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.in
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/poppler-config.h.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,6 +15,7 @@
//
// Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
// Copyright (C) 2014 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2016 Tor Lillqvist <tml at collabora.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
@@ -134,7 +135,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
@@ -186,7 +187,7 @@
#define GCC_PRINTF_FORMAT(fmt_index, va_index)
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
#define fmax(a, b) std::max(a, b)
#define fmin(a, b) std::min(a, b)
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/splash/Splash.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/splash/Splash.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/splash/Splash.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,9 +11,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005-2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
-// Copyright (C) 2010-2015 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2010-2016 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
// Copyright (C) 2011-2013, 2015 William Bader <williambader at hotmail.com>
// Copyright (C) 2012 Markus Trippelsdorf <markus at trippelsdorf.de>
@@ -1642,9 +1642,7 @@
restoreState();
}
delete state;
- if (vectorAntialias) {
- delete aaBuf;
- }
+ delete aaBuf;
}
//------------------------------------------------------------------------
@@ -5747,27 +5745,32 @@
colorinterp = scanColorMap[0] * scanLimitL + scanColorMap[1];
bitmapOff = scanLineOff + scanLimitL * colorComps;
- for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
- // FIXME : standard rectangular clipping can be done for a
- // complete scanline which is faster
- // --> see SplashClip and its methods
- if (!clip->test(X, Y))
- continue;
+ if (likely(bitmapOff >= 0)) {
+ for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
+ // FIXME : standard rectangular clipping can be done for a
+ // complete scanline which is faster
+ // --> see SplashClip and its methods
+ if (!clip->test(X, Y))
+ continue;
- assert(fabs(colorinterp - (scanColorMap[0] * X + scanColorMap[1])) < 1e-10);
- assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize);
+ assert(fabs(colorinterp - (scanColorMap[0] * X + scanColorMap[1])) < 1e-10);
+ assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize);
- shading->getParameterizedColor(colorinterp, bitmapMode, &bitmapData[bitmapOff]);
+ shading->getParameterizedColor(colorinterp, bitmapMode, &bitmapData[bitmapOff]);
- // make the shading visible.
- // Note that opacity is handled by the bDirectBlit stuff, see
- // above for comments and below for implementation.
- if (hasAlpha)
- bitmapAlpha[Y * bitmapWidth + X] = 255;
- }
+ // make the shading visible.
+ // Note that opacity is handled by the bDirectBlit stuff, see
+ // above for comments and below for implementation.
+ if (hasAlpha)
+ bitmapAlpha[Y * bitmapWidth + X] = 255;
+ }
+ }
}
}
} else {
+ if (!bDirectBlit) {
+ delete blitTarget;
+ }
return gFalse;
}
@@ -5914,7 +5917,7 @@
SplashPath *pathIn, *dashPath, *pathOut;
SplashCoord d, dx, dy, wdx, wdy, dxNext, dyNext, wdxNext, wdyNext;
SplashCoord crossprod, dotprod, miter, m;
- GBool first, last, closed;
+ GBool first, last, closed, hasangle;
int subpathStart0, subpathStart1, seg, i0, i1, j0, j1, k0, k1;
int left0, left1, left2, right0, right1, right2, join0, join1, join2;
int leftFirst, rightFirst, firstPt;
@@ -6142,6 +6145,7 @@
// compute the join parameters
crossprod = dx * dyNext - dy * dxNext;
dotprod = -(dx * dxNext + dy * dyNext);
+ hasangle = crossprod != 0 || dx * dxNext < 0 || dy * dyNext < 0;
if (dotprod > 0.9999) {
// avoid a divide-by-zero -- set miter to something arbitrary
// such that sqrt(miter) will exceed miterLimit (and m is never
@@ -6161,7 +6165,7 @@
}
// round join
- if (state->lineJoin == splashLineJoinRound) {
+ if (hasangle && state->lineJoin == splashLineJoinRound) {
pathOut->moveTo(pathIn->pts[j0].x + (SplashCoord)0.5 * w,
pathIn->pts[j0].y);
pathOut->curveTo(pathIn->pts[j0].x + (SplashCoord)0.5 * w,
@@ -6189,7 +6193,7 @@
pathIn->pts[j0].x + (SplashCoord)0.5 * w,
pathIn->pts[j0].y);
- } else {
+ } else if (hasangle) {
pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y);
// angle < 180
Modified: branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -22,6 +22,7 @@
// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2012 Anthony Wesley <awesley at smartnetworks.com.au>
// Copyright (C) 2015 Adam Reichold <adamreichold at myopera.com>
+// Copyright (C) 2016 Kenji Uno <ku at digitaldolphins.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -354,6 +355,8 @@
ImgWriter *writer;
SplashError e;
+ SplashColorMode imageWriterFormat = splashModeRGB8;
+
switch (format) {
#ifdef ENABLE_LIBPNG
case splashFormatPng:
@@ -377,9 +380,11 @@
switch (mode) {
case splashModeMono1:
writer = new TiffWriter(TiffWriter::MONOCHROME);
+ imageWriterFormat = splashModeMono1;
break;
case splashModeMono8:
writer = new TiffWriter(TiffWriter::GRAY);
+ imageWriterFormat = splashModeMono8;
break;
case splashModeRGB8:
case splashModeBGR8:
@@ -408,7 +413,7 @@
return splashErrGeneric;
}
- e = writeImgFile(writer, f, hDPI, vDPI);
+ e = writeImgFile(writer, f, hDPI, vDPI, imageWriterFormat);
delete writer;
return e;
}
@@ -617,7 +622,7 @@
}
#endif
-SplashError SplashBitmap::writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI) {
+SplashError SplashBitmap::writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI, SplashColorMode imageWriterFormat) {
if (mode != splashModeRGB8 && mode != splashModeMono8 && mode != splashModeMono1 && mode != splashModeXBGR8 && mode != splashModeBGR8
#if SPLASH_CMYK
&& mode != splashModeCMYK8 && mode != splashModeDeviceN8
@@ -744,41 +749,81 @@
case splashModeMono8:
{
- unsigned char *row = new unsigned char[3 * width];
- for (int y = 0; y < height; y++) {
- // Convert into a PNG row
- for (int x = 0; x < width; x++) {
- row[3*x] = data[y * rowSize + x];
- row[3*x+1] = data[y * rowSize + x];
- row[3*x+2] = data[y * rowSize + x];
+ if (imageWriterFormat == splashModeMono8) {
+ SplashColorPtr row;
+ unsigned char **row_pointers = new unsigned char*[height];
+ row = data;
+
+ for (int y = 0; y < height; ++y) {
+ row_pointers[y] = row;
+ row += rowSize;
}
-
- if (!writer->writeRow(&row)) {
- delete[] row;
+ if (!writer->writePointers(row_pointers, height)) {
+ delete[] row_pointers;
return splashErrGeneric;
}
+ delete[] row_pointers;
+ } else if (imageWriterFormat == splashModeRGB8) {
+ unsigned char *row = new unsigned char[3 * width];
+ for (int y = 0; y < height; y++) {
+ // Convert into a PNG row
+ for (int x = 0; x < width; x++) {
+ row[3*x] = data[y * rowSize + x];
+ row[3*x+1] = data[y * rowSize + x];
+ row[3*x+2] = data[y * rowSize + x];
+ }
+
+ if (!writer->writeRow(&row)) {
+ delete[] row;
+ return splashErrGeneric;
+ }
+ }
+ delete[] row;
}
- delete[] row;
+ else {
+ // only splashModeMono8 or splashModeRGB8
+ return splashErrGeneric;
+ }
}
break;
case splashModeMono1:
{
- unsigned char *row = new unsigned char[3 * width];
- for (int y = 0; y < height; y++) {
- // Convert into a PNG row
- for (int x = 0; x < width; x++) {
- getPixel(x, y, &row[3*x]);
- row[3*x+1] = row[3*x];
- row[3*x+2] = row[3*x];
+ if (imageWriterFormat == splashModeMono1) {
+ SplashColorPtr row;
+ unsigned char **row_pointers = new unsigned char*[height];
+ row = data;
+
+ for (int y = 0; y < height; ++y) {
+ row_pointers[y] = row;
+ row += rowSize;
}
-
- if (!writer->writeRow(&row)) {
- delete[] row;
+ if (!writer->writePointers(row_pointers, height)) {
+ delete[] row_pointers;
return splashErrGeneric;
}
+ delete[] row_pointers;
+ } else if (imageWriterFormat == splashModeRGB8) {
+ unsigned char *row = new unsigned char[3 * width];
+ for (int y = 0; y < height; y++) {
+ // Convert into a PNG row
+ for (int x = 0; x < width; x++) {
+ getPixel(x, y, &row[3*x]);
+ row[3*x+1] = row[3*x];
+ row[3*x+2] = row[3*x];
+ }
+
+ if (!writer->writeRow(&row)) {
+ delete[] row;
+ return splashErrGeneric;
+ }
+ }
+ delete[] row;
}
- delete[] row;
+ else {
+ // only splashModeMono1 or splashModeRGB8
+ return splashErrGeneric;
+ }
}
break;
Modified: branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/splash/SplashBitmap.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -21,6 +21,7 @@
// Copyright (C) 2010 William Bader <williambader at hotmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2015 Adam Reichold <adamreichold at myopera.com>
+// Copyright (C) 2016 Kenji Uno <ku at digitaldolphins.jp>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -74,7 +75,7 @@
SplashError writeImgFile(SplashImageFileFormat format, char *fileName, int hDPI, int vDPI, const char *compressionString = "");
SplashError writeImgFile(SplashImageFileFormat format, FILE *f, int hDPI, int vDPI, const char *compressionString = "");
- SplashError writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI);
+ SplashError writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI, SplashColorMode imageWriterFormat);
enum ConversionMode
{
Modified: branches/stable/source/src/libs/poppler/poppler-src/splash/SplashScreen.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/splash/SplashScreen.cc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/poppler-src/splash/SplashScreen.cc 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,7 +11,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 at kde.org>
+// Copyright (C) 2009, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
@@ -30,6 +30,7 @@
#include <algorithm>
#include "goo/gmem.h"
#include "goo/grandom.h"
+#include "goo/GooLikely.h"
#include "SplashMath.h"
#include "SplashScreen.h"
@@ -377,7 +378,9 @@
sizeM1 = screen->sizeM1;
log2Size = screen->log2Size;
mat = (Guchar *)gmallocn(size * size, sizeof(Guchar));
- memcpy(mat, screen->mat, size * size * sizeof(Guchar));
+ if (likely(mat != NULL)) {
+ memcpy(mat, screen->mat, size * size * sizeof(Guchar));
+ }
minVal = screen->minVal;
maxVal = screen->maxVal;
}
Modified: branches/stable/source/src/libs/poppler/version.ac
===================================================================
--- branches/stable/source/src/libs/poppler/version.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/poppler/version.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.42.0])
+m4_define([poppler_version], [0.51.0])
Added: branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,157 @@
+2015-05-09 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-41-W32TeX: On Windows use USERPROFILE instead of HOME.
+
+2015-05-07 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-41-W32TeX (new): More changes from Akira.
+
+2014-05-30 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported xpdf-3.04 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz
+
+ * patch-10-exclude-body-of-Page_getDefaultCTM,
+ patch-20-skip-reading-config-file,
+ patch-22-exclude-openTempFile, patch-30-include-strings_h,
+ patch-40-W32TeX: Adapted.
+
+2012-10-19 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-12-mingw32 (removed): The library now needs '-lgdi32'.
+ * patch-20-skip-reading-config-file: Less intrusive solution.
+ * patch-30-include-strings_h: Adapted.
+
+ * patch-40-W32TeX (new): Remove TL vs W32TeX diffs (from Akira).
+
+2012-05-16 Vladimir Volovich <vvv at vsu.ru>
+
+ * patch-30-include-strings_h (new): Bug fix for AIX 4.3 and xlc.
+ The Posix manpage says strcasecmp() is declared in <strings.h>.
+
+2011-08-22 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-40-objectStream-support-for-pdftosrc: Removed, no longer
+ required with new logic for Object Streams in pdftosrc.cc.
+
+2011-08-22 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported xpdf-3.03 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz
+
+ * patch-0?-pl?, patch-11-time_h, patch-15-fix-pow-arg,
+ patch-60-bug-fix: Removed, now in distribution.
+ * patch-10-exclude-body-of-Page_getDefaultCTM, patch-12-mingw32,
+ patch-20-skip-reading-config-file,
+ patch-22-exclude-openTempFile,
+ patch-40-objectStream-support-for-pdftosrc: Adapted.
+
+2010-12-02 Karl Berry <karl at tug.org>
+
+ * patch-60-bug-fix: update with Thanh's comments.
+
+2010-12-01 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-60-bug-fix (new): Bug fix for 4-digit bfrange values in
+ ToUnicode CMap; backport from poppler-0.14.5.
+ Mail from Thanh Han The, Wed, 1 Dec 2010 08:57:29, ref:
+ http://sarovar.org/tracker/index.php?func=detail&aid=4321&group_id=106&atid=493
+
+2010-10-25 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-05-pl5 (new): Official 3.02pl5 patch plus change of
+ xpdfVersion "3.02pl4" -> "3.02pl5"
+
+2010-04-13 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-45-getmetadatanf (removed): unnecessary.
+
+2010-04-06 Hartmut Henkel <hartmut_henkel at gmx.de>
+
+ * patch-45-getmetadatanf (new): needed by luaTeX's pdftoepdf.cc.
+
+2009-09-15 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-04-pl4 (new): Official 3.02pl4 patch plus change of
+ xpdfVersion "3.02pl3" -> "3.02pl4"
+ * patch-40-*: Adapted to presence of patch-04-pl4.
+
+2009-05-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-16-size-of-struct (removed): unnecessary.
+ * patch-17-strCrypt (removed): was never useful.
+ * patch-23-exclude-keyBindings (removed): has removed lots of
+ unused code, but may be problematic with future foolabs updates.
+
+2009-05-11 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-10-exclude-body-of-Page::getDefaultCTM (removed),
+ * patch-10-exclude-body-of-Page_getDefaultCTM (new): renamed
+ this file to avoid problems with rsync and windows.
+
+2009-05-10 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Reorganize and simplify pdftex patches.
+
+ * patch-10-PDF_PARSER_ONLY (removed): replaced by ...
+ * patch-10-exclude-body-of-Page::getDefaultCTM (new): ... this.
+
+ from Derek B. Noonburg <derek at foolabs.com>
+
+ * patch-20-pdftex (removed): split into several pieces.
+ * patch-20-skip-reading-config-file (new): simplified version
+ of previous code.
+ * patch-22-exclude-openTempFile: new file.
+ * patch-23-exclude-keyBindings: new file.
+ * patch-40-objectStream-support-for-pdftosrc: new file.
+
+ from Han The Thanh <thanh at pdftex.org>
+
+2009-05-05 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-15-fix-pow-arg (new): Three ...
+ * patch-16-size-of-struct (new): ... small patches ...
+ * patch-17-strCrypt (new): ... split of from ...
+ * patch-20-pdftex: ... this one.
+
+2009-04-30 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-03-pl3 (new): Official 3.02pl3 patch plus change of
+ xpdfVersion "3.02pl2" -> "3.02pl3"
+ * patch-[12]?-*: adapted to presence of patch-03-pl3.
+
+2009-04-02 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-12-mingw32 (new): Buld fix for mingw32.
+
+ from Derek B. Noonburg <derek at foolabs.com>
+
+2009-03-05 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-11-time_h (new): Buld fix for djgpp.
+
+ from Derek B. Noonburg <derek at foolabs.com>
+
+2009-02-08 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-10-PDF_PARSER_ONLY (new): required build with
+ PDF_PARSER_ONLY defined.
+
+ * patch-20-pdftex (new): To restore former tree for pdfTeX.
+
+2007-11-12 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-02-pl2 (new): Official 3.02pl2 patch plus change of
+ xpdfVersion "3.02pl1" -> "3.02pl2"
+
+2007-08-01 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * patch-01-pl1 (new): Official 3.02pl1 patch plus change of
+ xpdfVersion "3.02" -> "3.02pl1" in ../xpdf/config.h.
+
+2007-02-29 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Imported xpdf-3.02 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz
+ http://www.foolabs.com/xpdf/xpdf-3.02.tar.gz
+
Added: branches/stable/source/src/libs/xpdf/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/TL-Changes (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/TL-Changes 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,6 @@
+Changes applied to the xpdf-3.04/ tree as obtained from:
+ ftp://ftp.foolabs.com/pub/xpdf/
+
+Removed:
+ install-sh
+
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-10-exclude-body-of-Page_getDefaultCTM
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-10-exclude-body-of-Page_getDefaultCTM (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-10-exclude-body-of-Page_getDefaultCTM 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,23 @@
+ Enable compilation with -DPDF_PARSER_ONLY
+
+diff -ur -N xpdf-3.04.orig/xpdf/Page.cc xpdf-3.04/xpdf/Page.cc
+--- xpdf-3.04.orig/xpdf/Page.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/Page.cc 2014-05-30 19:57:46.000000000 +0200
+@@ -468,9 +468,9 @@
+ delete links;
+ }
+
+-#ifndef PDF_PARSER_ONLY
+ void Page::getDefaultCTM(double *ctm, double hDPI, double vDPI,
+ int rotate, GBool useMediaBox, GBool upsideDown) {
++#ifndef PDF_PARSER_ONLY
+ GfxState *state;
+ int i;
+
+@@ -487,5 +487,5 @@
+ ctm[i] = state->getCTM()[i];
+ }
+ delete state;
+-}
+ #endif
++}
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-20-skip-reading-config-file
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-20-skip-reading-config-file (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-20-skip-reading-config-file 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,60 @@
+ Patches for pdfTeX / luaTeX / XeTeX
+
+ Declare GlobalParams constructor with a default config file argument
+ and skip reading a config file.
+
+ from:
+ Han The Thanh <thanh at pdftex.org>
+ Peter Breitenlohner <tex-live at tug.org>
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 2001-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live at tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #include <aconf.h>
+
+@@ -812,6 +815,7 @@
+ f = NULL;
+ fileName = NULL;
+ if (cfgFileName && cfgFileName[0]) {
++#ifndef PDF_PARSER_ONLY
+ fileName = new GString(cfgFileName);
+ if (!(f = fopen(fileName->getCString(), "r"))) {
+ delete fileName;
+@@ -844,6 +848,7 @@
+ parseFile(fileName, f);
+ delete fileName;
+ fclose(f);
++#endif /* !PDF_PARSER_ONLY */
+ }
+ }
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.h xpdf-3.04/xpdf/GlobalParams.h
+--- xpdf-3.04.orig/xpdf/GlobalParams.h 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.h 2014-05-30 19:29:23.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 2001-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live at tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #ifndef GLOBALPARAMS_H
+ #define GLOBALPARAMS_H
+@@ -173,7 +176,7 @@
+
+ // Initialize the global parameters by attempting to read a config
+ // file.
+- GlobalParams(const char *cfgFileName);
++ GlobalParams(const char *cfgFileName = NULL);
+
+ ~GlobalParams();
+
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-22-exclude-openTempFile
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-22-exclude-openTempFile (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-22-exclude-openTempFile 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,34 @@
+ Patches for pdfTeX / luaTeX / XeTeX
+
+ from:
+ Han The Thanh <thanh at pdftex.org>
+
+diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc
+--- xpdf-3.04.orig/goo/gfile.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200
+@@ -7,6 +7,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live at tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #include <aconf.h>
+
+@@ -441,6 +444,7 @@
+ #endif
+ }
+
++#ifndef PDF_PARSER_ONLY
+ GBool openTempFile(GString **name, FILE **f,
+ const char *mode, const char *ext) {
+ #if defined(_WIN32)
+@@ -551,6 +555,7 @@
+ return gTrue;
+ #endif
+ }
++#endif
+
+ GBool createDir(char *path, int mode) {
+ #ifdef _WIN32
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-30-include-strings_h
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-30-include-strings_h (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-30-include-strings_h 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,15 @@
+ The Posix manpage says strcasecmp() is declared in <strings.h>
+ and this indeed required for AIX 4.3 and xlc.
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200
+@@ -54,6 +54,8 @@
+ #ifdef _WIN32
+ # define strcasecmp stricmp
+ # define strncasecmp strnicmp
++#else
++# include <strings.h>
+ #endif
+
+ #if MULTITHREADED
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-40-W32TeX
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-40-W32TeX (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-40-W32TeX 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,29 @@
+ WIN32TeX uses MSVC 5.0 with the kpathsea headers and library.
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200
+@@ -52,6 +52,8 @@
+ #include "GlobalParams.h"
+
+ #ifdef _WIN32
++# undef strcasecmp
++# undef strncasecmp
+ # define strcasecmp stricmp
+ # define strncasecmp strnicmp
+ #else
+diff -ur -N xpdf-3.04.orig/xpdf/config.h xpdf-3.04/xpdf/config.h
+--- xpdf-3.04.orig/xpdf/config.h 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/config.h 2014-05-30 19:52:04.000000000 +0200
+@@ -78,11 +78,6 @@
+ // 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
Added: branches/stable/source/src/libs/xpdf/TLpatches/patch-41-W32TeX
===================================================================
--- branches/stable/source/src/libs/xpdf/TLpatches/patch-41-W32TeX (rev 0)
+++ branches/stable/source/src/libs/xpdf/TLpatches/patch-41-W32TeX 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,177 @@
+diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc
+--- xpdf-3.04.orig/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200
++++ xpdf-3.04/goo/gfile.cc 2015-05-09 15:49:36.000000000 +0200
+@@ -55,7 +55,11 @@
+ char *s;
+ GString *ret;
+
++#ifdef _WIN32
++ if ((s = getenv("USERPROFILE")))
++#else
+ if ((s = getenv("HOME")))
++#endif
+ ret = new GString(s);
+ else
+ ret = new GString(".");
+@@ -559,7 +563,7 @@
+
+ GBool createDir(char *path, int mode) {
+ #ifdef _WIN32
+- return !mkdir(path);
++ return !_mkdir(path);
+ #else
+ return !mkdir(path, mode);
+ #endif
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -16,7 +16,9 @@
+ #endif
+
+ #ifdef _WIN32
++# ifndef _WIN32_WINNT
+ # define _WIN32_WINNT 0x0500 // for GetSystemWindowsDirectory
++# endif
+ # include <windows.h>
+ #endif
+ #include <string.h>
+@@ -54,8 +56,8 @@
+ #ifdef _WIN32
+ # undef strcasecmp
+ # undef strncasecmp
+-# define strcasecmp stricmp
+-# define strncasecmp strnicmp
++# define strcasecmp _stricmp
++# define strncasecmp _strnicmp
+ #else
+ # include <strings.h>
+ #endif
+@@ -2138,8 +2140,11 @@
+ base14->fontNum,
+ displayFontTab[i].obliqueFactor));
+ } else {
++// Do not display unnecessary looking message on W32
++#ifndef _WIN32
+ error(errConfig, -1, "No display font for '{0:s}'",
+ displayFontTab[i].name);
++#endif
+ }
+ }
+ }
+diff -ur -N xpdf-3.04.orig/xpdf/pdfdetach.cc xpdf-3.04/xpdf/pdfdetach.cc
+--- xpdf-3.04.orig/xpdf/pdfdetach.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdfdetach.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -74,6 +74,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if ((doList ? 1 : 0) +
+diff -ur -N xpdf-3.04.orig/xpdf/pdffonts.cc xpdf-3.04/xpdf/pdffonts.cc
+--- xpdf-3.04.orig/xpdf/pdffonts.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdffonts.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -107,6 +107,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc != 2 || printVersion || printHelp) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdfimages.cc xpdf-3.04/xpdf/pdfimages.cc
+--- xpdf-3.04.orig/xpdf/pdfimages.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdfimages.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -76,6 +76,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc != 3 || printVersion || printHelp) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdfinfo.cc xpdf-3.04/xpdf/pdfinfo.cc
+--- xpdf-3.04.orig/xpdf/pdfinfo.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdfinfo.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -100,6 +100,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc != 2 || printVersion || printHelp) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdftohtml.cc xpdf-3.04/xpdf/pdftohtml.cc
+--- xpdf-3.04.orig/xpdf/pdftohtml.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdftohtml.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -86,6 +86,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc != 3 || printVersion || printHelp) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdftopng.cc xpdf-3.04/xpdf/pdftopng.cc
+--- xpdf-3.04.orig/xpdf/pdftopng.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdftopng.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -99,6 +99,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (mono && gray) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdftoppm.cc xpdf-3.04/xpdf/pdftoppm.cc
+--- xpdf-3.04.orig/xpdf/pdftoppm.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdftoppm.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -111,6 +111,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (mono && gray) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdftops.cc xpdf-3.04/xpdf/pdftops.cc
+--- xpdf-3.04.orig/xpdf/pdftops.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdftops.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -168,6 +168,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
+diff -ur -N xpdf-3.04.orig/xpdf/pdftotext.cc xpdf-3.04/xpdf/pdftotext.cc
+--- xpdf-3.04.orig/xpdf/pdftotext.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/pdftotext.cc 2015-05-07 08:43:30.000000000 +0200
+@@ -129,6 +129,9 @@
+
+ exitCode = 99;
+
++#ifdef _MSC_VER
++ (void)kpse_set_program_name(argv[0], NULL);
++#endif
+ // parse args
+ ok = parseArgs(argDesc, &argc, argv);
+ if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
Modified: branches/stable/source/src/libs/zlib/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,11 @@
+2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import zlib-1.2.11.
+
+2017-01-03 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import zlib-1.2.10.
+
2016-02-15 Karl Berry <karl at tug.org>
* zlib-src: rename dir from zlib-1.2.8.
Modified: branches/stable/source/src/libs/zlib/README
===================================================================
--- branches/stable/source/src/libs/zlib/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,11 +1,11 @@
- Building zlib-1.2.3 as part of the TL tree
+ Building zlib-1.2.11 as part of the TL tree
==========================================
This directory libs/zlib/ uses a proxy Makefile.am to build the zlib library
-'libz' from the unmodified(*) source tree in libs/zlib/zlib-x.y.z/, bypassing
+'libz' from the unmodified(*) source tree in libs/zlib/zlib-src/, bypassing
the original build system.
-As far as applicable, the tests in libs/zlib/zlib-x.y.z/configure have been
+As far as applicable, the tests in libs/zlib/zlib-src/configure have been
translated into equivalent test in libs/zlib/configure.ac.
-----------------------------
@@ -15,3 +15,4 @@
=============================
2009-01-28 Peter Breitenlohner <peb at mppmu.mpg.de>
+2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Added: branches/stable/source/src/libs/zlib/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/TLpatches/ChangeLog (rev 0)
+++ branches/stable/source/src/libs/zlib/TLpatches/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,21 @@
+2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import zlib-1.2.11.
+ * Add patch-01-not-define-WIDECHAR-for-cygwin: Adapted.
+
+2017-01-03 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import zlib-1.2.10.
+
+2012-02-11 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Import zlib-1.2.6.
+ * patch-01-LARGEFILE64_SOURCE: Removed.
+
+2010-09-27 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ Create patch-01-LARGEFILE64_SOURCE:
+ * zlib-1.2.5/zlib.h: Use #ifndef _LARGEFILE64_SOURCE instead
+ of #ifdef _LARGEFILE64_SOURCE, to allow compilation with
+ _LARGEFILE64_SOURCE.
+
Added: branches/stable/source/src/libs/zlib/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/zlib/TLpatches/TL-Changes (rev 0)
+++ branches/stable/source/src/libs/zlib/TLpatches/TL-Changes 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,75 @@
+Changes applied to the zlib-1.2.11/ tree as obtained from:
+ http://zlib.net/zlib-1.2.11.tar.xz
+
+Removed:
+ Makefile
+ zconf.h
+ doc/rfc*
+
+Converted Dos/Win line ends to native:
+ contrib/dotzlib/DotZLib/AssemblyInfo.cs
+ contrib/dotzlib/DotZLib/ChecksumImpl.cs
+ contrib/dotzlib/DotZLib/CircularBuffer.cs
+ contrib/dotzlib/DotZLib/CodecBase.cs
+ contrib/dotzlib/DotZLib/Deflater.cs
+ contrib/dotzlib/DotZLib/DotZLib.cs
+ contrib/dotzlib/DotZLib/DotZLib.csproj
+ contrib/dotzlib/DotZLib/GZipStream.cs
+ contrib/dotzlib/DotZLib/Inflater.cs
+ contrib/dotzlib/DotZLib/UnitTests.cs
+ contrib/dotzlib/DotZLib.build
+ contrib/dotzlib/DotZLib.sln
+ contrib/dotzlib/LICENSE_1_0.txt
+ contrib/dotzlib/readme.txt
+ contrib/gcc_gvmat64/gvmat64.S
+ contrib/masmx64/bld_ml64.bat
+ contrib/masmx64/gvmat64.asm
+ contrib/masmx64/inffas8664.c
+ contrib/masmx64/inffasx64.asm
+ contrib/masmx64/readme.txt
+ contrib/masmx86/bld_ml32.bat
+ contrib/masmx86/inffas32.asm
+ contrib/masmx86/match686.asm
+ contrib/masmx86/readme.txt
+ contrib/testzlib/testzlib.c
+ contrib/testzlib/testzlib.txt
+ contrib/vstudio/readme.txt
+ contrib/vstudio/vc10/miniunz.vcxproj
+ contrib/vstudio/vc10/miniunz.vcxproj.filters
+ contrib/vstudio/vc10/minizip.vcxproj
+ contrib/vstudio/vc10/minizip.vcxproj.filters
+ contrib/vstudio/vc10/testzlib.vcxproj
+ contrib/vstudio/vc10/testzlib.vcxproj.filters
+ contrib/vstudio/vc10/testzlibdll.vcxproj
+ contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+ contrib/vstudio/vc10/zlib.rc
+ contrib/vstudio/vc10/zlibstat.vcxproj
+ contrib/vstudio/vc10/zlibstat.vcxproj.filters
+ contrib/vstudio/vc10/zlibvc.def
+ contrib/vstudio/vc10/zlibvc.sln
+ contrib/vstudio/vc10/zlibvc.vcxproj
+ contrib/vstudio/vc10/zlibvc.vcxproj.filters
+ contrib/vstudio/vc11/miniunz.vcxproj
+ contrib/vstudio/vc11/minizip.vcxproj
+ contrib/vstudio/vc11/testzlib.vcxproj
+ contrib/vstudio/vc11/testzlibdll.vcxproj
+ contrib/vstudio/vc11/zlib.rc
+ contrib/vstudio/vc11/zlibstat.vcxproj
+ contrib/vstudio/vc11/zlibvc.def
+ contrib/vstudio/vc11/zlibvc.sln
+ contrib/vstudio/vc11/zlibvc.vcxproj
+ contrib/vstudio/vc9/miniunz.vcproj
+ contrib/vstudio/vc9/minizip.vcproj
+ contrib/vstudio/vc9/testzlib.vcproj
+ contrib/vstudio/vc9/testzlibdll.vcproj
+ contrib/vstudio/vc9/zlib.rc
+ contrib/vstudio/vc9/zlibstat.vcproj
+ contrib/vstudio/vc9/zlibvc.def
+ contrib/vstudio/vc9/zlibvc.sln
+ contrib/vstudio/vc9/zlibvc.vcproj
+
+Added newline at end of file:
+ contrib/dotzlib/DotZLib/ChecksumImpl.cs
+ contrib/dotzlib/LICENSE_1_0.txt
+ contrib/testzlib/testzlib.txt
+
Added: branches/stable/source/src/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin
===================================================================
--- branches/stable/source/src/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin (rev 0)
+++ branches/stable/source/src/libs/zlib/TLpatches/patch-01-not-define-WIDECHAR-for-cygwin 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,12 @@
+diff -ur zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h
+--- zlib-1.2.11.orig/gzguts.h Sun Jan 01 16:37:10 2017
++++ zlib-1.2.11/gzguts.h Mon Jan 16 07:53:25 2017
+@@ -39,7 +39,7 @@
+ # include <io.h>
+ #endif
+
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+ # define WIDECHAR
+ #endif
+
Modified: branches/stable/source/src/libs/zlib/configure
===================================================================
--- branches/stable/source/src/libs/zlib/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for zlib (TeX Live) 1.2.8.
+# Generated by GNU Autoconf 2.69 for zlib (TeX Live) 1.2.11.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='zlib (TeX Live)'
PACKAGE_TARNAME='zlib--tex-live-'
-PACKAGE_VERSION='1.2.8'
-PACKAGE_STRING='zlib (TeX Live) 1.2.8'
+PACKAGE_VERSION='1.2.11'
+PACKAGE_STRING='zlib (TeX Live) 1.2.11'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1280,7 +1280,7 @@
# 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 zlib (TeX Live) 1.2.8 to adapt to many kinds of systems.
+\`configure' configures zlib (TeX Live) 1.2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.8:";;
+ short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.11:";;
esac
cat <<\_ACEOF
@@ -1444,7 +1444,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zlib (TeX Live) configure 1.2.8
+zlib (TeX Live) configure 1.2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1746,7 +1746,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zlib (TeX Live) $as_me 1.2.8, which was
+It was created by zlib (TeX Live) $as_me 1.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3669,7 +3669,7 @@
# Define the identity of the package.
PACKAGE='zlib--tex-live-'
- VERSION='1.2.8'
+ VERSION='1.2.11'
cat >>confdefs.h <<_ACEOF
@@ -6120,7 +6120,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zlib (TeX Live) $as_me 1.2.8, which was
+This file was extended by zlib (TeX Live) $as_me 1.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6186,7 +6186,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-zlib (TeX Live) config.status 1.2.8
+zlib (TeX Live) config.status 1.2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/zlib/version.ac
===================================================================
--- branches/stable/source/src/libs/zlib/version.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/version.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current zlib version
-m4_define([zlib_version], [1.2.8])
+m4_define([zlib_version], [1.2.11])
Modified: branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,7 +3,7 @@
project(zlib C)
-set(VERSION "1.2.8")
+set(VERSION "1.2.11")
option(ASM686 "Enable building i686 assembly implementation")
option(AMD64 "Enable building amd64 assembly implementation")
Modified: branches/stable/source/src/libs/zlib/zlib-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,10 +1,53 @@
ChangeLog file for zlib
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
+Changes in 1.2.10 (2 Jan 2017)
+- Avoid warnings on snprintf() return value
+- Fix bug in deflate_stored() for zero-length input
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
+
+Changes in 1.2.9 (31 Dec 2016)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
+- Improve contrib/blast to return unused bytes
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
+
Changes in 1.2.8 (28 Apr 2013)
- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
- Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Ro§]
+- Clean up contrib/vstudio [Roß]
- Correct spelling error in zlib.h
- Fix mixed line endings in contrib/vstudio
@@ -34,7 +77,7 @@
- Clean up the usage of z_const and respect const usage within zlib
- Clean up examples/gzlog.[ch] comparisons of different types
- Avoid shift equal to bits in type (caused endless loop)
-- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix uninitialized value bug in gzputc() introduced by const patches
- Fix memory allocation error in examples/zran.c [Nor]
- Fix bug where gzopen(), gzclose() would write an empty file
- Fix bug in gzclose() when gzwrite() runs out of memory
@@ -194,7 +237,7 @@
- Add a transparent write mode to gzopen() when 'T' is in the mode
- Update python link in zlib man page
- Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no libary use
+- Add a ./config --solo option to make zlib subset with no library use
- Add undocumented inflateResetKeep() function for CAB file decoding
- Add --cover option to ./configure for gcc coverage testing
- Add #define ZLIB_CONST option to use const in the z_stream interface
@@ -564,7 +607,7 @@
- Update make_vms.com [Zinser]
- Use -fPIC for shared build in configure [Teredesai, Nicholson]
- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
- Add some FAQ entries about the contrib directory
- Update the MVS question in the FAQ
- Avoid extraneous reads after EOF in gzio.c [Brown]
@@ -1178,7 +1221,7 @@
386 asm code replacing longest_match().
contrib/iostream/ by Kevin Ruland <kevin at rodin.wustl.edu>
A C++ I/O streams interface to the zlib gz* functions
- contrib/iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
+ contrib/iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
Another C++ I/O streams interface
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag at tid.es>
A very simple tar.gz file extractor using zlib
@@ -1267,7 +1310,7 @@
- fix array overlay in deflate.c which sometimes caused bad compressed data
- fix inflate bug with empty stored block
- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
+- fix deflateParams() which could generate bad compressed data.
- Bytef is define'd instead of typedef'ed (work around Borland bug)
- added an INDEX file
- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
Deleted: branches/stable/source/src/libs/zlib/zlib-src/Makefile
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/Makefile 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/Makefile 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +0,0 @@
-all:
- - at echo "Please use ./configure first. Thank you."
-
-distclean:
- make -f Makefile.in distclean
Modified: branches/stable/source/src/libs/zlib/zlib-src/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/Makefile.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/Makefile.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
# Makefile for zlib
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
# For conditions of distribution and use, see copyright notice in zlib.h
# To compile and test, type:
@@ -20,7 +20,7 @@
CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
+#CFLAGS=-g -DZLIB_DEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
# -Wstrict-prototypes -Wmissing-prototypes
@@ -32,7 +32,7 @@
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.8
+SHAREDLIBV=libz.so.1.2.11
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -53,6 +53,9 @@
mandir = ${prefix}/share/man
man3dir = ${mandir}/man3
pkgconfigdir = ${libdir}/pkgconfig
+SRCDIR=
+ZINC=
+ZINCOUT=-I.
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
@@ -113,8 +116,8 @@
fi; \
rm -f $$TMP64
-infcover.o: test/infcover.c zlib.h zconf.h
- $(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
+infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
+ $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
infcover: infcover.o libz.a
$(CC) $(CFLAGS) -o $@ infcover.o libz.a
@@ -140,25 +143,141 @@
mv _match.o match.lo
rm -f _match.s
-example.o: test/example.c zlib.h zconf.h
- $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
+example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
+ $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
-minigzip.o: test/minigzip.c zlib.h zconf.h
- $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
+minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
+ $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
-example64.o: test/example.c zlib.h zconf.h
- $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
+example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
+ $(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
-minigzip64.o: test/minigzip.c zlib.h zconf.h
- $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
+minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
+ $(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
-.SUFFIXES: .lo
-.c.lo:
+adler32.o: $(SRCDIR)adler32.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
+
+crc32.o: $(SRCDIR)crc32.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
+
+deflate.o: $(SRCDIR)deflate.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
+
+infback.o: $(SRCDIR)infback.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
+
+inffast.o: $(SRCDIR)inffast.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
+
+inflate.o: $(SRCDIR)inflate.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
+
+inftrees.o: $(SRCDIR)inftrees.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
+
+trees.o: $(SRCDIR)trees.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
+
+zutil.o: $(SRCDIR)zutil.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
+
+compress.o: $(SRCDIR)compress.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
+
+uncompr.o: $(SRCDIR)uncompr.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
+
+gzclose.o: $(SRCDIR)gzclose.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
+
+gzlib.o: $(SRCDIR)gzlib.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
+
+gzread.o: $(SRCDIR)gzread.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
+
+gzwrite.o: $(SRCDIR)gzwrite.c
+ $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
+
+
+adler32.lo: $(SRCDIR)adler32.c
- at mkdir objs 2>/dev/null || test -d objs
- $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
- - at mv objs/$*.o $@
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
+ - at mv objs/adler32.o $@
+crc32.lo: $(SRCDIR)crc32.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
+ - at mv objs/crc32.o $@
+
+deflate.lo: $(SRCDIR)deflate.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
+ - at mv objs/deflate.o $@
+
+infback.lo: $(SRCDIR)infback.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
+ - at mv objs/infback.o $@
+
+inffast.lo: $(SRCDIR)inffast.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
+ - at mv objs/inffast.o $@
+
+inflate.lo: $(SRCDIR)inflate.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
+ - at mv objs/inflate.o $@
+
+inftrees.lo: $(SRCDIR)inftrees.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
+ - at mv objs/inftrees.o $@
+
+trees.lo: $(SRCDIR)trees.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
+ - at mv objs/trees.o $@
+
+zutil.lo: $(SRCDIR)zutil.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
+ - at mv objs/zutil.o $@
+
+compress.lo: $(SRCDIR)compress.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
+ - at mv objs/compress.o $@
+
+uncompr.lo: $(SRCDIR)uncompr.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
+ - at mv objs/uncompr.o $@
+
+gzclose.lo: $(SRCDIR)gzclose.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
+ - at mv objs/gzclose.o $@
+
+gzlib.lo: $(SRCDIR)gzlib.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
+ - at mv objs/gzlib.o $@
+
+gzread.lo: $(SRCDIR)gzread.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
+ - at mv objs/gzread.o $@
+
+gzwrite.lo: $(SRCDIR)gzwrite.c
+ - at mkdir objs 2>/dev/null || test -d objs
+ $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
+ - at mv objs/gzwrite.o $@
+
+
placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
rm -f $(SHAREDLIB) $(SHAREDLIBM)
@@ -190,10 +309,12 @@
- at if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
- at if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- at if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
cp $(STATICLIB) $(DESTDIR)$(libdir)
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
- at if test -n "$(SHAREDLIBV)"; then \
+ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
@@ -203,8 +324,10 @@
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
($(LDCONFIG) || true) >/dev/null 2>&1; \
fi
- cp zlib.3 $(DESTDIR)$(man3dir)
+ rm -f $(DESTDIR)$(man3dir)/zlib.3
+ cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+ rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
cp zlib.pc $(DESTDIR)$(pkgconfigdir)
chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
# The ranlib in install is needed on NeXTSTEP which checks file times
@@ -212,7 +335,8 @@
install: install-libs
- at if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
- cp zlib.h zconf.h $(DESTDIR)$(includedir)
+ rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+ cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
uninstall:
@@ -226,18 +350,18 @@
docs: zlib.3.pdf
-zlib.3.pdf: zlib.3
- groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
+zlib.3.pdf: $(SRCDIR)zlib.3
+ groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
-zconf.h.cmakein: zconf.h.in
+zconf.h.cmakein: $(SRCDIR)zconf.h.in
-@ TEMPFILE=zconfh_$$; \
echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
- sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\
- touch -r zconf.h.in zconf.h.cmakein &&\
+ sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
+ touch -r $(SRCDIR)zconf.h.in $@ &&\
rm $$TEMPFILE
-zconf: zconf.h.in
- cp -p zconf.h.in zconf.h
+zconf: $(SRCDIR)zconf.h.in
+ cp -p $(SRCDIR)zconf.h.in zconf.h
mostlyclean: clean
clean:
@@ -255,34 +379,32 @@
distclean: clean zconf zconf.h.cmakein docs
rm -f Makefile zlib.pc configure.log
- at rm -f .DS_Store
- - at printf 'all:\n\t- at echo "Please use ./configure first. Thank you."\n' > Makefile
- - at printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile
- - at touch -r Makefile.in Makefile
+ @if [ -f Makefile.in ]; then \
+ printf 'all:\n\t- at echo "Please use ./configure first. Thank you."\n' > Makefile ; \
+ printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
+ touch -r $(SRCDIR)Makefile.in Makefile ; fi
+ @if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi
+ @if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi
tags:
- etags *.[ch]
+ etags $(SRCDIR)*.[ch]
-depend:
- makedepend -- $(CFLAGS) -- *.[ch]
+adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
+compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h
+crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
+deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
+inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
+inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
+trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o zutil.o: zutil.h zlib.h zconf.h
-gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
-compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
-crc32.o: zutil.h zlib.h zconf.h crc32.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-
-adler32.lo zutil.lo: zutil.h zlib.h zconf.h
-gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
-compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
-crc32.lo: zutil.h zlib.h zconf.h crc32.h
-deflate.lo: deflate.h zutil.h zlib.h zconf.h
-infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
-trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h
+adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
+compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h
+crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
+deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
+inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
+inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
+trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
Modified: branches/stable/source/src/libs/zlib/zlib-src/README
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.8 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.8 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
@@ -84,7 +84,7 @@
Copyright notice:
- (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Modified: branches/stable/source/src/libs/zlib/zlib-src/adler32.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/adler32.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/adler32.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -7,11 +7,9 @@
#include "zutil.h"
-#define local static
-
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-#define BASE 65521 /* largest prime smaller than 65536 */
+#define BASE 65521U /* largest prime smaller than 65536 */
#define NMAX 5552
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -62,10 +60,10 @@
#endif
/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
+uLong ZEXPORT adler32_z(adler, buf, len)
uLong adler;
const Bytef *buf;
- uInt len;
+ z_size_t len;
{
unsigned long sum2;
unsigned n;
@@ -133,6 +131,15 @@
}
/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+ uLong adler;
+ const Bytef *buf;
+ uInt len;
+{
+ return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
local uLong adler32_combine_(adler1, adler2, len2)
uLong adler1;
uLong adler2;
@@ -156,7 +163,7 @@
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
if (sum1 >= BASE) sum1 -= BASE;
if (sum1 >= BASE) sum1 -= BASE;
- if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+ if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
if (sum2 >= BASE) sum2 -= BASE;
return sum1 | (sum2 << 16);
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/compress.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/compress.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/compress.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -28,16 +28,11 @@
{
z_stream stream;
int err;
+ const uInt max = (uInt)-1;
+ uLong left;
- stream.next_in = (z_const Bytef *)source;
- stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
- /* Check for source > 64K on 16-bit machine: */
- if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
- stream.next_out = dest;
- stream.avail_out = (uInt)*destLen;
- if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+ left = *destLen;
+ *destLen = 0;
stream.zalloc = (alloc_func)0;
stream.zfree = (free_func)0;
@@ -46,15 +41,26 @@
err = deflateInit(&stream, level);
if (err != Z_OK) return err;
- err = deflate(&stream, Z_FINISH);
- if (err != Z_STREAM_END) {
- deflateEnd(&stream);
- return err == Z_OK ? Z_BUF_ERROR : err;
- }
+ stream.next_out = dest;
+ stream.avail_out = 0;
+ stream.next_in = (z_const Bytef *)source;
+ stream.avail_in = 0;
+
+ do {
+ if (stream.avail_out == 0) {
+ stream.avail_out = left > (uLong)max ? max : (uInt)left;
+ left -= stream.avail_out;
+ }
+ if (stream.avail_in == 0) {
+ stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+ sourceLen -= stream.avail_in;
+ }
+ err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
+ } while (err == Z_OK);
+
*destLen = stream.total_out;
-
- err = deflateEnd(&stream);
- return err;
+ deflateEnd(&stream);
+ return err == Z_STREAM_END ? Z_OK : err;
}
/* ===========================================================================
Modified: branches/stable/source/src/libs/zlib/zlib-src/configure
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -18,6 +18,18 @@
echo $0 $* >> configure.log
date >> configure.log
+# get source directory
+SRCDIR=`dirname $0`
+if test $SRCDIR = "."; then
+ ZINC=""
+ ZINCOUT="-I."
+ SRCDIR=""
+else
+ ZINC='-include zconf.h'
+ ZINCOUT='-I. -I$(SRCDIR)'
+ SRCDIR="$SRCDIR/"
+fi
+
# set command prefix for cross-compilation
if [ -n "${CHOST}" ]; then
uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
@@ -28,10 +40,10 @@
STATICLIB=libz.a
# extract zlib version numbers from zlib.h
-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
-VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
+VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
+VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
+VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
# establish commands for library building
if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
@@ -73,6 +85,8 @@
zconst=0
build64=0
gcc=0
+warn=0
+debug=0
old_cc="$CC"
old_cflags="$CFLAGS"
OBJC='$(OBJZ) $(OBJG)'
@@ -121,6 +135,8 @@
--sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
--localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
-c* | --const) zconst=1; shift ;;
+ -w* | --warn) warn=1; shift ;;
+ -d* | --debug) debug=1; shift ;;
*)
echo "unknown option: $1" | tee -a configure.log
echo "$0 --help for help" | tee -a configure.log
@@ -159,6 +175,7 @@
esac
case `$cc -v 2>&1` in
*gcc*) gcc=1 ;;
+ *clang*) gcc=1 ;;
esac
show $cc -c $test.c
@@ -165,14 +182,17 @@
if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
echo ... using gcc >> configure.log
CC="$cc"
- CFLAGS="${CFLAGS--O3} ${ARCHS}"
+ CFLAGS="${CFLAGS--O3}"
SFLAGS="${CFLAGS--O3} -fPIC"
- LDFLAGS="${LDFLAGS} ${ARCHS}"
+ if test "$ARCHS"; then
+ CFLAGS="${CFLAGS} ${ARCHS}"
+ LDFLAGS="${LDFLAGS} ${ARCHS}"
+ fi
if test $build64 -eq 1; then
CFLAGS="${CFLAGS} -m64"
SFLAGS="${SFLAGS} -m64"
fi
- if test "${ZLIBGCCWARN}" = "YES"; then
+ if test "$warn" -eq 1; then
if test "$zconst" -eq 1; then
CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
else
@@ -179,14 +199,18 @@
CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
fi
fi
+ if test $debug -eq 1; then
+ CFLAGS="${CFLAGS} -DZLIB_DEBUG"
+ SFLAGS="${SFLAGS} -DZLIB_DEBUG"
+ fi
if test -z "$uname"; then
uname=`(uname -s || echo unknown) 2>/dev/null`
fi
case "$uname" in
Linux* | linux* | GNU | GNU/* | solaris*)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
*BSD | *bsd* | DragonFly)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
LDCONFIG="ldconfig -m" ;;
CYGWIN* | Cygwin* | cygwin* | OS/2*)
EXE='.exe' ;;
@@ -287,6 +311,9 @@
esac
fi
fi
+ if test -n "$ZINC"; then
+ ZINC='-I- -I. -I$(SRCDIR)'
+ fi
;;
SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
CFLAGS=${CFLAGS-"-O2"}
@@ -337,16 +364,16 @@
}
echo - using any output from compiler to indicate an error >> configure.log
else
-try()
-{
- show $*
- ( $* ) >> configure.log 2>&1
- ret=$?
- if test $ret -ne 0; then
- echo "(exit code "$ret")" >> configure.log
- fi
- return $ret
-}
+ try()
+ {
+ show $*
+ ( $* ) >> configure.log 2>&1
+ ret=$?
+ if test $ret -ne 0; then
+ echo "(exit code "$ret")" >> configure.log
+ fi
+ return $ret
+ }
fi
tryboth()
@@ -422,6 +449,65 @@
echo >> configure.log
+# check for size_t
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdlib.h>
+size_t dummy = 0;
+EOF
+if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for size_t... Yes." | tee -a configure.log
+ need_sizet=0
+else
+ echo "Checking for size_t... No." | tee -a configure.log
+ need_sizet=1
+fi
+
+echo >> configure.log
+
+# find the size_t integer type, if needed
+if test $need_sizet -eq 1; then
+ cat > $test.c <<EOF
+long long dummy = 0;
+EOF
+ if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for long long... Yes." | tee -a configure.log
+ cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+ if (sizeof(void *) <= sizeof(int)) puts("int");
+ else if (sizeof(void *) <= sizeof(long)) puts("long");
+ else puts("z_longlong");
+ return 0;
+}
+EOF
+ else
+ echo "Checking for long long... No." | tee -a configure.log
+ cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+ if (sizeof(void *) <= sizeof(int)) puts("int");
+ else puts("long");
+ return 0;
+}
+EOF
+ fi
+ if try $CC $CFLAGS -o $test $test.c; then
+ sizet=`./$test`
+ echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
+ else
+ echo "Failed to find a pointer-size integer type." | tee -a configure.log
+ leave 1
+ fi
+fi
+
+if test $need_sizet -eq 1; then
+ CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
+ SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
+fi
+
+echo >> configure.log
+
# check for large file support, and if none, check for fseeko()
cat > $test.c <<EOF
#include <sys/types.h>
@@ -470,7 +556,7 @@
fi
# copy clean zconf.h for subsequent edits
-cp -p zconf.h.in zconf.h
+cp -p ${SRCDIR}zconf.h.in zconf.h
echo >> configure.log
@@ -764,6 +850,7 @@
echo TEST = $TEST >> configure.log
echo VER = $VER >> configure.log
echo Z_U4 = $Z_U4 >> configure.log
+echo SRCDIR = $SRCDIR >> configure.log
echo exec_prefix = $exec_prefix >> configure.log
echo includedir = $includedir >> configure.log
echo libdir = $libdir >> configure.log
@@ -773,7 +860,7 @@
echo uname = $uname >> configure.log
# udpate Makefile with the configure results
-sed < Makefile.in "
+sed < ${SRCDIR}Makefile.in "
/^CC *=/s#=.*#=$CC#
/^CFLAGS *=/s#=.*#=$CFLAGS#
/^SFLAGS *=/s#=.*#=$SFLAGS#
@@ -790,6 +877,9 @@
/^LDCONFIG *=/s#=.*#=$LDCONFIG#
/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
/^EXE *=/s#=.*#=$EXE#
+/^SRCDIR *=/s#=.*#=$SRCDIR#
+/^ZINC *=/s#=.*#=$ZINC#
+/^ZINCOUT *=/s#=.*#=$ZINCOUT#
/^prefix *=/s#=.*#=$prefix#
/^exec_prefix *=/s#=.*#=$exec_prefix#
/^libdir *=/s#=.*#=$libdir#
@@ -803,7 +893,7 @@
" > Makefile
# create zlib.pc with the configure results
-sed < zlib.pc.in "
+sed < ${SRCDIR}zlib.pc.in "
/^CC *=/s#=.*#=$CC#
/^CFLAGS *=/s#=.*#=$CFLAGS#
/^CPP *=/s#=.*#=$CPP#
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib 2017-02-16 16:38:15 UTC (rev 766)
@@ -38,7 +38,7 @@
iostream/ by Kevin Ruland <kevin at rodin.wustl.edu>
A C++ I/O streams interface to the zlib gz* functions
-iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
+iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
Another C++ I/O streams interface
iostream3/ by Ludwig Schwardt <schwardt at sun.ac.za>
@@ -58,7 +58,7 @@
minizip/ by Gilles Vollant <info at winimage.com>
Mini zip and unzip based on zlib
Includes Zip64 support by Mathias Svensson <mathias at result42.com>
- See http://www.winimage.com/zLibDll/unzip.html
+ See http://www.winimage.com/zLibDll/minizip.html
pascal/ by Bob Dellaca <bobdl at xtra.co.nz> et al.
Support for Pascal
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-streams.ads
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-streams.ads 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-streams.ads 2017-02-16 16:38:15 UTC (rev 766)
@@ -31,7 +31,7 @@
Mode : in Flush_Mode := Sync_Flush);
-- Flush the written data to the back stream,
-- all data placed to the compressor is flushing to the Back stream.
- -- Should not be used untill necessary, becouse it is decreasing
+ -- Should not be used until necessary, because it is decreasing
-- compression.
function Read_Total_In (Stream : in Stream_Type) return Count;
@@ -97,13 +97,13 @@
Rest_Last : Stream_Element_Offset;
-- Buffer for Read operation.
-- We need to have this buffer in the record
- -- becouse not all read data from back stream
+ -- because not all read data from back stream
-- could be processed during the read operation.
Buffer_Size : Stream_Element_Offset;
-- Buffer size for write operation.
-- We do not need to have this buffer
- -- in the record becouse all data could be
+ -- in the record because all data could be
-- processed in the write operation.
Back : Stream_Access;
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-thin.ads
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-thin.ads 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/ada/zlib-thin.ads 2017-02-16 16:38:15 UTC (rev 766)
@@ -436,7 +436,7 @@
pragma Import (C, inflateBackInit, "inflateBackInit_");
- -- I stopped binding the inflateBack routines, becouse realize that
+ -- I stopped binding the inflateBack routines, because realize that
-- it does not support zlib and gzip headers for now, and have no
-- symmetric deflateBack routines.
-- ZLib-Ada is symmetric regarding deflate/inflate data transformation
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* blast.c
- * Copyright (C) 2003, 2012 Mark Adler
+ * Copyright (C) 2003, 2012, 2013 Mark Adler
* For conditions of distribution and use, see copyright notice in blast.h
- * version 1.2, 24 Oct 2012
+ * version 1.3, 24 Aug 2013
*
* blast.c decompresses data compressed by the PKWare Compression Library.
* This function provides functionality similar to the explode() function of
@@ -24,8 +24,12 @@
* 1.1 16 Feb 2003 - Fixed distance check for > 4 GB uncompressed data
* 1.2 24 Oct 2012 - Add note about using binary mode in stdio
* - Fix comparisons of differently signed integers
+ * 1.3 24 Aug 2013 - Return unused input from blast()
+ * - Fix test code to correctly report unused input
+ * - Enable the provision of initial input to blast()
*/
+#include <stddef.h> /* for NULL */
#include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */
#include "blast.h" /* prototype for blast() */
@@ -256,7 +260,7 @@
* next, 0 for literals, 1 for length/distance.
*
* - If literals are uncoded, then the next eight bits are the literal, in the
- * normal bit order in th stream, i.e. no bit-reversal is needed. Similarly,
+ * normal bit order in the stream, i.e. no bit-reversal is needed. Similarly,
* no bit reversal is needed for either the length extra bits or the distance
* extra bits.
*
@@ -376,7 +380,8 @@
}
/* See comments in blast.h */
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow)
+int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
+ unsigned *left, unsigned char **in)
{
struct state s; /* input/output state */
int err; /* return value */
@@ -384,7 +389,12 @@
/* initialize input state */
s.infun = infun;
s.inhow = inhow;
- s.left = 0;
+ if (left != NULL && *left) {
+ s.left = *left;
+ s.in = *in;
+ }
+ else
+ s.left = 0;
s.bitbuf = 0;
s.bitcnt = 0;
@@ -400,6 +410,12 @@
else
err = decomp(&s); /* decompress */
+ /* return unused input */
+ if (left != NULL)
+ *left = s.left;
+ if (in != NULL)
+ *in = s.left ? s.in : NULL;
+
/* write any leftover output and update the error code if needed */
if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0)
err = 1;
@@ -429,16 +445,20 @@
/* Decompress a PKWare Compression Library stream from stdin to stdout */
int main(void)
{
- int ret, n;
+ int ret;
+ unsigned left;
/* decompress to stdout */
- ret = blast(inf, stdin, outf, stdout);
- if (ret != 0) fprintf(stderr, "blast error: %d\n", ret);
+ left = 0;
+ ret = blast(inf, stdin, outf, stdout, &left, NULL);
+ if (ret != 0)
+ fprintf(stderr, "blast error: %d\n", ret);
- /* see if there are any leftover bytes */
- n = 0;
- while (getchar() != EOF) n++;
- if (n) fprintf(stderr, "blast warning: %d unused bytes of input\n", n);
+ /* count any leftover bytes */
+ while (getchar() != EOF)
+ left++;
+ if (left)
+ fprintf(stderr, "blast warning: %u unused bytes of input\n", left);
/* return blast() error code */
return ret;
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/blast/blast.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* blast.h -- interface for blast.c
- Copyright (C) 2003, 2012 Mark Adler
- version 1.2, 24 Oct 2012
+ Copyright (C) 2003, 2012, 2013 Mark Adler
+ version 1.3, 24 Aug 2013
This software is provided 'as-is', without any express or implied
warranty. In no event will the author be held liable for any damages
@@ -42,7 +42,8 @@
*/
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow);
+int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
+ unsigned *left, unsigned char **in);
/* Decompress input to output using the provided infun() and outfun() calls.
* On success, the return value of blast() is zero. If there is an error in
* the source data, i.e. it is not in the proper format, then a negative value
@@ -55,6 +56,9 @@
* an input error. (blast() only asks for input if it needs it.) inhow is for
* use by the application to pass an input descriptor to infun(), if desired.
*
+ * If left and in are not NULL and *left is not zero when blast() is called,
+ * then the *left bytes are *in are consumed for input before infun() is used.
+ *
* The output function is invoked: err = outfun(how, buf, len), where the bytes
* to be written are buf[0..len-1]. If err is not zero, then blast() returns
* with an output error. outfun() is always called with len <= 4096. outhow
@@ -61,6 +65,10 @@
* is for use by the application to pass an output descriptor to outfun(), if
* desired.
*
+ * If there is any unused input, *left is set to the number of bytes that were
+ * read and *in points to them. Otherwise *left is set to zero and *in is set
+ * to NULL. If left or in are NULL, then they are not set.
+ *
* The return codes are:
*
* 2: ran out of input before completing decompression
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas 2017-02-16 16:38:15 UTC (rev 766)
@@ -152,7 +152,7 @@
const OutBuf: Pointer; BufSize: Integer);
const
- zlib_version = '1.2.8';
+ zlib_version = '1.2.11';
type
EZlibError = class(Exception);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs 2017-02-16 16:38:15 UTC (rev 766)
@@ -156,7 +156,7 @@
public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.8", Info.Version);
+ Assert.AreEqual("1.2.11", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
- " inflate9 1.2.8 Copyright 1995-2013 Mark Adler ";
+ " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 133, 133, 133, 133, 144, 72, 78};
+ 133, 133, 133, 133, 144, 77, 202};
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
AC_CONFIG_SRCDIR([minizip.c])
AM_INIT_AUTOMAKE([foreign])
LT_INIT
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -26,8 +26,9 @@
#endif
+// see Include/shared/winapifamily.h in the Windows Kit
#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
#define IOWIN32_USING_WINRT_API 1
#endif
#endif
@@ -243,7 +244,7 @@
return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
#else
LONG lHigh = pos.HighPart;
- DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
+ DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod);
BOOL fOk = TRUE;
if (dwNewPos == 0xFFFFFFFF)
if (GetLastError() != NO_ERROR)
@@ -370,7 +371,7 @@
{
LARGE_INTEGER pos;
pos.QuadPart = offset;
- if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
+ if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
{
DWORD dwErr = GetLastError();
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -200,7 +200,7 @@
/* ===========================================================================
Read a byte from a gz_stream; update next_in and avail_in. Return EOF
for end of file.
- IN assertion: the stream s has been sucessfully opened for reading.
+ IN assertion: the stream s has been successfully opened for reading.
*/
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -15,7 +15,7 @@
Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
It is used when recreting zip archive with RAW when deleting items from a zip.
- ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+ ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
@@ -116,7 +116,7 @@
struct linkedlist_datablock_internal_s* next_datablock;
uLong avail_in_this_block;
uLong filled_in_this_block;
- uLong unused; /* for future use and alignement */
+ uLong unused; /* for future use and alignment */
unsigned char data[SIZEDATA_INDATABLOCK];
} linkedlist_datablock_internal;
@@ -171,7 +171,7 @@
curfile64_info ci; /* info on the file curretly writing */
ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
- ZPOS64_T add_position_when_writting_offset;
+ ZPOS64_T add_position_when_writing_offset;
ZPOS64_T number_entry;
#ifndef NO_ADDFILEINEXISTINGZIP
@@ -807,7 +807,7 @@
}
byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
- pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+ pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
{
ZPOS64_T size_central_dir_to_read = size_central_dir;
@@ -875,7 +875,7 @@
ziinit.in_opened_file_inzip = 0;
ziinit.ci.stream_initialised = 0;
ziinit.number_entry = 0;
- ziinit.add_position_when_writting_offset = 0;
+ ziinit.add_position_when_writing_offset = 0;
init_linkedlist(&(ziinit.central_dir));
@@ -1164,7 +1164,7 @@
if(zi->ci.pos_local_header >= 0xffffffff)
zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
else
- zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
+ zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
for (i=0;i<size_filename;i++)
*(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
@@ -1755,7 +1755,7 @@
int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
{
int err = ZIP_OK;
- ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+ ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
@@ -1808,7 +1808,7 @@
if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
{
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
}
return err;
@@ -1849,13 +1849,13 @@
if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
{
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
if(pos >= 0xffffffff)
{
err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
}
else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
}
return err;
@@ -1921,7 +1921,7 @@
}
free_linkedlist(&(zi->central_dir));
- pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
{
ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas 2017-02-16 16:38:15 UTC (rev 766)
@@ -10,8 +10,8 @@
interface
const
- ZLIB_VERSION = '1.2.8';
- ZLIB_VERNUM = $1280;
+ ZLIB_VERSION = '1.2.11';
+ ZLIB_VERNUM = $12a0;
type
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -17,7 +17,7 @@
* All dynamically allocated memory comes from the stack. The stack required
* is less than 2K bytes. This code is compatible with 16-bit int's and
* assumes that long's are at least 32 bits. puff.c uses the short data type,
- * assumed to be 16 bits, for arrays in order to to conserve memory. The code
+ * assumed to be 16 bits, for arrays in order to conserve memory. The code
* works whether integers are stored big endian or little endian.
*
* In the comments below are "Format notes" that describe the inflate process
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.8
+Building instructions for the DLL versions of Zlib 1.2.11
========================================================
This directory contains projects that build zlib and minizip using
@@ -16,7 +16,7 @@
Build instructions for Visual Studio 2008 (32 bits or 64 bits)
--------------------------------------------------------------
-- Uncompress current zlib, including all contrib/* files
+- Decompress current zlib, including all contrib/* files
- Compile assembly code (with Visual Studio Command Prompt) by running:
bld_ml64.bat (in contrib\masmx64)
bld_ml32.bat (in contrib\masmx86)
@@ -25,15 +25,25 @@
Build instructions for Visual Studio 2010 (32 bits or 64 bits)
--------------------------------------------------------------
-- Uncompress current zlib, including all contrib/* files
+- Decompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
Build instructions for Visual Studio 2012 (32 bits or 64 bits)
--------------------------------------------------------------
-- Uncompress current zlib, including all contrib/* files
+- Decompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
+Build instructions for Visual Studio 2013 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Decompress current zlib, including all contrib/* files
+- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
+Build instructions for Visual Studio 2015 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Decompress current zlib, including all contrib/* files
+- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
+
+
Important
---------
- To use zlibwapi.dll in your application, you must define the
@@ -63,3 +73,6 @@
Gilles Vollant
info at winimage.com
+
+Visual Studio 2013 and 2015 Projects from Sean Hunt
+seandhunt_7 at yahoo.com
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,8,0
- PRODUCTVERSION 1,2,8,0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.8\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.def 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
LIBRARY
; zlib data compression and ZIP file I/O library
-VERSION 1.2.8
+VERSION 1.2
EXPORTS
adler32 @1
@@ -141,3 +141,13 @@
; zlib1 v1.2.8 added:
inflateGetDictionary @166
gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,8,0
- PRODUCTVERSION 1,2,8,0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.8\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.def 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
LIBRARY
; zlib data compression and ZIP file I/O library
-VERSION 1.2.8
+VERSION 1.2
EXPORTS
adler32 @1
@@ -141,3 +141,13 @@
; zlib1 v1.2.8 added:
inflateGetDictionary @166
gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/miniunz.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/minizip.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlibdll.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,32 @@
+#include <windows.h>
+
+#define IDR_VERSION1 1
+IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS 0
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ //language ID = U.S. English, char set = Windows, Multilingual
+
+ BEGIN
+ VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
+ VALUE "FileVersion", "1.2.11\0"
+ VALUE "InternalName", "zlib\0"
+ VALUE "OriginalFilename", "zlibwapi.dll\0"
+ VALUE "ProductName", "ZLib.DLL\0"
+ VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,153 @@
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION 1.2
+
+EXPORTS
+ adler32 @1
+ compress @2
+ crc32 @3
+ deflate @4
+ deflateCopy @5
+ deflateEnd @6
+ deflateInit2_ @7
+ deflateInit_ @8
+ deflateParams @9
+ deflateReset @10
+ deflateSetDictionary @11
+ gzclose @12
+ gzdopen @13
+ gzerror @14
+ gzflush @15
+ gzopen @16
+ gzread @17
+ gzwrite @18
+ inflate @19
+ inflateEnd @20
+ inflateInit2_ @21
+ inflateInit_ @22
+ inflateReset @23
+ inflateSetDictionary @24
+ inflateSync @25
+ uncompress @26
+ zlibVersion @27
+ gzprintf @28
+ gzputc @29
+ gzgetc @30
+ gzseek @31
+ gzrewind @32
+ gztell @33
+ gzeof @34
+ gzsetparams @35
+ zError @36
+ inflateSyncPoint @37
+ get_crc_table @38
+ compress2 @39
+ gzputs @40
+ gzgets @41
+ inflateCopy @42
+ inflateBackInit_ @43
+ inflateBack @44
+ inflateBackEnd @45
+ compressBound @46
+ deflateBound @47
+ gzclearerr @48
+ gzungetc @49
+ zlibCompileFlags @50
+ deflatePrime @51
+ deflatePending @52
+
+ unzOpen @61
+ unzClose @62
+ unzGetGlobalInfo @63
+ unzGetCurrentFileInfo @64
+ unzGoToFirstFile @65
+ unzGoToNextFile @66
+ unzOpenCurrentFile @67
+ unzReadCurrentFile @68
+ unzOpenCurrentFile3 @69
+ unztell @70
+ unzeof @71
+ unzCloseCurrentFile @72
+ unzGetGlobalComment @73
+ unzStringFileNameCompare @74
+ unzLocateFile @75
+ unzGetLocalExtrafield @76
+ unzOpen2 @77
+ unzOpenCurrentFile2 @78
+ unzOpenCurrentFilePassword @79
+
+ zipOpen @80
+ zipOpenNewFileInZip @81
+ zipWriteInFileInZip @82
+ zipCloseFileInZip @83
+ zipClose @84
+ zipOpenNewFileInZip2 @86
+ zipCloseFileInZipRaw @87
+ zipOpen2 @88
+ zipOpenNewFileInZip3 @89
+
+ unzGetFilePos @100
+ unzGoToFilePos @101
+
+ fill_win32_filefunc @110
+
+; zlibwapi v1.2.4 added:
+ fill_win32_filefunc64 @111
+ fill_win32_filefunc64A @112
+ fill_win32_filefunc64W @113
+
+ unzOpen64 @120
+ unzOpen2_64 @121
+ unzGetGlobalInfo64 @122
+ unzGetCurrentFileInfo64 @124
+ unzGetCurrentFileZStreamPos64 @125
+ unztell64 @126
+ unzGetFilePos64 @127
+ unzGoToFilePos64 @128
+
+ zipOpen64 @130
+ zipOpen2_64 @131
+ zipOpenNewFileInZip64 @132
+ zipOpenNewFileInZip2_64 @133
+ zipOpenNewFileInZip3_64 @134
+ zipOpenNewFileInZip4_64 @135
+ zipCloseFileInZipRaw64 @136
+
+; zlib1 v1.2.4 added:
+ adler32_combine @140
+ crc32_combine @142
+ deflateSetHeader @144
+ deflateTune @145
+ gzbuffer @146
+ gzclose_r @147
+ gzclose_w @148
+ gzdirect @149
+ gzoffset @150
+ inflateGetHeader @156
+ inflateMark @157
+ inflatePrime @158
+ inflateReset2 @159
+ inflateUndermine @160
+
+; zlib1 v1.2.6 added:
+ gzgetc_ @161
+ inflateResetKeep @163
+ deflateResetKeep @164
+
+; zlib1 v1.2.7 added:
+ gzopen_w @165
+
+; zlib1 v1.2.8 added:
+ inflateGetDictionary @166
+ gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.sln
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.sln (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.sln 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,119 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Itanium = Debug|Itanium
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Itanium = Release|Itanium
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+ ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+ ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,32 @@
+#include <windows.h>
+
+#define IDR_VERSION1 1
+IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS 0
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ //language ID = U.S. English, char set = Windows, Multilingual
+
+ BEGIN
+ VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
+ VALUE "FileVersion", "1.2.11\0"
+ VALUE "InternalName", "zlib\0"
+ VALUE "OriginalFilename", "zlibwapi.dll\0"
+ VALUE "ProductName", "ZLib.DLL\0"
+ VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.def (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,153 @@
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION 1.2
+
+EXPORTS
+ adler32 @1
+ compress @2
+ crc32 @3
+ deflate @4
+ deflateCopy @5
+ deflateEnd @6
+ deflateInit2_ @7
+ deflateInit_ @8
+ deflateParams @9
+ deflateReset @10
+ deflateSetDictionary @11
+ gzclose @12
+ gzdopen @13
+ gzerror @14
+ gzflush @15
+ gzopen @16
+ gzread @17
+ gzwrite @18
+ inflate @19
+ inflateEnd @20
+ inflateInit2_ @21
+ inflateInit_ @22
+ inflateReset @23
+ inflateSetDictionary @24
+ inflateSync @25
+ uncompress @26
+ zlibVersion @27
+ gzprintf @28
+ gzputc @29
+ gzgetc @30
+ gzseek @31
+ gzrewind @32
+ gztell @33
+ gzeof @34
+ gzsetparams @35
+ zError @36
+ inflateSyncPoint @37
+ get_crc_table @38
+ compress2 @39
+ gzputs @40
+ gzgets @41
+ inflateCopy @42
+ inflateBackInit_ @43
+ inflateBack @44
+ inflateBackEnd @45
+ compressBound @46
+ deflateBound @47
+ gzclearerr @48
+ gzungetc @49
+ zlibCompileFlags @50
+ deflatePrime @51
+ deflatePending @52
+
+ unzOpen @61
+ unzClose @62
+ unzGetGlobalInfo @63
+ unzGetCurrentFileInfo @64
+ unzGoToFirstFile @65
+ unzGoToNextFile @66
+ unzOpenCurrentFile @67
+ unzReadCurrentFile @68
+ unzOpenCurrentFile3 @69
+ unztell @70
+ unzeof @71
+ unzCloseCurrentFile @72
+ unzGetGlobalComment @73
+ unzStringFileNameCompare @74
+ unzLocateFile @75
+ unzGetLocalExtrafield @76
+ unzOpen2 @77
+ unzOpenCurrentFile2 @78
+ unzOpenCurrentFilePassword @79
+
+ zipOpen @80
+ zipOpenNewFileInZip @81
+ zipWriteInFileInZip @82
+ zipCloseFileInZip @83
+ zipClose @84
+ zipOpenNewFileInZip2 @86
+ zipCloseFileInZipRaw @87
+ zipOpen2 @88
+ zipOpenNewFileInZip3 @89
+
+ unzGetFilePos @100
+ unzGoToFilePos @101
+
+ fill_win32_filefunc @110
+
+; zlibwapi v1.2.4 added:
+ fill_win32_filefunc64 @111
+ fill_win32_filefunc64A @112
+ fill_win32_filefunc64W @113
+
+ unzOpen64 @120
+ unzOpen2_64 @121
+ unzGetGlobalInfo64 @122
+ unzGetCurrentFileInfo64 @124
+ unzGetCurrentFileZStreamPos64 @125
+ unztell64 @126
+ unzGetFilePos64 @127
+ unzGoToFilePos64 @128
+
+ zipOpen64 @130
+ zipOpen2_64 @131
+ zipOpenNewFileInZip64 @132
+ zipOpenNewFileInZip2_64 @133
+ zipOpenNewFileInZip3_64 @134
+ zipOpenNewFileInZip4_64 @135
+ zipCloseFileInZipRaw64 @136
+
+; zlib1 v1.2.4 added:
+ adler32_combine @140
+ crc32_combine @142
+ deflateSetHeader @144
+ deflateTune @145
+ gzbuffer @146
+ gzclose_r @147
+ gzclose_w @148
+ gzdirect @149
+ gzoffset @150
+ inflateGetHeader @156
+ inflateMark @157
+ inflatePrime @158
+ inflateReset2 @159
+ inflateUndermine @160
+
+; zlib1 v1.2.6 added:
+ gzgetc_ @161
+ inflateResetKeep @163
+ deflateResetKeep @164
+
+; zlib1 v1.2.7 added:
+ gzopen_w @165
+
+; zlib1 v1.2.8 added:
+ inflateGetDictionary @166
+ gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.sln
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.sln (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.sln 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,119 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Itanium = Debug|Itanium
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Itanium = Release|Itanium
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+ ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+ ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+ {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+ {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
===================================================================
(Binary files differ)
Index: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj 2017-02-16 16:38:15 UTC (rev 766)
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,8,0
- PRODUCTVERSION 1,2,8,0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.8\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.def 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
LIBRARY
; zlib data compression and ZIP file I/O library
-VERSION 1.2.8
+VERSION 1.2
EXPORTS
adler32 @1
@@ -141,3 +141,13 @@
; zlib1 v1.2.8 added:
inflateGetDictionary @166
gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
Modified: branches/stable/source/src/libs/zlib/zlib-src/crc32.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/crc32.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/crc32.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*
* Thanks to Rodney Brown <rbrown64 at csc.com.au> for his contribution of faster
@@ -30,8 +30,6 @@
#include "zutil.h" /* for STDC and FAR definitions */
-#define local static
-
/* Definitions for doing the crc four data bytes at a time. */
#if !defined(NOBYFOUR) && defined(Z_U4)
# define BYFOUR
@@ -38,9 +36,9 @@
#endif
#ifdef BYFOUR
local unsigned long crc32_little OF((unsigned long,
- const unsigned char FAR *, unsigned));
+ const unsigned char FAR *, z_size_t));
local unsigned long crc32_big OF((unsigned long,
- const unsigned char FAR *, unsigned));
+ const unsigned char FAR *, z_size_t));
# define TBLS 8
#else
# define TBLS 1
@@ -201,10 +199,10 @@
#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
+unsigned long ZEXPORT crc32_z(crc, buf, len)
unsigned long crc;
const unsigned char FAR *buf;
- uInt len;
+ z_size_t len;
{
if (buf == Z_NULL) return 0UL;
@@ -235,8 +233,29 @@
return crc ^ 0xffffffffUL;
}
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+ unsigned long crc;
+ const unsigned char FAR *buf;
+ uInt len;
+{
+ return crc32_z(crc, buf, len);
+}
+
#ifdef BYFOUR
+/*
+ This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
+ integer pointer type. This violates the strict aliasing rule, where a
+ compiler can assume, for optimization purposes, that two pointers to
+ fundamentally different types won't ever point to the same memory. This can
+ manifest as a problem only if one of the pointers is written to. This code
+ only reads from those pointers. So long as this code remains isolated in
+ this compilation unit, there won't be a problem. For this reason, this code
+ should not be copied and pasted into a compilation unit in which other code
+ writes to the buffer that is passed to these routines.
+ */
+
/* ========================================================================= */
#define DOLIT4 c ^= *buf4++; \
c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
@@ -247,7 +266,7 @@
local unsigned long crc32_little(crc, buf, len)
unsigned long crc;
const unsigned char FAR *buf;
- unsigned len;
+ z_size_t len;
{
register z_crc_t c;
register const z_crc_t FAR *buf4;
@@ -278,7 +297,7 @@
}
/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
+#define DOBIG4 c ^= *buf4++; \
c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
@@ -287,7 +306,7 @@
local unsigned long crc32_big(crc, buf, len)
unsigned long crc;
const unsigned char FAR *buf;
- unsigned len;
+ z_size_t len;
{
register z_crc_t c;
register const z_crc_t FAR *buf4;
@@ -300,7 +319,6 @@
}
buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
- buf4--;
while (len >= 32) {
DOBIG32;
len -= 32;
@@ -309,7 +327,6 @@
DOBIG4;
len -= 4;
}
- buf4++;
buf = (const unsigned char FAR *)buf4;
if (len) do {
Modified: branches/stable/source/src/libs/zlib/zlib-src/deflate.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/deflate.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/deflate.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -73,6 +73,8 @@
typedef block_state (*compress_func) OF((deflate_state *s, int flush));
/* Compression function. Returns the block state after the call. */
+local int deflateStateCheck OF((z_streamp strm));
+local void slide_hash OF((deflate_state *s));
local void fill_window OF((deflate_state *s));
local block_state deflate_stored OF((deflate_state *s, int flush));
local block_state deflate_fast OF((deflate_state *s, int flush));
@@ -84,8 +86,9 @@
local void lm_init OF((deflate_state *s));
local void putShortMSB OF((deflate_state *s, uInt b));
local void flush_pending OF((z_streamp strm));
-local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
+local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
#ifdef ASMV
+# pragma message("Assembler code may have bugs -- use at your own risk")
void match_init OF((void)); /* asm code initialization */
uInt longest_match OF((deflate_state *s, IPos cur_match));
#else
@@ -92,7 +95,7 @@
local uInt longest_match OF((deflate_state *s, IPos cur_match));
#endif
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
local void check_match OF((deflate_state *s, IPos start, IPos match,
int length));
#endif
@@ -148,21 +151,14 @@
* meaning.
*/
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
/* ===========================================================================
* Update a hash value with the given input byte
- * IN assertion: all calls to to UPDATE_HASH are made with consecutive
- * input characters, so that a running hash key can be computed from the
- * previous key instead of complete recalculation each time.
+ * IN assertion: all calls to UPDATE_HASH are made with consecutive input
+ * characters, so that a running hash key can be computed from the previous
+ * key instead of complete recalculation each time.
*/
#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
@@ -173,9 +169,9 @@
* the previous length of the hash chain.
* If this file is compiled with -DFASTEST, the compression level is forced
* to 1, and no hash chains are maintained.
- * IN assertion: all calls to to INSERT_STRING are made with consecutive
- * input characters and the first MIN_MATCH bytes of str are valid
- * (except for the last MIN_MATCH-1 bytes of the input file).
+ * IN assertion: all calls to INSERT_STRING are made with consecutive input
+ * characters and the first MIN_MATCH bytes of str are valid (except for
+ * the last MIN_MATCH-1 bytes of the input file).
*/
#ifdef FASTEST
#define INSERT_STRING(s, str, match_head) \
@@ -197,6 +193,37 @@
s->head[s->hash_size-1] = NIL; \
zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local void slide_hash(s)
+ deflate_state *s;
+{
+ unsigned n, m;
+ Posf *p;
+ uInt wsize = s->w_size;
+
+ n = s->hash_size;
+ p = &s->head[n];
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m - wsize : NIL);
+ } while (--n);
+ n = wsize;
+#ifndef FASTEST
+ p = &s->prev[n];
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m - wsize : NIL);
+ /* If n is not on any hash chain, prev[n] is garbage but
+ * its value will never be used.
+ */
+ } while (--n);
+#endif
+}
+
/* ========================================================================= */
int ZEXPORT deflateInit_(strm, level, version, stream_size)
z_streamp strm;
@@ -270,7 +297,7 @@
#endif
if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
- strategy < 0 || strategy > Z_FIXED) {
+ strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
return Z_STREAM_ERROR;
}
if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
@@ -278,14 +305,15 @@
if (s == Z_NULL) return Z_MEM_ERROR;
strm->state = (struct internal_state FAR *)s;
s->strm = strm;
+ s->status = INIT_STATE; /* to pass state test in deflateReset() */
s->wrap = wrap;
s->gzhead = Z_NULL;
- s->w_bits = windowBits;
+ s->w_bits = (uInt)windowBits;
s->w_size = 1 << s->w_bits;
s->w_mask = s->w_size - 1;
- s->hash_bits = memLevel + 7;
+ s->hash_bits = (uInt)memLevel + 7;
s->hash_size = 1 << s->hash_bits;
s->hash_mask = s->hash_size - 1;
s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
@@ -319,6 +347,31 @@
return deflateReset(strm);
}
+/* =========================================================================
+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
+ */
+local int deflateStateCheck (strm)
+ z_streamp strm;
+{
+ deflate_state *s;
+ if (strm == Z_NULL ||
+ strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+ return 1;
+ s = strm->state;
+ if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
+#ifdef GZIP
+ s->status != GZIP_STATE &&
+#endif
+ s->status != EXTRA_STATE &&
+ s->status != NAME_STATE &&
+ s->status != COMMENT_STATE &&
+ s->status != HCRC_STATE &&
+ s->status != BUSY_STATE &&
+ s->status != FINISH_STATE))
+ return 1;
+ return 0;
+}
+
/* ========================================================================= */
int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
z_streamp strm;
@@ -331,7 +384,7 @@
unsigned avail;
z_const unsigned char *next;
- if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+ if (deflateStateCheck(strm) || dictionary == Z_NULL)
return Z_STREAM_ERROR;
s = strm->state;
wrap = s->wrap;
@@ -389,13 +442,34 @@
}
/* ========================================================================= */
+int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
+ z_streamp strm;
+ Bytef *dictionary;
+ uInt *dictLength;
+{
+ deflate_state *s;
+ uInt len;
+
+ if (deflateStateCheck(strm))
+ return Z_STREAM_ERROR;
+ s = strm->state;
+ len = s->strstart + s->lookahead;
+ if (len > s->w_size)
+ len = s->w_size;
+ if (dictionary != Z_NULL && len)
+ zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
+ if (dictLength != Z_NULL)
+ *dictLength = len;
+ return Z_OK;
+}
+
+/* ========================================================================= */
int ZEXPORT deflateResetKeep (strm)
z_streamp strm;
{
deflate_state *s;
- if (strm == Z_NULL || strm->state == Z_NULL ||
- strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+ if (deflateStateCheck(strm)) {
return Z_STREAM_ERROR;
}
@@ -410,7 +484,11 @@
if (s->wrap < 0) {
s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
}
- s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+ s->status =
+#ifdef GZIP
+ s->wrap == 2 ? GZIP_STATE :
+#endif
+ s->wrap ? INIT_STATE : BUSY_STATE;
strm->adler =
#ifdef GZIP
s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
@@ -440,8 +518,8 @@
z_streamp strm;
gz_headerp head;
{
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm) || strm->state->wrap != 2)
+ return Z_STREAM_ERROR;
strm->state->gzhead = head;
return Z_OK;
}
@@ -452,7 +530,7 @@
int *bits;
z_streamp strm;
{
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
if (pending != Z_NULL)
*pending = strm->state->pending;
if (bits != Z_NULL)
@@ -469,7 +547,7 @@
deflate_state *s;
int put;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state;
if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
return Z_BUF_ERROR;
@@ -494,9 +572,8 @@
{
deflate_state *s;
compress_func func;
- int err = Z_OK;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state;
#ifdef FASTEST
@@ -510,13 +587,22 @@
func = configuration_table[s->level].func;
if ((strategy != s->strategy || func != configuration_table[level].func) &&
- strm->total_in != 0) {
+ s->high_water) {
/* Flush the last buffer: */
- err = deflate(strm, Z_BLOCK);
- if (err == Z_BUF_ERROR && s->pending == 0)
- err = Z_OK;
+ int err = deflate(strm, Z_BLOCK);
+ if (err == Z_STREAM_ERROR)
+ return err;
+ if (strm->avail_out == 0)
+ return Z_BUF_ERROR;
}
if (s->level != level) {
+ if (s->level == 0 && s->matches != 0) {
+ if (s->matches == 1)
+ slide_hash(s);
+ else
+ CLEAR_HASH(s);
+ s->matches = 0;
+ }
s->level = level;
s->max_lazy_match = configuration_table[level].max_lazy;
s->good_match = configuration_table[level].good_length;
@@ -524,7 +610,7 @@
s->max_chain_length = configuration_table[level].max_chain;
}
s->strategy = strategy;
- return err;
+ return Z_OK;
}
/* ========================================================================= */
@@ -537,12 +623,12 @@
{
deflate_state *s;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state;
- s->good_match = good_length;
- s->max_lazy_match = max_lazy;
+ s->good_match = (uInt)good_length;
+ s->max_lazy_match = (uInt)max_lazy;
s->nice_match = nice_length;
- s->max_chain_length = max_chain;
+ s->max_chain_length = (uInt)max_chain;
return Z_OK;
}
@@ -569,7 +655,6 @@
{
deflate_state *s;
uLong complen, wraplen;
- Bytef *str;
/* conservative upper bound for compressed data */
complen = sourceLen +
@@ -576,7 +661,7 @@
((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
/* if can't get parameters, return conservative bound plus zlib wrapper */
- if (strm == Z_NULL || strm->state == Z_NULL)
+ if (deflateStateCheck(strm))
return complen + 6;
/* compute wrapper length */
@@ -588,9 +673,11 @@
case 1: /* zlib wrapper */
wraplen = 6 + (s->strstart ? 4 : 0);
break;
+#ifdef GZIP
case 2: /* gzip wrapper */
wraplen = 18;
if (s->gzhead != Z_NULL) { /* user-supplied gzip header */
+ Bytef *str;
if (s->gzhead->extra != Z_NULL)
wraplen += 2 + s->gzhead->extra_len;
str = s->gzhead->name;
@@ -607,6 +694,7 @@
wraplen += 2;
}
break;
+#endif
default: /* for compiler happiness */
wraplen = 6;
}
@@ -634,10 +722,10 @@
}
/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
+ * Flush as much pending output as possible. All deflate() output, except for
+ * some deflate_stored() output, goes through this function so some
+ * applications may wish to modify it to avoid allocating a large
+ * strm->next_out buffer and copying into it. (See also read_buf()).
*/
local void flush_pending(strm)
z_streamp strm;
@@ -654,13 +742,23 @@
strm->next_out += len;
s->pending_out += len;
strm->total_out += len;
- strm->avail_out -= len;
- s->pending -= len;
+ strm->avail_out -= len;
+ s->pending -= len;
if (s->pending == 0) {
s->pending_out = s->pending_buf;
}
}
+/* ===========================================================================
+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
+ */
+#define HCRC_UPDATE(beg) \
+ do { \
+ if (s->gzhead->hcrc && s->pending > (beg)) \
+ strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
+ s->pending - (beg)); \
+ } while (0)
+
/* ========================================================================= */
int ZEXPORT deflate (strm, flush)
z_streamp strm;
@@ -669,231 +767,230 @@
int old_flush; /* value of flush param for previous deflate call */
deflate_state *s;
- if (strm == Z_NULL || strm->state == Z_NULL ||
- flush > Z_BLOCK || flush < 0) {
+ if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
return Z_STREAM_ERROR;
}
s = strm->state;
if (strm->next_out == Z_NULL ||
- (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+ (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
(s->status == FINISH_STATE && flush != Z_FINISH)) {
ERR_RETURN(strm, Z_STREAM_ERROR);
}
if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
- s->strm = strm; /* just in case */
old_flush = s->last_flush;
s->last_flush = flush;
+ /* Flush as much pending output as possible */
+ if (s->pending != 0) {
+ flush_pending(strm);
+ if (strm->avail_out == 0) {
+ /* Since avail_out is 0, deflate will be called again with
+ * more output space, but possibly with both pending and
+ * avail_in equal to zero. There won't be anything to do,
+ * but this is not an error situation so make sure we
+ * return OK instead of BUF_ERROR at next call of deflate:
+ */
+ s->last_flush = -1;
+ return Z_OK;
+ }
+
+ /* Make sure there is something to do and avoid duplicate consecutive
+ * flushes. For repeated and useless calls with Z_FINISH, we keep
+ * returning Z_STREAM_END instead of Z_BUF_ERROR.
+ */
+ } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+ flush != Z_FINISH) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
+ /* User must not provide more input after the first FINISH: */
+ if (s->status == FINISH_STATE && strm->avail_in != 0) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
/* Write the header */
if (s->status == INIT_STATE) {
-#ifdef GZIP
- if (s->wrap == 2) {
- strm->adler = crc32(0L, Z_NULL, 0);
- put_byte(s, 31);
- put_byte(s, 139);
- put_byte(s, 8);
- if (s->gzhead == Z_NULL) {
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, s->level == 9 ? 2 :
- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
- 4 : 0));
- put_byte(s, OS_CODE);
- s->status = BUSY_STATE;
- }
- else {
- put_byte(s, (s->gzhead->text ? 1 : 0) +
- (s->gzhead->hcrc ? 2 : 0) +
- (s->gzhead->extra == Z_NULL ? 0 : 4) +
- (s->gzhead->name == Z_NULL ? 0 : 8) +
- (s->gzhead->comment == Z_NULL ? 0 : 16)
- );
- put_byte(s, (Byte)(s->gzhead->time & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
- put_byte(s, s->level == 9 ? 2 :
- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
- 4 : 0));
- put_byte(s, s->gzhead->os & 0xff);
- if (s->gzhead->extra != Z_NULL) {
- put_byte(s, s->gzhead->extra_len & 0xff);
- put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
- }
- if (s->gzhead->hcrc)
- strm->adler = crc32(strm->adler, s->pending_buf,
- s->pending);
- s->gzindex = 0;
- s->status = EXTRA_STATE;
- }
- }
+ /* zlib header */
+ uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+ uInt level_flags;
+
+ if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+ level_flags = 0;
+ else if (s->level < 6)
+ level_flags = 1;
+ else if (s->level == 6)
+ level_flags = 2;
else
-#endif
- {
- uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
- uInt level_flags;
+ level_flags = 3;
+ header |= (level_flags << 6);
+ if (s->strstart != 0) header |= PRESET_DICT;
+ header += 31 - (header % 31);
- if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
- level_flags = 0;
- else if (s->level < 6)
- level_flags = 1;
- else if (s->level == 6)
- level_flags = 2;
- else
- level_flags = 3;
- header |= (level_flags << 6);
- if (s->strstart != 0) header |= PRESET_DICT;
- header += 31 - (header % 31);
+ putShortMSB(s, header);
+ /* Save the adler32 of the preset dictionary: */
+ if (s->strstart != 0) {
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ }
+ strm->adler = adler32(0L, Z_NULL, 0);
+ s->status = BUSY_STATE;
+
+ /* Compression must start with an empty pending buffer */
+ flush_pending(strm);
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
+ }
+ }
+#ifdef GZIP
+ if (s->status == GZIP_STATE) {
+ /* gzip header */
+ strm->adler = crc32(0L, Z_NULL, 0);
+ put_byte(s, 31);
+ put_byte(s, 139);
+ put_byte(s, 8);
+ if (s->gzhead == Z_NULL) {
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, s->level == 9 ? 2 :
+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+ 4 : 0));
+ put_byte(s, OS_CODE);
s->status = BUSY_STATE;
- putShortMSB(s, header);
- /* Save the adler32 of the preset dictionary: */
- if (s->strstart != 0) {
- putShortMSB(s, (uInt)(strm->adler >> 16));
- putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ /* Compression must start with an empty pending buffer */
+ flush_pending(strm);
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
}
- strm->adler = adler32(0L, Z_NULL, 0);
}
+ else {
+ put_byte(s, (s->gzhead->text ? 1 : 0) +
+ (s->gzhead->hcrc ? 2 : 0) +
+ (s->gzhead->extra == Z_NULL ? 0 : 4) +
+ (s->gzhead->name == Z_NULL ? 0 : 8) +
+ (s->gzhead->comment == Z_NULL ? 0 : 16)
+ );
+ put_byte(s, (Byte)(s->gzhead->time & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+ put_byte(s, s->level == 9 ? 2 :
+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+ 4 : 0));
+ put_byte(s, s->gzhead->os & 0xff);
+ if (s->gzhead->extra != Z_NULL) {
+ put_byte(s, s->gzhead->extra_len & 0xff);
+ put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+ }
+ if (s->gzhead->hcrc)
+ strm->adler = crc32(strm->adler, s->pending_buf,
+ s->pending);
+ s->gzindex = 0;
+ s->status = EXTRA_STATE;
+ }
}
-#ifdef GZIP
if (s->status == EXTRA_STATE) {
if (s->gzhead->extra != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
-
- while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
- if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size)
- break;
+ ulg beg = s->pending; /* start of bytes to update crc */
+ uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
+ while (s->pending + left > s->pending_buf_size) {
+ uInt copy = s->pending_buf_size - s->pending;
+ zmemcpy(s->pending_buf + s->pending,
+ s->gzhead->extra + s->gzindex, copy);
+ s->pending = s->pending_buf_size;
+ HCRC_UPDATE(beg);
+ s->gzindex += copy;
+ flush_pending(strm);
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
}
- put_byte(s, s->gzhead->extra[s->gzindex]);
- s->gzindex++;
+ beg = 0;
+ left -= copy;
}
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (s->gzindex == s->gzhead->extra_len) {
- s->gzindex = 0;
- s->status = NAME_STATE;
- }
+ zmemcpy(s->pending_buf + s->pending,
+ s->gzhead->extra + s->gzindex, left);
+ s->pending += left;
+ HCRC_UPDATE(beg);
+ s->gzindex = 0;
}
- else
- s->status = NAME_STATE;
+ s->status = NAME_STATE;
}
if (s->status == NAME_STATE) {
if (s->gzhead->name != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
+ ulg beg = s->pending; /* start of bytes to update crc */
int val;
-
do {
if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
+ HCRC_UPDATE(beg);
flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size) {
- val = 1;
- break;
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
}
+ beg = 0;
}
val = s->gzhead->name[s->gzindex++];
put_byte(s, val);
} while (val != 0);
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (val == 0) {
- s->gzindex = 0;
- s->status = COMMENT_STATE;
- }
+ HCRC_UPDATE(beg);
+ s->gzindex = 0;
}
- else
- s->status = COMMENT_STATE;
+ s->status = COMMENT_STATE;
}
if (s->status == COMMENT_STATE) {
if (s->gzhead->comment != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
+ ulg beg = s->pending; /* start of bytes to update crc */
int val;
-
do {
if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
+ HCRC_UPDATE(beg);
flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size) {
- val = 1;
- break;
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
}
+ beg = 0;
}
val = s->gzhead->comment[s->gzindex++];
put_byte(s, val);
} while (val != 0);
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (val == 0)
- s->status = HCRC_STATE;
+ HCRC_UPDATE(beg);
}
- else
- s->status = HCRC_STATE;
+ s->status = HCRC_STATE;
}
if (s->status == HCRC_STATE) {
if (s->gzhead->hcrc) {
- if (s->pending + 2 > s->pending_buf_size)
+ if (s->pending + 2 > s->pending_buf_size) {
flush_pending(strm);
- if (s->pending + 2 <= s->pending_buf_size) {
- put_byte(s, (Byte)(strm->adler & 0xff));
- put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
- strm->adler = crc32(0L, Z_NULL, 0);
- s->status = BUSY_STATE;
+ if (s->pending != 0) {
+ s->last_flush = -1;
+ return Z_OK;
+ }
}
+ put_byte(s, (Byte)(strm->adler & 0xff));
+ put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+ strm->adler = crc32(0L, Z_NULL, 0);
}
- else
- s->status = BUSY_STATE;
- }
-#endif
+ s->status = BUSY_STATE;
- /* Flush as much pending output as possible */
- if (s->pending != 0) {
+ /* Compression must start with an empty pending buffer */
flush_pending(strm);
- if (strm->avail_out == 0) {
- /* Since avail_out is 0, deflate will be called again with
- * more output space, but possibly with both pending and
- * avail_in equal to zero. There won't be anything to do,
- * but this is not an error situation so make sure we
- * return OK instead of BUF_ERROR at next call of deflate:
- */
+ if (s->pending != 0) {
s->last_flush = -1;
return Z_OK;
}
-
- /* Make sure there is something to do and avoid duplicate consecutive
- * flushes. For repeated and useless calls with Z_FINISH, we keep
- * returning Z_STREAM_END instead of Z_BUF_ERROR.
- */
- } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
- flush != Z_FINISH) {
- ERR_RETURN(strm, Z_BUF_ERROR);
}
+#endif
- /* User must not provide more input after the first FINISH: */
- if (s->status == FINISH_STATE && strm->avail_in != 0) {
- ERR_RETURN(strm, Z_BUF_ERROR);
- }
-
/* Start a new block or continue the current one.
*/
if (strm->avail_in != 0 || s->lookahead != 0 ||
@@ -900,9 +997,10 @@
(flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
block_state bstate;
- bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
- (s->strategy == Z_RLE ? deflate_rle(s, flush) :
- (*(configuration_table[s->level].func))(s, flush));
+ bstate = s->level == 0 ? deflate_stored(s, flush) :
+ s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+ s->strategy == Z_RLE ? deflate_rle(s, flush) :
+ (*(configuration_table[s->level].func))(s, flush);
if (bstate == finish_started || bstate == finish_done) {
s->status = FINISH_STATE;
@@ -944,7 +1042,6 @@
}
}
}
- Assert(strm->avail_out > 0, "bug2");
if (flush != Z_FINISH) return Z_OK;
if (s->wrap <= 0) return Z_STREAM_END;
@@ -981,18 +1078,9 @@
{
int status;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
status = strm->state->status;
- if (status != INIT_STATE &&
- status != EXTRA_STATE &&
- status != NAME_STATE &&
- status != COMMENT_STATE &&
- status != HCRC_STATE &&
- status != BUSY_STATE &&
- status != FINISH_STATE) {
- return Z_STREAM_ERROR;
- }
/* Deallocate in reverse order of allocations: */
TRY_FREE(strm, strm->state->pending_buf);
@@ -1023,7 +1111,7 @@
ushf *overlay;
- if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+ if (deflateStateCheck(source) || dest == Z_NULL) {
return Z_STREAM_ERROR;
}
@@ -1073,7 +1161,7 @@
* allocating a large strm->next_in buffer and copying from it.
* (See also flush_pending()).
*/
-local int read_buf(strm, buf, size)
+local unsigned read_buf(strm, buf, size)
z_streamp strm;
Bytef *buf;
unsigned size;
@@ -1097,7 +1185,7 @@
strm->next_in += len;
strm->total_in += len;
- return (int)len;
+ return len;
}
/* ===========================================================================
@@ -1151,9 +1239,9 @@
{
unsigned chain_length = s->max_chain_length;/* max hash chain length */
register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
+ register Bytef *match; /* matched string */
register int len; /* length of current match */
- int best_len = s->prev_length; /* best match length so far */
+ int best_len = (int)s->prev_length; /* best match length so far */
int nice_match = s->nice_match; /* stop if match long enough */
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
s->strstart - (IPos)MAX_DIST(s) : NIL;
@@ -1188,7 +1276,7 @@
/* Do not look for matches beyond the end of the input. This is necessary
* to make deflate deterministic.
*/
- if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+ if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
@@ -1349,7 +1437,11 @@
#endif /* FASTEST */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
/* ===========================================================================
* Check that the match at match_start is indeed a match.
*/
@@ -1375,7 +1467,7 @@
}
#else
# define check_match(s, start, match, length)
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
/* ===========================================================================
* Fill the window when the lookahead becomes insufficient.
@@ -1390,8 +1482,7 @@
local void fill_window(s)
deflate_state *s;
{
- register unsigned n, m;
- register Posf *p;
+ unsigned n;
unsigned more; /* Amount of free space at the end of the window. */
uInt wsize = s->w_size;
@@ -1418,35 +1509,11 @@
*/
if (s->strstart >= wsize+MAX_DIST(s)) {
- zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+ zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
s->match_start -= wsize;
s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
s->block_start -= (long) wsize;
-
- /* Slide the hash table (could be avoided with 32 bit values
- at the expense of memory usage). We slide even when level == 0
- to keep the hash table consistent if we switch back to level > 0
- later. (Using level 0 permanently is not an optimal usage of
- zlib, so we don't care about this pathological case.)
- */
- n = s->hash_size;
- p = &s->head[n];
- do {
- m = *--p;
- *p = (Pos)(m >= wsize ? m-wsize : NIL);
- } while (--n);
-
- n = wsize;
-#ifndef FASTEST
- p = &s->prev[n];
- do {
- m = *--p;
- *p = (Pos)(m >= wsize ? m-wsize : NIL);
- /* If n is not on any hash chain, prev[n] is garbage but
- * its value will never be used.
- */
- } while (--n);
-#endif
+ slide_hash(s);
more += wsize;
}
if (s->strm->avail_in == 0) break;
@@ -1552,70 +1619,199 @@
if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
}
+/* Maximum stored block length in deflate format (not including header). */
+#define MAX_STORED 65535
+
+/* Minimum of a and b. */
+#define MIN(a, b) ((a) > (b) ? (b) : (a))
+
/* ===========================================================================
* Copy without compression as much as possible from the input stream, return
* the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
+ *
+ * In case deflateParams() is used to later switch to a non-zero compression
+ * level, s->matches (otherwise unused when storing) keeps track of the number
+ * of hash table slides to perform. If s->matches is 1, then one hash table
+ * slide will be done when switching. If s->matches is 2, the maximum value
+ * allowed here, then the hash table will be cleared, since two or more slides
+ * is the same as a clear.
+ *
+ * deflate_stored() is written to minimize the number of times an input byte is
+ * copied. It is most efficient with large input and output buffers, which
+ * maximizes the opportunites to have a single copy from next_in to next_out.
*/
local block_state deflate_stored(s, flush)
deflate_state *s;
int flush;
{
- /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
- * to pending_buf_size, and each stored block has a 5 byte header:
+ /* Smallest worthy block size when not flushing or finishing. By default
+ * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
+ * large input and output buffers, the stored block size will be larger.
*/
- ulg max_block_size = 0xffff;
- ulg max_start;
+ unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
- if (max_block_size > s->pending_buf_size - 5) {
- max_block_size = s->pending_buf_size - 5;
- }
+ /* Copy as many min_block or larger stored blocks directly to next_out as
+ * possible. If flushing, copy the remaining available input to next_out as
+ * stored blocks, if there is enough space.
+ */
+ unsigned len, left, have, last = 0;
+ unsigned used = s->strm->avail_in;
+ do {
+ /* Set len to the maximum size block that we can copy directly with the
+ * available input data and output space. Set left to how much of that
+ * would be copied from what's left in the window.
+ */
+ len = MAX_STORED; /* maximum deflate stored block length */
+ have = (s->bi_valid + 42) >> 3; /* number of header bytes */
+ if (s->strm->avail_out < have) /* need room for header */
+ break;
+ /* maximum stored block length that will fit in avail_out: */
+ have = s->strm->avail_out - have;
+ left = s->strstart - s->block_start; /* bytes left in window */
+ if (len > (ulg)left + s->strm->avail_in)
+ len = left + s->strm->avail_in; /* limit len to the input */
+ if (len > have)
+ len = have; /* limit len to the output */
- /* Copy as much as possible from input to output: */
- for (;;) {
- /* Fill the window as much as possible: */
- if (s->lookahead <= 1) {
+ /* If the stored block would be less than min_block in length, or if
+ * unable to copy all of the available input when flushing, then try
+ * copying to the window and the pending buffer instead. Also don't
+ * write an empty block when flushing -- deflate() does that.
+ */
+ if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+ flush == Z_NO_FLUSH ||
+ len != left + s->strm->avail_in))
+ break;
- Assert(s->strstart < s->w_size+MAX_DIST(s) ||
- s->block_start >= (long)s->w_size, "slide too late");
+ /* Make a dummy stored block in pending to get the header bytes,
+ * including any pending bits. This also updates the debugging counts.
+ */
+ last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
+ _tr_stored_block(s, (char *)0, 0L, last);
- fill_window(s);
- if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+ /* Replace the lengths in the dummy stored block with len. */
+ s->pending_buf[s->pending - 4] = len;
+ s->pending_buf[s->pending - 3] = len >> 8;
+ s->pending_buf[s->pending - 2] = ~len;
+ s->pending_buf[s->pending - 1] = ~len >> 8;
- if (s->lookahead == 0) break; /* flush the current block */
- }
- Assert(s->block_start >= 0L, "block gone");
+ /* Write the stored block header bytes. */
+ flush_pending(s->strm);
- s->strstart += s->lookahead;
- s->lookahead = 0;
+#ifdef ZLIB_DEBUG
+ /* Update debugging counts for the data about to be copied. */
+ s->compressed_len += len << 3;
+ s->bits_sent += len << 3;
+#endif
- /* Emit a stored block if pending_buf will be full: */
- max_start = s->block_start + max_block_size;
- if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
- /* strstart == 0 is possible when wraparound on 16-bit machine */
- s->lookahead = (uInt)(s->strstart - max_start);
- s->strstart = (uInt)max_start;
- FLUSH_BLOCK(s, 0);
+ /* Copy uncompressed bytes from the window to next_out. */
+ if (left) {
+ if (left > len)
+ left = len;
+ zmemcpy(s->strm->next_out, s->window + s->block_start, left);
+ s->strm->next_out += left;
+ s->strm->avail_out -= left;
+ s->strm->total_out += left;
+ s->block_start += left;
+ len -= left;
}
- /* Flush if we may have to slide, otherwise block_start may become
- * negative and the data will be gone:
+
+ /* Copy uncompressed bytes directly from next_in to next_out, updating
+ * the check value.
*/
- if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
- FLUSH_BLOCK(s, 0);
+ if (len) {
+ read_buf(s->strm, s->strm->next_out, len);
+ s->strm->next_out += len;
+ s->strm->avail_out -= len;
+ s->strm->total_out += len;
}
+ } while (last == 0);
+
+ /* Update the sliding window with the last s->w_size bytes of the copied
+ * data, or append all of the copied data to the existing window if less
+ * than s->w_size bytes were copied. Also update the number of bytes to
+ * insert in the hash tables, in the event that deflateParams() switches to
+ * a non-zero compression level.
+ */
+ used -= s->strm->avail_in; /* number of input bytes directly copied */
+ if (used) {
+ /* If any input was used, then no unused input remains in the window,
+ * therefore s->block_start == s->strstart.
+ */
+ if (used >= s->w_size) { /* supplant the previous history */
+ s->matches = 2; /* clear hash */
+ zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
+ s->strstart = s->w_size;
+ }
+ else {
+ if (s->window_size - s->strstart <= used) {
+ /* Slide the window down. */
+ s->strstart -= s->w_size;
+ zmemcpy(s->window, s->window + s->w_size, s->strstart);
+ if (s->matches < 2)
+ s->matches++; /* add a pending slide_hash() */
+ }
+ zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
+ s->strstart += used;
+ }
+ s->block_start = s->strstart;
+ s->insert += MIN(used, s->w_size - s->insert);
}
- s->insert = 0;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
+ if (s->high_water < s->strstart)
+ s->high_water = s->strstart;
+
+ /* If the last block was written to next_out, then done. */
+ if (last)
return finish_done;
+
+ /* If flushing and all input has been consumed, then done. */
+ if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+ s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+ return block_done;
+
+ /* Fill the window with any remaining input. */
+ have = s->window_size - s->strstart - 1;
+ if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+ /* Slide the window down. */
+ s->block_start -= s->w_size;
+ s->strstart -= s->w_size;
+ zmemcpy(s->window, s->window + s->w_size, s->strstart);
+ if (s->matches < 2)
+ s->matches++; /* add a pending slide_hash() */
+ have += s->w_size; /* more space now */
}
- if ((long)s->strstart > s->block_start)
- FLUSH_BLOCK(s, 0);
- return block_done;
+ if (have > s->strm->avail_in)
+ have = s->strm->avail_in;
+ if (have) {
+ read_buf(s->strm, s->window + s->strstart, have);
+ s->strstart += have;
+ }
+ if (s->high_water < s->strstart)
+ s->high_water = s->strstart;
+
+ /* There was not enough avail_out to write a complete worthy or flushed
+ * stored block to next_out. Write a stored block to pending instead, if we
+ * have enough input for a worthy block, or if flushing and there is enough
+ * room for the remaining input as a stored block in the pending buffer.
+ */
+ have = (s->bi_valid + 42) >> 3; /* number of header bytes */
+ /* maximum stored block length that will fit in pending: */
+ have = MIN(s->pending_buf_size - have, MAX_STORED);
+ min_block = MIN(have, s->w_size);
+ left = s->strstart - s->block_start;
+ if (left >= min_block ||
+ ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+ s->strm->avail_in == 0 && left <= have)) {
+ len = MIN(left, have);
+ last = flush == Z_FINISH && s->strm->avail_in == 0 &&
+ len == left ? 1 : 0;
+ _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
+ s->block_start += len;
+ flush_pending(s->strm);
+ }
+
+ /* We've done all we can with the available input and output. */
+ return last ? finish_started : need_more;
}
/* ===========================================================================
@@ -1892,7 +2088,7 @@
prev == *++scan && prev == *++scan &&
prev == *++scan && prev == *++scan &&
scan < strend);
- s->match_length = MAX_MATCH - (int)(strend - scan);
+ s->match_length = MAX_MATCH - (uInt)(strend - scan);
if (s->match_length > s->lookahead)
s->match_length = s->lookahead;
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/deflate.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/deflate.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/deflate.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -51,13 +51,16 @@
#define Buf_size 16
/* size of bit buffer in bi_buf */
-#define INIT_STATE 42
-#define EXTRA_STATE 69
-#define NAME_STATE 73
-#define COMMENT_STATE 91
-#define HCRC_STATE 103
-#define BUSY_STATE 113
-#define FINISH_STATE 666
+#define INIT_STATE 42 /* zlib header -> BUSY_STATE */
+#ifdef GZIP
+# define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */
+#endif
+#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */
+#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */
+#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE 113 /* deflate -> FINISH_STATE */
+#define FINISH_STATE 666 /* stream complete */
/* Stream status */
@@ -83,7 +86,7 @@
typedef struct tree_desc_s {
ct_data *dyn_tree; /* the dynamic tree */
int max_code; /* largest code with non zero frequency */
- static_tree_desc *stat_desc; /* the corresponding static tree */
+ const static_tree_desc *stat_desc; /* the corresponding static tree */
} FAR tree_desc;
typedef ush Pos;
@@ -100,10 +103,10 @@
Bytef *pending_buf; /* output still pending */
ulg pending_buf_size; /* size of pending_buf */
Bytef *pending_out; /* next pending byte to output to the stream */
- uInt pending; /* nb of bytes in the pending buffer */
+ ulg pending; /* nb of bytes in the pending buffer */
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
gz_headerp gzhead; /* gzip header information to write */
- uInt gzindex; /* where in extra, name, or comment */
+ ulg gzindex; /* where in extra, name, or comment */
Byte method; /* can only be DEFLATED */
int last_flush; /* value of flush param for previous deflate call */
@@ -249,7 +252,7 @@
uInt matches; /* number of string matches in current block */
uInt insert; /* bytes at end of window left to insert */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
ulg compressed_len; /* total bit length of compressed file mod 2^32 */
ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
#endif
@@ -275,7 +278,7 @@
/* Output a byte on the stream.
* IN assertion: there is enough room in pending_buf.
*/
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
@@ -309,7 +312,7 @@
* used.
*/
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
/* Inline versions of _tr_tally for speed: */
#if defined(GEN_TREES_H) || !defined(STDC)
@@ -328,8 +331,8 @@
flush = (s->last_lit == s->lit_bufsize-1); \
}
# define _tr_tally_dist(s, distance, length, flush) \
- { uch len = (length); \
- ush dist = (distance); \
+ { uch len = (uch)(length); \
+ ush dist = (ush)(distance); \
s->d_buf[s->last_lit] = dist; \
s->l_buf[s->last_lit++] = len; \
dist--; \
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -46,7 +46,7 @@
end-of-file, they cannot be concantenated. If a Unix compress stream is
encountered in an input file, it is the last stream in that file.
- Like gunzip and uncompress, the file attributes of the orignal compressed
+ Like gunzip and uncompress, the file attributes of the original compressed
file are maintained in the final uncompressed file, to the extent that the
user permissions allow it.
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/*
* gzlog.c
- * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved
+ * Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved
* For conditions of distribution and use, see copyright notice in gzlog.h
* version 2.2, 14 Aug 2012
*/
@@ -243,7 +243,7 @@
typedef unsigned long ulong;
/* Macro for debugging to deterministically force recovery operations */
-#ifdef DEBUG
+#ifdef GZLOG_DEBUG
#include <setjmp.h> /* longjmp */
jmp_buf gzlog_jump; /* where to go back to */
int gzlog_bail = 0; /* which point to bail at (1..8) */
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -27,7 +27,7 @@
grows as needed to accommodate the points.
To use the index, an offset in the uncompressed data is provided, for which
- the latest accees point at or preceding that offset is located in the index.
+ the latest access point at or preceding that offset is located in the index.
The input file is positioned to the specified location in the index, and if
necessary the first few bits of the compressed data is read from the file.
inflate is initialized with those bits and the 32K of uncompressed data, and
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzguts.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzguts.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzguts.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -25,6 +25,10 @@
# include <stdlib.h>
# include <limits.h>
#endif
+
+#ifndef _POSIX_SOURCE
+# define _POSIX_SOURCE
+#endif
#include <fcntl.h>
#ifdef _WIN32
@@ -35,6 +39,10 @@
# include <io.h>
#endif
+#if defined(_WIN32)
+# define WIDECHAR
+#endif
+
#ifdef WINAPI_FAMILY
# define open _open
# define read _read
@@ -95,11 +103,10 @@
# endif
#endif
-/* unlike snprintf (which is required in C99, yet still not supported by
- Microsoft more than a decade later!), _snprintf does not guarantee null
- termination of the result -- however this is only used in gzlib.c where
+/* unlike snprintf (which is required in C99), _snprintf does not guarantee
+ null termination of the result -- however this is only used in gzlib.c where
the result is assured to fit in the space provided */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
# define snprintf _snprintf
#endif
@@ -106,7 +113,9 @@
#ifndef local
# define local static
#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
+ define "local" for the non-static meaning of "static", for readability
+ (compile with -Dlocal if your debugger can't find static symbols) */
/* gz* functions always use library allocation functions */
#ifndef STDC
@@ -170,7 +179,7 @@
char *path; /* path or fd for error messages */
unsigned size; /* buffer size, zero if not allocated yet */
unsigned want; /* requested buffer size, default is GZBUFSIZE */
- unsigned char *in; /* input buffer */
+ unsigned char *in; /* input buffer (double-sized when writing) */
unsigned char *out; /* output buffer (double-sized when reading) */
int direct; /* 0 if processing gzip, 1 if transparent */
/* just for reading */
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzlib.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzlib.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzlib.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,11 +1,11 @@
/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
#include "gzguts.h"
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
# define LSEEK _lseeki64
#else
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
@@ -94,7 +94,7 @@
const char *mode;
{
gz_statep state;
- size_t len;
+ z_size_t len;
int oflag;
#ifdef O_CLOEXEC
int cloexec = 0;
@@ -188,10 +188,10 @@
}
/* save the path name for error messages */
-#ifdef _WIN32
+#ifdef WIDECHAR
if (fd == -2) {
len = wcstombs(NULL, path, 0);
- if (len == (size_t)-1)
+ if (len == (z_size_t)-1)
len = 0;
}
else
@@ -202,7 +202,7 @@
free(state);
return NULL;
}
-#ifdef _WIN32
+#ifdef WIDECHAR
if (fd == -2)
if (len)
wcstombs(state->path, path, len + 1);
@@ -211,7 +211,7 @@
else
#endif
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
- snprintf(state->path, len + 1, "%s", (const char *)path);
+ (void)snprintf(state->path, len + 1, "%s", (const char *)path);
#else
strcpy(state->path, path);
#endif
@@ -239,7 +239,7 @@
/* open the file with the appropriate flags (or just use fd) */
state->fd = fd > -1 ? fd : (
-#ifdef _WIN32
+#ifdef WIDECHAR
fd == -2 ? _wopen(path, oflag, 0666) :
#endif
open((const char *)path, oflag, 0666));
@@ -248,8 +248,10 @@
free(state);
return NULL;
}
- if (state->mode == GZ_APPEND)
+ if (state->mode == GZ_APPEND) {
+ LSEEK(state->fd, 0, SEEK_END); /* so gzoffset() is correct */
state->mode = GZ_WRITE; /* simplify later checks */
+ }
/* save the current position for rewinding (only if reading) */
if (state->mode == GZ_READ) {
@@ -291,7 +293,7 @@
if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
return NULL;
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
- snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
+ (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
#else
sprintf(path, "<fd:%d>", fd); /* for debugging */
#endif
@@ -301,7 +303,7 @@
}
/* -- see zlib.h -- */
-#ifdef _WIN32
+#ifdef WIDECHAR
gzFile ZEXPORT gzopen_w(path, mode)
const wchar_t *path;
const char *mode;
@@ -329,6 +331,8 @@
return -1;
/* check and set requested size */
+ if ((size << 1) < size)
+ return -1; /* need to be able to double it */
if (size < 2)
size = 2; /* need two bytes to check magic header */
state->want = size;
@@ -604,14 +608,13 @@
return;
}
#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
- snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
- "%s%s%s", state->path, ": ", msg);
+ (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+ "%s%s%s", state->path, ": ", msg);
#else
strcpy(state->msg, state->path);
strcat(state->msg, ": ");
strcat(state->msg, msg);
#endif
- return;
}
#ifndef INT_MAX
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzread.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzread.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzread.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -12,6 +12,7 @@
local int gz_decomp OF((gz_statep));
local int gz_fetch OF((gz_statep));
local int gz_skip OF((gz_statep, z_off64_t));
+local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
state->fd, and update state->eof, state->err, and state->msg as appropriate.
@@ -24,13 +25,17 @@
unsigned *have;
{
int ret;
+ unsigned get, max = ((unsigned)-1 >> 2) + 1;
*have = 0;
do {
- ret = read(state->fd, buf + *have, len - *have);
+ get = len - *have;
+ if (get > max)
+ get = max;
+ ret = read(state->fd, buf + *have, get);
if (ret <= 0)
break;
- *have += ret;
+ *have += (unsigned)ret;
} while (*have < len);
if (ret < 0) {
gz_error(state, Z_ERRNO, zstrerror());
@@ -94,10 +99,8 @@
state->in = (unsigned char *)malloc(state->want);
state->out = (unsigned char *)malloc(state->want << 1);
if (state->in == NULL || state->out == NULL) {
- if (state->out != NULL)
- free(state->out);
- if (state->in != NULL)
- free(state->in);
+ free(state->out);
+ free(state->in);
gz_error(state, Z_MEM_ERROR, "out of memory");
return -1;
}
@@ -284,34 +287,18 @@
return 0;
}
-/* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
- gzFile file;
+/* Read len bytes into buf from file, or less than len up to the end of the
+ input. Return the number of bytes read. If zero is returned, either the
+ end of file was reached, or there was an error. state->err must be
+ consulted in that case to determine which. */
+local z_size_t gz_read(state, buf, len)
+ gz_statep state;
voidp buf;
- unsigned len;
+ z_size_t len;
{
- unsigned got, n;
- gz_statep state;
- z_streamp strm;
+ z_size_t got;
+ unsigned n;
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're reading and that there's no (serious) error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return -1;
-
- /* since an int is returned, make sure len fits in one, otherwise return
- with an error (this avoids the flaw in the interface) */
- if ((int)len < 0) {
- gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
- return -1;
- }
-
/* if len is zero, avoid unnecessary operations */
if (len == 0)
return 0;
@@ -320,15 +307,21 @@
if (state->seek) {
state->seek = 0;
if (gz_skip(state, state->skip) == -1)
- return -1;
+ return 0;
}
/* get len bytes to buf, or less than len if at the end */
got = 0;
do {
+ /* set n to the maximum amount of len that fits in an unsigned int */
+ n = -1;
+ if (n > len)
+ n = len;
+
/* first just try copying data from the output buffer */
if (state->x.have) {
- n = state->x.have > len ? len : state->x.have;
+ if (state->x.have < n)
+ n = state->x.have;
memcpy(buf, state->x.next, n);
state->x.next += n;
state->x.have -= n;
@@ -335,7 +328,7 @@
}
/* output buffer empty -- return if we're at the end of the input */
- else if (state->eof && strm->avail_in == 0) {
+ else if (state->eof && state->strm.avail_in == 0) {
state->past = 1; /* tried to read past end */
break;
}
@@ -342,10 +335,10 @@
/* need output data -- for small len or new stream load up our output
buffer */
- else if (state->how == LOOK || len < (state->size << 1)) {
+ else if (state->how == LOOK || n < (state->size << 1)) {
/* get more output, looking for header if required */
if (gz_fetch(state) == -1)
- return -1;
+ return 0;
continue; /* no progress yet -- go back to copy above */
/* the copy above assures that we will leave with space in the
output buffer, allowing at least one gzungetc() to succeed */
@@ -353,16 +346,16 @@
/* large len -- read directly into user buffer */
else if (state->how == COPY) { /* read directly */
- if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
- return -1;
+ if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
+ return 0;
}
/* large len -- decompress directly into user buffer */
else { /* state->how == GZIP */
- strm->avail_out = len;
- strm->next_out = (unsigned char *)buf;
+ state->strm.avail_out = n;
+ state->strm.next_out = (unsigned char *)buf;
if (gz_decomp(state) == -1)
- return -1;
+ return 0;
n = state->x.have;
state->x.have = 0;
}
@@ -374,11 +367,78 @@
state->x.pos += n;
} while (len);
- /* return number of bytes read into user buffer (will fit in int) */
- return (int)got;
+ /* return number of bytes read into user buffer */
+ return got;
}
/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+ gzFile file;
+ voidp buf;
+ unsigned len;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return -1;
+
+ /* since an int is returned, make sure len fits in one, otherwise return
+ with an error (this avoids a flaw in the interface) */
+ if ((int)len < 0) {
+ gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
+ return -1;
+ }
+
+ /* read len or fewer bytes to buf */
+ len = gz_read(state, buf, len);
+
+ /* check for an error */
+ if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
+ return -1;
+
+ /* return the number of bytes read (this is assured to fit in an int) */
+ return (int)len;
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfread(buf, size, nitems, file)
+ voidp buf;
+ z_size_t size;
+ z_size_t nitems;
+ gzFile file;
+{
+ z_size_t len;
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return 0;
+
+ /* compute bytes to read -- error on overflow */
+ len = nitems * size;
+ if (size && len / size != nitems) {
+ gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+ return 0;
+ }
+
+ /* read len or fewer bytes to buf, return the number of full items read */
+ return len ? gz_read(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
#ifdef Z_PREFIX_SET
# undef z_gzgetc
#else
@@ -408,8 +468,8 @@
return *(state->x.next)++;
}
- /* nothing there -- try gzread() */
- ret = gzread(file, buf, 1);
+ /* nothing there -- try gz_read() */
+ ret = gz_read(state, buf, 1);
return ret < 1 ? -1 : buf[0];
}
@@ -451,7 +511,7 @@
if (state->x.have == 0) {
state->x.have = 1;
state->x.next = state->out + (state->size << 1) - 1;
- state->x.next[0] = c;
+ state->x.next[0] = (unsigned char)c;
state->x.pos--;
state->past = 0;
return c;
@@ -473,7 +533,7 @@
}
state->x.have++;
state->x.next--;
- state->x.next[0] = c;
+ state->x.next[0] = (unsigned char)c;
state->x.pos--;
state->past = 0;
return c;
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,9 +9,11 @@
local int gz_init OF((gz_statep));
local int gz_comp OF((gz_statep, int));
local int gz_zero OF((gz_statep, z_off64_t));
+local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
/* Initialize state for writing a gzip file. Mark initialization by setting
- state->size to non-zero. Return -1 on failure or 0 on success. */
+ state->size to non-zero. Return -1 on a memory allocation failure, or 0 on
+ success. */
local int gz_init(state)
gz_statep state;
{
@@ -18,8 +20,8 @@
int ret;
z_streamp strm = &(state->strm);
- /* allocate input buffer */
- state->in = (unsigned char *)malloc(state->want);
+ /* allocate input buffer (double size for gzprintf) */
+ state->in = (unsigned char *)malloc(state->want << 1);
if (state->in == NULL) {
gz_error(state, Z_MEM_ERROR, "out of memory");
return -1;
@@ -47,6 +49,7 @@
gz_error(state, Z_MEM_ERROR, "out of memory");
return -1;
}
+ strm->next_in = NULL;
}
/* mark state as initialized */
@@ -62,17 +65,17 @@
}
/* Compress whatever is at avail_in and next_in and write to the output file.
- Return -1 if there is an error writing to the output file, otherwise 0.
- flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH,
- then the deflate() state is reset to start a new gzip stream. If gz->direct
- is true, then simply write to the output file without compressing, and
- ignore flush. */
+ Return -1 if there is an error writing to the output file or if gz_init()
+ fails to allocate memory, otherwise 0. flush is assumed to be a valid
+ deflate() flush value. If flush is Z_FINISH, then the deflate() state is
+ reset to start a new gzip stream. If gz->direct is true, then simply write
+ to the output file without compressing, and ignore flush. */
local int gz_comp(state, flush)
gz_statep state;
int flush;
{
- int ret, got;
- unsigned have;
+ int ret, writ;
+ unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
z_streamp strm = &(state->strm);
/* allocate memory if this is the first time through */
@@ -81,12 +84,16 @@
/* write directly if requested */
if (state->direct) {
- got = write(state->fd, strm->next_in, strm->avail_in);
- if (got < 0 || (unsigned)got != strm->avail_in) {
- gz_error(state, Z_ERRNO, zstrerror());
- return -1;
+ while (strm->avail_in) {
+ put = strm->avail_in > max ? max : strm->avail_in;
+ writ = write(state->fd, strm->next_in, put);
+ if (writ < 0) {
+ gz_error(state, Z_ERRNO, zstrerror());
+ return -1;
+ }
+ strm->avail_in -= (unsigned)writ;
+ strm->next_in += writ;
}
- strm->avail_in = 0;
return 0;
}
@@ -97,17 +104,21 @@
doing Z_FINISH then don't write until we get to Z_STREAM_END */
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
(flush != Z_FINISH || ret == Z_STREAM_END))) {
- have = (unsigned)(strm->next_out - state->x.next);
- if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
- (unsigned)got != have)) {
- gz_error(state, Z_ERRNO, zstrerror());
- return -1;
+ while (strm->next_out > state->x.next) {
+ put = strm->next_out - state->x.next > (int)max ? max :
+ (unsigned)(strm->next_out - state->x.next);
+ writ = write(state->fd, state->x.next, put);
+ if (writ < 0) {
+ gz_error(state, Z_ERRNO, zstrerror());
+ return -1;
+ }
+ state->x.next += writ;
}
if (strm->avail_out == 0) {
strm->avail_out = state->size;
strm->next_out = state->out;
+ state->x.next = state->out;
}
- state->x.next = strm->next_out;
}
/* compress */
@@ -129,7 +140,8 @@
return 0;
}
-/* Compress len zeros to output. Return -1 on error, 0 on success. */
+/* Compress len zeros to output. Return -1 on a write error or memory
+ allocation failure by gz_comp(), or 0 on success. */
local int gz_zero(state, len)
gz_statep state;
z_off64_t len;
@@ -161,33 +173,15 @@
return 0;
}
-/* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
- gzFile file;
+/* Write len bytes from buf to file. Return the number of bytes written. If
+ the returned value is less than len, then there was an error. */
+local z_size_t gz_write(state, buf, len)
+ gz_statep state;
voidpc buf;
- unsigned len;
+ z_size_t len;
{
- unsigned put = len;
- gz_statep state;
- z_streamp strm;
+ z_size_t put = len;
- /* get internal structure */
- if (file == NULL)
- return 0;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
-
- /* since an int is returned, make sure len fits in one, otherwise return
- with an error (this avoids the flaw in the interface) */
- if ((int)len < 0) {
- gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
- return 0;
- }
-
/* if len is zero, avoid unnecessary operations */
if (len == 0)
return 0;
@@ -209,14 +203,15 @@
do {
unsigned have, copy;
- if (strm->avail_in == 0)
- strm->next_in = state->in;
- have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+ if (state->strm.avail_in == 0)
+ state->strm.next_in = state->in;
+ have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
+ state->in);
copy = state->size - have;
if (copy > len)
copy = len;
memcpy(state->in + have, buf, copy);
- strm->avail_in += copy;
+ state->strm.avail_in += copy;
state->x.pos += copy;
buf = (const char *)buf + copy;
len -= copy;
@@ -226,22 +221,86 @@
}
else {
/* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+ if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
return 0;
/* directly compress user buffer to file */
- strm->avail_in = len;
- strm->next_in = (z_const Bytef *)buf;
- state->x.pos += len;
- if (gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
+ state->strm.next_in = (z_const Bytef *)buf;
+ do {
+ unsigned n = (unsigned)-1;
+ if (n > len)
+ n = len;
+ state->strm.avail_in = n;
+ state->x.pos += n;
+ if (gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+ len -= n;
+ } while (len);
}
- /* input was all buffered or compressed (put will fit in int) */
- return (int)put;
+ /* input was all buffered or compressed */
+ return put;
}
/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+ gzFile file;
+ voidpc buf;
+ unsigned len;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return 0;
+
+ /* since an int is returned, make sure len fits in one, otherwise return
+ with an error (this avoids a flaw in the interface) */
+ if ((int)len < 0) {
+ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+ return 0;
+ }
+
+ /* write len bytes from buf (the return value will fit in an int) */
+ return (int)gz_write(state, buf, len);
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
+ voidpc buf;
+ z_size_t size;
+ z_size_t nitems;
+ gzFile file;
+{
+ z_size_t len;
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return 0;
+
+ /* compute bytes to read -- error on overflow */
+ len = nitems * size;
+ if (size && len / size != nitems) {
+ gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+ return 0;
+ }
+
+ /* write len bytes to buf, return the number of full items written */
+ return len ? gz_write(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
int ZEXPORT gzputc(file, c)
gzFile file;
int c;
@@ -275,7 +334,7 @@
strm->next_in = state->in;
have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
if (have < state->size) {
- state->in[have] = c;
+ state->in[have] = (unsigned char)c;
strm->avail_in++;
state->x.pos++;
return c & 0xff;
@@ -283,8 +342,8 @@
}
/* no room in buffer or not initialized, use gz_write() */
- buf[0] = c;
- if (gzwrite(file, buf, 1) != 1)
+ buf[0] = (unsigned char)c;
+ if (gz_write(state, buf, 1) != 1)
return -1;
return c & 0xff;
}
@@ -295,11 +354,21 @@
const char *str;
{
int ret;
- unsigned len;
+ z_size_t len;
+ gz_statep state;
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return -1;
+
/* write string */
- len = (unsigned)strlen(str);
- ret = gzwrite(file, str, len);
+ len = strlen(str);
+ ret = gz_write(state, str, len);
return ret == 0 && len != 0 ? -1 : ret;
}
@@ -309,63 +378,73 @@
/* -- see zlib.h -- */
int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
{
- int size, len;
+ int len;
+ unsigned left;
+ char *next;
gz_statep state;
z_streamp strm;
/* get internal structure */
if (file == NULL)
- return -1;
+ return Z_STREAM_ERROR;
state = (gz_statep)file;
strm = &(state->strm);
/* check that we're writing and that there's no error */
if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
+ return Z_STREAM_ERROR;
/* make sure we have some buffer space */
if (state->size == 0 && gz_init(state) == -1)
- return 0;
+ return state->err;
/* check for seek request */
if (state->seek) {
state->seek = 0;
if (gz_zero(state, state->skip) == -1)
- return 0;
+ return state->err;
}
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
-
- /* do the printf() into the input buffer, put length in len */
- size = (int)(state->size);
- state->in[size - 1] = 0;
+ /* do the printf() into the input buffer, put length in len -- the input
+ buffer is double-sized just for this function, so there is guaranteed to
+ be state->size bytes available after the current contents */
+ if (strm->avail_in == 0)
+ strm->next_in = state->in;
+ next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
+ next[state->size - 1] = 0;
#ifdef NO_vsnprintf
# ifdef HAS_vsprintf_void
- (void)vsprintf((char *)(state->in), format, va);
- for (len = 0; len < size; len++)
- if (state->in[len] == 0) break;
+ (void)vsprintf(next, format, va);
+ for (len = 0; len < state->size; len++)
+ if (next[len] == 0) break;
# else
- len = vsprintf((char *)(state->in), format, va);
+ len = vsprintf(next, format, va);
# endif
#else
# ifdef HAS_vsnprintf_void
- (void)vsnprintf((char *)(state->in), size, format, va);
- len = strlen((char *)(state->in));
+ (void)vsnprintf(next, state->size, format, va);
+ len = strlen(next);
# else
- len = vsnprintf((char *)(state->in), size, format, va);
+ len = vsnprintf(next, state->size, format, va);
# endif
#endif
/* check that printf() results fit in buffer */
- if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+ if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
return 0;
- /* update buffer and position, defer compression until needed */
- strm->avail_in = (unsigned)len;
- strm->next_in = state->in;
+ /* update buffer and position, compress first half if past that */
+ strm->avail_in += (unsigned)len;
state->x.pos += len;
+ if (strm->avail_in >= state->size) {
+ left = strm->avail_in - state->size;
+ strm->avail_in = state->size;
+ if (gz_comp(state, Z_NO_FLUSH) == -1)
+ return state->err;
+ memcpy(state->in, state->in + state->size, left);
+ strm->next_in = state->in;
+ strm->avail_in = left;
+ }
return len;
}
@@ -390,73 +469,82 @@
int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
{
- int size, len;
+ unsigned len, left;
+ char *next;
gz_statep state;
z_streamp strm;
/* get internal structure */
if (file == NULL)
- return -1;
+ return Z_STREAM_ERROR;
state = (gz_statep)file;
strm = &(state->strm);
/* check that can really pass pointer in ints */
if (sizeof(int) != sizeof(void *))
- return 0;
+ return Z_STREAM_ERROR;
/* check that we're writing and that there's no error */
if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
+ return Z_STREAM_ERROR;
/* make sure we have some buffer space */
if (state->size == 0 && gz_init(state) == -1)
- return 0;
+ return state->error;
/* check for seek request */
if (state->seek) {
state->seek = 0;
if (gz_zero(state, state->skip) == -1)
- return 0;
+ return state->error;
}
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
-
- /* do the printf() into the input buffer, put length in len */
- size = (int)(state->size);
- state->in[size - 1] = 0;
+ /* do the printf() into the input buffer, put length in len -- the input
+ buffer is double-sized just for this function, so there is guaranteed to
+ be state->size bytes available after the current contents */
+ if (strm->avail_in == 0)
+ strm->next_in = state->in;
+ next = (char *)(strm->next_in + strm->avail_in);
+ next[state->size - 1] = 0;
#ifdef NO_snprintf
# ifdef HAS_sprintf_void
- sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+ sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
+ a13, a14, a15, a16, a17, a18, a19, a20);
for (len = 0; len < size; len++)
- if (state->in[len] == 0) break;
+ if (next[len] == 0)
+ break;
# else
- len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+ len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
+ a12, a13, a14, a15, a16, a17, a18, a19, a20);
# endif
#else
# ifdef HAS_snprintf_void
- snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
- len = strlen((char *)(state->in));
+ snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
+ a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+ len = strlen(next);
# else
- len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
- a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
- a19, a20);
+ len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
# endif
#endif
/* check that printf() results fit in buffer */
- if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+ if (len == 0 || len >= state->size || next[state->size - 1] != 0)
return 0;
- /* update buffer and position, defer compression until needed */
- strm->avail_in = (unsigned)len;
- strm->next_in = state->in;
+ /* update buffer and position, compress first half if past that */
+ strm->avail_in += len;
state->x.pos += len;
- return len;
+ if (strm->avail_in >= state->size) {
+ left = strm->avail_in - state->size;
+ strm->avail_in = state->size;
+ if (gz_comp(state, Z_NO_FLUSH) == -1)
+ return state->err;
+ memcpy(state->in, state->in + state->size, left);
+ strm->next_in = state->in;
+ strm->avail_in = left;
+ }
+ return (int)len;
}
#endif
@@ -470,7 +558,7 @@
/* get internal structure */
if (file == NULL)
- return -1;
+ return Z_STREAM_ERROR;
state = (gz_statep)file;
/* check that we're writing and that there's no error */
@@ -485,11 +573,11 @@
if (state->seek) {
state->seek = 0;
if (gz_zero(state, state->skip) == -1)
- return -1;
+ return state->err;
}
/* compress remaining data with requested flush */
- gz_comp(state, flush);
+ (void)gz_comp(state, flush);
return state->err;
}
@@ -520,13 +608,13 @@
if (state->seek) {
state->seek = 0;
if (gz_zero(state, state->skip) == -1)
- return -1;
+ return state->err;
}
/* change compression parameters for subsequent input */
if (state->size) {
/* flush previous input with previous parameters before changing */
- if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
+ if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
return state->err;
deflateParams(strm, level, strategy);
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/infback.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/infback.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/infback.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -61,7 +61,7 @@
Tracev((stderr, "inflate: allocated\n"));
strm->state = (struct internal_state FAR *)state;
state->dmax = 32768U;
- state->wbits = windowBits;
+ state->wbits = (uInt)windowBits;
state->wsize = 1U << windowBits;
state->window = window;
state->wnext = 0;
Modified: branches/stable/source/src/libs/zlib/zlib-src/inffast.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inffast.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/inffast.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -8,26 +8,9 @@
#include "inflate.h"
#include "inffast.h"
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
- Based on testing to date,
- Pre-increment preferred for:
- - PowerPC G3 (Adler)
- - MIPS R5000 (Randers-Pehrson)
- Post-increment preferred for:
- - none
- No measurable difference:
- - Pentium III (Anderson)
- - M68060 (Nikl)
- */
-#ifdef POSTINC
-# define OFF 0
-# define PUP(a) *(a)++
+#ifdef ASMINF
+# pragma message("Assembler code may have bugs -- use at your own risk")
#else
-# define OFF 1
-# define PUP(a) *++(a)
-#endif
/*
Decode literal, length, and distance codes and write out the resulting
@@ -96,9 +79,9 @@
/* copy state to local variables */
state = (struct inflate_state FAR *)strm->state;
- in = strm->next_in - OFF;
+ in = strm->next_in;
last = in + (strm->avail_in - 5);
- out = strm->next_out - OFF;
+ out = strm->next_out;
beg = out - (start - strm->avail_out);
end = out + (strm->avail_out - 257);
#ifdef INFLATE_STRICT
@@ -119,9 +102,9 @@
input data or output space */
do {
if (bits < 15) {
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
}
here = lcode[hold & lmask];
@@ -134,7 +117,7 @@
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
"inflate: literal '%c'\n" :
"inflate: literal 0x%02x\n", here.val));
- PUP(out) = (unsigned char)(here.val);
+ *out++ = (unsigned char)(here.val);
}
else if (op & 16) { /* length base */
len = (unsigned)(here.val);
@@ -141,7 +124,7 @@
op &= 15; /* number of extra bits */
if (op) {
if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
}
len += (unsigned)hold & ((1U << op) - 1);
@@ -150,9 +133,9 @@
}
Tracevv((stderr, "inflate: length %u\n", len));
if (bits < 15) {
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
}
here = dcode[hold & dmask];
@@ -165,10 +148,10 @@
dist = (unsigned)(here.val);
op &= 15; /* number of extra bits */
if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
if (bits < op) {
- hold += (unsigned long)(PUP(in)) << bits;
+ hold += (unsigned long)(*in++) << bits;
bits += 8;
}
}
@@ -196,30 +179,30 @@
#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
if (len <= op - whave) {
do {
- PUP(out) = 0;
+ *out++ = 0;
} while (--len);
continue;
}
len -= op - whave;
do {
- PUP(out) = 0;
+ *out++ = 0;
} while (--op > whave);
if (op == 0) {
from = out - dist;
do {
- PUP(out) = PUP(from);
+ *out++ = *from++;
} while (--len);
continue;
}
#endif
}
- from = window - OFF;
+ from = window;
if (wnext == 0) { /* very common case */
from += wsize - op;
if (op < len) { /* some from window */
len -= op;
do {
- PUP(out) = PUP(from);
+ *out++ = *from++;
} while (--op);
from = out - dist; /* rest from output */
}
@@ -230,14 +213,14 @@
if (op < len) { /* some from end of window */
len -= op;
do {
- PUP(out) = PUP(from);
+ *out++ = *from++;
} while (--op);
- from = window - OFF;
+ from = window;
if (wnext < len) { /* some from start of window */
op = wnext;
len -= op;
do {
- PUP(out) = PUP(from);
+ *out++ = *from++;
} while (--op);
from = out - dist; /* rest from output */
}
@@ -248,35 +231,35 @@
if (op < len) { /* some from window */
len -= op;
do {
- PUP(out) = PUP(from);
+ *out++ = *from++;
} while (--op);
from = out - dist; /* rest from output */
}
}
while (len > 2) {
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
+ *out++ = *from++;
+ *out++ = *from++;
+ *out++ = *from++;
len -= 3;
}
if (len) {
- PUP(out) = PUP(from);
+ *out++ = *from++;
if (len > 1)
- PUP(out) = PUP(from);
+ *out++ = *from++;
}
}
else {
from = out - dist; /* copy direct from output */
do { /* minimum length is three */
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
- PUP(out) = PUP(from);
+ *out++ = *from++;
+ *out++ = *from++;
+ *out++ = *from++;
len -= 3;
} while (len > 2);
if (len) {
- PUP(out) = PUP(from);
+ *out++ = *from++;
if (len > 1)
- PUP(out) = PUP(from);
+ *out++ = *from++;
}
}
}
@@ -313,8 +296,8 @@
hold &= (1U << bits) - 1;
/* update state and return */
- strm->next_in = in + OFF;
- strm->next_out = out + OFF;
+ strm->next_in = in;
+ strm->next_out = out;
strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
strm->avail_out = (unsigned)(out < end ?
257 + (end - out) : 257 - (out - end));
Modified: branches/stable/source/src/libs/zlib/zlib-src/inflate.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inflate.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/inflate.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -92,6 +92,7 @@
#endif
/* function prototypes */
+local int inflateStateCheck OF((z_streamp strm));
local void fixedtables OF((struct inflate_state FAR *state));
local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
unsigned copy));
@@ -101,12 +102,26 @@
local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
unsigned len));
+local int inflateStateCheck(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+ if (strm == Z_NULL ||
+ strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+ return 1;
+ state = (struct inflate_state FAR *)strm->state;
+ if (state == Z_NULL || state->strm != strm ||
+ state->mode < HEAD || state->mode > SYNC)
+ return 1;
+ return 0;
+}
+
int ZEXPORT inflateResetKeep(strm)
z_streamp strm;
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
strm->total_in = strm->total_out = state->total = 0;
strm->msg = Z_NULL;
@@ -131,7 +146,7 @@
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
state->wsize = 0;
state->whave = 0;
@@ -147,7 +162,7 @@
struct inflate_state FAR *state;
/* get the state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
/* extract wrap request from windowBits parameter */
@@ -156,7 +171,7 @@
windowBits = -windowBits;
}
else {
- wrap = (windowBits >> 4) + 1;
+ wrap = (windowBits >> 4) + 5;
#ifdef GUNZIP
if (windowBits < 48)
windowBits &= 15;
@@ -210,7 +225,9 @@
if (state == Z_NULL) return Z_MEM_ERROR;
Tracev((stderr, "inflate: allocated\n"));
strm->state = (struct internal_state FAR *)state;
+ state->strm = strm;
state->window = Z_NULL;
+ state->mode = HEAD; /* to pass state test in inflateReset2() */
ret = inflateReset2(strm, windowBits);
if (ret != Z_OK) {
ZFREE(strm, state);
@@ -234,7 +251,7 @@
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
if (bits < 0) {
state->hold = 0;
@@ -241,10 +258,10 @@
state->bits = 0;
return Z_OK;
}
- if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+ if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
value &= (1L << bits) - 1;
- state->hold += value << state->bits;
- state->bits += bits;
+ state->hold += (unsigned)value << state->bits;
+ state->bits += (uInt)bits;
return Z_OK;
}
@@ -625,7 +642,7 @@
static const unsigned short order[19] = /* permutation of code lengths */
{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
- if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+ if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
(strm->next_in == Z_NULL && strm->avail_in != 0))
return Z_STREAM_ERROR;
@@ -645,6 +662,8 @@
NEEDBITS(16);
#ifdef GUNZIP
if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */
+ if (state->wbits == 0)
+ state->wbits = 15;
state->check = crc32(0L, Z_NULL, 0);
CRC2(state->check, hold);
INITBITS();
@@ -672,7 +691,7 @@
len = BITS(4) + 8;
if (state->wbits == 0)
state->wbits = len;
- else if (len > state->wbits) {
+ if (len > 15 || len > state->wbits) {
strm->msg = (char *)"invalid window size";
state->mode = BAD;
break;
@@ -699,7 +718,8 @@
}
if (state->head != Z_NULL)
state->head->text = (int)((hold >> 8) & 1);
- if (state->flags & 0x0200) CRC2(state->check, hold);
+ if ((state->flags & 0x0200) && (state->wrap & 4))
+ CRC2(state->check, hold);
INITBITS();
state->mode = TIME;
case TIME:
@@ -706,7 +726,8 @@
NEEDBITS(32);
if (state->head != Z_NULL)
state->head->time = hold;
- if (state->flags & 0x0200) CRC4(state->check, hold);
+ if ((state->flags & 0x0200) && (state->wrap & 4))
+ CRC4(state->check, hold);
INITBITS();
state->mode = OS;
case OS:
@@ -715,7 +736,8 @@
state->head->xflags = (int)(hold & 0xff);
state->head->os = (int)(hold >> 8);
}
- if (state->flags & 0x0200) CRC2(state->check, hold);
+ if ((state->flags & 0x0200) && (state->wrap & 4))
+ CRC2(state->check, hold);
INITBITS();
state->mode = EXLEN;
case EXLEN:
@@ -724,7 +746,8 @@
state->length = (unsigned)(hold);
if (state->head != Z_NULL)
state->head->extra_len = (unsigned)hold;
- if (state->flags & 0x0200) CRC2(state->check, hold);
+ if ((state->flags & 0x0200) && (state->wrap & 4))
+ CRC2(state->check, hold);
INITBITS();
}
else if (state->head != Z_NULL)
@@ -742,7 +765,7 @@
len + copy > state->head->extra_max ?
state->head->extra_max - len : copy);
}
- if (state->flags & 0x0200)
+ if ((state->flags & 0x0200) && (state->wrap & 4))
state->check = crc32(state->check, next, copy);
have -= copy;
next += copy;
@@ -761,9 +784,9 @@
if (state->head != Z_NULL &&
state->head->name != Z_NULL &&
state->length < state->head->name_max)
- state->head->name[state->length++] = len;
+ state->head->name[state->length++] = (Bytef)len;
} while (len && copy < have);
- if (state->flags & 0x0200)
+ if ((state->flags & 0x0200) && (state->wrap & 4))
state->check = crc32(state->check, next, copy);
have -= copy;
next += copy;
@@ -782,9 +805,9 @@
if (state->head != Z_NULL &&
state->head->comment != Z_NULL &&
state->length < state->head->comm_max)
- state->head->comment[state->length++] = len;
+ state->head->comment[state->length++] = (Bytef)len;
} while (len && copy < have);
- if (state->flags & 0x0200)
+ if ((state->flags & 0x0200) && (state->wrap & 4))
state->check = crc32(state->check, next, copy);
have -= copy;
next += copy;
@@ -796,7 +819,7 @@
case HCRC:
if (state->flags & 0x0200) {
NEEDBITS(16);
- if (hold != (state->check & 0xffff)) {
+ if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
strm->msg = (char *)"header crc mismatch";
state->mode = BAD;
break;
@@ -1177,11 +1200,11 @@
out -= left;
strm->total_out += out;
state->total += out;
- if (out)
+ if ((state->wrap & 4) && out)
strm->adler = state->check =
UPDATE(state->check, put - out, out);
out = left;
- if ((
+ if ((state->wrap & 4) && (
#ifdef GUNZIP
state->flags ? hold :
#endif
@@ -1240,10 +1263,10 @@
strm->total_in += in;
strm->total_out += out;
state->total += out;
- if (state->wrap && out)
+ if ((state->wrap & 4) && out)
strm->adler = state->check =
UPDATE(state->check, strm->next_out - out, out);
- strm->data_type = state->bits + (state->last ? 64 : 0) +
+ strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
(state->mode == TYPE ? 128 : 0) +
(state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
@@ -1255,7 +1278,7 @@
z_streamp strm;
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+ if (inflateStateCheck(strm))
return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
if (state->window != Z_NULL) ZFREE(strm, state->window);
@@ -1273,7 +1296,7 @@
struct inflate_state FAR *state;
/* check state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
/* copy dictionary */
@@ -1298,7 +1321,7 @@
int ret;
/* check state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
if (state->wrap != 0 && state->mode != DICT)
return Z_STREAM_ERROR;
@@ -1330,7 +1353,7 @@
struct inflate_state FAR *state;
/* check state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
@@ -1383,7 +1406,7 @@
struct inflate_state FAR *state;
/* check parameters */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
@@ -1430,7 +1453,7 @@
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
return state->mode == STORED && state->bits == 0;
}
@@ -1445,8 +1468,7 @@
unsigned wsize;
/* check input */
- if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
- source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+ if (inflateStateCheck(source) || dest == Z_NULL)
return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)source->state;
@@ -1467,6 +1489,7 @@
/* copy state */
zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+ copy->strm = dest;
if (state->lencode >= state->codes &&
state->lencode <= state->codes + ENOUGH - 1) {
copy->lencode = copy->codes + (state->lencode - state->codes);
@@ -1488,25 +1511,51 @@
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
state = (struct inflate_state FAR *)strm->state;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
state->sane = !subvert;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
return Z_OK;
#else
+ (void)subvert;
state->sane = 1;
return Z_DATA_ERROR;
#endif
}
+int ZEXPORT inflateValidate(strm, check)
+z_streamp strm;
+int check;
+{
+ struct inflate_state FAR *state;
+
+ if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if (check)
+ state->wrap |= 4;
+ else
+ state->wrap &= ~4;
+ return Z_OK;
+}
+
long ZEXPORT inflateMark(strm)
z_streamp strm;
{
struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+ if (inflateStateCheck(strm))
+ return -(1L << 16);
state = (struct inflate_state FAR *)strm->state;
- return ((long)(state->back) << 16) +
+ return (long)(((unsigned long)((long)state->back)) << 16) +
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}
+
+unsigned long ZEXPORT inflateCodesUsed(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+ if (inflateStateCheck(strm)) return (unsigned long)-1;
+ state = (struct inflate_state FAR *)strm->state;
+ return (unsigned long)(state->next - state->codes);
+}
Modified: branches/stable/source/src/libs/zlib/zlib-src/inflate.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inflate.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/inflate.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -18,7 +18,7 @@
/* Possible inflate modes between inflate() calls */
typedef enum {
- HEAD, /* i: waiting for magic header */
+ HEAD = 16180, /* i: waiting for magic header */
FLAGS, /* i: waiting for method and flags (gzip) */
TIME, /* i: waiting for modification time (gzip) */
OS, /* i: waiting for extra flags and operating system (gzip) */
@@ -77,11 +77,14 @@
CHECK -> LENGTH -> DONE
*/
-/* state maintained between inflate() calls. Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+ including the allocated sliding window, which is up to 32K bytes. */
struct inflate_state {
+ z_streamp strm; /* pointer back to this zlib stream */
inflate_mode mode; /* current inflate mode */
int last; /* true if processing last block */
- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
+ int wrap; /* bit 0 true for zlib, bit 1 true for gzip,
+ bit 2 true to validate check value */
int havedict; /* true if dictionary provided */
int flags; /* gzip header method and flags (0 if zlib) */
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
Modified: branches/stable/source/src/libs/zlib/zlib-src/inftrees.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inftrees.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/inftrees.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
+ " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -54,7 +54,7 @@
code FAR *next; /* next available space in table */
const unsigned short FAR *base; /* base value table to use */
const unsigned short FAR *extra; /* extra bits table to use */
- int end; /* use base and extra for symbol > end */
+ unsigned match; /* use base and extra for symbol >= match */
unsigned short count[MAXBITS+1]; /* number of codes of each length */
unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
static const unsigned short lbase[31] = { /* Length codes 257..285 base */
@@ -62,7 +62,7 @@
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -181,19 +181,17 @@
switch (type) {
case CODES:
base = extra = work; /* dummy value--not used */
- end = 19;
+ match = 20;
break;
case LENS:
base = lbase;
- base -= 257;
extra = lext;
- extra -= 257;
- end = 256;
+ match = 257;
break;
- default: /* DISTS */
+ default: /* DISTS */
base = dbase;
extra = dext;
- end = -1;
+ match = 0;
}
/* initialize state for loop */
@@ -216,13 +214,13 @@
for (;;) {
/* create table entry */
here.bits = (unsigned char)(len - drop);
- if ((int)(work[sym]) < end) {
+ if (work[sym] + 1U < match) {
here.op = (unsigned char)0;
here.val = work[sym];
}
- else if ((int)(work[sym]) > end) {
- here.op = (unsigned char)(extra[work[sym]]);
- here.val = base[work[sym]];
+ else if (work[sym] >= match) {
+ here.op = (unsigned char)(extra[work[sym] - match]);
+ here.val = base[work[sym] - match];
}
else {
here.op = (unsigned char)(32 + 64); /* end of block */
Modified: branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.dj2
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.dj2 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.dj2 2017-02-16 16:38:15 UTC (rev 766)
@@ -29,7 +29,7 @@
#CFLAGS=-MMD -O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DDEBUG
+#CFLAGS=-MMD -g -DZLIB_DEBUG
CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes
Modified: branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.emx
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.emx 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/msdos/Makefile.emx 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,7 +11,7 @@
#CFLAGS=-MMD -O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DDEBUG
+#CFLAGS=-MMD -g -DZLIB_DEBUG
CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes
Modified: branches/stable/source/src/libs/zlib/zlib-src/old/Makefile.emx
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/old/Makefile.emx 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/old/Makefile.emx 2017-02-16 16:38:15 UTC (rev 766)
@@ -11,7 +11,7 @@
#CFLAGS=-MMD -O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DDEBUG
+#CFLAGS=-MMD -g -DZLIB_DEBUG
CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes
Modified: branches/stable/source/src/libs/zlib/zlib-src/old/os2/Makefile.os2
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/old/os2/Makefile.os2 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/old/os2/Makefile.os2 2017-02-16 16:38:15 UTC (rev 766)
@@ -14,7 +14,7 @@
CFLAGS=-O6 -Wall
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
+#CFLAGS=-g -DZLIB_DEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
# -Wstrict-prototypes -Wmissing-prototypes
Added: branches/stable/source/src/libs/zlib/zlib-src/os400/README400
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/README400 (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/README400 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,48 @@
+ ZLIB version 1.2.11 for OS/400 installation instructions
+
+1) Download and unpack the zlib tarball to some IFS directory.
+ (i.e.: /path/to/the/zlib/ifs/source/directory)
+
+ If the installed IFS command suppors gzip format, this is straightforward,
+else you have to unpack first to some directory on a system supporting it,
+then move the whole directory to the IFS via the network (via SMB or FTP).
+
+2) Edit the configuration parameters in the compilation script.
+
+ EDTF STMF('/path/to/the/zlib/ifs/source/directory/os400/make.sh')
+
+Tune the parameters according to your needs if not matching the defaults.
+Save the file and exit after edition.
+
+3) Enter qshell, then work in the zlib OS/400 specific directory.
+
+ QSH
+ cd /path/to/the/zlib/ifs/source/directory/os400
+
+4) Compile and install
+
+ sh make.sh
+
+The script will:
+- create the libraries, objects and IFS directories for the zlib environment,
+- compile all modules,
+- create a service program,
+- create a static and a dynamic binding directory,
+- install header files for C/C++ and for ILE/RPG, both for compilation in
+ DB2 and IFS environments.
+
+That's all.
+
+
+Notes: For OS/400 ILE RPG programmers, a /copy member defining the ZLIB
+ API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
+ In the ILE environment, the same definitions are available from
+ file zlib.inc located in the same IFS include directory as the
+ C/C++ header files.
+ Please read comments in this member for more information.
+
+ Remember that most foreign textual data are ASCII coded: this
+ implementation does not handle conversion from/to ASCII, so
+ text data code conversions must be done explicitely.
+
+ Mainly for the reason above, always open zipped files in binary mode.
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/os400/README400
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,119 @@
+STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.1.3 entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("adler32")
+ EXPORT SYMBOL("compress")
+ EXPORT SYMBOL("compress2")
+ EXPORT SYMBOL("crc32")
+ EXPORT SYMBOL("get_crc_table")
+ EXPORT SYMBOL("deflate")
+ EXPORT SYMBOL("deflateEnd")
+ EXPORT SYMBOL("deflateSetDictionary")
+ EXPORT SYMBOL("deflateCopy")
+ EXPORT SYMBOL("deflateReset")
+ EXPORT SYMBOL("deflateParams")
+ EXPORT SYMBOL("deflatePrime")
+ EXPORT SYMBOL("deflateInit_")
+ EXPORT SYMBOL("deflateInit2_")
+ EXPORT SYMBOL("gzopen")
+ EXPORT SYMBOL("gzdopen")
+ EXPORT SYMBOL("gzsetparams")
+ EXPORT SYMBOL("gzread")
+ EXPORT SYMBOL("gzwrite")
+ EXPORT SYMBOL("gzprintf")
+ EXPORT SYMBOL("gzputs")
+ EXPORT SYMBOL("gzgets")
+ EXPORT SYMBOL("gzputc")
+ EXPORT SYMBOL("gzgetc")
+ EXPORT SYMBOL("gzflush")
+ EXPORT SYMBOL("gzseek")
+ EXPORT SYMBOL("gzrewind")
+ EXPORT SYMBOL("gztell")
+ EXPORT SYMBOL("gzeof")
+ EXPORT SYMBOL("gzclose")
+ EXPORT SYMBOL("gzerror")
+ EXPORT SYMBOL("inflate")
+ EXPORT SYMBOL("inflateEnd")
+ EXPORT SYMBOL("inflateSetDictionary")
+ EXPORT SYMBOL("inflateSync")
+ EXPORT SYMBOL("inflateReset")
+ EXPORT SYMBOL("inflateInit_")
+ EXPORT SYMBOL("inflateInit2_")
+ EXPORT SYMBOL("inflateSyncPoint")
+ EXPORT SYMBOL("uncompress")
+ EXPORT SYMBOL("zlibVersion")
+ EXPORT SYMBOL("zError")
+ EXPORT SYMBOL("z_errmsg")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.1 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("compressBound")
+ EXPORT SYMBOL("deflateBound")
+ EXPORT SYMBOL("deflatePending")
+ EXPORT SYMBOL("gzungetc")
+ EXPORT SYMBOL("gzclearerr")
+ EXPORT SYMBOL("inflateBack")
+ EXPORT SYMBOL("inflateBackEnd")
+ EXPORT SYMBOL("inflateBackInit_")
+ EXPORT SYMBOL("inflateCopy")
+ EXPORT SYMBOL("zlibCompileFlags")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.4 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("adler32_combine")
+ EXPORT SYMBOL("adler32_combine64")
+ EXPORT SYMBOL("crc32_combine")
+ EXPORT SYMBOL("crc32_combine64")
+ EXPORT SYMBOL("deflateSetHeader")
+ EXPORT SYMBOL("deflateTune")
+ EXPORT SYMBOL("gzbuffer")
+ EXPORT SYMBOL("gzclose_r")
+ EXPORT SYMBOL("gzclose_w")
+ EXPORT SYMBOL("gzdirect")
+ EXPORT SYMBOL("gzoffset")
+ EXPORT SYMBOL("gzoffset64")
+ EXPORT SYMBOL("gzopen64")
+ EXPORT SYMBOL("gzseek64")
+ EXPORT SYMBOL("gztell64")
+ EXPORT SYMBOL("inflateGetHeader")
+ EXPORT SYMBOL("inflateMark")
+ EXPORT SYMBOL("inflatePrime")
+ EXPORT SYMBOL("inflateReset2")
+ EXPORT SYMBOL("inflateUndermine")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.6 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("deflateResetKeep")
+ EXPORT SYMBOL("gzgetc_")
+ EXPORT SYMBOL("inflateResetKeep")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.8 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("gzvprintf")
+ EXPORT SYMBOL("inflateGetDictionary")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.9 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("adler32_z")
+ EXPORT SYMBOL("crc32_z")
+ EXPORT SYMBOL("deflateGetDictionary")
+ EXPORT SYMBOL("gzfread")
+ EXPORT SYMBOL("gzfwrite")
+ EXPORT SYMBOL("inflateCodesUsed")
+ EXPORT SYMBOL("inflateValidate")
+ EXPORT SYMBOL("uncompress2")
+
+ENDPGMEXP
Added: branches/stable/source/src/libs/zlib/zlib-src/os400/make.sh
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/make.sh (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/make.sh 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,366 @@
+#!/bin/sh
+#
+# ZLIB compilation script for the OS/400.
+#
+#
+# This is a shell script since make is not a standard component of OS/400.
+
+
+################################################################################
+#
+# Tunable configuration parameters.
+#
+################################################################################
+
+TARGETLIB='ZLIB' # Target OS/400 program library
+STATBNDDIR='ZLIB_A' # Static binding directory.
+DYNBNDDIR='ZLIB' # Dynamic binding directory.
+SRVPGM="ZLIB" # Service program.
+IFSDIR='/zlib' # IFS support base directory.
+TGTCCSID='500' # Target CCSID of objects
+DEBUG='*NONE' # Debug level
+OPTIMIZE='40' # Optimisation level
+OUTPUT='*NONE' # Compilation output option.
+TGTRLS='V6R1M0' # Target OS release
+
+export TARGETLIB STATBNDDIR DYNBNDDIR SRVPGM IFSDIR
+export TGTCCSID DEBUG OPTIMIZE OUTPUT TGTRLS
+
+
+################################################################################
+#
+# OS/400 specific definitions.
+#
+################################################################################
+
+LIBIFSNAME="/QSYS.LIB/${TARGETLIB}.LIB"
+
+
+################################################################################
+#
+# Procedures.
+#
+################################################################################
+
+# action_needed dest [src]
+#
+# dest is an object to build
+# if specified, src is an object on which dest depends.
+#
+# exit 0 (succeeds) if some action has to be taken, else 1.
+
+action_needed()
+
+{
+ [ ! -e "${1}" ] && return 0
+ [ "${2}" ] || return 1
+ [ "${1}" -ot "${2}" ] && return 0
+ return 1
+}
+
+
+# make_module module_name source_name [additional_definitions]
+#
+# Compile source name into module if needed.
+# As side effect, append the module name to variable MODULES.
+# Set LINK to "YES" if the module has been compiled.
+
+make_module()
+
+{
+ MODULES="${MODULES} ${1}"
+ MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
+ CSRC="`basename \"${2}\"`"
+
+ if action_needed "${MODIFSNAME}" "${2}"
+ then :
+ elif [ ! "`sed -e \"/<source name=\\\"${CSRC}\\\">/,/<\\\\/source>/!d\" \
+ -e '/<depend /!d' \
+ -e 's/.* name=\"\\([^\"]*\\)\".*/\\1/' < \"${TOPDIR}/treebuild.xml\" |
+ while read HDR
+ do if action_needed \"${MODIFSNAME}\" \"${IFSDIR}/include/${HDR}\"
+ then echo recompile
+ break
+ fi
+ done`" ]
+ then return 0
+ fi
+
+ CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('${2}')"
+ CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)"
+ CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
+ CMD="${CMD} INCDIR('${IFSDIR}/include' ${INCLUDES})"
+ CMD="${CMD} TGTCCSID(${TGTCCSID}) TGTRLS(${TGTRLS})"
+ CMD="${CMD} OUTPUT(${OUTPUT})"
+ CMD="${CMD} OPTIMIZE(${OPTIMIZE})"
+ CMD="${CMD} DBGVIEW(${DEBUG})"
+ system "${CMD}"
+ LINK=YES
+}
+
+
+# Determine DB2 object name from IFS name.
+
+db2_name()
+
+{
+ basename "${1}" |
+ tr 'a-z-' 'A-Z_' |
+ sed -e 's/\..*//' \
+ -e 's/^\(.\).*\(.........\)$/\1\2/'
+}
+
+
+# Force enumeration types to be the same size as integers.
+
+copy_hfile()
+
+{
+ sed -e '1i\
+#pragma enum(int)\
+' "${@}" -e '$a\
+#pragma enum(pop)\
+'
+}
+
+
+################################################################################
+#
+# Script initialization.
+#
+################################################################################
+
+SCRIPTDIR=`dirname "${0}"`
+
+case "${SCRIPTDIR}" in
+/*) ;;
+*) SCRIPTDIR="`pwd`/${SCRIPTDIR}"
+esac
+
+while true
+do case "${SCRIPTDIR}" in
+ */.) SCRIPTDIR="${SCRIPTDIR%/.}";;
+ *) break;;
+ esac
+done
+
+# The script directory is supposed to be in ${TOPDIR}/os400.
+
+TOPDIR=`dirname "${SCRIPTDIR}"`
+export SCRIPTDIR TOPDIR
+cd "${TOPDIR}"
+
+
+# Extract the version from the master compilation XML file.
+
+VERSION=`sed -e '/^<package /!d' \
+ -e 's/^.* version="\([0-9.]*\)".*$/\1/' -e 'q' \
+ < treebuild.xml`
+export VERSION
+
+################################################################################
+
+
+# Create the OS/400 library if it does not exist.
+
+if action_needed "${LIBIFSNAME}"
+then CMD="CRTLIB LIB(${TARGETLIB}) TEXT('ZLIB: Data compression API')"
+ system "${CMD}"
+fi
+
+
+# Create the DOCS source file if it does not exist.
+
+if action_needed "${LIBIFSNAME}/DOCS.FILE"
+then CMD="CRTSRCPF FILE(${TARGETLIB}/DOCS) RCDLEN(112)"
+ CMD="${CMD} CCSID(${TGTCCSID}) TEXT('Documentation texts')"
+ system "${CMD}"
+fi
+
+# Copy some documentation files if needed.
+
+for TEXT in "${TOPDIR}/ChangeLog" "${TOPDIR}/FAQ" \
+ "${TOPDIR}/README" "${SCRIPTDIR}/README400"
+do MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${TEXT}\"`.MBR"
+
+ if action_needed "${MEMBER}" "${TEXT}"
+ then CMD="CPY OBJ('${TEXT}') TOOBJ('${MEMBER}') TOCCSID(${TGTCCSID})"
+ CMD="${CMD} DTAFMT(*TEXT) REPLACE(*YES)"
+ system "${CMD}"
+ fi
+done
+
+
+# Create the OS/400 source program file for the C header files.
+
+SRCPF="${LIBIFSNAME}/H.FILE"
+
+if action_needed "${SRCPF}"
+then CMD="CRTSRCPF FILE(${TARGETLIB}/H) RCDLEN(112)"
+ CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: C/C++ header files')"
+ system "${CMD}"
+fi
+
+
+# Create the IFS directory for the C header files.
+
+if action_needed "${IFSDIR}/include"
+then mkdir -p "${IFSDIR}/include"
+fi
+
+# Copy the header files to DB2 library. Link from IFS include directory.
+
+for HFILE in "${TOPDIR}/"*.h
+do DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"
+
+ if action_needed "${DEST}" "${HFILE}"
+ then copy_hfile < "${HFILE}" > tmphdrfile
+
+ # Need to translate to target CCSID.
+
+ CMD="CPY OBJ('`pwd`/tmphdrfile') TOOBJ('${DEST}')"
+ CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+ system "${CMD}"
+ # touch -r "${HFILE}" "${DEST}"
+ rm -f tmphdrfile
+ fi
+
+ IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
+
+ if action_needed "${IFSFILE}" "${DEST}"
+ then rm -f "${IFSFILE}"
+ ln -s "${DEST}" "${IFSFILE}"
+ fi
+done
+
+
+# Install the ILE/RPG header file.
+
+
+HFILE="${SCRIPTDIR}/zlib.inc"
+DEST="${SRCPF}/ZLIB.INC.MBR"
+
+if action_needed "${DEST}" "${HFILE}"
+then CMD="CPY OBJ('${HFILE}') TOOBJ('${DEST}')"
+ CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+ system "${CMD}"
+ # touch -r "${HFILE}" "${DEST}"
+fi
+
+IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
+
+if action_needed "${IFSFILE}" "${DEST}"
+then rm -f "${IFSFILE}"
+ ln -s "${DEST}" "${IFSFILE}"
+fi
+
+
+# Create and compile the identification source file.
+
+echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
+echo '#pragma comment(user, __DATE__)' >> os400.c
+echo '#pragma comment(user, __TIME__)' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
+make_module OS400 os400.c
+LINK= # No need to rebuild service program yet.
+MODULES=
+
+
+# Get source list.
+
+CSOURCES=`sed -e '/<source name="/!d' \
+ -e 's/.* name="\([^"]*\)".*/\1/' < treebuild.xml`
+
+# Compile the sources into modules.
+
+for SRC in ${CSOURCES}
+do MODULE=`db2_name "${SRC}"`
+ make_module "${MODULE}" "${SRC}"
+done
+
+
+# If needed, (re)create the static binding directory.
+
+if action_needed "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
+then LINK=YES
+fi
+
+if [ "${LINK}" ]
+then rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
+ CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+ CMD="${CMD} TEXT('ZLIB static binding directory')"
+ system "${CMD}"
+
+ for MODULE in ${MODULES}
+ do CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+ CMD="${CMD} OBJ((${TARGETLIB}/${MODULE} *MODULE))"
+ system "${CMD}"
+ done
+fi
+
+
+# The exportation file for service program creation must be in a DB2
+# source file, so make sure it exists.
+
+if action_needed "${LIBIFSNAME}/TOOLS.FILE"
+then CMD="CRTSRCPF FILE(${TARGETLIB}/TOOLS) RCDLEN(112)"
+ CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: build tools')"
+ system "${CMD}"
+fi
+
+
+DEST="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
+
+if action_needed "${SCRIPTDIR}/bndsrc" "${DEST}"
+then CMD="CPY OBJ('${SCRIPTDIR}/bndsrc') TOOBJ('${DEST}')"
+ CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+ system "${CMD}"
+ # touch -r "${SCRIPTDIR}/bndsrc" "${DEST}"
+ LINK=YES
+fi
+
+
+# Build the service program if needed.
+
+if action_needed "${LIBIFSNAME}/${SRVPGM}.SRVPGM"
+then LINK=YES
+fi
+
+if [ "${LINK}" ]
+then CMD="CRTSRVPGM SRVPGM(${TARGETLIB}/${SRVPGM})"
+ CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(BNDSRC)"
+ CMD="${CMD} MODULE(${TARGETLIB}/OS400)"
+ CMD="${CMD} BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+ CMD="${CMD} TEXT('ZLIB ${VERSION} dynamic library')"
+ CMD="${CMD} TGTRLS(${TGTRLS})"
+ system "${CMD}"
+ LINK=YES
+
+ # Duplicate the service program for a versioned backup.
+
+ BACKUP=`echo "${SRVPGM}${VERSION}" |
+ sed -e 's/.*\(..........\)$/\1/' -e 's/\./_/g'`
+ BACKUP="`db2_name \"${BACKUP}\"`"
+ BKUPIFSNAME="${LIBIFSNAME}/${BACKUP}.SRVPGM"
+ rm -f "${BKUPIFSNAME}"
+ CMD="CRTDUPOBJ OBJ(${SRVPGM}) FROMLIB(${TARGETLIB})"
+ CMD="${CMD} OBJTYPE(*SRVPGM) NEWOBJ(${BACKUP})"
+ system "${CMD}"
+fi
+
+
+# If needed, (re)create the dynamic binding directory.
+
+if action_needed "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
+then LINK=YES
+fi
+
+if [ "${LINK}" ]
+then rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
+ CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
+ CMD="${CMD} TEXT('ZLIB dynamic binding directory')"
+ system "${CMD}"
+ CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
+ CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"
+ system "${CMD}"
+fi
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/os400/make.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc 2017-02-16 16:38:15 UTC (rev 766)
@@ -0,0 +1,527 @@
+ * ZLIB.INC - Interface to the general purpose compression library
+ *
+ * ILE RPG400 version by Patrick Monnerat, DATASPHERE.
+ * Version 1.2.11
+ *
+ *
+ * WARNING:
+ * Procedures inflateInit(), inflateInit2(), deflateInit(),
+ * deflateInit2() and inflateBackInit() need to be called with
+ * two additional arguments:
+ * the package version string and the stream control structure.
+ * size. This is needed because RPG lacks some macro feature.
+ * Call these procedures as:
+ * inflateInit(...: ZLIB_VERSION: %size(z_stream))
+ *
+ /if not defined(ZLIB_H_)
+ /define ZLIB_H_
+ *
+ **************************************************************************
+ * Constants
+ **************************************************************************
+ *
+ * Versioning information.
+ *
+ D ZLIB_VERSION C '1.2.11'
+ D ZLIB_VERNUM C X'12a0'
+ D ZLIB_VER_MAJOR C 1
+ D ZLIB_VER_MINOR C 2
+ D ZLIB_VER_REVISION...
+ D C 11
+ D ZLIB_VER_SUBREVISION...
+ D C 0
+ *
+ * Other equates.
+ *
+ D Z_NO_FLUSH C 0
+ D Z_PARTIAL_FLUSH...
+ D C 1
+ D Z_SYNC_FLUSH C 2
+ D Z_FULL_FLUSH C 3
+ D Z_FINISH C 4
+ D Z_BLOCK C 5
+ D Z_TREES C 6
+ *
+ D Z_OK C 0
+ D Z_STREAM_END C 1
+ D Z_NEED_DICT C 2
+ D Z_ERRNO C -1
+ D Z_STREAM_ERROR C -2
+ D Z_DATA_ERROR C -3
+ D Z_MEM_ERROR C -4
+ D Z_BUF_ERROR C -5
+ D Z_VERSION_ERROR C -6
+ *
+ D Z_NO_COMPRESSION...
+ D C 0
+ D Z_BEST_SPEED C 1
+ D Z_BEST_COMPRESSION...
+ D C 9
+ D Z_DEFAULT_COMPRESSION...
+ D C -1
+ *
+ D Z_FILTERED C 1
+ D Z_HUFFMAN_ONLY C 2
+ D Z_RLE C 3
+ D Z_DEFAULT_STRATEGY...
+ D C 0
+ *
+ D Z_BINARY C 0
+ D Z_ASCII C 1
+ D Z_UNKNOWN C 2
+ *
+ D Z_DEFLATED C 8
+ *
+ D Z_NULL C 0
+ *
+ **************************************************************************
+ * Types
+ **************************************************************************
+ *
+ D z_streamp S * Stream struct ptr
+ D gzFile S * File pointer
+ D gz_headerp S *
+ D z_off_t S 10i 0 Stream offsets
+ D z_off64_t S 20i 0 Stream offsets
+ *
+ **************************************************************************
+ * Structures
+ **************************************************************************
+ *
+ * The GZIP encode/decode stream support structure.
+ *
+ D z_stream DS align based(z_streamp)
+ D zs_next_in * Next input byte
+ D zs_avail_in 10U 0 Byte cnt at next_in
+ D zs_total_in 10U 0 Total bytes read
+ D zs_next_out * Output buffer ptr
+ D zs_avail_out 10U 0 Room left @ next_out
+ D zs_total_out 10U 0 Total bytes written
+ D zs_msg * Last errmsg or null
+ D zs_state * Internal state
+ D zs_zalloc * procptr Int. state allocator
+ D zs_free * procptr Int. state dealloc.
+ D zs_opaque * Private alloc. data
+ D zs_data_type 10i 0 ASC/BIN best guess
+ D zs_adler 10u 0 Uncompr. adler32 val
+ D 10U 0 Reserved
+ D 10U 0 Ptr. alignment
+ *
+ **************************************************************************
+ * Utility function prototypes
+ **************************************************************************
+ *
+ D compress PR 10I 0 extproc('compress')
+ D dest 65535 options(*varsize) Destination buffer
+ D destLen 10U 0 Destination length
+ D source 65535 const options(*varsize) Source buffer
+ D sourceLen 10u 0 value Source length
+ *
+ D compress2 PR 10I 0 extproc('compress2')
+ D dest 65535 options(*varsize) Destination buffer
+ D destLen 10U 0 Destination length
+ D source 65535 const options(*varsize) Source buffer
+ D sourceLen 10U 0 value Source length
+ D level 10I 0 value Compression level
+ *
+ D compressBound PR 10U 0 extproc('compressBound')
+ D sourceLen 10U 0 value
+ *
+ D uncompress PR 10I 0 extproc('uncompress')
+ D dest 65535 options(*varsize) Destination buffer
+ D destLen 10U 0 Destination length
+ D source 65535 const options(*varsize) Source buffer
+ D sourceLen 10U 0 value Source length
+ *
+ D uncompress2 PR 10I 0 extproc('uncompress2')
+ D dest 65535 options(*varsize) Destination buffer
+ D destLen 10U 0 Destination length
+ D source 65535 const options(*varsize) Source buffer
+ D sourceLen 10U 0 Source length
+ *
+ /if not defined(LARGE_FILES)
+ D gzopen PR extproc('gzopen')
+ D like(gzFile)
+ D path * value options(*string) File pathname
+ D mode * value options(*string) Open mode
+ /else
+ D gzopen PR extproc('gzopen64')
+ D like(gzFile)
+ D path * value options(*string) File pathname
+ D mode * value options(*string) Open mode
+ *
+ D gzopen64 PR extproc('gzopen64')
+ D like(gzFile)
+ D path * value options(*string) File pathname
+ D mode * value options(*string) Open mode
+ /endif
+ *
+ D gzdopen PR extproc('gzdopen')
+ D like(gzFile)
+ D fd 10I 0 value File descriptor
+ D mode * value options(*string) Open mode
+ *
+ D gzbuffer PR 10I 0 extproc('gzbuffer')
+ D file value like(gzFile) File pointer
+ D size 10U 0 value
+ *
+ D gzsetparams PR 10I 0 extproc('gzsetparams')
+ D file value like(gzFile) File pointer
+ D level 10I 0 value
+ D strategy 10I 0 value
+ *
+ D gzread PR 10I 0 extproc('gzread')
+ D file value like(gzFile) File pointer
+ D buf 65535 options(*varsize) Buffer
+ D len 10u 0 value Buffer length
+ *
+ D gzfread PR 20I 0 extproc('gzfread')
+ D buf 65535 options(*varsize) Buffer
+ D size 20u 0 value Buffer length
+ D nitems 20u 0 value Buffer length
+ D file value like(gzFile) File pointer
+ *
+ D gzwrite PR 10I 0 extproc('gzwrite')
+ D file value like(gzFile) File pointer
+ D buf 65535 const options(*varsize) Buffer
+ D len 10u 0 value Buffer length
+ *
+ D gzfwrite PR 20I 0 extproc('gzfwrite')
+ D buf 65535 options(*varsize) Buffer
+ D size 20u 0 value Buffer length
+ D nitems 20u 0 value Buffer length
+ D file value like(gzFile) File pointer
+ *
+ D gzputs PR 10I 0 extproc('gzputs')
+ D file value like(gzFile) File pointer
+ D s * value options(*string) String to output
+ *
+ D gzgets PR * extproc('gzgets')
+ D file value like(gzFile) File pointer
+ D buf 65535 options(*varsize) Read buffer
+ D len 10i 0 value Buffer length
+ *
+ D gzputc PR 10i 0 extproc('gzputc')
+ D file value like(gzFile) File pointer
+ D c 10I 0 value Character to write
+ *
+ D gzgetc PR 10i 0 extproc('gzgetc')
+ D file value like(gzFile) File pointer
+ *
+ D gzgetc_ PR 10i 0 extproc('gzgetc_')
+ D file value like(gzFile) File pointer
+ *
+ D gzungetc PR 10i 0 extproc('gzungetc')
+ D c 10I 0 value Character to push
+ D file value like(gzFile) File pointer
+ *
+ D gzflush PR 10i 0 extproc('gzflush')
+ D file value like(gzFile) File pointer
+ D flush 10I 0 value Type of flush
+ *
+ /if not defined(LARGE_FILES)
+ D gzseek PR extproc('gzseek')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ D offset value like(z_off_t) Offset
+ D whence 10i 0 value Origin
+ /else
+ D gzseek PR extproc('gzseek64')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ D offset value like(z_off_t) Offset
+ D whence 10i 0 value Origin
+ *
+ D gzseek64 PR extproc('gzseek64')
+ D like(z_off64_t)
+ D file value like(gzFile) File pointer
+ D offset value like(z_off64_t) Offset
+ D whence 10i 0 value Origin
+ /endif
+ *
+ D gzrewind PR 10i 0 extproc('gzrewind')
+ D file value like(gzFile) File pointer
+ *
+ /if not defined(LARGE_FILES)
+ D gztell PR extproc('gztell')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ /else
+ D gztell PR extproc('gztell64')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ *
+ D gztell64 PR extproc('gztell64')
+ D like(z_off64_t)
+ D file value like(gzFile) File pointer
+ /endif
+ *
+ /if not defined(LARGE_FILES)
+ D gzoffset PR extproc('gzoffset')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ /else
+ D gzoffset PR extproc('gzoffset64')
+ D like(z_off_t)
+ D file value like(gzFile) File pointer
+ *
+ D gzoffset64 PR extproc('gzoffset64')
+ D like(z_off64_t)
+ D file value like(gzFile) File pointer
+ /endif
+ *
+ D gzeof PR 10i 0 extproc('gzeof')
+ D file value like(gzFile) File pointer
+ *
+ D gzdirect PR 10i 0 extproc('gzdirect')
+ D file value like(gzFile) File pointer
+ *
+ D gzclose_r PR 10i 0 extproc('gzclose_r')
+ D file value like(gzFile) File pointer
+ *
+ D gzclose_w PR 10i 0 extproc('gzclose_w')
+ D file value like(gzFile) File pointer
+ *
+ D gzclose PR 10i 0 extproc('gzclose')
+ D file value like(gzFile) File pointer
+ *
+ D gzerror PR * extproc('gzerror') Error string
+ D file value like(gzFile) File pointer
+ D errnum 10I 0 Error code
+ *
+ D gzclearerr PR extproc('gzclearerr')
+ D file value like(gzFile) File pointer
+ *
+ **************************************************************************
+ * Basic function prototypes
+ **************************************************************************
+ *
+ D zlibVersion PR * extproc('zlibVersion') Version string
+ *
+ D deflateInit PR 10I 0 extproc('deflateInit_') Init. compression
+ D strm like(z_stream) Compression stream
+ D level 10I 0 value Compression level
+ D version * value options(*string) Version string
+ D stream_size 10i 0 value Stream struct. size
+ *
+ D deflate PR 10I 0 extproc('deflate') Compress data
+ D strm like(z_stream) Compression stream
+ D flush 10I 0 value Flush type required
+ *
+ D deflateEnd PR 10I 0 extproc('deflateEnd') Termin. compression
+ D strm like(z_stream) Compression stream
+ *
+ D inflateInit PR 10I 0 extproc('inflateInit_') Init. expansion
+ D strm like(z_stream) Expansion stream
+ D version * value options(*string) Version string
+ D stream_size 10i 0 value Stream struct. size
+ *
+ D inflate PR 10I 0 extproc('inflate') Expand data
+ D strm like(z_stream) Expansion stream
+ D flush 10I 0 value Flush type required
+ *
+ D inflateEnd PR 10I 0 extproc('inflateEnd') Termin. expansion
+ D strm like(z_stream) Expansion stream
+ *
+ **************************************************************************
+ * Advanced function prototypes
+ **************************************************************************
+ *
+ D deflateInit2 PR 10I 0 extproc('deflateInit2_') Init. compression
+ D strm like(z_stream) Compression stream
+ D level 10I 0 value Compression level
+ D method 10I 0 value Compression method
+ D windowBits 10I 0 value log2(window size)
+ D memLevel 10I 0 value Mem/cmpress tradeoff
+ D strategy 10I 0 value Compression strategy
+ D version * value options(*string) Version string
+ D stream_size 10i 0 value Stream struct. size
+ *
+ D deflateSetDictionary...
+ D PR 10I 0 extproc('deflateSetDictionary') Init. dictionary
+ D strm like(z_stream) Compression stream
+ D dictionary 65535 const options(*varsize) Dictionary bytes
+ D dictLength 10U 0 value Dictionary length
+ *
+ D deflateCopy PR 10I 0 extproc('deflateCopy') Compress strm 2 strm
+ D dest like(z_stream) Destination stream
+ D source like(z_stream) Source stream
+ *
+ D deflateReset PR 10I 0 extproc('deflateReset') End and init. stream
+ D strm like(z_stream) Compression stream
+ *
+ D deflateParams PR 10I 0 extproc('deflateParams') Change level & strat
+ D strm like(z_stream) Compression stream
+ D level 10I 0 value Compression level
+ D strategy 10I 0 value Compression strategy
+ *
+ D deflateTune PR 10I 0 extproc('deflateTune')
+ D strm like(z_stream) Compression stream
+ D good 10I 0 value
+ D lazy 10I 0 value
+ D nice 10I 0 value
+ D chain 10I 0 value
+ *
+ D deflateBound PR 10U 0 extproc('deflateBound') Change level & strat
+ D strm like(z_stream) Compression stream
+ D sourcelen 10U 0 value Compression level
+ *
+ D deflatePending PR 10I 0 extproc('deflatePending') Change level & strat
+ D strm like(z_stream) Compression stream
+ D pending 10U 0 Pending bytes
+ D bits 10I 0 Pending bits
+ *
+ D deflatePrime PR 10I 0 extproc('deflatePrime') Change level & strat
+ D strm like(z_stream) Compression stream
+ D bits 10I 0 value # of bits to insert
+ D value 10I 0 value Bits to insert
+ *
+ D inflateInit2 PR 10I 0 extproc('inflateInit2_') Init. expansion
+ D strm like(z_stream) Expansion stream
+ D windowBits 10I 0 value log2(window size)
+ D version * value options(*string) Version string
+ D stream_size 10i 0 value Stream struct. size
+ *
+ D inflateSetDictionary...
+ D PR 10I 0 extproc('inflateSetDictionary') Init. dictionary
+ D strm like(z_stream) Expansion stream
+ D dictionary 65535 const options(*varsize) Dictionary bytes
+ D dictLength 10U 0 value Dictionary length
+ *
+ D inflateGetDictionary...
+ D PR 10I 0 extproc('inflateGetDictionary') Get dictionary
+ D strm like(z_stream) Expansion stream
+ D dictionary 65535 options(*varsize) Dictionary bytes
+ D dictLength 10U 0 Dictionary length
+ *
+ D deflateGetDictionary...
+ D PR 10I 0 extproc('deflateGetDictionary') Get dictionary
+ D strm like(z_stream) Expansion stream
+ D dictionary 65535 options(*varsize) Dictionary bytes
+ D dictLength 10U 0 Dictionary length
+ *
+ D inflateSync PR 10I 0 extproc('inflateSync') Sync. expansion
+ D strm like(z_stream) Expansion stream
+ *
+ D inflateCopy PR 10I 0 extproc('inflateCopy')
+ D dest like(z_stream) Destination stream
+ D source like(z_stream) Source stream
+ *
+ D inflateReset PR 10I 0 extproc('inflateReset') End and init. stream
+ D strm like(z_stream) Expansion stream
+ *
+ D inflateReset2 PR 10I 0 extproc('inflateReset2') End and init. stream
+ D strm like(z_stream) Expansion stream
+ D windowBits 10I 0 value Log2(buffer size)
+ *
+ D inflatePrime PR 10I 0 extproc('inflatePrime') Insert bits
+ D strm like(z_stream) Expansion stream
+ D bits 10I 0 value Bit count
+ D value 10I 0 value Bits to insert
+ *
+ D inflateMark PR 10I 0 extproc('inflateMark') Get inflate info
+ D strm like(z_stream) Expansion stream
+ *
+ D inflateCodesUsed...
+ PR 20U 0 extproc('inflateCodesUsed')
+ D strm like(z_stream) Expansion stream
+ *
+ D inflateValidate...
+ PR 20U 0 extproc('inflateValidate')
+ D strm like(z_stream) Expansion stream
+ D check 10I 0 value
+ *
+ D inflateGetHeader...
+ PR 10U 0 extproc('inflateGetHeader')
+ D strm like(z_stream) Expansion stream
+ D head like(gz_headerp)
+ *
+ D deflateSetHeader...
+ PR 10U 0 extproc('deflateSetHeader')
+ D strm like(z_stream) Expansion stream
+ D head like(gz_headerp)
+ *
+ D inflateBackInit...
+ D PR 10I 0 extproc('inflateBackInit_')
+ D strm like(z_stream) Expansion stream
+ D windowBits 10I 0 value Log2(buffer size)
+ D window 65535 options(*varsize) Buffer
+ D version * value options(*string) Version string
+ D stream_size 10i 0 value Stream struct. size
+ *
+ D inflateBack PR 10I 0 extproc('inflateBack')
+ D strm like(z_stream) Expansion stream
+ D in * value procptr Input function
+ D in_desc * value Input descriptor
+ D out * value procptr Output function
+ D out_desc * value Output descriptor
+ *
+ D inflateBackEnd PR 10I 0 extproc('inflateBackEnd')
+ D strm like(z_stream) Expansion stream
+ *
+ D zlibCompileFlags...
+ D PR 10U 0 extproc('zlibCompileFlags')
+ *
+ **************************************************************************
+ * Checksum function prototypes
+ **************************************************************************
+ *
+ D adler32 PR 10U 0 extproc('adler32') New checksum
+ D adler 10U 0 value Old checksum
+ D buf 65535 const options(*varsize) Bytes to accumulate
+ D len 10U 0 value Buffer length
+ *
+ D adler32_combine...
+ PR 10U 0 extproc('adler32_combine') New checksum
+ D adler1 10U 0 value Old checksum
+ D adler2 10U 0 value Old checksum
+ D len2 20U 0 value Buffer length
+ *
+ D adler32_z PR 10U 0 extproc('adler32_z') New checksum
+ D adler 10U 0 value Old checksum
+ D buf 65535 const options(*varsize) Bytes to accumulate
+ D len 20U 0 value Buffer length
+ *
+ D crc32 PR 10U 0 extproc('crc32') New checksum
+ D crc 10U 0 value Old checksum
+ D buf 65535 const options(*varsize) Bytes to accumulate
+ D len 10U 0 value Buffer length
+ *
+ D crc32_combine...
+ PR 10U 0 extproc('crc32_combine') New checksum
+ D crc1 10U 0 value Old checksum
+ D crc2 10U 0 value Old checksum
+ D len2 20U 0 value Buffer length
+ *
+ D crc32_z PR 10U 0 extproc('crc32_z') New checksum
+ D crc 10U 0 value Old checksum
+ D buf 65535 const options(*varsize) Bytes to accumulate
+ D len 20U 0 value Buffer length
+ *
+ **************************************************************************
+ * Miscellaneous function prototypes
+ **************************************************************************
+ *
+ D zError PR * extproc('zError') Error string
+ D err 10I 0 value Error code
+ *
+ D inflateSyncPoint...
+ D PR 10I 0 extproc('inflateSyncPoint')
+ D strm like(z_stream) Expansion stream
+ *
+ D get_crc_table PR * extproc('get_crc_table') Ptr to ulongs
+ *
+ D inflateUndermine...
+ D PR 10I 0 extproc('inflateUndermine')
+ D strm like(z_stream) Expansion stream
+ D arg 10I 0 value Error code
+ *
+ D inflateResetKeep...
+ D PR 10I 0 extproc('inflateResetKeep') End and init. stream
+ D strm like(z_stream) Expansion stream
+ *
+ D deflateResetKeep...
+ D PR 10I 0 extproc('deflateResetKeep') End and init. stream
+ D strm like(z_stream) Expansion stream
+ *
+ /endif
Property changes on: branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg 2017-02-16 16:38:15 UTC (rev 766)
@@ -25,10 +25,10 @@
<QPG:Files>
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" user="root:bin" permission="644"/>
- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.8"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.8"/>
- <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" component="slib"/>
+ <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" user="root:bin" permission="644"/>
+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
+ <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.8</QPM:ReleaseVersion>
+ <QPM:ReleaseVersion>1.2.11</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
Modified: branches/stable/source/src/libs/zlib/zlib-src/test/example.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/test/example.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/test/example.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2006, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -26,13 +26,13 @@
} \
}
-z_const char hello[] = "hello, hello!";
+static z_const char hello[] = "hello, hello!";
/* "hello world" would be more standard, but the repeated "hello"
* stresses the compression code better, sorry...
*/
-const char dictionary[] = "hello";
-uLong dictId; /* Adler32 value of the dictionary */
+static const char dictionary[] = "hello";
+static uLong dictId; /* Adler32 value of the dictionary */
void test_deflate OF((Byte *compr, uLong comprLen));
void test_inflate OF((Byte *compr, uLong comprLen,
@@ -59,13 +59,13 @@
void *q;
unsigned n, m;
{
- q = Z_NULL;
+ (void)q;
return calloc(n, m);
}
void myfree(void *q, void *p)
{
- q = Z_NULL;
+ (void)q;
free(p);
}
@@ -432,7 +432,7 @@
d_stream.next_out = uncompr;
d_stream.avail_out = (uInt)uncomprLen;
- inflate(&d_stream, Z_NO_FLUSH);
+ err = inflate(&d_stream, Z_NO_FLUSH);
CHECK_ERR(err, "inflate");
d_stream.avail_in = (uInt)comprLen-2; /* read all compressed data */
@@ -573,7 +573,8 @@
}
#ifdef Z_SOLO
- argc = strlen(argv[0]);
+ (void)argc;
+ (void)argv;
#else
test_compress(compr, comprLen, uncompr, uncomprLen);
Modified: branches/stable/source/src/libs/zlib/zlib-src/test/infcover.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/test/infcover.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/test/infcover.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011 Mark Adler
+ * Copyright (C) 2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -237,14 +237,14 @@
/* Decode a hexadecimal string, set *len to length, in[] to the bytes. This
decodes liberally, in that hex digits can be adjacent, in which case two in
- a row writes a byte. Or they can delimited by any non-hex character, where
- the delimiters are ignored except when a single hex digit is followed by a
- delimiter in which case that single digit writes a byte. The returned
- data is allocated and must eventually be freed. NULL is returned if out of
- memory. If the length is not needed, then len can be NULL. */
+ a row writes a byte. Or they can be delimited by any non-hex character,
+ where the delimiters are ignored except when a single hex digit is followed
+ by a delimiter, where that single digit writes a byte. The returned data is
+ allocated and must eventually be freed. NULL is returned if out of memory.
+ If the length is not needed, then len can be NULL. */
local unsigned char *h2b(const char *hex, unsigned *len)
{
- unsigned char *in;
+ unsigned char *in, *re;
unsigned next, val;
in = malloc((strlen(hex) + 1) >> 1);
@@ -268,8 +268,8 @@
} while (*hex++); /* go through the loop with the terminating null */
if (len != NULL)
*len = next;
- in = reallocf(in, next);
- return in;
+ re = realloc(in, next);
+ return re == NULL ? in : re;
}
/* generic inflate() run, where hex is the hexadecimal input data, what is the
Modified: branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -40,7 +40,7 @@
# define SET_BINARY_MODE(file)
#endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
# define snprintf _snprintf
#endif
@@ -156,7 +156,7 @@
void *q;
unsigned n, m;
{
- q = Z_NULL;
+ (void)q;
return calloc(n, m);
}
@@ -163,7 +163,7 @@
void myfree(q, p)
void *q, *p;
{
- q = Z_NULL;
+ (void)q;
free(p);
}
@@ -333,7 +333,7 @@
#endif
-char *prog;
+static char *prog;
void error OF((const char *msg));
void gz_compress OF((FILE *in, gzFile out));
@@ -500,7 +500,7 @@
char *infile, *outfile;
FILE *out;
gzFile in;
- size_t len = strlen(file);
+ unsigned len = strlen(file);
if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
fprintf(stderr, "%s: filename too long\n", prog);
Modified: branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<package name="zlib" version="1.2.8">
- <library name="zlib" dlversion="1.2.8" dlname="z">
+<package name="zlib" version="1.2.11">
+ <library name="zlib" dlversion="1.2.11" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
@@ -101,7 +101,7 @@
<!--
CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
+#CFLAGS=-g -DZLIB_DEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
# -Wstrict-prototypes -Wmissing-prototypes
Modified: branches/stable/source/src/libs/zlib/zlib-src/trees.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/trees.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/trees.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
* detect_data_type() function provided freely by Cosmin Truta, 2006
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -36,7 +36,7 @@
#include "deflate.h"
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
# include <ctype.h>
#endif
@@ -122,13 +122,13 @@
int max_length; /* max bit length for the codes */
};
-local static_tree_desc static_l_desc =
+local const static_tree_desc static_l_desc =
{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-local static_tree_desc static_d_desc =
+local const static_tree_desc static_d_desc =
{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS};
-local static_tree_desc static_bl_desc =
+local const static_tree_desc static_bl_desc =
{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS};
/* ===========================================================================
@@ -152,18 +152,16 @@
local unsigned bi_reverse OF((unsigned value, int length));
local void bi_windup OF((deflate_state *s));
local void bi_flush OF((deflate_state *s));
-local void copy_block OF((deflate_state *s, charf *buf, unsigned len,
- int header));
#ifdef GEN_TREES_H
local void gen_trees_header OF((void));
#endif
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
/* Send a code of the given tree. c and tree must not have side effects */
-#else /* DEBUG */
+#else /* !ZLIB_DEBUG */
# define send_code(s, c, tree) \
{ if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
send_bits(s, tree[c].Code, tree[c].Len); }
@@ -182,7 +180,7 @@
* Send a value on a given number of bits.
* IN assertion: length <= 16 and value fits in length bits.
*/
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
local void send_bits OF((deflate_state *s, int value, int length));
local void send_bits(s, value, length)
@@ -208,12 +206,12 @@
s->bi_valid += length;
}
}
-#else /* !DEBUG */
+#else /* !ZLIB_DEBUG */
#define send_bits(s, value, length) \
{ int len = length;\
if (s->bi_valid > (int)Buf_size - len) {\
- int val = value;\
+ int val = (int)value;\
s->bi_buf |= (ush)val << s->bi_valid;\
put_short(s, s->bi_buf);\
s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
@@ -223,7 +221,7 @@
s->bi_valid += len;\
}\
}
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
/* the arguments must not have side effects */
@@ -317,7 +315,7 @@
* Genererate the file trees.h describing the static trees.
*/
#ifdef GEN_TREES_H
-# ifndef DEBUG
+# ifndef ZLIB_DEBUG
# include <stdio.h>
# endif
@@ -394,7 +392,7 @@
s->bi_buf = 0;
s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->compressed_len = 0L;
s->bits_sent = 0L;
#endif
@@ -522,12 +520,12 @@
xbits = 0;
if (n >= base) xbits = extra[n-base];
f = tree[n].Freq;
- s->opt_len += (ulg)f * (bits + xbits);
- if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+ s->opt_len += (ulg)f * (unsigned)(bits + xbits);
+ if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
}
if (overflow == 0) return;
- Trace((stderr,"\nbit length overflow\n"));
+ Tracev((stderr,"\nbit length overflow\n"));
/* This happens for example on obj2 and pic of the Calgary corpus */
/* Find the first bit length which could increase: */
@@ -554,9 +552,8 @@
m = s->heap[--h];
if (m > max_code) continue;
if ((unsigned) tree[m].Len != (unsigned) bits) {
- Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
- s->opt_len += ((long)bits - (long)tree[m].Len)
- *(long)tree[m].Freq;
+ Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+ s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
tree[m].Len = (ush)bits;
}
n--;
@@ -578,7 +575,7 @@
ushf *bl_count; /* number of codes at each bit length */
{
ush next_code[MAX_BITS+1]; /* next code value for each bit length */
- ush code = 0; /* running code value */
+ unsigned code = 0; /* running code value */
int bits; /* bit index */
int n; /* code index */
@@ -586,7 +583,8 @@
* without bit reversal.
*/
for (bits = 1; bits <= MAX_BITS; bits++) {
- next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+ code = (code + bl_count[bits-1]) << 1;
+ next_code[bits] = (ush)code;
}
/* Check that the bit counts in bl_count are consistent. The last code
* must be all ones.
@@ -599,7 +597,7 @@
int len = tree[n].Len;
if (len == 0) continue;
/* Now reverse the bits */
- tree[n].Code = bi_reverse(next_code[len]++, len);
+ tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
@@ -821,7 +819,7 @@
if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
}
/* Update opt_len to include the bit length tree and counts */
- s->opt_len += 3*(max_blindex+1) + 5+5+4;
+ s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
s->opt_len, s->static_len));
@@ -869,11 +867,17 @@
int last; /* one if this is the last block for a file */
{
send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */
-#ifdef DEBUG
+ bi_windup(s); /* align on byte boundary */
+ put_short(s, (ush)stored_len);
+ put_short(s, (ush)~stored_len);
+ zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+ s->pending += stored_len;
+#ifdef ZLIB_DEBUG
s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
s->compressed_len += (stored_len + 4) << 3;
+ s->bits_sent += 2*16;
+ s->bits_sent += stored_len<<3;
#endif
- copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
}
/* ===========================================================================
@@ -894,7 +898,7 @@
{
send_bits(s, STATIC_TREES<<1, 3);
send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
#endif
bi_flush(s);
@@ -902,7 +906,7 @@
/* ===========================================================================
* Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * trees or store, and write out the encoded block.
*/
void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
deflate_state *s;
@@ -974,7 +978,7 @@
send_bits(s, (STATIC_TREES<<1)+last, 3);
compress_block(s, (const ct_data *)static_ltree,
(const ct_data *)static_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->compressed_len += 3 + s->static_len;
#endif
} else {
@@ -983,7 +987,7 @@
max_blindex+1);
compress_block(s, (const ct_data *)s->dyn_ltree,
(const ct_data *)s->dyn_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->compressed_len += 3 + s->opt_len;
#endif
}
@@ -995,7 +999,7 @@
if (last) {
bi_windup(s);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->compressed_len += 7; /* align on byte boundary */
#endif
}
@@ -1090,7 +1094,7 @@
send_code(s, code, dtree); /* send the distance code */
extra = extra_dbits[code];
if (extra != 0) {
- dist -= base_dist[code];
+ dist -= (unsigned)base_dist[code];
send_bits(s, dist, extra); /* send the extra distance bits */
}
} /* literal or match pair ? */
@@ -1193,34 +1197,7 @@
}
s->bi_buf = 0;
s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
s->bits_sent = (s->bits_sent+7) & ~7;
#endif
}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
- deflate_state *s;
- charf *buf; /* the input data */
- unsigned len; /* its length */
- int header; /* true if block header must be written */
-{
- bi_windup(s); /* align on byte boundary */
-
- if (header) {
- put_short(s, (ush)len);
- put_short(s, (ush)~len);
-#ifdef DEBUG
- s->bits_sent += 2*16;
-#endif
- }
-#ifdef DEBUG
- s->bits_sent += (ulg)len<<3;
-#endif
- while (len--) {
- put_byte(s, *buf++);
- }
-}
Modified: branches/stable/source/src/libs/zlib/zlib-src/uncompr.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/uncompr.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/uncompr.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,51 +9,85 @@
#include "zlib.h"
/* ===========================================================================
- Decompresses the source buffer into the destination buffer. sourceLen is
- the byte length of the source buffer. Upon entry, destLen is the total
- size of the destination buffer, which must be large enough to hold the
- entire uncompressed data. (The size of the uncompressed data must have
- been saved previously by the compressor and transmitted to the decompressor
- by some mechanism outside the scope of this compression library.)
- Upon exit, destLen is the actual size of the compressed buffer.
+ Decompresses the source buffer into the destination buffer. *sourceLen is
+ the byte length of the source buffer. Upon entry, *destLen is the total size
+ of the destination buffer, which must be large enough to hold the entire
+ uncompressed data. (The size of the uncompressed data must have been saved
+ previously by the compressor and transmitted to the decompressor by some
+ mechanism outside the scope of this compression library.) Upon exit,
+ *destLen is the size of the decompressed data and *sourceLen is the number
+ of source bytes consumed. Upon return, source + *sourceLen points to the
+ first unused input byte.
- uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_BUF_ERROR if there was not enough room in the output
- buffer, or Z_DATA_ERROR if the input data was corrupted.
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+ Z_DATA_ERROR if the input data was corrupted, including if the input data is
+ an incomplete zlib stream.
*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
- uLong sourceLen;
+ uLong *sourceLen;
{
z_stream stream;
int err;
+ const uInt max = (uInt)-1;
+ uLong len, left;
+ Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */
+ len = *sourceLen;
+ if (*destLen) {
+ left = *destLen;
+ *destLen = 0;
+ }
+ else {
+ left = 1;
+ dest = buf;
+ }
+
stream.next_in = (z_const Bytef *)source;
- stream.avail_in = (uInt)sourceLen;
- /* Check for source > 64K on 16-bit machine: */
- if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
- stream.next_out = dest;
- stream.avail_out = (uInt)*destLen;
- if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
+ stream.avail_in = 0;
stream.zalloc = (alloc_func)0;
stream.zfree = (free_func)0;
+ stream.opaque = (voidpf)0;
err = inflateInit(&stream);
if (err != Z_OK) return err;
- err = inflate(&stream, Z_FINISH);
- if (err != Z_STREAM_END) {
- inflateEnd(&stream);
- if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
- return Z_DATA_ERROR;
- return err;
- }
- *destLen = stream.total_out;
+ stream.next_out = dest;
+ stream.avail_out = 0;
- err = inflateEnd(&stream);
- return err;
+ do {
+ if (stream.avail_out == 0) {
+ stream.avail_out = left > (uLong)max ? max : (uInt)left;
+ left -= stream.avail_out;
+ }
+ if (stream.avail_in == 0) {
+ stream.avail_in = len > (uLong)max ? max : (uInt)len;
+ len -= stream.avail_in;
+ }
+ err = inflate(&stream, Z_NO_FLUSH);
+ } while (err == Z_OK);
+
+ *sourceLen -= len + stream.avail_in;
+ if (dest != buf)
+ *destLen = stream.total_out;
+ else if (stream.total_out && err == Z_BUF_ERROR)
+ left = 1;
+
+ inflateEnd(&stream);
+ return err == Z_STREAM_END ? Z_OK :
+ err == Z_NEED_DICT ? Z_DATA_ERROR :
+ err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+ err;
}
+
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+ Bytef *dest;
+ uLongf *destLen;
+ const Bytef *source;
+ uLong sourceLen;
+{
+ return uncompress2(dest, destLen, source, &sourceLen);
+}
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.gcc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.gcc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.gcc 2017-02-16 16:38:15 UTC (rev 766)
@@ -39,7 +39,7 @@
SHARED_MODE=0
#LOC = -DASMV
-#LOC = -DDEBUG -g
+#LOC = -DZLIB_DEBUG -g
PREFIX =
CC = $(PREFIX)gcc
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.msc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.msc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/Makefile.msc 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
#
# Usage:
# nmake -f win32/Makefile.msc (standard build)
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.8 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@
Manifest:
-The package zlib-1.2.8-win32-x86.zip will contain the following files:
+The package zlib-1.2.11-win32-x86.zip will contain the following files:
README-WIN32.txt This document
ChangeLog Changes since previous zlib packages
@@ -72,7 +72,7 @@
Copyright notice:
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/VisualC.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/VisualC.txt 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/VisualC.txt 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,3 @@
To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the projects/ directory.
+use the appropriate project from the contrib/vstudio/ directory.
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/zlib.def
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/zlib.def 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/zlib.def 2017-02-16 16:38:15 UTC (rev 766)
@@ -8,6 +8,7 @@
inflateEnd
; advanced functions
deflateSetDictionary
+ deflateGetDictionary
deflateCopy
deflateReset
deflateParams
@@ -33,12 +34,15 @@
compress2
compressBound
uncompress
+ uncompress2
gzopen
gzdopen
gzbuffer
gzsetparams
gzread
+ gzfread
gzwrite
+ gzfwrite
gzprintf
gzvprintf
gzputs
@@ -67,7 +71,9 @@
crc32_combine64
; checksum functions
adler32
+ adler32_z
crc32
+ crc32_z
adler32_combine
crc32_combine
; various hacks, don't look :)
@@ -81,6 +87,8 @@
inflateSyncPoint
get_crc_table
inflateUndermine
+ inflateValidate
+ inflateCodesUsed
inflateResetKeep
deflateResetKeep
gzopen_w
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc 2017-02-16 16:38:15 UTC (rev 766)
@@ -26,7 +26,7 @@
VALUE "FileDescription", "zlib data compression library\0"
VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
VALUE "ProductVersion", ZLIB_VERSION "\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -19,7 +19,7 @@
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
-/* all linked symbols */
+/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
@@ -31,6 +31,7 @@
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
+# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
@@ -39,10 +40,14 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
+# define deflateGetDictionary z_deflateGetDictionary
+# define deflateInit z_deflateInit
+# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
@@ -69,6 +74,8 @@
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
+# define gzfread z_gzfread
+# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
@@ -80,7 +87,6 @@
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
-# define gzvprintf z_gzvprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
@@ -91,15 +97,21 @@
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
+# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
+# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
+# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
+# define inflateInit z_inflateInit
+# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
@@ -106,17 +118,18 @@
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
+# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
-# define inflateGetDictionary z_inflateGetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
+# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
+# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
@@ -226,9 +239,19 @@
# define z_const
#endif
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
+#ifdef Z_SOLO
+ typedef unsigned long z_size_t;
+#else
+# define z_longlong long long
+# if defined(NO_SIZE_T)
+ typedef unsigned NO_SIZE_T z_size_t;
+# elif defined(STDC)
+# include <stddef.h>
+ typedef size_t z_size_t;
+# else
+ typedef unsigned long z_size_t;
+# endif
+# undef z_longlong
#endif
/* Maximum value for memLevel in deflateInit2 */
@@ -258,7 +281,7 @@
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
Modified: branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -17,7 +17,7 @@
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
-/* all linked symbols */
+/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
@@ -29,6 +29,7 @@
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
+# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
@@ -37,10 +38,14 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
+# define deflateGetDictionary z_deflateGetDictionary
+# define deflateInit z_deflateInit
+# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
@@ -67,6 +72,8 @@
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
+# define gzfread z_gzfread
+# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
@@ -78,7 +85,6 @@
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
-# define gzvprintf z_gzvprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
@@ -89,15 +95,21 @@
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
+# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
+# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
+# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
+# define inflateInit z_inflateInit
+# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
@@ -104,17 +116,18 @@
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
+# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
-# define inflateGetDictionary z_inflateGetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
+# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
+# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
@@ -224,9 +237,19 @@
# define z_const
#endif
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
+#ifdef Z_SOLO
+ typedef unsigned long z_size_t;
+#else
+# define z_longlong long long
+# if defined(NO_SIZE_T)
+ typedef unsigned NO_SIZE_T z_size_t;
+# elif defined(STDC)
+# include <stddef.h>
+ typedef size_t z_size_t;
+# else
+ typedef unsigned long z_size_t;
+# endif
+# undef z_longlong
#endif
/* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.3
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib.3 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib.3 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "28 Apr 2013"
+.TH ZLIB 3 "15 Jan 2017"
.SH NAME
zlib \- compression/decompression library
.SH SYNOPSIS
@@ -48,32 +48,10 @@
that accompanies the source.
.LP
.I zlib
-is available in Java using the java.util.zip package:
-.IP
-http://java.sun.com/developer/technicalArticles/Programming/compression/
+is built in to many languages and operating systems, including but not limited to
+Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
.LP
-A Perl interface to
-.IR zlib ,
-written by Paul Marquess (pmqs at cpan.org),
-is available at CPAN (Comprehensive Perl Archive Network) sites,
-including:
-.IP
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/
-.LP
-A Python interface to
-.IR zlib ,
-written by A.M. Kuchling (amk at magnet.com),
-is available in Python 1.5 and later versions:
-.IP
-http://docs.python.org/library/zlib.html
-.LP
-.I zlib
-is built into
-.IR tcl:
-.IP
-http://wiki.tcl.tk/4610
-.LP
-An experimental package to read and write files in .zip format,
+An experimental package to read and write files in the .zip format,
written on top of
.I zlib
by Gilles Vollant (info at winimage.com),
@@ -92,7 +70,9 @@
.IP
http://zlib.net/
.LP
-The data format used by the zlib library is described by RFC
+The data format used by the
+.I zlib
+library is described by RFC
(Request for Comments) 1950 to 1952 in the files:
.IP
http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
@@ -124,17 +104,35 @@
before asking for help.
Send questions and/or comments to zlib at gzip.org,
or (for the Windows DLL version) to Gilles Vollant (info at winimage.com).
-.SH AUTHORS
-Version 1.2.8
-Copyright (C) 1995-2013 Jean-loup Gailly (jloup at gzip.org)
-and Mark Adler (madler at alumni.caltech.edu).
+.SH AUTHORS AND LICENSE
+Version 1.2.11
.LP
-This software is provided "as-is,"
-without any express or implied warranty.
-In no event will the authors be held liable for any damages
+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+.LP
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
-See the distribution directory with respect to requirements
-governing redistribution.
+.LP
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+.LP
+.nr step 1 1
+.IP \n[step]. 3
+The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+.IP \n+[step].
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+.IP \n+[step].
+This notice may not be removed or altered from any source distribution.
+.LP
+Jean-loup Gailly Mark Adler
+.br
+jloup at gzip.org madler at alumni.caltech.edu
+.LP
The deflate format used by
.I zlib
was defined by Phil Katz.
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.3.pdf
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.8, April 28th, 2013
+ version 1.2.11, January 15th, 2017
- Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.11"
+#define ZLIB_VERNUM 0x12b0
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 11
#define ZLIB_VER_SUBREVISION 0
/*
@@ -65,7 +65,8 @@
with "gz". The gzip format is different from the zlib format. gzip is a
gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
- This library can optionally read and write gzip streams in memory as well.
+ This library can optionally read and write gzip and raw deflate streams in
+ memory as well.
The zlib format was designed to be compact and fast for use in memory
and on communications channels. The gzip format was designed for single-
@@ -74,7 +75,7 @@
The library does not install any signal handler. The decoder checks
the consistency of the compressed data, so the library should never crash
- even in case of corrupted input.
+ even in the case of corrupted input.
*/
typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@
uInt avail_in; /* number of bytes available at next_in */
uLong total_in; /* total number of input bytes read so far */
- Bytef *next_out; /* next output byte should be put there */
+ Bytef *next_out; /* next output byte will go here */
uInt avail_out; /* remaining free space at next_out */
uLong total_out; /* total number of bytes output so far */
@@ -98,8 +99,9 @@
free_func zfree; /* used to free the internal state */
voidpf opaque; /* private data object passed to zalloc and zfree */
- int data_type; /* best guess about the data type: binary or text */
- uLong adler; /* adler32 value of the uncompressed data */
+ int data_type; /* best guess about the data type: binary or text
+ for deflate, or the decoding state for inflate */
+ uLong adler; /* Adler-32 or CRC-32 value of the uncompressed data */
uLong reserved; /* reserved for future use */
} z_stream;
@@ -142,7 +144,9 @@
zalloc must return Z_NULL if there is not enough memory for the object.
If zlib is used in a multi-threaded application, zalloc and zfree must be
- thread safe.
+ thread safe. In that case, zlib is thread-safe. When zalloc and zfree are
+ Z_NULL on entry to the initialization function, they are set to internal
+ routines that use the standard library functions malloc() and free().
On 16-bit systems, the functions zalloc and zfree must be able to allocate
exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@
The fields total_in and total_out can be used for statistics or progress
reports. After compression, total_in holds the total size of the
- uncompressed data and may be saved for use in the decompressor (particularly
+ uncompressed data and may be saved for use by the decompressor (particularly
if the decompressor wants to decompress everything in a single step).
*/
@@ -200,7 +204,7 @@
#define Z_TEXT 1
#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
#define Z_UNKNOWN 2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
#define Z_DEFLATED 8
/* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@
enough room in the output buffer), next_in and avail_in are updated and
processing will resume at this point for the next call of deflate().
- - Provide more output starting at next_out and update next_out and avail_out
+ - Generate more output starting at next_out and update next_out and avail_out
accordingly. This action is forced if the parameter flush is non zero.
Forcing flush frequently degrades the compression ratio, so this parameter
- should be set only when necessary (in interactive applications). Some
- output may be provided even if flush is not set.
+ should be set only when necessary. Some output may be provided even if
+ flush is zero.
Before the call of deflate(), the application should ensure that at least
one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@
output when it wants, for example when the output buffer is full (avail_out
== 0), or after each call of deflate(). If deflate returns Z_OK and with
zero avail_out, it must be called again after making room in the output
- buffer because there might be more output pending.
+ buffer because there might be more output pending. See deflatePending(),
+ which can be used if desired to determine whether or not there is more ouput
+ in that case.
Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@
input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
This completes the current deflate block and follows it with an empty fixed
codes block that is 10 bits long. This assures that enough bytes are output
- in order for the decompressor to finish the block before the empty fixed code
- block.
+ in order for the decompressor to finish the block before the empty fixed
+ codes block.
If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@
If the parameter flush is set to Z_FINISH, pending input is processed,
pending output is flushed and deflate returns with Z_STREAM_END if there was
- enough output space; if deflate returns with Z_OK, this function must be
- called again with Z_FINISH and more output space (updated avail_out) but no
- more input data, until it returns with Z_STREAM_END or an error. After
- deflate has returned Z_STREAM_END, the only possible operations on the stream
- are deflateReset or deflateEnd.
+ enough output space. If deflate returns with Z_OK or Z_BUF_ERROR, this
+ function must be called again with Z_FINISH and more output space (updated
+ avail_out) but no more input data, until it returns with Z_STREAM_END or an
+ error. After deflate has returned Z_STREAM_END, the only possible operations
+ on the stream are deflateReset or deflateEnd.
- Z_FINISH can be used immediately after deflateInit if all the compression
- is to be done in a single step. In this case, avail_out must be at least the
- value returned by deflateBound (see below). Then deflate is guaranteed to
- return Z_STREAM_END. If not enough output space is provided, deflate will
- not return Z_STREAM_END, and it must be called again as described above.
+ Z_FINISH can be used in the first deflate call after deflateInit if all the
+ compression is to be done in a single step. In order to complete in one
+ call, avail_out must be at least the value returned by deflateBound (see
+ below). Then deflate is guaranteed to return Z_STREAM_END. If not enough
+ output space is provided, deflate will not return Z_STREAM_END, and it must
+ be called again as described above.
- deflate() sets strm->adler to the adler32 checksum of all input read
- so far (that is, total_in bytes).
+ deflate() sets strm->adler to the Adler-32 checksum of all input read
+ so far (that is, total_in bytes). If a gzip stream is being generated, then
+ strm->adler will be the CRC-32 checksum of the input read so far. (See
+ deflateInit2 below.)
deflate() may update strm->data_type if it can make a good guess about
- the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
- binary. This field is only for information purposes and does not affect the
- compression algorithm in any manner.
+ the input data type (Z_BINARY or Z_TEXT). If in doubt, the data is
+ considered binary. This field is only for information purposes and does not
+ affect the compression algorithm in any manner.
deflate() returns Z_OK if some progress has been made (more input
processed or more output produced), Z_STREAM_END if all input has been
consumed and all output has been produced (only when flush is set to
Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
- if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
- (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
- fatal, and deflate() can be called again with more input and more output
- space to continue compressing.
+ if next_in or next_out was Z_NULL or the state was inadvertently written over
+ by the application), or Z_BUF_ERROR if no progress is possible (for example
+ avail_in or avail_out was zero). Note that Z_BUF_ERROR is not fatal, and
+ deflate() can be called again with more input and more output space to
+ continue compressing.
*/
@@ -369,23 +379,21 @@
Initializes the internal stream state for decompression. The fields
next_in, avail_in, zalloc, zfree and opaque must be initialized before by
- the caller. If next_in is not Z_NULL and avail_in is large enough (the
- exact value depends on the compression method), inflateInit determines the
- compression method from the zlib header and allocates all data structures
- accordingly; otherwise the allocation will be deferred to the first call of
- inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
- use default allocation functions.
+ the caller. In the current version of inflate, the provided input is not
+ read or consumed. The allocation of a sliding window will be deferred to
+ the first call of inflate (if the decompression does not complete on the
+ first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
+ them to use default allocation functions.
inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
version assumed by the caller, or Z_STREAM_ERROR if the parameters are
invalid, such as a null pointer to the structure. msg is set to null if
- there is no error message. inflateInit does not perform any decompression
- apart from possibly reading the zlib header if present: actual decompression
- will be done by inflate(). (So next_in and avail_in may be modified, but
- next_out and avail_out are unused and unchanged.) The current implementation
- of inflateInit() does not process any header information -- that is deferred
- until inflate() is called.
+ there is no error message. inflateInit does not perform any decompression.
+ Actual decompression will be done by inflate(). So next_in, and avail_in,
+ next_out, and avail_out are unused and unchanged. The current
+ implementation of inflateInit() does not process any header information --
+ that is deferred until inflate() is called.
*/
@@ -401,10 +409,11 @@
- Decompress more input starting at next_in and update next_in and avail_in
accordingly. If not all input can be processed (because there is not
- enough room in the output buffer), next_in is updated and processing will
- resume at this point for the next call of inflate().
+ enough room in the output buffer), then next_in and avail_in are updated
+ accordingly, and processing will resume at this point for the next call of
+ inflate().
- - Provide more output starting at next_out and update next_out and avail_out
+ - Generate more output starting at next_out and update next_out and avail_out
accordingly. inflate() provides as much output as possible, until there is
no more input data or no more space in the output buffer (see below about
the flush parameter).
@@ -411,7 +420,9 @@
Before the call of inflate(), the application should ensure that at least
one of the actions is possible, by providing more input and/or consuming more
- output, and updating the next_* and avail_* values accordingly. The
+ output, and updating the next_* and avail_* values accordingly. If the
+ caller of inflate() does not provide both available input and available
+ output space, it is possible that there will be no progress made. The
application can consume the uncompressed output when it wants, for example
when the output buffer is full (avail_out == 0), or after each call of
inflate(). If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@
gets to the end of that block, or when it runs out of data.
The Z_BLOCK option assists in appending to or combining deflate streams.
- Also to assist in this, on return inflate() will set strm->data_type to the
+ To assist in this, on return inflate() always sets strm->data_type to the
number of unused bits in the last byte taken from strm->next_in, plus 64 if
inflate() is currently decoding the last block in the deflate stream, plus
128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@
this case all pending input is processed and all pending output is flushed;
avail_out must be large enough to hold all of the uncompressed data for the
operation to complete. (The size of the uncompressed data may have been
- saved by the compressor for this purpose.) The use of Z_FINISH is not
+ saved by the compressor for this purpose.) The use of Z_FINISH is not
required to perform an inflation in one step. However it may be used to
inform inflate that a faster approach can be used for the single inflate()
call. Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,7 +487,7 @@
chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
strm->adler to the Adler-32 checksum of all output produced so far (that is,
total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
- below. At the end of the stream, inflate() checks that its computed adler32
+ below. At the end of the stream, inflate() checks that its computed Adler-32
checksum is equal to that saved by the compressor and returns Z_STREAM_END
only if the checksum is correct.
@@ -483,11 +494,10 @@
inflate() can decompress and check either zlib-wrapped or gzip-wrapped
deflate data. The header type is detected automatically, if requested when
initializing with inflateInit2(). Any information contained in the gzip
- header is not retained, so applications that need that information should
- instead use raw inflate, see inflateInit2() below, or inflateBack() and
- perform their own processing of the gzip header and trailer. When processing
+ header is not retained unless inflateGetHeader() is used. When processing
gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
- producted so far. The CRC-32 is checked against the gzip trailer.
+ produced so far. The CRC-32 is checked against the gzip trailer, as is the
+ uncompressed length, modulo 2^32.
inflate() returns Z_OK if some progress has been made (more input processed
or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -494,14 +504,16 @@
been reached and all uncompressed output has been produced, Z_NEED_DICT if a
preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
corrupted (input stream not conforming to the zlib format or incorrect check
- value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
- next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
- Z_BUF_ERROR if no progress is possible or if there was not enough room in the
- output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+ value, in which case strm->msg points to a string with a more specific
+ error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+ next_in or next_out was Z_NULL, or the state was inadvertently written over
+ by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+ if no progress was possible or if there was not enough room in the output
+ buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
inflate() can be called again with more input and more output space to
continue decompressing. If Z_DATA_ERROR is returned, the application may
then call inflateSync() to look for a good compression block if a partial
- recovery of the data is desired.
+ recovery of the data is to be attempted.
*/
@@ -511,9 +523,8 @@
This function discards any unprocessed input and does not flush any pending
output.
- inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
- was inconsistent. In the error case, msg may be set but then points to a
- static string (which must not be deallocated).
+ inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+ was inconsistent.
*/
@@ -544,17 +555,30 @@
compression at the expense of memory usage. The default value is 15 if
deflateInit is used instead.
+ For the current implementation of deflate(), a windowBits value of 8 (a
+ window size of 256 bytes) is not supported. As a result, a request for 8
+ will result in 9 (a 512-byte window). In that case, providing 8 to
+ inflateInit2() will result in an error when the zlib header with 9 is
+ checked against the initialization of inflate(). The remedy is to not use 8
+ with deflateInit2() with this initialization, or at least in that case use 9
+ with inflateInit2().
+
windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
determines the window size. deflate() will then generate raw deflate data
- with no zlib header or trailer, and will not compute an adler32 check value.
+ with no zlib header or trailer, and will not compute a check value.
windowBits can also be greater than 15 for optional gzip encoding. Add
16 to windowBits to write a simple gzip header and trailer around the
compressed data instead of a zlib wrapper. The gzip header will have no
file name, no extra data, no comment, no modification time (set to zero), no
- header crc, and the operating system will be set to 255 (unknown). If a
- gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+ header crc, and the operating system will be set to the appropriate value,
+ if the operating system was determined at compile time. If a gzip stream is
+ being written, strm->adler is a CRC-32 instead of an Adler-32.
+ For raw deflate or gzip encoding, a request for a 256-byte window is
+ rejected as invalid, since only the zlib header provides a means of
+ transmitting the window size to the decompressor.
+
The memLevel parameter specifies how much memory should be allocated
for the internal compression state. memLevel=1 uses minimum memory but is
slow and reduces compression ratio; memLevel=9 uses maximum memory for
@@ -614,12 +638,12 @@
addition, the current implementation of deflate will use at most the window
size minus 262 bytes of the provided dictionary.
- Upon return of this function, strm->adler is set to the adler32 value
+ Upon return of this function, strm->adler is set to the Adler-32 value
of the dictionary; the decompressor may later use this value to determine
- which dictionary has been used by the compressor. (The adler32 value
+ which dictionary has been used by the compressor. (The Adler-32 value
applies to the whole dictionary even if only a subset of the dictionary is
actually used by the compressor.) If a raw deflate was requested, then the
- adler32 value is not computed and strm->adler is not set.
+ Adler-32 value is not computed and strm->adler is not set.
deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@
not perform any compression: this will be done by deflate().
*/
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+ Bytef *dictionary,
+ uInt *dictLength));
+/*
+ Returns the sliding dictionary being maintained by deflate. dictLength is
+ set to the number of bytes in the dictionary, and that many bytes are copied
+ to dictionary. dictionary must have enough space, where 32768 bytes is
+ always enough. If deflateGetDictionary() is called with dictionary equal to
+ Z_NULL, then only the dictionary length is returned, and nothing is copied.
+ Similary, if dictLength is Z_NULL, then it is not set.
+
+ deflateGetDictionary() may return a length less than the window size, even
+ when more than the window size in input has been provided. It may return up
+ to 258 bytes less in that case, due to how zlib's implementation of deflate
+ manages the sliding window and lookahead for matches, where matches can be
+ up to 258 bytes long. If the application needs the last window-size bytes of
+ input, then that would need to be saved by the application outside of zlib.
+
+ deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+ stream state is inconsistent.
+*/
+
ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
z_streamp source));
/*
@@ -648,10 +694,10 @@
ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
/*
- This function is equivalent to deflateEnd followed by deflateInit,
- but does not free and reallocate all the internal compression state. The
- stream will keep the same compression level and any other attributes that
- may have been set by deflateInit2.
+ This function is equivalent to deflateEnd followed by deflateInit, but
+ does not free and reallocate the internal compression state. The stream
+ will leave the compression level and any other attributes that may have been
+ set unchanged.
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,36 @@
int strategy));
/*
Dynamically update the compression level and compression strategy. The
- interpretation of level and strategy is as in deflateInit2. This can be
+ interpretation of level and strategy is as in deflateInit2(). This can be
used to switch between compression and straight copy of the input data, or
to switch to a different kind of input data requiring a different strategy.
- If the compression level is changed, the input available so far is
- compressed with the old level (and may be flushed); the new level will take
- effect only at the next call of deflate().
+ If the compression approach (which is a function of the level) or the
+ strategy is changed, and if any input has been consumed in a previous
+ deflate() call, then the input available so far is compressed with the old
+ level and strategy using deflate(strm, Z_BLOCK). There are three approaches
+ for the compression levels 0, 1..3, and 4..9 respectively. The new level
+ and strategy will take effect at the next call of deflate().
- Before the call of deflateParams, the stream state must be set as for
- a call of deflate(), since the currently available input may have to be
- compressed and flushed. In particular, strm->avail_out must be non-zero.
+ If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+ not have enough output space to complete, then the parameter change will not
+ take effect. In this case, deflateParams() can be called again with the
+ same parameters and more output space to try again.
- deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
- stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
- strm->avail_out was zero.
+ In order to assure a change in the parameters on the first try, the
+ deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+ request until strm.avail_out is not zero, before calling deflateParams().
+ Then no more input data should be provided before the deflateParams() call.
+ If this is done, the old level and strategy will be applied to the data
+ compressed before deflateParams(), and the new level and strategy will be
+ applied to the the data compressed after deflateParams().
+
+ deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+ state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+ there was not enough output space to complete the compression of the
+ available input data before a change in the strategy or approach. Note that
+ in the case of a Z_BUF_ERROR, the parameters are not changed. A return
+ value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+ retried with more output space.
*/
ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +855,7 @@
is for use with other formats that use the deflate compressed data format
such as zip. Those formats provide their own check values. If a custom
format is developed using the raw deflate format for compressed data, it is
- recommended that a check value such as an adler32 or a crc32 be applied to
+ recommended that a check value such as an Adler-32 or a CRC-32 be applied to
the uncompressed data as is done in the zlib, gzip, and zip formats. For
most applications, the zlib format should be used as is. Note that comments
above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +864,10 @@
32 to windowBits to enable zlib and gzip decoding with automatic header
detection, or add 16 to decode only the gzip format (the zlib format will
return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a
- crc32 instead of an adler32.
+ CRC-32 instead of an Adler-32. Unlike the gunzip utility and gzread() (see
+ below), inflate() will not automatically decode concatenated gzip streams.
+ inflate() will return Z_STREAM_END at the end of the gzip stream. The state
+ would need to be reset to continue decoding a subsequent gzip stream.
inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +888,7 @@
Initializes the decompression dictionary from the given uncompressed byte
sequence. This function must be called immediately after a call of inflate,
if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
- can be determined from the adler32 value returned by that call of inflate.
+ can be determined from the Adler-32 value returned by that call of inflate.
The compressor and decompressor must use exactly the same dictionary (see
deflateSetDictionary). For raw inflate, this function can be called at any
time to set the dictionary. If the provided dictionary is smaller than the
@@ -834,7 +899,7 @@
inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
- expected one (incorrect adler32 value). inflateSetDictionary does not
+ expected one (incorrect Adler-32 value). inflateSetDictionary does not
perform any decompression: this will be done by subsequent calls of
inflate().
*/
@@ -892,7 +957,7 @@
ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
/*
This function is equivalent to inflateEnd followed by inflateInit,
- but does not free and reallocate all the internal decompression state. The
+ but does not free and reallocate the internal decompression state. The
stream will keep attributes that may have been set by inflateInit2.
inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +969,9 @@
/*
This function is the same as inflateReset, but it also permits changing
the wrap and window size requests. The windowBits parameter is interpreted
- the same as it is for inflateInit2.
+ the same as it is for inflateInit2. If the window size is changed, then the
+ memory allocated for the window is freed, and the window will be reallocated
+ by inflate() if needed.
inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1023,7 @@
location in the input stream can be determined from avail_in and data_type
as noted in the description for the Z_BLOCK flush parameter for inflate.
- inflateMark returns the value noted above or -1 << 16 if the provided
+ inflateMark returns the value noted above, or -65536 if the provided
source stream state was inconsistent.
*/
@@ -1048,9 +1115,9 @@
This routine would normally be used in a utility that reads zip or gzip
files and writes out uncompressed files. The utility would decode the
header and process the trailer on its own, hence this routine expects only
- the raw deflate stream to decompress. This is different from the normal
- behavior of inflate(), which expects either a zlib or gzip header and
- trailer around the deflate stream.
+ the raw deflate stream to decompress. This is different from the default
+ behavior of inflate(), which expects a zlib header and trailer around the
+ deflate stream.
inflateBack() uses two subroutines supplied by the caller that are then
called by inflateBack() for input and output. inflateBack() calls those
@@ -1059,12 +1126,12 @@
parameters and return types are defined above in the in_func and out_func
typedefs. inflateBack() will call in(in_desc, &buf) which should return the
number of bytes of provided input, and a pointer to that input in buf. If
- there is no input available, in() must return zero--buf is ignored in that
- case--and inflateBack() will return a buffer error. inflateBack() will call
- out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
- should return zero on success, or non-zero on failure. If out() returns
- non-zero, inflateBack() will return with an error. Neither in() nor out()
- are permitted to change the contents of the window provided to
+ there is no input available, in() must return zero -- buf is ignored in that
+ case -- and inflateBack() will return a buffer error. inflateBack() will
+ call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+ out() should return zero on success, or non-zero on failure. If out()
+ returns non-zero, inflateBack() will return with an error. Neither in() nor
+ out() are permitted to change the contents of the window provided to
inflateBackInit(), which is also the buffer that out() uses to write from.
The length written by out() will be at most the window size. Any non-zero
amount of input may be provided by in().
@@ -1092,7 +1159,7 @@
using strm->next_in which will be Z_NULL only if in() returned an error. If
strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
non-zero. (in() will always be called before out(), so strm->next_in is
- assured to be defined if out() returns non-zero.) Note that inflateBack()
+ assured to be defined if out() returns non-zero.) Note that inflateBack()
cannot return Z_OK.
*/
@@ -1114,7 +1181,7 @@
7.6: size of z_off_t
Compiler, assembler, and debug options:
- 8: DEBUG
+ 8: ZLIB_DEBUG
9: ASMV or ASMINF -- use ASM code
10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
11: 0 (reserved)
@@ -1164,7 +1231,8 @@
the byte length of the source buffer. Upon entry, destLen is the total size
of the destination buffer, which must be at least the value returned by
compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
+ compressed data. compress() is equivalent to compress2() with a level
+ parameter of Z_DEFAULT_COMPRESSION.
compress returns Z_OK if success, Z_MEM_ERROR if there was not
enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1248,7 @@
length of the source buffer. Upon entry, destLen is the total size of the
destination buffer, which must be at least the value returned by
compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
+ compressed data.
compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1271,7 @@
uncompressed data. (The size of the uncompressed data must have been saved
previously by the compressor and transmitted to the decompressor by some
mechanism outside the scope of this compression library.) Upon exit, destLen
- is the actual size of the uncompressed buffer.
+ is the actual size of the uncompressed data.
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1280,14 @@
buffer with the uncompressed data up to that point.
*/
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong *sourceLen));
+/*
+ Same as uncompress, except that sourceLen is a pointer, where the
+ length of the source is *sourceLen. On return, *sourceLen is the number of
+ source bytes consumed.
+*/
+
/* gzip file access functions */
/*
@@ -1290,10 +1366,9 @@
default buffer size is 8192 bytes. This function must be called after
gzopen() or gzdopen(), and before any other calls that read or write the
file. The buffer memory allocation is always deferred to the first read or
- write. Two buffers are allocated, either both of the specified size when
- writing, or one of the specified size and the other twice that size when
- reading. A larger buffer size of, for example, 64K or 128K bytes will
- noticeably increase the speed of decompression (reading).
+ write. Three times that size in buffer space is allocated. A larger buffer
+ size of, for example, 64K or 128K bytes will noticeably increase the speed
+ of decompression (reading).
The new buffer size also affects the maximum length for gzprintf().
@@ -1304,10 +1379,12 @@
ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
/*
Dynamically update the compression level or strategy. See the description
- of deflateInit2 for the meaning of these parameters.
+ of deflateInit2 for the meaning of these parameters. Previously provided
+ data is flushed before the parameter change.
- gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
- opened for writing.
+ gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+ opened for writing, Z_ERRNO if there is an error writing the flushed data,
+ or Z_MEM_ERROR if there is a memory allocation error.
*/
ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,9 +1412,37 @@
case.
gzread returns the number of uncompressed bytes actually read, less than
- len for end of file, or -1 for error.
+ len for end of file, or -1 for error. If len is too large to fit in an int,
+ then nothing is read, -1 is returned, and the error state is set to
+ Z_STREAM_ERROR.
*/
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+ gzFile file));
+/*
+ Read up to nitems items of size size from file to buf, otherwise operating
+ as gzread() does. This duplicates the interface of stdio's fread(), with
+ size_t request and return types. If the library defines size_t, then
+ z_size_t is identical to size_t. If not, then z_size_t is an unsigned
+ integer type that can contain a pointer.
+
+ gzfread() returns the number of full items read of size size, or zero if
+ the end of the file was reached and a full item could not be read, or if
+ there was an error. gzerror() must be consulted if zero is returned in
+ order to determine if there was an error. If the multiplication of size and
+ nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+ is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+ In the event that the end of file is reached and only a partial item is
+ available at the end, i.e. the remaining uncompressed data length is not a
+ multiple of size, then the final partial item is nevetheless read into buf
+ and the end-of-file flag is set. The length of the partial item read is not
+ provided, but could be inferred from the result of gztell(). This behavior
+ is the same as the behavior of fread() implementations in common libraries,
+ but it prevents the direct use of gzfread() to read a concurrently written
+ file, reseting and retrying on end-of-file, when size is not 1.
+*/
+
ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
voidpc buf, unsigned len));
/*
@@ -1346,19 +1451,33 @@
error.
*/
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+ z_size_t nitems, gzFile file));
+/*
+ gzfwrite() writes nitems items of size size from buf to file, duplicating
+ the interface of stdio's fwrite(), with size_t request and return types. If
+ the library defines size_t, then z_size_t is identical to size_t. If not,
+ then z_size_t is an unsigned integer type that can contain a pointer.
+
+ gzfwrite() returns the number of full items written of size size, or zero
+ if there was an error. If the multiplication of size and nitems overflows,
+ i.e. the product does not fit in a z_size_t, then nothing is written, zero
+ is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
/*
Converts, formats, and writes the arguments to the compressed file under
control of the format string, as in fprintf. gzprintf returns the number of
- uncompressed bytes actually written, or 0 in case of error. The number of
- uncompressed bytes written is limited to 8191, or one less than the buffer
- size given to gzbuffer(). The caller should assure that this limit is not
- exceeded. If it is exceeded, then gzprintf() will return an error (0) with
- nothing written. In this case, there may also be a buffer overflow with
- unpredictable consequences, which is possible only if zlib was compiled with
- the insecure functions sprintf() or vsprintf() because the secure snprintf()
- or vsnprintf() functions were not available. This can be determined using
- zlibCompileFlags().
+ uncompressed bytes actually written, or a negative zlib error code in case
+ of error. The number of uncompressed bytes written is limited to 8191, or
+ one less than the buffer size given to gzbuffer(). The caller should assure
+ that this limit is not exceeded. If it is exceeded, then gzprintf() will
+ return an error (0) with nothing written. In this case, there may also be a
+ buffer overflow with unpredictable consequences, which is possible only if
+ zlib was compiled with the insecure functions sprintf() or vsprintf()
+ because the secure snprintf() or vsnprintf() functions were not available.
+ This can be determined using zlibCompileFlags().
*/
ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1537,7 @@
If the flush parameter is Z_FINISH, the remaining data is written and the
gzip stream is completed in the output. If gzwrite() is called again, a new
gzip stream will be started in the output. gzread() is able to read such
- concatented gzip streams.
+ concatenated gzip streams.
gzflush should be called only when strictly necessary because it will
degrade compression if called too often.
@@ -1572,7 +1691,7 @@
return the updated checksum. If buf is Z_NULL, this function returns the
required initial value for the checksum.
- An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+ An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
much faster.
Usage example:
@@ -1585,7 +1704,13 @@
if (adler != original_adler) error();
*/
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+ z_size_t len));
/*
+ Same as adler32(), but with a size_t length.
+*/
+
+/*
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
z_off_t len2));
@@ -1614,7 +1739,13 @@
if (crc != original_crc) error();
*/
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+ z_size_t len));
/*
+ Same as crc32(), but with a size_t length.
+*/
+
+/*
ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
Combine two CRC-32 check values into one. For two sequences of bytes,
@@ -1644,19 +1775,35 @@
unsigned char FAR *window,
const char *version,
int stream_size));
-#define deflateInit(strm, level) \
- deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
- inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
- deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
- (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
- inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
- (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
- inflateBackInit_((strm), (windowBits), (window), \
- ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+# define z_deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+# define z_inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+# define z_inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+ (int)sizeof(z_stream))
+# define z_inflateBackInit(strm, windowBits, window) \
+ inflateBackInit_((strm), (windowBits), (window), \
+ ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+# define deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+# define inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+# define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+# define inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+ (int)sizeof(z_stream))
+# define inflateBackInit(strm, windowBits, window) \
+ inflateBackInit_((strm), (windowBits), (window), \
+ ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
#ifndef Z_SOLO
@@ -1676,10 +1823,10 @@
#ifdef Z_PREFIX_SET
# undef z_gzgetc
# define z_gzgetc(g) \
- ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
#else
# define gzgetc(g) \
- ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
#endif
/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1884,16 @@
#endif /* !Z_SOLO */
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
- struct internal_state {int dummy;};
-#endif
-
/* undocumented functions */
ZEXTERN const char * ZEXPORT zError OF((int));
ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void));
ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp));
ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
const char *mode));
#endif
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.map
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib.map 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib.map 2017-02-16 16:38:15 UTC (rev 766)
@@ -81,3 +81,14 @@
inflateGetDictionary;
gzvprintf;
} ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+ inflateCodesUsed;
+ inflateValidate;
+ uncompress2;
+ gzfread;
+ gzfwrite;
+ deflateGetDictionary;
+ adler32_z;
+ crc32_z;
+} ZLIB_1.2.7.1;
Modified: branches/stable/source/src/libs/zlib/zlib-src/zutil.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zutil.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zutil.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2017 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -10,21 +10,18 @@
# include "gzguts.h"
#endif
-#ifndef NO_DUMMY_DECL
-struct internal_state {int dummy;}; /* for buggy compilers */
-#endif
-
z_const char * const z_errmsg[10] = {
-"need dictionary", /* Z_NEED_DICT 2 */
-"stream end", /* Z_STREAM_END 1 */
-"", /* Z_OK 0 */
-"file error", /* Z_ERRNO (-1) */
-"stream error", /* Z_STREAM_ERROR (-2) */
-"data error", /* Z_DATA_ERROR (-3) */
-"insufficient memory", /* Z_MEM_ERROR (-4) */
-"buffer error", /* Z_BUF_ERROR (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
+ (z_const char *)"need dictionary", /* Z_NEED_DICT 2 */
+ (z_const char *)"stream end", /* Z_STREAM_END 1 */
+ (z_const char *)"", /* Z_OK 0 */
+ (z_const char *)"file error", /* Z_ERRNO (-1) */
+ (z_const char *)"stream error", /* Z_STREAM_ERROR (-2) */
+ (z_const char *)"data error", /* Z_DATA_ERROR (-3) */
+ (z_const char *)"insufficient memory", /* Z_MEM_ERROR (-4) */
+ (z_const char *)"buffer error", /* Z_BUF_ERROR (-5) */
+ (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
+ (z_const char *)""
+};
const char * ZEXPORT zlibVersion()
@@ -61,7 +58,7 @@
case 8: flags += 2 << 6; break;
default: flags += 3 << 6;
}
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
flags += 1 << 8;
#endif
#if defined(ASMV) || defined(ASMINF)
@@ -115,8 +112,8 @@
return flags;
}
-#ifdef DEBUG
-
+#ifdef ZLIB_DEBUG
+#include <stdlib.h>
# ifndef verbose
# define verbose 0
# endif
@@ -219,9 +216,11 @@
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
{
- voidpf buf = opaque; /* just to make some compilers happy */
+ voidpf buf;
ulg bsize = (ulg)items*size;
+ (void)opaque;
+
/* If we allocate less than 65520 bytes, we assume that farmalloc
* will return a usable pointer which doesn't have to be normalized.
*/
@@ -244,6 +243,9 @@
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
{
int n;
+
+ (void)opaque;
+
if (*(ush*)&ptr != 0) { /* object < 64K */
farfree(ptr);
return;
@@ -259,7 +261,6 @@
next_ptr--;
return;
}
- ptr = opaque; /* just to make some compilers happy */
Assert(0, "zcfree: ptr not found");
}
@@ -278,13 +279,13 @@
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
{
- if (opaque) opaque = 0; /* to make compiler happy */
+ (void)opaque;
return _halloc((long)items, size);
}
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
{
- if (opaque) opaque = 0; /* to make compiler happy */
+ (void)opaque;
_hfree(ptr);
}
@@ -306,7 +307,7 @@
unsigned items;
unsigned size;
{
- if (opaque) items += size - size; /* make compiler happy */
+ (void)opaque;
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
(voidpf)calloc(items, size);
}
@@ -315,8 +316,8 @@
voidpf opaque;
voidpf ptr;
{
+ (void)opaque;
free(ptr);
- if (opaque) return; /* make compiler happy */
}
#endif /* MY_ZCALLOC */
Modified: branches/stable/source/src/libs/zlib/zlib-src/zutil.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zutil.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/libs/zlib/zlib-src/zutil.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -36,7 +36,9 @@
#ifndef local
# define local static
#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
+ define "local" for the non-static meaning of "static", for readability
+ (compile with -Dlocal if your debugger can't find static symbols) */
typedef unsigned char uch;
typedef uch FAR uchf;
@@ -98,21 +100,31 @@
#endif
#ifdef AMIGA
-# define OS_CODE 0x01
+# define OS_CODE 1
#endif
#if defined(VAXC) || defined(VMS)
-# define OS_CODE 0x02
+# define OS_CODE 2
# define F_OPEN(name, mode) \
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
#endif
+#ifdef __370__
+# if __TARGET_LIB__ < 0x20000000
+# define OS_CODE 4
+# elif __TARGET_LIB__ < 0x40000000
+# define OS_CODE 11
+# else
+# define OS_CODE 8
+# endif
+#endif
+
#if defined(ATARI) || defined(atarist)
-# define OS_CODE 0x05
+# define OS_CODE 5
#endif
#ifdef OS2
-# define OS_CODE 0x06
+# define OS_CODE 6
# if defined(M_I86) && !defined(Z_SOLO)
# include <malloc.h>
# endif
@@ -119,7 +131,7 @@
#endif
#if defined(MACOS) || defined(TARGET_OS_MAC)
-# define OS_CODE 0x07
+# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
@@ -131,20 +143,26 @@
# endif
#endif
-#ifdef TOPS20
-# define OS_CODE 0x0a
+#ifdef __acorn
+# define OS_CODE 13
#endif
-#ifdef WIN32
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-# define OS_CODE 0x0b
-# endif
+#if defined(WIN32) && !defined(__CYGWIN__)
+# define OS_CODE 10
#endif
-#ifdef __50SERIES /* Prime/PRIMOS */
-# define OS_CODE 0x0f
+#ifdef _BEOS_
+# define OS_CODE 16
#endif
+#ifdef __TOS_OS400__
+# define OS_CODE 18
+#endif
+
+#ifdef __APPLE__
+# define OS_CODE 19
+#endif
+
#if defined(_BEOS_) || defined(RISCOS)
# define fdopen(fd,mode) NULL /* No fdopen() */
#endif
@@ -177,7 +195,7 @@
/* common defaults */
#ifndef OS_CODE
-# define OS_CODE 0x03 /* assume Unix */
+# define OS_CODE 3 /* assume Unix */
#endif
#ifndef F_OPEN
@@ -216,7 +234,7 @@
#endif
/* Diagnostic functions */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
# include <stdio.h>
extern int ZLIB_INTERNAL z_verbose;
extern void ZLIB_INTERNAL z_error OF((char *m));
Modified: branches/stable/source/src/tardate.ac
===================================================================
--- branches/stable/source/src/tardate.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/tardate.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,7 @@
+dnl $Id: tardate.ac 41571 2016-06-29 23:09:13Z karl $
+dnl Copyright 2016 Karl Berry <tex-live at tug.org>
+dnl Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
-dnl Copyright (C) 2010-2015 Peter Breitenlohner <tex-live at 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.
@@ -8,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2015-06-12])
+m4_define([tex_live_tardate], [2016-05-23])
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,5 @@
-$Id: README 40624 2016-04-19 23:51:42Z kakuto $
-Copyright 2006-2016 TeX Users Group.
+$Id: README 43213 2017-02-13 19:32:16Z karl $
+Copyright 2006-2017 TeX Users Group.
You may freely use, modify and/or distribute this file.
This TeX Live directory contains the programs that use the kpathsea
@@ -27,7 +27,7 @@
bibtexu
http://omega.enstb.org/yannis/bibtexu/
-chktex 1.7.4 - checked 12apr15
+chktex 1.7.6 - checked 15sep16
http://mirror.ctan.org/support/chktex/
http://download.savannah.gnu.org/releases/chktex/
@@ -46,7 +46,7 @@
dviljk - maintained here, by Joachim Schrod
-dvipdfm-x - maintained here, by Khaled Hosny, Akira Kakuto, et al., contains
+dvipdfm-x - maintained here, by us, contains
dvipdfmx
xdvipdfmx
@@ -58,10 +58,10 @@
dvipsk - maintained here, by us
-dvisvgm 1.15.1 - checked 20apr16
+dvisvgm 2.1.2 - checked 13feb17
http://dvisvgm.bplaced.net/Downloads
-gregorio 4.1.1 - checked 11mar16
+gregorio 4.2.0 - checked 25sep16
https://github.com/gregorio-project/gregorio/releases/
gsftopk - from Paul Vojta's xdvi?
@@ -68,7 +68,7 @@
kpathsea - maintained here, by us
-lcdf-typetools 2.105 - checked 27sep15
+lcdf-typetools 2.106 - checked 22jun16
http://www.lcdf.org/type/
makeindexk - maintained here, by us
@@ -96,9 +96,9 @@
ttf2pk2 - maintained here, by us
-ttfdump - ?
+ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
-upmendex 0.50 -
+upmendex 0.51 - by Takuji Tanaka
http://www.ctan.org/pkg/upmendex
http://www.t-lab.opal.ne.jp/tex/uptex_en.html
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2016.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2017/dev.
#
# Report bugs to <peb at mppmu.mpg.de>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live texk'
PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2016'
-PACKAGE_STRING='TeX Live texk 2016'
+PACKAGE_VERSION='2017/dev'
+PACKAGE_STRING='TeX Live texk 2017/dev'
PACKAGE_BUGREPORT='peb at mppmu.mpg.de'
PACKAGE_URL=''
@@ -1430,7 +1430,7 @@
# 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 TeX Live texk 2016 to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2017/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live texk 2016:";;
+ short | recursive ) echo "Configuration of TeX Live texk 2017/dev:";;
esac
cat <<\_ACEOF
@@ -1795,7 +1795,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live texk configure 2016
+TeX Live texk configure 2017/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1896,7 +1896,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live texk $as_me 2016, which was
+It was created by TeX Live texk $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -6138,7 +6138,7 @@
# Define the identity of the package.
PACKAGE='tex-live-texk'
- VERSION='2016'
+ VERSION='2017/dev'
cat >>confdefs.h <<_ACEOF
@@ -7300,7 +7300,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live texk $as_me 2016, which was
+This file was extended by TeX Live texk $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7357,7 +7357,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live texk config.status 2016
+TeX Live texk config.status 2017/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,57 @@
+2016-12-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * xgetcwd.c: Typo. Thanks Luigi.
+
+2016-12-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * kpsestat.c: Change tex-k at mail.tug.org to tex-k at tug.org.
+
+2016-11-30 Karl Berry <karl at ks.tug.org>
+
+ * texmf.cnf (shell_escape_commands): remove mpost, due to
+ the -tex option. Oops! Report from Bruno Le Floch.
+
+2016-11-08 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * tex-file.c: Add ".OTF" as a suffix of OpenType fonts.
+
+2016-11-02 Karl Berry <karl at tug.org>
+
+ * mktexdir: try a silent mkdir before a non-silent mkdir,
+ to try to work around the inevitable race condition.
+ https://bugs.debian.org/794228.
+
+2016-08-04 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (max_strings.bibtex, et al.): increase to 100,000
+ per report from Michael Perryman,
+ http://tug.org/pipermail/tex-live/2016-July/039109.html.
+
+2016-07-01 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * knj.c, knj.h: Avoid compiler warnings.
+
+2016-06-30 Karl Berry <karl at tug.org>
+
+ * version.ac (kpse_version): 6.2.2 => 6.2.3dev.
+
+2016-06-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * kpsewhich.c: Remove unnecessary w32 changes,
+
+2016-06-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * config.h, db.c, elt-dirs.c, expand.c, find-suffix.c, hash.c, knj.c,
+ knj.h, kpsewhich.c, make-suffix.c, path-elt.c, progname.c, readable.c,
+ tilde.c, types.h, variable.c, win32lib.c, win32lib.h, xbasename.c,
+ xdirname.c, xdirtest.c, xgetcwd.c: Eliminate global and static
+ variables (w32 only).
+
+2016-05-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * tex-file.c: Fix a bug that TEXMFOUTPUT does not work (w32 only).
+ See http://tug.org/pipermail/tex-k/2016-May/002719.html.
+
2016-05-20 Karl Berry <karl at tug.org>
* Version 6.2.2 for TeX Live 2016.
Modified: branches/stable/source/src/texk/kpathsea/c-auto.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-auto.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/c-auto.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -23,7 +23,7 @@
#define KPATHSEA_C_AUTO_H
/* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.2.2"
+#define KPSEVERSION "kpathsea version 6.2.3/dev"
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
Modified: branches/stable/source/src/texk/kpathsea/config.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/config.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/config.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* config.h: master configuration file, included first by all compilable
source files (not headers).
- Copyright 1993, 1995, 1996, 1997, 2008, 2010, 2011 Karl Berry.
+ Copyright 1993, 1995, 1996, 1997, 2008, 2010, 2011, 2016 Karl Berry.
Copyright 2000, 2003, 2004, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -95,12 +95,13 @@
but before "lib.h". FP.
*/
#if defined (WIN32) || defined (_WIN32)
-#include <kpathsea/knj.h>
#ifdef __MINGW32__
#include <kpathsea/mingw32.h>
#else
#include <kpathsea/win32lib.h>
#endif
+#include <kpathsea/types.h>
+#include <kpathsea/knj.h>
#endif
#if defined(WIN32) || defined(WRAP_SNPRINTF)
Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.2.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.3/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.2.2'
-PACKAGE_STRING='Kpathsea 6.2.2'
+PACKAGE_VERSION='6.2.3/dev'
+PACKAGE_STRING='Kpathsea 6.2.3/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1339,7 +1339,7 @@
# 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 Kpathsea 6.2.2 to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.2.3/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1409,7 +1409,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.2.2:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.2.3/dev:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.2.2
+Kpathsea configure 6.2.3/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.2.2, which was
+It was created by Kpathsea $as_me 6.2.3/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2757,14 +2757,14 @@
-KPSEVERSION=6.2.2
+KPSEVERSION=6.2.3/dev
-KPSE_LT_VERSINFO=8:2:2
+KPSE_LT_VERSINFO=8:3:2
- WEB2CVERSION=" (TeX Live 2016)"
+ WEB2CVERSION=" (TeX Live 2017/dev)"
am__api_version='1.15'
@@ -8071,7 +8071,7 @@
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.2.2'
+ VERSION='6.2.3/dev'
cat >>confdefs.h <<_ACEOF
@@ -14695,7 +14695,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.2.2, which was
+This file was extended by Kpathsea $as_me 6.2.3/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14761,7 +14761,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Kpathsea config.status 6.2.2
+Kpathsea config.status 6.2.3/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/db.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/db.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/db.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* db.c: an external database to avoid filesystem lookups.
- Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2014 Karl Berry.
+ Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2014, 2016 Karl Berry.
Copyright 1997-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -106,7 +106,7 @@
#if defined(WIN32)
for (pp = line; *pp; pp++) {
- if (IS_KANJI(pp))
+ if (kpathsea_IS_KANJI(kpse, pp))
pp++;
else
*pp = TRANSFORM(*pp);
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-This is kpathsea.info, produced by makeinfo version 6.1 from
+This is kpathsea.info, produced by makeinfo version 6.3 from
kpathsea.texi.
This file documents the Kpathsea library for path searching.
@@ -37,7 +37,7 @@
****************
This manual documents the Kpathsea library for path searching. It
-corresponds to version 6.2.2, released in Aprile 2016.
+corresponds to version 6.2.3dev, released in June 2016.
* Menu:
@@ -61,8 +61,8 @@
1 Introduction
**************
-This manual corresponds to version 6.2.2 of the Kpathsea library,
-released in Aprile 2016.
+This manual corresponds to version 6.2.3dev of the Kpathsea library,
+released in June 2016.
The library's fundamental purpose is to return a filename from a list
of directories specified by the user, similar to what shells do when
@@ -3637,58 +3637,58 @@
Tag Table:
Node: Top1480
-Node: Introduction2261
-Node: History4208
-Node: unixtex.ftp8805
-Node: Security10300
-Node: TeX directory structure12804
-Node: Path searching16852
-Node: Searching overview17510
-Node: Path sources20905
-Node: Config files21963
-Node: Path expansion25890
-Node: Default expansion26839
-Node: Variable expansion28909
-Node: Tilde expansion30310
-Node: Brace expansion31290
-Node: KPSE_DOT expansion32215
-Node: Subdirectory expansion32728
-Node: Filename database35082
-Node: ls-R36136
-Node: Filename aliases39031
-Node: Database format40209
-Node: Invoking kpsewhich41222
-Node: Path searching options42177
-Node: Specially-recognized files50097
-Node: Auxiliary tasks51452
-Node: Standard options53791
-Node: TeX support54147
-Node: Supported file formats55499
-Node: File lookup63164
-Node: Glyph lookup64913
-Node: Basic glyph lookup66037
-Node: Fontmap66917
-Node: Fallback font69338
-Node: Suppressing warnings70250
-Node: mktex scripts71377
-Node: mktex configuration72592
-Node: mktex script names78395
-Node: mktex script arguments79781
-Node: Programming80660
-Node: Programming overview81182
-Node: Calling sequence83879
-Node: Program-specific files90411
-Node: Programming with config files91434
-Node: Reporting bugs92746
-Node: Bug checklist93424
-Node: Mailing lists96896
-Node: Debugging97571
-Node: Logging102648
-Node: Common problems104515
-Node: Unable to find files104992
-Node: Slow path searching107402
-Node: Unable to generate fonts108777
-Node: TeX or Metafont failing111248
-Node: Index112601
+Node: Introduction2262
+Node: History4210
+Node: unixtex.ftp8807
+Node: Security10302
+Node: TeX directory structure12806
+Node: Path searching16854
+Node: Searching overview17512
+Node: Path sources20907
+Node: Config files21965
+Node: Path expansion25892
+Node: Default expansion26841
+Node: Variable expansion28911
+Node: Tilde expansion30312
+Node: Brace expansion31292
+Node: KPSE_DOT expansion32217
+Node: Subdirectory expansion32730
+Node: Filename database35084
+Node: ls-R36138
+Node: Filename aliases39033
+Node: Database format40211
+Node: Invoking kpsewhich41224
+Node: Path searching options42179
+Node: Specially-recognized files50099
+Node: Auxiliary tasks51454
+Node: Standard options53793
+Node: TeX support54149
+Node: Supported file formats55501
+Node: File lookup63166
+Node: Glyph lookup64915
+Node: Basic glyph lookup66039
+Node: Fontmap66919
+Node: Fallback font69340
+Node: Suppressing warnings70252
+Node: mktex scripts71379
+Node: mktex configuration72594
+Node: mktex script names78397
+Node: mktex script arguments79783
+Node: Programming80662
+Node: Programming overview81184
+Node: Calling sequence83881
+Node: Program-specific files90413
+Node: Programming with config files91436
+Node: Reporting bugs92748
+Node: Bug checklist93426
+Node: Mailing lists96898
+Node: Debugging97573
+Node: Logging102650
+Node: Common problems104517
+Node: Unable to find files104994
+Node: Slow path searching107404
+Node: Unable to generate fonts108779
+Node: TeX or Metafont failing111250
+Node: Index112603
End Tag Table
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2017-02-16 16:38:15 UTC (rev 766)
@@ -2,8 +2,8 @@
@setfilename kpathsea.info
@settitle Kpathsea: A library for path searching
- at set version 6.2.2
- at set month-year Aprile 2016
+ at set version 6.2.3dev
+ at set month-year June 2016
@copying
This file documents the Kpathsea library for path searching.
Modified: branches/stable/source/src/texk/kpathsea/elt-dirs.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/elt-dirs.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/elt-dirs.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* elt-dirs.c: Translate a path element to its corresponding director{y,ies}.
- Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011, 2016 Karl Berry.
Copyright 1997, 1998, 1999, 2000, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -133,7 +133,7 @@
#if defined (WIN32)
strcpy(dirname, FN_STRING(name));
strcat(dirname, "/*.*"); /* "*.*" or "*" -- seems equivalent. */
- get_wstring_from_fsyscp(dirname, dirnamew);
+ get_wstring_from_mbstring(kpse->File_system_codepage, dirname, dirnamew);
hnd = FindFirstFileW(dirnamew, &find_file_data);
if (hnd == INVALID_HANDLE_VALUE) {
@@ -158,7 +158,7 @@
int links;
/* Construct the potential subdirectory name. */
- potname = get_fsyscp_from_wstring(find_file_data.cFileName, potname=NULL);
+ potname = get_mbstring_from_wstring(kpse->File_system_codepage, find_file_data.cFileName, potname=NULL);
fn_str_grow (&name, potname);
free(potname);
@@ -368,7 +368,7 @@
for (i = 0; elt[i]; i++) {
if (elt[i] == '\\')
elt[i] = '/';
- else if (IS_KANJI(elt + i))
+ else if (kpathsea_IS_KANJI(kpse, elt + i))
i++;
}
#endif
Modified: branches/stable/source/src/texk/kpathsea/expand.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/expand.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/expand.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* expand.c: general expansion.
Copyright 1993, 1994, 1995, 1996, 1997, 2005, 2008, 2009, 2011,
- 2012 Karl Berry.
+ 2012, 2016 Karl Berry.
Copyright 1997-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -226,7 +226,7 @@
for (p = zpath; *p; p++)
if (*p == '\\')
*p = '/';
- else if (IS_KANJI(p))
+ else if (kpathsea_IS_KANJI(kpse, p))
p++;
ypath = zpath;
@@ -343,7 +343,7 @@
for (p+=2; *p!='}';++p);
}
#if defined(WIN32)
- else if (IS_KANJI(p))
+ else if (kpathsea_IS_KANJI(kpse, p))
p++;
#endif
}
Modified: branches/stable/source/src/texk/kpathsea/find-suffix.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/find-suffix.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/find-suffix.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* find-suffix.c: return the stuff after a dot.
- Copyright 1992, 1993, 1995, 2008, 2011 Karl Berry.
+ Copyright 1992, 1993, 1995, 2008, 2011, 2016 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -47,10 +47,6 @@
for (p = dot_pos + 1; *p; p++) {
if (IS_DIR_SEP (*p))
return NULL;
-#if defined(WIN32)
- else if (IS_KANJI(p))
- p++;
-#endif
}
return dot_pos + 1;
Modified: branches/stable/source/src/texk/kpathsea/hash.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/hash.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/hash.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* hash.c: hash table operations.
- Copyright 1994-2000, 2002, 2005, 2008, 2012
+ Copyright 1994-2000, 2002, 2005, 2008, 2012, 2016
Karl Berry & Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
/* Our keys aren't often anagrams of each other, so no point in
weighting the characters. */
while (*key != 0)
-#if defined(WIN32)
+#if defined (WIN32) && defined (KPSE_COMPAT_API)
if (IS_KANJI(key)) {
n = (n + n + (unsigned)(*key++)) % table.size;
n = (n + n + (unsigned)(*key++)) % table.size;
Modified: branches/stable/source/src/texk/kpathsea/knj.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/knj.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/knj.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -20,38 +20,17 @@
#include <kpathsea/debug.h>
#include <wchar.h>
-int is_cp932_system, file_system_codepage;
-
-int isknj(int c)
+static int
+is_include_space(const char *s)
{
- c &= 0xff;
- switch (is_cp932_system) {
- case 932:
- return((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc));
- case 936:
- return(c>=0x81 && c<=0xfe);
- case 950:
- return((c>=0xa1 && c<=0xc6) || (c>=0xc9 && c<=0xf9));
- default:
- return(0);
- }
+ char *p;
+ p = strchr(s, ' ');
+ if(p) return 1;
+ p = strchr(s, '\t');
+ if(p) return 1;
+ return 0;
}
-int isknj2(int c)
-{
- c &= 0xff;
- switch (is_cp932_system) {
- case 932:
- return(c>=0x40 && c<=0xfc && c!=0x7f);
- case 936:
- return(c>=0x40 && c<=0xfe && c!=0x7f);
- case 950:
- return((c>=0x40 && c<=0x7e) || (c>=0xa1 && c<=0xfe));
- default:
- return(0);
- }
-}
-
/*
Get wide string from multibyte string.
*/
@@ -96,27 +75,55 @@
return mbstr;
}
+int
+kpathsea_isknj(kpathsea kpse, int c)
+{
+ c &= 0xff;
+ switch (kpse->Is_cp932_system) {
+ case 932:
+ return((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc));
+ case 936:
+ return(c>=0x81 && c<=0xfe);
+ case 950:
+ return((c>=0xa1 && c<=0xc6) || (c>=0xc9 && c<=0xf9));
+ default:
+ return(0);
+ }
+}
+
+int
+kpathsea_isknj2(kpathsea kpse, int c)
+{
+ c &= 0xff;
+ switch (kpse->Is_cp932_system) {
+ case 932:
+ return(c>=0x40 && c<=0xfc && c!=0x7f);
+ case 936:
+ return(c>=0x40 && c<=0xfe && c!=0x7f);
+ case 950:
+ return((c>=0x40 && c<=0x7e) || (c>=0xa1 && c<=0xfe));
+ default:
+ return(0);
+ }
+}
+
/*
xfopen by file system codepage
*/
FILE *
-fsyscp_xfopen (const char *filename, const char *mode)
+kpathsea_fsyscp_xfopen (kpathsea kpse, const char *filename, const char *mode)
{
FILE *f;
wchar_t *fnamew, modew[4];
int i;
-#if defined (KPSE_COMPAT_API)
- kpathsea kpse;
-#endif
+
assert(filename && mode);
- fnamew = get_wstring_from_fsyscp(filename, fnamew=NULL);
+ fnamew = get_wstring_from_mbstring(kpse->File_system_codepage, filename, fnamew=NULL);
for(i=0; (modew[i]=(wchar_t)mode[i]); i++) {} /* mode[i] must be ASCII */
f = _wfopen(fnamew, modew);
if (f == NULL)
FATAL_PERROR(filename);
-#if defined (KPSE_COMPAT_API)
- kpse = kpse_def;
if (KPATHSEA_DEBUG_P (KPSE_DEBUG_FOPEN)) {
DEBUGF_START ();
fprintf (stderr, "fsyscp_xfopen(%s [", filename);
@@ -128,7 +135,6 @@
#endif
DEBUGF_END ();
}
-#endif
free(fnamew);
return f;
@@ -138,22 +144,18 @@
fopen by file system codepage
*/
FILE *
-fsyscp_fopen (const char *filename, const char *mode)
+kpathsea_fsyscp_fopen (kpathsea kpse, const char *filename, const char *mode)
{
FILE *f;
wchar_t *fnamew, modew[4];
int i;
-#if defined (KPSE_COMPAT_API)
- kpathsea kpse;
-#endif
+
assert(filename && mode);
- fnamew = get_wstring_from_fsyscp(filename, fnamew=NULL);
+ fnamew = get_wstring_from_mbstring(kpse->File_system_codepage, filename, fnamew=NULL);
for(i=0; (modew[i]=(wchar_t)mode[i]); i++) {} /* mode[i] must be ASCII */
f = _wfopen(fnamew, modew);
-#if defined (KPSE_COMPAT_API)
if (f != NULL) {
- kpse = kpse_def;
if (KPATHSEA_DEBUG_P (KPSE_DEBUG_FOPEN)) {
DEBUGF_START ();
fprintf (stderr, "fsyscp_fopen(%s [", filename);
@@ -166,35 +168,19 @@
DEBUGF_END ();
}
}
-#endif
free(fnamew);
return f;
}
-/*
- popen by file system codepage
-*/
-static int
-is_include_space(const char *s)
-{
- char *p;
- p = strchr(s, ' ');
- if(p) return 1;
- p = strchr(s, '\t');
- if(p) return 1;
- return 0;
-}
FILE *
-fsyscp_popen (const char *command, const char *mode)
+kpathsea_fsyscp_popen (kpathsea kpse, const char *command, const char *mode)
{
FILE *f;
wchar_t *commandw, modew[4];
int i;
-#if defined (KPSE_COMPAT_API)
- kpathsea kpse;
-#endif
+
assert(command && mode);
if (is_include_space (command)) {
@@ -208,16 +194,15 @@
*q++ = *p++;
*q++ = '\"';
*q = '\0';
- commandw = get_wstring_from_fsyscp(command2, commandw=NULL);
+ commandw = get_wstring_from_mbstring(kpse->File_system_codepage,command2, commandw=NULL);
free (command2);
} else {
- commandw = get_wstring_from_fsyscp(command, commandw=NULL);
+ commandw = get_wstring_from_mbstring(kpse->File_system_codepage,command, commandw=NULL);
}
for(i=0; (modew[i]=(wchar_t)mode[i]); i++) {} /* mode[i] must be ASCII */
f = _wpopen(commandw, modew);
-#if defined (KPSE_COMPAT_API)
+
if (f != NULL) {
- kpse = kpse_def;
if (KPATHSEA_DEBUG_P (KPSE_DEBUG_FOPEN)) {
DEBUGF_START ();
fprintf (stderr, "fsyscp_popen(%s [", command);
@@ -230,7 +215,7 @@
DEBUGF_END ();
}
}
-#endif
+
free (commandw);
/* We use always binary mode on Windows */
if(f) _setmode (fileno (f), _O_BINARY);
@@ -239,7 +224,7 @@
}
int
-get_command_line_args_utf8 (const_string enc, int *p_ac, char ***p_av)
+kpathsea_get_command_line_args_utf8 (kpathsea kpse, const_string enc, int *p_ac, char ***p_av)
{
int argc;
string *argv;
@@ -258,8 +243,8 @@
HANDLE hStderr;
hStderr = GetStdHandle( STD_ERROR_HANDLE );
#endif /* DEBUG */
- file_system_codepage = CP_UTF8;
- is_cp932_system = 0;
+ kpse->File_system_codepage = CP_UTF8;
+ kpse->Is_cp932_system = 0;
argvw = CommandLineToArgvW(GetCommandLineW(), &argcw);
argc = argcw;
argv = xmalloc(sizeof(char *)*(argcw+1));
@@ -275,7 +260,7 @@
argv[argcw] = NULL;
*p_ac = argc;
*p_av = argv;
- return file_system_codepage;
+ return kpse->File_system_codepage;
} else {
return 0;
}
@@ -285,7 +270,7 @@
spawnvp by file system codepage
*/
int
-fsyscp_spawnvp (int mode, const char *command, const char* const *argv)
+kpathsea_fsyscp_spawnvp (kpathsea kpse, int mode, const char *command, const char* const *argv)
{
int ret;
wchar_t *commandw, **argvw, **pw;
@@ -296,11 +281,11 @@
for (i = 0, p = argv; *p; p++)
i++;
argvw = xcalloc (i + 3, sizeof (wchar_t *));
- commandw = get_wstring_from_fsyscp(command, commandw=NULL);
+ commandw = get_wstring_from_mbstring(kpse->File_system_codepage, command, commandw=NULL);
p = argv;
pw = argvw;
while (*p) {
- *pw = get_wstring_from_fsyscp(*p, *pw=NULL);
+ *pw = get_wstring_from_mbstring(kpse->File_system_codepage, *p, *pw=NULL);
p++;
pw++;
}
@@ -323,7 +308,7 @@
system by file system codepage
*/
int
-fsyscp_system (const char *cmd)
+kpathsea_fsyscp_system (kpathsea kpse, const char *cmd)
{
const char *p;
char *q;
@@ -353,7 +338,7 @@
*q++ = '"';
*q = '\0';
av[3] = NULL;
- ret = fsyscp_spawnvp (_P_WAIT, av[0], (const char* const*) av);
+ ret = kpathsea_fsyscp_spawnvp (kpse, _P_WAIT, av[0], (const char* const*) av);
free (av[0]);
free (av[1]);
free (av[2]);
@@ -360,10 +345,8 @@
return ret;
}
-static int getc_len;
-static int getc_buff[4];
-
-int win32_getc(FILE *fp)
+int
+kpathsea_win32_getc(kpathsea kpse, FILE *fp)
{
const int fd = fileno(fp);
HANDLE hStdin;
@@ -371,17 +354,16 @@
wchar_t wc[3];
char mbc[5];
int j;
- static wchar_t wcbuf = L'\0';
- if (!(fd == fileno(stdin) && _isatty(fd) && file_system_codepage == CP_UTF8))
+ if (!(fd == fileno(stdin) && _isatty(fd) && kpse->File_system_codepage == CP_UTF8))
return getc(fp);
- if (getc_len == 0)
+ if (kpse->getc_len == 0)
{
hStdin = GetStdHandle(STD_INPUT_HANDLE);
- if (wcbuf) {
- wc[0] = wcbuf;
- wcbuf = L'\0';
+ if (kpse->wcbuf) {
+ wc[0] = kpse->wcbuf;
+ kpse->wcbuf = L'\0';
}
else if (ReadConsoleW(hStdin, wc, 1, &ret, NULL) == 0)
return EOF;
@@ -391,7 +373,7 @@
if (0xdc00<=wc[1] && wc[1]<0xe000) {
wc[2]=L'\0';
} else {
- wcbuf=wc[1];
+ kpse->wcbuf=wc[1];
wc[0]=0xfffd; /* illegal surrogate pair */
wc[1]=L'\0';
}
@@ -404,21 +386,22 @@
get_utf8_from_wstring(wc,mbc);
j=strlen(mbc)-1;
while(j>=0) {
- getc_buff[getc_len++]=(int)mbc[j--];
+ kpse->getc_buff[kpse->getc_len++]=(int)mbc[j--];
}
}
- return getc_buff[--getc_len];
+ return kpse->getc_buff[--kpse->getc_len];
}
-int win32_ungetc(int c, FILE *fp)
+int
+kpathsea_win32_ungetc(kpathsea kpse, int c, FILE *fp)
{
const int fd = fileno(fp);
- if (!(fd == fileno(stdin) && _isatty(fd) && file_system_codepage == CP_UTF8))
+ if (!(fd == fileno(stdin) && _isatty(fd) && kpse->File_system_codepage == CP_UTF8))
return ungetc(c, fp);
- assert(getc_len < 4);
- return getc_buff[getc_len++] = c;
+ assert(kpse->getc_len < 4);
+ return kpse->getc_buff[kpse->getc_len++] = c;
}
static int __win32_fputs(const char *str, HANDLE hStdout)
@@ -437,13 +420,14 @@
return ret;
}
-int win32_fputs(const char *str, FILE *fp)
+int
+kpathsea_win32_fputs(kpathsea kpse, const char *str, FILE *fp)
{
const int fd = fileno(fp);
HANDLE hStdout;
if (!((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)
- && file_system_codepage == CP_UTF8))
+ && kpse->File_system_codepage == CP_UTF8))
return fputs(str, fp);
hStdout = (fd == fileno(stdout)) ?
@@ -454,7 +438,8 @@
#define MAX_PROMPT_STR_SIZE 8192
-int win32_vfprintf(FILE *fp, const char *format, va_list argp)
+int
+kpathsea_win32_vfprintf(kpathsea kpse, FILE *fp, const char *format, va_list argp)
{
const int fd = fileno(fp);
HANDLE hStdout;
@@ -462,7 +447,7 @@
int ret;
if (!((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)
- && file_system_codepage == CP_UTF8))
+ && kpse->File_system_codepage == CP_UTF8))
return vfprintf(fp, format, argp);
hStdout = (fd == fileno(stdout)) ?
@@ -475,25 +460,25 @@
return ret;
}
-int win32_puts(const char *str)
+int
+kpathsea_win32_puts(kpathsea kpse, const char *str)
{
- if (win32_fputs(str, stdout)==EOF) {
+ if (kpathsea_win32_fputs(kpse, str, stdout)==EOF) {
return EOF;
}
return puts("");
}
-int win32_putc(int c, FILE *fp)
+int
+kpathsea_win32_putc(kpathsea kpse, int c, FILE *fp)
{
const int fd = fileno(fp);
HANDLE hStdout;
DWORD ret;
wchar_t wstr[3];
- static int len = 0;
- static char buff[5], *str;
if (!((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)
- && file_system_codepage == CP_UTF8))
+ && kpse->File_system_codepage == CP_UTF8))
return putc(c, fp);
hStdout = (fd == fileno(stdout)) ?
@@ -502,31 +487,158 @@
c &= 0xff;
if (c < 0x80) {
- str = buff;
- len = 1;
+ kpse->st_str = kpse->st_buff;
+ kpse->st_len = 1;
}
if (c < 0xc0) { /* ASCII or trailer */
- *str++ = c;
- len--;
- if (len == 0) {
- *str = '\0';
- get_wstring_from_utf8(buff, wstr);
+ *(kpse->st_str)++ = c;
+ kpse->st_len--;
+ if (kpse->st_len == 0) {
+ *(kpse->st_str) = '\0';
+ get_wstring_from_utf8(kpse->st_buff, wstr);
if (WriteConsoleW(hStdout, wstr, wcslen(wstr), &ret, NULL) == 0) {
- len = 0;
+ kpse->st_len = 0;
return EOF;
}
}
- else if (len < 0) return EOF;
+ else if (kpse->st_len < 0) return EOF;
return c;
}
- else if (c < 0xc2) { len = 0; return EOF; } /* illegal */
- else if (c < 0xe0) len = 2;
- else if (c < 0xf0) len = 3;
- else if (c < 0xf5) len = 4;
- else { len = 0; return EOF; }
+ else if (c < 0xc2) { kpse->st_len = 0; return EOF; } /* illegal */
+ else if (c < 0xe0) kpse->st_len = 2;
+ else if (c < 0xf0) kpse->st_len = 3;
+ else if (c < 0xf5) kpse->st_len = 4;
+ else { kpse->st_len = 0; return EOF; }
- str = buff;
- *str++ = c;
- len--;
+ kpse->st_str = kpse->st_buff;
+ *(kpse->st_str)++ = c;
+ kpse->st_len--;
return c;
}
+
+int
+kpathsea_IS_KANJI(kpathsea kpse, const char *p)
+{
+ int ret;
+
+ ret = kpse->Is_cp932_system && kpathsea_isknj(kpse, *(p)) &&
+ kpathsea_isknj2(kpse, *(p+1));
+ return ret;
+}
+
+char *
+kpathsea_get_fsyscp_from_wstring(kpathsea kpse, const wchar_t *w,char *mb)
+{
+ return get_mbstring_from_wstring(kpse->File_system_codepage, w, mb);
+}
+
+wchar_t *
+kpathsea_get_wstring_from_fsyscp(kpathsea kpse, const char *mb,wchar_t *w)
+{
+ return get_wstring_from_mbstring(kpse->File_system_codepage, mb, w);
+}
+
+#if defined (KPSE_COMPAT_API)
+
+int
+isknj(int c)
+{
+ return kpathsea_isknj(kpse_def, c);
+}
+
+int
+isknj2(int c)
+{
+ return kpathsea_isknj2(kpse_def, c);
+}
+
+FILE *
+fsyscp_xfopen (const char *filename, const char *mode)
+{
+ return kpathsea_fsyscp_xfopen (kpse_def, filename, mode);
+}
+
+FILE *
+fsyscp_fopen (const char *filename, const char *mode)
+{
+ return kpathsea_fsyscp_fopen (kpse_def, filename, mode);
+}
+
+FILE *
+fsyscp_popen (const char *command, const char *mode)
+{
+ return kpathsea_fsyscp_popen (kpse_def, command, mode);
+}
+
+int
+get_command_line_args_utf8 (const_string enc, int *p_ac, char ***p_av)
+{
+ return kpathsea_get_command_line_args_utf8 (kpse_def, enc, p_ac, p_av);
+}
+
+int
+fsyscp_spawnvp (int mode, const char *command, const char* const *argv)
+{
+ return kpathsea_fsyscp_spawnvp (kpse_def, mode, command, argv);
+}
+
+int
+fsyscp_system (const char *cmd)
+{
+ return kpathsea_fsyscp_system (kpse_def, cmd);
+}
+
+int
+win32_getc(FILE *fp)
+{
+ return kpathsea_win32_getc(kpse_def, fp);
+}
+
+int
+win32_ungetc(int c, FILE *fp)
+{
+ return kpathsea_win32_ungetc(kpse_def, c, fp);
+}
+
+int
+win32_fputs(const char *str, FILE *fp)
+{
+ return kpathsea_win32_fputs(kpse_def, str, fp);
+}
+
+int
+win32_vfprintf(FILE *fp, const char *format, va_list argp)
+{
+ return kpathsea_win32_vfprintf(kpse_def, fp, format, argp);
+}
+
+int
+win32_puts(const char *str)
+{
+ return kpathsea_win32_puts(kpse_def, str);
+}
+
+int
+win32_putc(int c, FILE *fp)
+{
+ return kpathsea_win32_putc(kpse_def, c, fp);
+}
+
+int
+IS_KANJI(const char *p)
+{
+ return kpathsea_IS_KANJI(kpse_def, p);
+}
+
+char *
+get_fsyscp_from_wstring(const wchar_t *w,char *mb)
+{
+ return kpathsea_get_fsyscp_from_wstring(kpse_def, w, mb);
+}
+
+wchar_t *
+get_wstring_from_fsyscp(const char *mb,wchar_t *w)
+{
+ return kpathsea_get_wstring_from_fsyscp(kpse_def, mb, w);
+}
+#endif
Modified: branches/stable/source/src/texk/kpathsea/knj.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/knj.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/knj.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* knj.h: check for 2-Byte Kanji (CP 932, SJIS) codes.
- Copyright 2010, 2014 Akira Kakuto.
+ Copyright 2010, 2014, 2016 Akira Kakuto.
Copyright 2013, 2014 TANAKA Takuji.
This library is free software; you can redistribute it and/or
@@ -23,14 +23,32 @@
extern "C" {
#endif
-extern KPSEDLL int is_cp932_system;
-extern KPSEDLL int file_system_codepage;
+extern KPSEDLL wchar_t* get_wstring_from_mbstring(int cp, const char *mbstr, wchar_t *wstr);
+extern KPSEDLL char* get_mbstring_from_wstring(int cp, const wchar_t *wstr, char *mbstr);
+extern KPSEDLL int kpathsea_isknj(kpathsea kpse, int c);
+extern KPSEDLL int kpathsea_isknj2(kpathsea kpse, int c);
+extern KPSEDLL FILE* kpathsea_fsyscp_xfopen(kpathsea kpse, const char *filename, const char *mode);
+extern KPSEDLL FILE* kpathsea_fsyscp_fopen(kpathsea kpse, const char *filename, const char *mode);
+extern KPSEDLL FILE* kpathsea_fsyscp_popen(kpathsea kpse, const char *command, const char *mode);
+extern KPSEDLL int kpathsea_fsyscp_spawnvp(kpathsea kpse, int mode, const char *command, const char* const *argv);
+extern KPSEDLL int kpathsea_fsyscp_system(kpathsea kpse, const char *cmd);
+extern KPSEDLL int kpathsea_get_command_line_args_utf8(kpathsea kpse, const char *enc, int *p_ac, char ***p_av);
+extern KPSEDLL int kpathsea_win32_getc(kpathsea kpse, FILE *fp);
+extern KPSEDLL int kpathsea_win32_ungetc(kpathsea kpse, int c, FILE *fp);
+extern KPSEDLL int kpathsea_win32_fputs(kpathsea kpse, const char *str, FILE *fp);
+extern KPSEDLL int kpathsea_win32_puts(kpathsea kpse, const char *str);
+extern KPSEDLL int kpathsea_win32_vfprintf(kpathsea kpse, FILE *fp, const char *format, va_list argp);
+extern KPSEDLL int kpathsea_win32_putc(kpathsea kpse, int c, FILE *fp);
+extern KPSEDLL int kpathsea_IS_KANJI(kpathsea kpse, const char *p);
+extern KPSEDLL char *kpathsea_get_fsyscp_from_wstring(kpathsea kpse, const wchar_t *w,char *mb);
+extern KPSEDLL wchar_t *kpathsea_get_wstring_from_fsyscp(kpathsea kpse, const char *mb,wchar_t *w);
+#if defined (KPSE_COMPAT_API)
+#define is_cp932_system kpse_def->Is_cp932_system
+#define file_system_codepage kpse_def->File_system_codepage
+
extern KPSEDLL int isknj(int c);
extern KPSEDLL int isknj2(int c);
-
-extern KPSEDLL wchar_t* get_wstring_from_mbstring(int cp, const char *mbstr, wchar_t *wstr);
-extern KPSEDLL char* get_mbstring_from_wstring(int cp, const wchar_t *wstr, char *mbstr);
extern KPSEDLL FILE* fsyscp_xfopen(const char *filename, const char *mode);
extern KPSEDLL FILE* fsyscp_fopen(const char *filename, const char *mode);
extern KPSEDLL FILE* fsyscp_popen(const char *command, const char *mode);
@@ -43,21 +61,17 @@
extern KPSEDLL int win32_puts(const char *str);
extern KPSEDLL int win32_vfprintf(FILE *fp, const char *format, va_list argp);
extern KPSEDLL int win32_putc(int c, FILE *fp);
-
+extern KPSEDLL int IS_KANJI(const char *p);
+extern KPSEDLL char *get_fsyscp_from_wstring(const wchar_t *w,char *mb);
+extern KPSEDLL wchar_t *get_wstring_from_fsyscp(const char *mb,wchar_t *w);
+#endif
#ifdef __cplusplus
}
#endif
-/* True if P points to a 2-Byte Kanji (CP 932, SJIS) code. */
-#define IS_KANJI(p) is_cp932_system && isknj(*(p)) && isknj2(*(p+1))
-
/* Get wide string from multibyte string in UTF-8 */
#define get_wstring_from_utf8(mb,w) get_wstring_from_mbstring(CP_UTF8,mb,w)
/* Get multibyte string in UTF-8 from wide string */
#define get_utf8_from_wstring(w,mb) get_mbstring_from_wstring(CP_UTF8,w,mb)
-/* Get wide string from multibyte string in file system codepage */
-#define get_wstring_from_fsyscp(mb,w) get_wstring_from_mbstring(file_system_codepage,mb,w)
-/* Get multibyte string in file system codepage from wide string */
-#define get_fsyscp_from_wstring(w,mb) get_mbstring_from_wstring(file_system_codepage,w,mb)
#endif /* not KPATHSEA_KNJ_H */
Modified: branches/stable/source/src/texk/kpathsea/kpsestat.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kpsestat.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/kpsestat.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* kpsestat -- show file permissions of a file in octal form.
- Copyright 2008 Karl Berry.
+ Copyright 2008, 2016 Karl Berry.
Copyright 1997, 2000, 2001, 2005 Olaf Weber.
This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
\n\
--help display this help and exit\n\
--version output version information and exit\n\n", argv[0]);
- fputs ("Email bug reports to tex-k at mail.tug.org.\n", stdout);
+ fputs ("Email bug reports to tex-k at tug.org.\n", stdout);
exit(0);
} else if (argc > 1 && strcmp (argv[1], "--version") == 0) {
printf ("%s (%s)\n\
Modified: branches/stable/source/src/texk/kpathsea/kpsewhich.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kpsewhich.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/kpsewhich.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -30,13 +30,6 @@
#include <kpathsea/variable.h>
#include <kpathsea/version.h>
-#ifdef WIN32
-#undef fputs
-#undef puts
-#define fputs win32_fputs
-#define puts win32_puts
-#endif
-
/* For variable and path expansion. (-expand-var, -expand-path,
-show-path) */
string var_to_expand = NULL;
@@ -272,14 +265,14 @@
We don't reallocate the actual strings, just the list elements.
Perhaps later we will implement wildcards or // or something. */
+#if defined(WIN32)
static string *
-subdir_match (str_list_type subdirs, string *matches)
+kpathsea_subdir_match (kpathsea kpse, str_list_type subdirs, string *matches)
{
string *ret = XTALLOC1 (string);
unsigned len = 1;
unsigned e;
unsigned m;
-#if defined(WIN32)
string p;
for (e = 0; e < STR_LIST_LENGTH (subdirs); e++) {
@@ -286,11 +279,10 @@
for (p = STR_LIST_ELT (subdirs, e); *p; p++) {
if (*p == '\\')
*p = '/';
- else if (IS_KANJI(p))
+ else if (kpathsea_IS_KANJI(kpse, p))
p++;
}
}
-#endif
for (m = 0; matches[m]; m++) {
unsigned loc;
@@ -322,7 +314,46 @@
return ret;
}
+#else /* WIN32 */
+static string *
+subdir_match (str_list_type subdirs, string *matches)
+{
+ string *ret = XTALLOC1 (string);
+ unsigned len = 1;
+ unsigned e;
+ unsigned m;
+ for (m = 0; matches[m]; m++) {
+ unsigned loc;
+ string s = xstrdup (matches[m]);
+ for (loc = strlen (s); loc > 0 && !IS_DIR_SEP_CH (s[loc-1]); loc--)
+ ;
+ while (loc > 0 && IS_DIR_SEP_CH (s[loc-1])) {
+ loc--;
+ }
+ s[loc] = 0; /* wipe out basename */
+
+ for (e = 0; e < STR_LIST_LENGTH (subdirs); e++) {
+ string subdir = STR_LIST_ELT (subdirs, e);
+ unsigned subdir_len = strlen (subdir);
+ while (subdir_len > 0 && IS_DIR_SEP_CH (subdir[subdir_len-1])) {
+ subdir_len--;
+ subdir[subdir_len] = 0; /* remove trailing slashes from subdir spec */
+ }
+ if (FILESTRCASEEQ (subdir, s + loc - subdir_len)) {
+ /* matched, save this one. */
+ XRETALLOC (ret, len + 1, string);
+ ret[len-1] = matches[m];
+ len++;
+ }
+ }
+ free (s);
+ }
+ ret[len-1] = NULL;
+ return ret;
+}
+#endif /* WIN32 */
+
/* Look up a single filename NAME. Return 0 if success, 1 if failure. */
@@ -395,7 +426,11 @@
/* Filter by subdirectories, if specified. */
if (STR_LIST_LENGTH (subdir_paths) > 0) {
+#if defined(WIN32)
+ string *new_list = kpathsea_subdir_match (kpse, subdir_paths, ret_list);
+#else
string *new_list = subdir_match (subdir_paths, ret_list);
+#endif /* WIN32 */
free (ret_list);
ret_list = new_list;
}
@@ -403,7 +438,11 @@
/* Print output. */
if (ret_list) {
for (i = 0; ret_list[i]; i++)
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, ret_list[i]);
+#else
puts (ret_list[i]);
+#endif
/* Save whether we found anything */
ret = ret_list[0];
free (ret_list);
@@ -493,7 +532,11 @@
putchar (':');
for (ext = kpse->format_info[f].suffix; ext && *ext; ext++) {
putchar (' ');
+#ifdef WIN32
+ kpathsea_win32_fputs (kpse, *ext, stdout);
+#else
fputs (*ext, stdout);
+#endif
}
if (kpse->format_info[f].alt_suffix) {
@@ -502,7 +545,11 @@
}
for (ext = kpse->format_info[f].alt_suffix; ext && *ext; ext++) {
putchar (' ');
+#ifdef WIN32
+ kpathsea_win32_fputs (kpse, *ext, stdout);
+#else
fputs (*ext, stdout);
+#endif
}
printf (" [variables: %s]\n", envvar_list);
@@ -720,7 +767,7 @@
enc = "utf-8";
else
enc = kpathsea_var_value (kpse, "command_line_encoding");
- if (get_command_line_args_utf8(enc, &ac, &av)) {
+ if (kpathsea_get_command_line_args_utf8(kpse, enc, &ac, &av)) {
optind = 0;
read_command_line (kpse, ac, av);
argv = av;
@@ -735,15 +782,27 @@
/* Variable expansion. */
if (var_to_expand)
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, kpathsea_var_expand (kpse, var_to_expand));
+#else
puts (kpathsea_var_expand (kpse, var_to_expand));
+#endif
/* Brace expansion. */
if (braces_to_expand)
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, kpathsea_brace_expand (kpse, braces_to_expand));
+#else
puts (kpathsea_brace_expand (kpse, braces_to_expand));
+#endif
/* Path expansion. */
if (path_to_expand)
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, kpathsea_path_expand (kpse, path_to_expand));
+#else
puts (kpathsea_path_expand (kpse, path_to_expand));
+#endif
/* Show a search path. */
if (path_to_show) {
@@ -750,7 +809,11 @@
if (user_format != kpse_last_format) {
if (!kpse->format_info[user_format].type) /* needed if arg was numeric */
kpathsea_init_format (kpse, user_format);
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, kpse->format_info[user_format].path);
+#else
puts (kpse->format_info[user_format].path);
+#endif
} else {
WARNING ("kpsewhich: Cannot show path for unknown file type");
}
@@ -763,7 +826,11 @@
unfound++;
value = "";
}
+#ifdef WIN32
+ kpathsea_win32_puts (kpse, value);
+#else
puts (value);
+#endif
}
if (safe_in_name) {
Modified: branches/stable/source/src/texk/kpathsea/make-suffix.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/make-suffix.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/make-suffix.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* make-suffix.c: unconditionally add a filename suffix.
- Copyright 1992, 1993, 1995, 2008, 2011 Karl Berry.
+ Copyright 1992, 1993, 1995, 2008, 2011, 2016 Karl Berry.
Copyright 2001, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@
dot_pos = NULL;
break;
}
-#if defined(WIN32)
+#if defined(WIN32) && defined(KPSE_COMPAT_API)
else if (IS_KANJI(p))
p++;
#endif
@@ -59,8 +59,10 @@
for (q = new_s; *q; q++) {
if (*q == '\\')
*q = '/';
+#if defined(KPSE_COMPAT_API)
else if (IS_KANJI(q))
q++;
+#endif
}
#endif
Modified: branches/stable/source/src/texk/kpathsea/mktexdir
===================================================================
--- branches/stable/source/src/texk/kpathsea/mktexdir 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/mktexdir 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,12 +1,13 @@
#!/bin/sh
-# mkinstalldirs (now mktexdir) -- make directory hierarchy.
+# mktexdir (was mkinstalldirs) -- make directory hierarchy.
# Author: Noah Friedman <friedman at prep.ai.mit.edu>, created: 1993-05-16.
# Public domain.
#
# Modified for sticky directory creation, --help, --version, more,
# by Thomas Esser, Karl Berry, Olaf Weber, et al.
+# Maintained as part of TeX Live, http://tug.org/tex-live.
-version='$Id: mktexdir 34656 2014-07-18 23:38:50Z karl $'
+version='$Id: mktexdir 42425 2016-11-02 21:34:11Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
# preferentially use subprograms from our own directory.
@@ -50,7 +51,18 @@
pathcomp="$pathcomp$d"
if test ! -d "./$pathcomp"; then
- mkdir "./$pathcomp" || { errstatus=$?; break; }
+ # This shell stuff is not atomic, therefore ./$pathcomp
+ # may have been created in another process and this mkdir will
+ # fail despite the above test, so do it silently:
+ mkdir "./$pathcomp" >/dev/null 2>&1
+
+ # So, if ./$pathcomp is a directory now, call it good.
+ if test ! -d "./$pathcomp"; then
+ # Otherwise, presumably it's a real error. Do the mkdir again
+ # and let the error be seen, and quit the loop.
+ # (Report at https://bugs.debian.org/794228.)
+ mkdir "./$pathcomp" || { errstatus=$?; break; }
+ fi
chmod `kpsestat ${MT_APPEND_MASK} "$pathcomp"/..` "./$pathcomp"
fi
@@ -59,3 +71,6 @@
done
exit $errstatus
+
+# P.S. We don't want to rely on mkdir -p, because of possible
+# portability programs. See current mkinstalldirs source (in Automake).
Modified: branches/stable/source/src/texk/kpathsea/path-elt.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/path-elt.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/path-elt.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* path-elt.c: return the stuff between colons.
- Copyright 1993, 1996 2008 Karl Berry.
+ Copyright 1993, 1996 2008, 2016 Karl Berry.
Copyright 1997, 2001, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@
if (*p == '{') ++brace_level;
else if (*p == '}') --brace_level;
#if defined(WIN32)
- else if (IS_KANJI(p))
+ else if (kpathsea_IS_KANJI(kpse, p))
p++;
#endif
p++;
Modified: branches/stable/source/src/texk/kpathsea/progname.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/progname.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/progname.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* progname.c: the executable name we were invoked as; general initialization.
- Copyright 1994, 1996, 1997, 2008-2013 Karl Berry.
+ Copyright 1994, 1996, 1997, 2008-2013, 2016 Karl Berry.
Copyright 1998-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -501,14 +501,14 @@
}
#if defined(WIN32)
- if (!file_system_codepage)
- file_system_codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();
- cp = file_system_codepage;
+ if (!kpse->File_system_codepage)
+ kpse->File_system_codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();
+ cp = kpse->File_system_codepage;
if (cp == 932 || cp == 936 || cp == 950) {
- is_cp932_system = cp;
+ kpse->Is_cp932_system = cp;
}
else
- is_cp932_system = 0;
+ kpse->Is_cp932_system = 0;
#if defined(__MINGW32__)
/* Set various info about user. Among many things,
@@ -585,7 +585,7 @@
for (fp = path; fp && *fp; fp++)
if (IS_DIR_SEP(*fp)) *fp = DIR_SEP;
#else /* !__MINGW32__ */
- if (getlongpath(path, short_path, PATH_MAX) == 0)
+ if (kpathsea_getlongpath(kpse, path, short_path, PATH_MAX) == 0)
FATAL1("Can't get long name for %s.\n", short_path);
if ((hnd = FindFirstFile(short_path, &ffd)) == INVALID_HANDLE_VALUE)
FATAL1("The following path points to an invalid file : %s\n", path);
Modified: branches/stable/source/src/texk/kpathsea/readable.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/readable.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/readable.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* readable.c: check if a filename is a readable non-directory file.
- Copyright 1993, 1995, 1996, 2008, 2011, 2012 Karl Berry.
+ Copyright 1993, 1995, 1996, 2008, 2011, 2012, 2016 Karl Berry.
Copyright 1998, 1999, 2000, 2001, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -38,10 +38,10 @@
#elif defined (WIN32)
/* st must be an unsigned int under Windows */
static boolean
-READABLE(const_string fn, unsigned int st)
+READABLE(kpathsea kpse, const_string fn, unsigned int st)
{
wchar_t *fnw;
- fnw = get_wstring_from_fsyscp(fn, fnw=NULL);
+ fnw = get_wstring_from_mbstring(kpse->File_system_codepage, fn, fnw=NULL);
if ((st = GetFileAttributesW(fnw)) != 0xFFFFFFFF) {
/* succeeded */
errno = 0;
@@ -82,7 +82,11 @@
#endif
kpathsea_normalize_path (kpse, name);
+#ifdef WIN32
+ if (READABLE (kpse, name, st)) {
+#else
if (READABLE (name, st)) {
+#endif
return name;
#ifdef ENAMETOOLONG
} else if (errno == ENAMETOOLONG) {
@@ -95,7 +99,7 @@
if (c_len <= NAME_MAX)
t = s;
#if defined(WIN32)
- if (IS_KANJI (s)) {
+ if (kpathsea_IS_KANJI (kpse, s)) {
s++;
c_len += 2;
continue;
@@ -118,7 +122,11 @@
/* Perhaps some other error will occur with the truncated name, so
let's call access again. */
+#ifdef WIN32
+ if (READABLE (kpse, name, st)) /* Success. */
+#else
if (READABLE (name, st)) /* Success. */
+#endif
return name;
#endif /* ENAMETOOLONG */
} else { /* Some other error. */
Modified: branches/stable/source/src/texk/kpathsea/tex-file.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/tex-file.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/tex-file.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* tex-file.c: high-level file searching by format.
Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011
- 2012, 2014 Karl Berry.
+ 2012, 2014, 2016 Karl Berry.
Copyright 1998-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -771,7 +771,8 @@
break;
case kpse_opentype_format:
INIT_FORMAT ("opentype fonts", DEFAULT_OPENTYPEFONTS, OPENTYPE_ENVS);
- SUFFIXES (".otf");
+#define OPENTYPE_SUFFIXES ".otf", ".OTF"
+ SUFFIXES (OPENTYPE_SUFFIXES);
FMT_INFO.suffix_search_only = true;
FMT_INFO.binmode = true;
break;
@@ -1304,7 +1305,7 @@
pp = kpse->suffixlist;
if (pp && q) {
while (*pp) {
- if (strchr (fname, ':') || !strcmp (q, *pp)) {
+ if (!strcmp (q, *pp)) {
if (!silent)
fprintf (stderr, "\n%s: Forbidden to open for writing\n", fname);
free (base);
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf 2017-02-16 16:38:15 UTC (rev 766)
@@ -568,7 +568,6 @@
gregorio,\
kpsewhich,\
makeindex,\
-mpost,\
repstopdf,\
% we'd like to allow:
@@ -778,10 +777,10 @@
% BibTeX only (max_strings also determines hash_size and hash_prime).
ent_str_size = 250
glob_str_size = 20000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
+max_strings.bibtex = 100000
+max_strings.bibtex8 = 100000
+max_strings.bibtexu = 100000
+max_strings.pbibtex = 100000
% GFtype only.
line_length.gftype = 500
Modified: branches/stable/source/src/texk/kpathsea/tilde.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/tilde.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/tilde.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,7 +1,7 @@
/* tilde.c: expand user's home directories.
Copyright 1997, 1998, 2005, Olaf Weber.
- Copyright 1993, 1995, 1996, 1997, 2008, 2011 Karl Berry.
+ Copyright 1993, 1995, 1996, 1997, 2008, 2011, 2016 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -88,7 +88,7 @@
c = 2;
while (!IS_DIR_SEP (name[c]) && name[c] != 0) { /* find user name */
#if defined(WIN32)
- if (IS_KANJI(name+c))
+ if (kpathsea_IS_KANJI(kpse, name+c))
c++;
#endif
c++;
@@ -130,7 +130,7 @@
for (q = home; *q; q++) {
if (IS_DIR_SEP (*q) && q[1] == 0)
c++;
- else if (IS_KANJI(q))
+ else if (kpathsea_IS_KANJI(kpse, q))
q++;
}
#else
@@ -146,7 +146,7 @@
for (p = expansion; *p; p++) {
if (*p == '\\')
*p = '/';
- else if (IS_KANJI(p))
+ else if (kpathsea_IS_KANJI(kpse, p))
p++;
}
#endif
Modified: branches/stable/source/src/texk/kpathsea/types.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/types.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/types.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* types.h: general types for kpathsea.
- Copyright 1993, 1995, 1996, 2005, 2008-2014 Karl Berry.
+ Copyright 1993, 1995, 1996, 2005, 2008-2014, 2016 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -292,6 +292,16 @@
struct passwd the_passwd;
int __system_allow_multiple_cmds;
#endif /* WIN32 && !__MINGW32__ */
+#if defined(WIN32)
+ int Is_cp932_system;
+ int File_system_codepage;
+ int getc_len;
+ int getc_buff[4];
+ wchar_t wcbuf;
+ int st_len;
+ char st_buff[5];
+ char *st_str;
+#endif
} kpathsea_instance;
/* these come from kpathsea.c */
Modified: branches/stable/source/src/texk/kpathsea/variable.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/variable.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/variable.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* variable.c: variable expansion.
- Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2012 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2012, 2016 Karl Berry.
Copyright 1997, 1999, 2001, 2002, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -222,7 +222,7 @@
while (*var_end && !IS_VAR_END_DELIMITER (*var_end)) {
#if defined(WIN32)
- if (IS_KANJI(var_end))
+ if (kpathsea_IS_KANJI(kpse, var_end))
var_end++;
#endif
var_end++;
Modified: branches/stable/source/src/texk/kpathsea/version.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/version.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/version.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 39950 2016-03-06 21:56:59Z karl $
+dnl $Id: version.ac 41571 2016-06-29 23:09:13Z karl $
dnl Copyright 2016 Karl Berry <tex-live at tug.org>
dnl Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -20,4 +20,4 @@
dnl --------------------------------------------------------
dnl
dnl this file is m4-included from configure.ac
-m4_define([kpse_version], [6.2.2])
+m4_define([kpse_version], [6.2.3/dev])
Modified: branches/stable/source/src/texk/kpathsea/win32lib.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32lib.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/win32lib.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -172,7 +172,7 @@
1 if succeeded
*/
-int getlongpath(char *buff, char *input, int len)
+int kpathsea_getlongpath(kpathsea kpse, char *buff, char *input, int len)
{
HANDLE hnd;
WIN32_FIND_DATA ffd;
@@ -202,7 +202,7 @@
p += 2;
r += 2;
while(*p != '\\' && *p) {
- if (IS_KANJI(p)) {
+ if (kpathsea_IS_KANJI(kpse, p)) {
cnt++;
if(cnt > len) return 0;
*r++ = *p++;
@@ -216,7 +216,7 @@
*r++ = '/';
if(*p) p++;
while(*p != '\\' && *p) {
- if (IS_KANJI(p)) {
+ if (kpathsea_IS_KANJI(kpse, p)) {
cnt++;
if(cnt > len) return 0;
*r++ = *p++;
@@ -244,7 +244,7 @@
}
for( ; *p; p++) {
- if(IS_KANJI(p)) {
+ if(kpathsea_IS_KANJI(kpse, p)) {
p++;
continue;
}
@@ -292,7 +292,7 @@
/* Sync'ed with Emacs 19.34.6 by Marc Paquette <marcpa at cam.org> */
/* Adapted to fpTeX 0.4 by Fabrice Popineau <Fabrice.Popineau at supelec.fr> */
-char * get_home_directory()
+char * kpathsea_get_home_directory(kpathsea kpse)
{
char *p;
char *home = getenv("HOME");
@@ -301,7 +301,7 @@
if(home) {
home = xstrdup(home);
for(p = home; *p; p++) {
- if(IS_KANJI(p)) {
+ if(kpathsea_IS_KANJI(kpse, p)) {
p++;
continue;
}
@@ -360,7 +360,7 @@
/* Ensure HOME and SHELL are defined. */
- home = get_home_directory();
+ home = kpathsea_get_home_directory(kpse);
if (home) {
putenv(concat("HOME=", home));
}
@@ -381,7 +381,7 @@
}
/* Set dir and shell from environment variables. */
- strcpy (kpse->the_passwd.pw_dir, get_home_directory());
+ strcpy (kpse->the_passwd.pw_dir, kpathsea_get_home_directory(kpse));
strcpy (kpse->the_passwd.pw_shell, getenv ("SHELL"));
}
@@ -424,6 +424,16 @@
}
#if defined (KPSE_COMPAT_API)
+int getlongpath(char *buff, char *input, int len)
+{
+ return kpathsea_getlongpath(kpse_def, buff, input, len);
+}
+
+char * get_home_directory(void)
+{
+ return kpathsea_get_home_directory(kpse_def);
+}
+
int
getuid (void)
{
Modified: branches/stable/source/src/texk/kpathsea/win32lib.h
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32lib.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/win32lib.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -275,8 +275,13 @@
extern KPSEDLL int system(const char * cmd);
extern KPSEDLL void texlive_gs_init(void);
+extern KPSEDLL int kpathsea_getlongpath (kpathsea kpse, char *output, char *input, int len);
+extern KPSEDLL char *kpathsea_get_home_directory (kpathsea kpse);
+
+#if defined (KPSE_COMPAT_API)
extern KPSEDLL int getlongpath (char *output, char *input, int len);
extern KPSEDLL char *get_home_directory (void);
+#endif
#define off_t __int64
#define xfseeko xfseek64
Modified: branches/stable/source/src/texk/kpathsea/xbasename.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/xbasename.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/xbasename.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* xbasename.c: return the last element in a path.
- Copyright 1992, 1994, 1995, 1996, 2008, 2011 Karl Berry.
+ Copyright 1992, 1994, 1995, 1996, 2008, 2011, 2016 Karl Berry.
Copyright 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -38,13 +38,13 @@
unsigned limit;
for (limit = 2; name[limit] && !IS_DIR_SEP (name[limit]); limit++)
-#if defined(WIN32)
+#if defined(WIN32) && defined (KPSE_COMPAT_API)
if (IS_KANJI(name+limit)) limit++
#endif
;
if (name[limit++] && name[limit] && !IS_DIR_SEP (name[limit])) {
for (; name[limit] && !IS_DIR_SEP (name[limit]); limit++)
-#if defined(WIN32)
+#if defined(WIN32) && defined (KPSE_COMPAT_API)
if (IS_KANJI(name+limit)) limit++
#endif
;
@@ -57,7 +57,7 @@
for (p = base; *p; p++) {
if (IS_DIR_SEP(*p))
base = p + 1;
-#if defined(WIN32)
+#if defined(WIN32) && defined (KPSE_COMPAT_API)
else if (IS_KANJI(p))
p++;
#endif
Modified: branches/stable/source/src/texk/kpathsea/xdirname.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/xdirname.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/xdirname.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* xdirname.c: return the directory part of a path.
- Copyright 1999, 2008, 2011 Karl Berry.
+ Copyright 1999, 2008, 2011, 2016 Karl Berry.
Copyright 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -43,13 +43,13 @@
limit = 2;
} else if (IS_UNC_NAME(name)) {
for (limit = 2; name[limit] && !IS_DIR_SEP (name[limit]); limit++)
-#if defined(WIN32)
+#if defined(WIN32) && defined(KPSE_COMPAT_API)
if (IS_KANJI(name+limit)) limit++
#endif
;
if (name[limit++] && name[limit] && !IS_DIR_SEP (name[limit])) {
for (; name[limit] && !IS_DIR_SEP (name[limit]); limit++)
-#if defined(WIN32)
+#if defined(WIN32) && defined(KPSE_COMPAT_API)
if (IS_KANJI(name+limit)) limit++
#endif
;
@@ -68,7 +68,10 @@
for (i++; IS_DIR_SEP (name[i]); i++)
;
loc = i + 1;
- } else if (IS_KANJI(name+i)) i++;
+ }
+#if defined (KPSE_COMPAT_API)
+ else if (IS_KANJI(name+i)) i++;
+#endif
}
#else
for (loc = strlen (name); loc > limit && !IS_DIR_SEP (name[loc-1]); loc--)
@@ -107,8 +110,10 @@
for (p = ret; *p; p++) {
if (*p == '\\')
*p = '/';
+#if defined (KPSE_COMPAT_API)
else if (IS_KANJI(p))
p++;
+#endif
}
#endif
Modified: branches/stable/source/src/texk/kpathsea/xdirtest.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/xdirtest.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/xdirtest.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,6 +3,7 @@
Copyright 1999 Karl Berry.
Copyright 2005 Olaf Weber.
Copyright 2011 Peter Breitenlohner.
+ Copyright 2016 Akira Kakuto.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -100,10 +101,10 @@
}
static void
-do_kanji (void) {
+do_kanji (kpathsea kpse) {
const char **p;
- printf("\nAssuming CP %s 932\n", is_cp932_system ? "is" : "is not");
+ printf("\nAssuming CP %s 932\n", kpse->Is_cp932_system ? "is" : "is not");
for (p = ktab; *p; p++) {
char *q = to_kanji(*p);
@@ -117,18 +118,18 @@
}
static void
-kanji_test(void) {
- int save_cp932 = is_cp932_system;
+kanji_test(kpathsea kpse) {
+ int save_cp932 = kpse->Is_cp932_system;
printf("\nTesting 2-Byte Kanji (CP 932, SJIS) codes with 'K' representing 0x81\n");
- is_cp932_system = 932; /* pretend CP is 932 */
- do_kanji();
+ kpse->Is_cp932_system = 932; /* pretend CP is 932 */
+ do_kanji(kpse);
- is_cp932_system = 0; /* pretend CP is not 932 */
- do_kanji();
+ kpse->Is_cp932_system = 0; /* pretend CP is not 932 */
+ do_kanji(kpse);
- is_cp932_system = save_cp932;
+ kpse->Is_cp932_system = save_cp932;
}
#endif
@@ -150,7 +151,7 @@
}
#if defined (WIN32)
- kanji_test();
+ kanji_test(kpse);
#endif
return 0;
Modified: branches/stable/source/src/texk/kpathsea/xgetcwd.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/xgetcwd.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/kpathsea/xgetcwd.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
/* xgetcwd.c: a from-scratch version of getwd. Ideas from tcsh 5.20 source.
- Copyright 1992, 1994, 1996, 2008, 2011 Karl Berry.
+ Copyright 1992, 1994, 1996, 2008, 2011, 2016 Karl Berry.
Copyright 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
xchdir (string dirname)
{
if (chdir(dirname) != 0)
- _PERROR(dirname);
+ FATAL_PERROR(dirname);
}
#endif /* (not HAVE_GETCWD || GETCWD_FORKS) && not HAVE_GETWD */
@@ -61,8 +61,10 @@
for (pp = path; *pp; pp++) {
if (*pp == '\\')
*pp = '/';
+#if defined (KPSE_COMPAT_API)
else if (IS_KANJI(pp))
pp++;
+#endif
}
#endif
Modified: branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,7 +5,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 40652 $';
+my $svnrev = '$Revision: 41437 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -58,9 +58,6 @@
# Generally not tested.
$MinRelease = 2016;
-# users can NOT upgrade due to internal changes, force a full installation
-#$MinRelease = $ReleaseYear;
-
# Meta Categories do not ship files, but only call for other packages.
our @MetaCategories = qw/Collection Scheme/;
our $MetaCategoriesRegexp = '(Collection|Scheme)';
Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 41175 $';
+my $svnrev = '$Revision: 41618 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2755,14 +2755,15 @@
my @lines = ();
my $usermode = $tlpdb->setting( "usertree" );
if (-r "$root/$headfile") {
- # we might be in user mode and do *not* want that the generation
- # of the configuration file just boils out.
open (INFILE, "<$root/$headfile")
|| die "open($root/$headfile) failed, but -r ok: $!";
@lines = <INFILE>;
close (INFILE);
- } else {
- die ("Giving up.") if (!$usermode);
+ } elsif (!$usermode) {
+ # we might be in user mode and then do *not* want the generation
+ # of the configuration file to just bail out.
+ tldie ("TLUtils::_create_config_files: giving up, unreadable: "
+ . "$root/$headfile\n")
}
push @lines, @$tlpdblinesref;
if (defined($localconf) && -r $localconf) {
@@ -2959,28 +2960,26 @@
}
-=item C<push_uniq(\@list, @items)>
+=item C<push_uniq(\@list, @new_items)>
-The C<push_uniq> function pushes the last elements on the list referenced
-by the first argument.
+The C<push_uniq> function pushes the last argument @ITEMS to the $LIST
+referenced by the first argument, if they are not already in the list.
=cut
sub push_uniq {
- # can't we use $l as a reference, and then use my? later ...
- local (*l, @le) = @_;
- foreach my $e (@le) {
- if (! &member($e, @l)) {
- push @l, $e;
+ my ($l, @new_items) = @_;
+ for my $e (@new_items) {
+ if (! &member($e, @$l)) {
+ push (@$l, $e);
}
}
}
-
=item C<member($item, @list)>
-The C<member> function returns true if the the first argument is contained
-in the list of the remaining arguments.
+The C<member> function returns true if the first argument
+is also inclued in the list of the remaining arguments.
=cut
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,23 @@
+2017-02-09 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * Makefile.am: Sync with the LuaTeX upstream.
+
+2017-01-28 Karl Berry <karl at freefriends.org>
+
+ * tex.ch (texarray),
+ * mf.ch (texarray): don't mention nonexistent pool files in error.
+ Thread from http://tug.org/pipermail/tex-live/2017-January/039647.html.
+
+2016-11-14 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * texmfmp.h: Change a condition to support new primitives in
+ eptex and euptex.
+
+2016-11-05 Karl Berry <karl at tug.org>
+
+ * help.h (CWEAVEHELP) <-x>: mention section names,
+ since that is what is actually omitted. Report from Igor Liferenko.
+
2016-05-20 Karl Berry <karl at tug.org>
* TeX Live 2016 release.
Modified: branches/stable/source/src/texk/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.am 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/Makefile.am 2017-02-16 16:38:15 UTC (rev 766)
@@ -227,6 +227,7 @@
include $(srcdir)/luatexdir/am/libunilib.am
include $(srcdir)/luatexdir/am/luafontforge.am
include $(srcdir)/luatexdir/am/libluatex.am
+include $(srcdir)/luatexdir/am/luaffi.am
include $(srcdir)/luatexdir/am/luatex.am
## XeTeX
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2017-02-16 16:38:15 UTC (rev 766)
@@ -475,9 +475,17 @@
libkanji_a_LIBADD =
am_libkanji_a_OBJECTS = ptexdir/libkanji_a-kanji.$(OBJEXT)
libkanji_a_OBJECTS = $(am_libkanji_a_OBJECTS)
+libluaffi_a_AR = $(AR) $(ARFLAGS)
+libluaffi_a_LIBADD =
+am__objects_1 = luatexdir/luaffi/libluaffi_a-call.$(OBJEXT) \
+ luatexdir/luaffi/libluaffi_a-ctype.$(OBJEXT) \
+ luatexdir/luaffi/libluaffi_a-ffi.$(OBJEXT) \
+ luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT)
+nodist_libluaffi_a_OBJECTS = $(am__objects_1)
+libluaffi_a_OBJECTS = $(nodist_libluaffi_a_OBJECTS)
libluajitmisc_a_AR = $(AR) $(ARFLAGS)
libluajitmisc_a_LIBADD =
-am__objects_1 = \
+am__objects_2 = \
luatexdir/luafilesystem/src/libluajitmisc_a-lfs.$(OBJEXT) \
luatexdir/luamd5/libluajitmisc_a-md5.$(OBJEXT) \
luatexdir/luamd5/libluajitmisc_a-md5lib.$(OBJEXT) \
@@ -492,11 +500,11 @@
luatexdir/luazlib/libluajitmisc_a-lgzip.$(OBJEXT) \
luatexdir/luazlib/libluajitmisc_a-lzlib.$(OBJEXT) \
luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT)
-nodist_libluajitmisc_a_OBJECTS = $(am__objects_1)
+nodist_libluajitmisc_a_OBJECTS = $(am__objects_2)
libluajitmisc_a_OBJECTS = $(nodist_libluajitmisc_a_OBJECTS)
libluajitsocket_a_AR = $(AR) $(ARFLAGS)
libluajitsocket_a_LIBADD =
-am__objects_2 = \
+am__objects_3 = \
luatexdir/luasocket/src/libluajitsocket_a-auxiliar.$(OBJEXT) \
luatexdir/luasocket/src/libluajitsocket_a-buffer.$(OBJEXT) \
luatexdir/luasocket/src/libluajitsocket_a-except.$(OBJEXT) \
@@ -512,13 +520,13 @@
luatexdir/luasocket/src/libluajitsocket_a-tcp.$(OBJEXT) \
luatexdir/luasocket/src/libluajitsocket_a-timeout.$(OBJEXT) \
luatexdir/luasocket/src/libluajitsocket_a-udp.$(OBJEXT)
-nodist_libluajitsocket_a_OBJECTS = $(am__objects_2)
+nodist_libluajitsocket_a_OBJECTS = $(am__objects_3)
libluajitsocket_a_OBJECTS = $(nodist_libluajitsocket_a_OBJECTS)
libluajittex_a_AR = $(AR) $(ARFLAGS)
libluajittex_a_LIBADD =
dist_libluajittex_a_OBJECTS = \
luatexdir/lua/libluajittex_a-lstrlibextjit.$(OBJEXT)
-am__objects_3 = luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT) \
+am__objects_4 = luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT) \
luatexdir/luafontloader/src/libluajittex_a-luafflib.$(OBJEXT) \
luatexdir/lua/libluajittex_a-lcallbacklib.$(OBJEXT) \
luatexdir/lua/libluajittex_a-lfontlib.$(OBJEXT) \
@@ -539,7 +547,7 @@
luatexdir/lua/libluajittex_a-lnewtokenlib.$(OBJEXT) \
luatexdir/utils/libluajittex_a-avl.$(OBJEXT) \
synctexdir/libluajittex_a-synctex.$(OBJEXT)
-am__objects_4 = libluajittex_a-dvigen.$(OBJEXT) \
+am__objects_5 = libluajittex_a-dvigen.$(OBJEXT) \
libluajittex_a-dofont.$(OBJEXT) \
libluajittex_a-luafont.$(OBJEXT) \
libluajittex_a-mapfile.$(OBJEXT) libluajittex_a-pkin.$(OBJEXT) \
@@ -630,13 +638,13 @@
libluajittex_a-utils.$(OBJEXT) \
libluajittex_a-unistring.$(OBJEXT)
nodist_libluajittex_a_OBJECTS = libluajittex_a-luajitstuff.$(OBJEXT) \
- libluajittex_a-texluajitc.$(OBJEXT) $(am__objects_3) \
- $(am__objects_4)
+ libluajittex_a-texluajitc.$(OBJEXT) $(am__objects_4) \
+ $(am__objects_5)
libluajittex_a_OBJECTS = $(dist_libluajittex_a_OBJECTS) \
$(nodist_libluajittex_a_OBJECTS)
libluamisc_a_AR = $(AR) $(ARFLAGS)
libluamisc_a_LIBADD =
-am__objects_5 = \
+am__objects_6 = \
luatexdir/luafilesystem/src/libluamisc_a-lfs.$(OBJEXT) \
luatexdir/luamd5/libluamisc_a-md5.$(OBJEXT) \
luatexdir/luamd5/libluamisc_a-md5lib.$(OBJEXT) \
@@ -651,11 +659,11 @@
luatexdir/luazlib/libluamisc_a-lgzip.$(OBJEXT) \
luatexdir/luazlib/libluamisc_a-lzlib.$(OBJEXT) \
luatexdir/slnunicode/libluamisc_a-slnunico.$(OBJEXT)
-nodist_libluamisc_a_OBJECTS = $(am__objects_5)
+nodist_libluamisc_a_OBJECTS = $(am__objects_6)
libluamisc_a_OBJECTS = $(nodist_libluamisc_a_OBJECTS)
libluasocket_a_AR = $(AR) $(ARFLAGS)
libluasocket_a_LIBADD =
-am__objects_6 = \
+am__objects_7 = \
luatexdir/luasocket/src/libluasocket_a-auxiliar.$(OBJEXT) \
luatexdir/luasocket/src/libluasocket_a-buffer.$(OBJEXT) \
luatexdir/luasocket/src/libluasocket_a-except.$(OBJEXT) \
@@ -671,13 +679,13 @@
luatexdir/luasocket/src/libluasocket_a-tcp.$(OBJEXT) \
luatexdir/luasocket/src/libluasocket_a-timeout.$(OBJEXT) \
luatexdir/luasocket/src/libluasocket_a-udp.$(OBJEXT)
-nodist_libluasocket_a_OBJECTS = $(am__objects_6)
+nodist_libluasocket_a_OBJECTS = $(am__objects_7)
libluasocket_a_OBJECTS = $(nodist_libluasocket_a_OBJECTS)
libluatex_a_AR = $(AR) $(ARFLAGS)
libluatex_a_LIBADD =
dist_libluatex_a_OBJECTS = \
luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT)
-am__objects_7 = \
+am__objects_8 = \
luatexdir/luafontloader/src/libluatex_a-ffdummies.$(OBJEXT) \
luatexdir/luafontloader/src/libluatex_a-luafflib.$(OBJEXT) \
luatexdir/lua/libluatex_a-lcallbacklib.$(OBJEXT) \
@@ -699,7 +707,7 @@
luatexdir/lua/libluatex_a-lnewtokenlib.$(OBJEXT) \
luatexdir/utils/libluatex_a-avl.$(OBJEXT) \
synctexdir/libluatex_a-synctex.$(OBJEXT)
-am__objects_8 = libluatex_a-dvigen.$(OBJEXT) \
+am__objects_9 = libluatex_a-dvigen.$(OBJEXT) \
libluatex_a-dofont.$(OBJEXT) libluatex_a-luafont.$(OBJEXT) \
libluatex_a-mapfile.$(OBJEXT) libluatex_a-pkin.$(OBJEXT) \
libluatex_a-sfnt.$(OBJEXT) libluatex_a-subfont.$(OBJEXT) \
@@ -759,8 +767,8 @@
libluatex_a-managed-sa.$(OBJEXT) libluatex_a-utils.$(OBJEXT) \
libluatex_a-unistring.$(OBJEXT)
nodist_libluatex_a_OBJECTS = libluatex_a-luastuff.$(OBJEXT) \
- libluatex_a-texluac.$(OBJEXT) $(am__objects_7) \
- $(am__objects_8)
+ libluatex_a-texluac.$(OBJEXT) $(am__objects_8) \
+ $(am__objects_9)
libluatex_a_OBJECTS = $(dist_libluatex_a_OBJECTS) \
$(nodist_libluatex_a_OBJECTS)
libmd5_a_AR = $(AR) $(ARFLAGS)
@@ -769,16 +777,16 @@
libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
libmf_a_AR = $(AR) $(ARFLAGS)
libmf_a_LIBADD =
-am__objects_9 = mfini.$(OBJEXT) mf0.$(OBJEXT)
-nodist_libmf_a_OBJECTS = $(am__objects_9) mf-pool.$(OBJEXT)
+am__objects_10 = mfini.$(OBJEXT) mf0.$(OBJEXT)
+nodist_libmf_a_OBJECTS = $(am__objects_10) mf-pool.$(OBJEXT)
libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
libmflua_a_AR = $(AR) $(ARFLAGS)
libmflua_a_LIBADD =
dist_libmflua_a_OBJECTS = luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT) \
mfluadir/libmflua_a-mfluac.$(OBJEXT)
-am__objects_10 = libmflua_a-mfluaini.$(OBJEXT) \
+am__objects_11 = libmflua_a-mfluaini.$(OBJEXT) \
libmflua_a-mflua0.$(OBJEXT)
-nodist_libmflua_a_OBJECTS = $(am__objects_10) \
+nodist_libmflua_a_OBJECTS = $(am__objects_11) \
libmflua_a-mflua-pool.$(OBJEXT)
libmflua_a_OBJECTS = $(dist_libmflua_a_OBJECTS) \
$(nodist_libmflua_a_OBJECTS)
@@ -787,27 +795,27 @@
dist_libmfluajit_a_OBJECTS = \
luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT) \
mfluadir/libmfluajit_a-mfluac.$(OBJEXT)
-am__objects_11 = libmfluajit_a-mfluajitini.$(OBJEXT) \
+am__objects_12 = libmfluajit_a-mfluajitini.$(OBJEXT) \
libmfluajit_a-mfluajit0.$(OBJEXT)
-nodist_libmfluajit_a_OBJECTS = $(am__objects_11) \
+nodist_libmfluajit_a_OBJECTS = $(am__objects_12) \
libmfluajit_a-mfluajit-pool.$(OBJEXT)
libmfluajit_a_OBJECTS = $(dist_libmfluajit_a_OBJECTS) \
$(nodist_libmfluajit_a_OBJECTS)
libmplib_a_AR = $(AR) $(ARFLAGS)
libmplib_a_LIBADD =
-am__objects_12 = libmplib_a-mp.$(OBJEXT)
-am__objects_13 = libmplib_a-mpmath.$(OBJEXT)
-am__objects_14 = libmplib_a-mpmathbinary.$(OBJEXT)
-am__objects_15 = libmplib_a-mpmathdecimal.$(OBJEXT)
-am__objects_16 = libmplib_a-mpmathdouble.$(OBJEXT)
-am__objects_17 = libmplib_a-mpstrings.$(OBJEXT)
-am__objects_18 = libmplib_a-pngout.$(OBJEXT)
-am__objects_19 = libmplib_a-psout.$(OBJEXT)
-am__objects_20 = libmplib_a-svgout.$(OBJEXT)
+am__objects_13 = libmplib_a-mp.$(OBJEXT)
+am__objects_14 = libmplib_a-mpmath.$(OBJEXT)
+am__objects_15 = libmplib_a-mpmathbinary.$(OBJEXT)
+am__objects_16 = libmplib_a-mpmathdecimal.$(OBJEXT)
+am__objects_17 = libmplib_a-mpmathdouble.$(OBJEXT)
+am__objects_18 = libmplib_a-mpstrings.$(OBJEXT)
+am__objects_19 = libmplib_a-pngout.$(OBJEXT)
+am__objects_20 = libmplib_a-psout.$(OBJEXT)
+am__objects_21 = libmplib_a-svgout.$(OBJEXT)
nodist_libmplib_a_OBJECTS = libmplib_a-tfmin.$(OBJEXT) \
- $(am__objects_12) $(am__objects_13) $(am__objects_14) \
- $(am__objects_15) $(am__objects_16) $(am__objects_17) \
- $(am__objects_18) $(am__objects_19) $(am__objects_20)
+ $(am__objects_13) $(am__objects_14) $(am__objects_15) \
+ $(am__objects_16) $(am__objects_17) $(am__objects_18) \
+ $(am__objects_19) $(am__objects_20) $(am__objects_21)
libmplib_a_OBJECTS = $(nodist_libmplib_a_OBJECTS)
libmputil_a_AR = $(AR) $(ARFLAGS)
libmputil_a_LIBADD =
@@ -829,7 +837,7 @@
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
pdftexdir/regex/regex.c pdftexdir/regex/regex.h
- at MINGW32_TRUE@am__objects_21 = \
+ at MINGW32_TRUE@am__objects_22 = \
@MINGW32_TRUE@ pdftexdir/regex/libpdftex_a-regex.$(OBJEXT)
am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
pdftexdir/libpdftex_a-avlstuff.$(OBJEXT) \
@@ -850,13 +858,13 @@
pdftexdir/libpdftex_a-writet1.$(OBJEXT) \
pdftexdir/libpdftex_a-writet3.$(OBJEXT) \
pdftexdir/libpdftex_a-writettf.$(OBJEXT) \
- pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_21)
+ pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_22)
libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
libsynctex_a_AR = $(AR) $(ARFLAGS)
libsynctex_a_LIBADD =
-am__objects_22 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
+am__objects_23 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
-nodist_libsynctex_a_OBJECTS = $(am__objects_22)
+nodist_libsynctex_a_OBJECTS = $(am__objects_23)
libsynctex_a_OBJECTS = $(nodist_libsynctex_a_OBJECTS)
libukanji_a_AR = $(AR) $(ARFLAGS)
libukanji_a_LIBADD =
@@ -897,10 +905,10 @@
xetexdir/XeTeXFontInst_Mac.h xetexdir/XeTeXFontMgr_Mac.mm \
xetexdir/XeTeXFontMgr_Mac.h xetexdir/XeTeX_mac.c \
xetexdir/XeTeXFontMgr_FC.cpp xetexdir/XeTeXFontMgr_FC.h
- at XETEX_MACOSX_TRUE@am__objects_23 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+ at XETEX_MACOSX_TRUE@am__objects_24 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
@XETEX_MACOSX_TRUE@ xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT) \
@XETEX_MACOSX_TRUE@ xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT)
- at XETEX_MACOSX_FALSE@am__objects_24 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
+ at XETEX_MACOSX_FALSE@am__objects_25 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT) \
xetexdir/libxetex_a-XeTeXLayoutInterface.$(OBJEXT) \
@@ -914,8 +922,8 @@
xetexdir/image/libxetex_a-jpegimage.$(OBJEXT) \
xetexdir/image/libxetex_a-mfileio.$(OBJEXT) \
xetexdir/image/libxetex_a-numbers.$(OBJEXT) \
- xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_23) \
- $(am__objects_24)
+ xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_24) \
+ $(am__objects_25)
libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -983,8 +991,8 @@
dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
alephdir/aleph-alephbis.$(OBJEXT) \
alephdir/aleph-alephextra.$(OBJEXT)
-am__objects_25 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_25) aleph-aleph-pool.$(OBJEXT)
+am__objects_26 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_26) aleph-aleph-pool.$(OBJEXT)
aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -1043,12 +1051,12 @@
eptexdir/eptexextra.h eptexdir/eptex_version.h \
synctexdir/synctex.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-eptex.h
- at EPTEX_SYNCTEX_TRUE@am__objects_26 = \
+ at EPTEX_SYNCTEX_TRUE@am__objects_27 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/eptex-synctex.$(OBJEXT)
dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
- $(am__objects_26)
-am__objects_27 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_27) eptex-eptex-pool.$(OBJEXT)
+ $(am__objects_27)
+am__objects_28 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_28) eptex-eptex-pool.$(OBJEXT)
eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
@EPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
@@ -1055,10 +1063,10 @@
etexdir/etex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-etex.h
- at ETEX_SYNCTEX_TRUE@am__objects_28 = synctexdir/etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_28)
-am__objects_29 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_29) etex-etex-pool.$(OBJEXT)
+ at ETEX_SYNCTEX_TRUE@am__objects_29 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_29)
+am__objects_30 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_30) etex-etex-pool.$(OBJEXT)
etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
@ETEX_SYNCTEX_TRUE at am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1067,12 +1075,12 @@
euptexdir/euptexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-euptex.h
- at EUPTEX_SYNCTEX_TRUE@am__objects_30 = \
+ at EUPTEX_SYNCTEX_TRUE@am__objects_31 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/euptex-synctex.$(OBJEXT)
dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
- $(am__objects_30)
-am__objects_31 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
-nodist_euptex_OBJECTS = $(am__objects_31) euptex-euptex-pool.$(OBJEXT)
+ $(am__objects_31)
+am__objects_32 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_32) euptex-euptex-pool.$(OBJEXT)
euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
@EUPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
am_gftodvi_OBJECTS =
@@ -1091,9 +1099,9 @@
nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
initex_OBJECTS = $(nodist_initex_OBJECTS)
initex_DEPENDENCIES =
-am__objects_32 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_33 = luatexdir/luajittex-luatex.$(OBJEXT) \
mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_32)
+nodist_luajittex_OBJECTS = $(am__objects_33)
luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
am__DEPENDENCIES_6 = libmplib.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1104,9 +1112,9 @@
luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \
$(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_33 = luatexdir/luatex-luatex.$(OBJEXT) \
+am__objects_34 = luatexdir/luatex-luatex.$(OBJEXT) \
mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_33)
+nodist_luatex_OBJECTS = $(am__objects_34)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -1133,8 +1141,8 @@
mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_34 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
-nodist_mflua_nowin_OBJECTS = $(am__objects_34)
+am__objects_35 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
+nodist_mflua_nowin_OBJECTS = $(am__objects_35)
mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
mflua_nowin_DEPENDENCIES = libmflua.a $(am__DEPENDENCIES_2) \
$(windowlib) $(am__DEPENDENCIES_7)
@@ -1148,8 +1156,8 @@
mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_35 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
-nodist_mfluajit_nowin_OBJECTS = $(am__objects_35)
+am__objects_36 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
+nodist_mfluajit_nowin_OBJECTS = $(am__objects_36)
mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
mfluajit_nowin_DEPENDENCIES = libmfluajit.a $(am__DEPENDENCIES_2) \
$(windowlib) $(am__DEPENDENCIES_1)
@@ -1161,8 +1169,8 @@
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_36 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_36)
+am__objects_37 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_37)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
mpost_DEPENDENCIES = libmplib.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1194,12 +1202,12 @@
pdftexdir/etex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
- at PDFTEX_SYNCTEX_TRUE@am__objects_37 = \
+ at PDFTEX_SYNCTEX_TRUE@am__objects_38 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT)
dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
- $(am__objects_37)
-am__objects_38 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_38) pdftex-pdftex-pool.$(OBJEXT)
+ $(am__objects_38)
+am__objects_39 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_39) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a
@@ -1226,20 +1234,20 @@
pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
pltotf_LDADD = $(LDADD)
pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_39 = pmpost-pmp.$(OBJEXT)
-am__objects_40 = pmpost-pmpmath.$(OBJEXT)
-am__objects_41 = pmpost-pmpmathbinary.$(OBJEXT)
-am__objects_42 = pmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_43 = pmpost-pmpmathdouble.$(OBJEXT)
-am__objects_44 = pmpost-pmpstrings.$(OBJEXT)
-am__objects_45 = pmpost-pmpxout.$(OBJEXT)
-am__objects_46 = pmpost-ppngout.$(OBJEXT)
-am__objects_47 = pmpost-ppsout.$(OBJEXT)
-am__objects_48 = pmpost-psvgout.$(OBJEXT)
-nodist_pmpost_OBJECTS = $(am__objects_39) $(am__objects_40) \
- $(am__objects_41) $(am__objects_42) $(am__objects_43) \
- pmpost-pmpost.$(OBJEXT) $(am__objects_44) $(am__objects_45) \
- $(am__objects_46) $(am__objects_47) $(am__objects_48) \
+am__objects_40 = pmpost-pmp.$(OBJEXT)
+am__objects_41 = pmpost-pmpmath.$(OBJEXT)
+am__objects_42 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_43 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_44 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_45 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_46 = pmpost-pmpxout.$(OBJEXT)
+am__objects_47 = pmpost-ppngout.$(OBJEXT)
+am__objects_48 = pmpost-ppsout.$(OBJEXT)
+am__objects_49 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_40) $(am__objects_41) \
+ $(am__objects_42) $(am__objects_43) $(am__objects_44) \
+ pmpost-pmpost.$(OBJEXT) $(am__objects_45) $(am__objects_46) \
+ $(am__objects_47) $(am__objects_48) $(am__objects_49) \
pmpost-ptfmin.$(OBJEXT)
pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1257,10 +1265,10 @@
ptexdir/ptex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-ptex.h
- at PTEX_SYNCTEX_TRUE@am__objects_49 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_49)
-am__objects_50 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_50) ptex-ptex-pool.$(OBJEXT)
+ at PTEX_SYNCTEX_TRUE@am__objects_50 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_50)
+am__objects_51 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_51) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
@PTEX_SYNCTEX_TRUE at am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
am_ptftopl_OBJECTS =
@@ -1281,10 +1289,10 @@
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_51 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_51)
-am__objects_52 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_52) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_52 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_52)
+am__objects_53 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_53) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
@TEX_SYNCTEX_TRUE at am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1309,21 +1317,21 @@
nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
$(nodist_updvitype_OBJECTS)
-am__objects_53 = upmpost-pmp.$(OBJEXT)
-am__objects_54 = upmpost-pmpmath.$(OBJEXT)
-am__objects_55 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_56 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_57 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_58 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_59 = upmpost-pmpxout.$(OBJEXT)
-am__objects_60 = upmpost-ppngout.$(OBJEXT)
-am__objects_61 = upmpost-ppsout.$(OBJEXT)
-am__objects_62 = upmpost-psvgout.$(OBJEXT)
-am__objects_63 = $(am__objects_53) $(am__objects_54) $(am__objects_55) \
- $(am__objects_56) $(am__objects_57) upmpost-pmpost.$(OBJEXT) \
- $(am__objects_58) $(am__objects_59) $(am__objects_60) \
- $(am__objects_61) $(am__objects_62) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_63)
+am__objects_54 = upmpost-pmp.$(OBJEXT)
+am__objects_55 = upmpost-pmpmath.$(OBJEXT)
+am__objects_56 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_57 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_58 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_59 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_60 = upmpost-pmpxout.$(OBJEXT)
+am__objects_61 = upmpost-ppngout.$(OBJEXT)
+am__objects_62 = upmpost-ppsout.$(OBJEXT)
+am__objects_63 = upmpost-psvgout.$(OBJEXT)
+am__objects_64 = $(am__objects_54) $(am__objects_55) $(am__objects_56) \
+ $(am__objects_57) $(am__objects_58) upmpost-pmpost.$(OBJEXT) \
+ $(am__objects_59) $(am__objects_60) $(am__objects_61) \
+ $(am__objects_62) $(am__objects_63) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_64)
upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1337,12 +1345,12 @@
uptexdir/uptexextra.h uptexdir/uptex_version.h \
synctexdir/synctex.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-uptex.h
- at UPTEX_SYNCTEX_TRUE@am__objects_64 = \
+ at UPTEX_SYNCTEX_TRUE@am__objects_65 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/uptex-synctex.$(OBJEXT)
dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
- $(am__objects_64)
-am__objects_65 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_65) uptex-uptex-pool.$(OBJEXT)
+ $(am__objects_65)
+am__objects_66 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_66) uptex-uptex-pool.$(OBJEXT)
uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
@UPTEX_SYNCTEX_TRUE at am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
am_uptftopl_OBJECTS =
@@ -1381,12 +1389,12 @@
xetexdir/xetex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_66 = \
+ at XETEX_SYNCTEX_TRUE@am__objects_67 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
- $(am__objects_66)
-am__objects_67 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_67) xetex-xetex-pool.$(OBJEXT)
+ $(am__objects_67)
+am__objects_68 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_68) xetex-xetex-pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
@XETEX_MACOSX_FALSE at am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \
@@ -1469,6 +1477,7 @@
am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
am__v_OBJCXXLD_1 =
SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
+ $(nodist_libluaffi_a_SOURCES) \
$(nodist_libluajitmisc_a_SOURCES) \
$(nodist_libluajitsocket_a_SOURCES) \
$(dist_libluajittex_a_SOURCES) \
@@ -1793,6 +1802,7 @@
$(srcdir)/euptexdir/am/euptex.am $(srcdir)/libmd5/am/md5.am \
$(srcdir)/luatexdir/am/libluatex.am \
$(srcdir)/luatexdir/am/libunilib.am \
+ $(srcdir)/luatexdir/am/luaffi.am \
$(srcdir)/luatexdir/am/luafontforge.am \
$(srcdir)/luatexdir/am/luamisc.am \
$(srcdir)/luatexdir/am/luasocket.am \
@@ -2100,8 +2110,8 @@
EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
libmplib.a libkanji.a libukanji.a libpdftex.a libluasocket.a \
libluajitsocket.a libluamisc.a libluajitmisc.a libunilib.a \
- libff.a libluatex.a libluajittex.a libxetex.a libsynctex.a \
- libmd5.a
+ libff.a libluatex.a libluajittex.a libluaffi.a libxetex.a \
+ libsynctex.a libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
lib_LIBRARIES = $(am__append_109)
lib_LTLIBRARIES = $(am__append_108)
@@ -3166,7 +3176,7 @@
luatexdir/luasocket/src/udp.h \
luatexdir/luasocket/src/usocket.h
-libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a
libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES)
libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
@@ -3501,7 +3511,23 @@
################################################################################
luatex_tex_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle)
luatex_utils_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/utils $(ctangle)
+libluaffi_a_CPPFLAGS = \
+ -I$(top_srcdir)/luatexdir/luaffi -I$(top_srcdir)/luatexdir/luaffi/dynasm $(LUA_INCLUDES)
+libluaffi_a_CFLAGS = # $(WARNING_CFLAGS)
+nodist_libluaffi_a_SOURCES = $(libluaffi_sources)
+libluaffi_sources = \
+ luatexdir/luaffi/call_arm.h \
+ luatexdir/luaffi/call.c \
+ luatexdir/luaffi/call_x64.h \
+ luatexdir/luaffi/call_x64win.h \
+ luatexdir/luaffi/call_x86.h \
+ luatexdir/luaffi/ctype.c \
+ luatexdir/luaffi/ffi.c \
+ luatexdir/luaffi/ffi.h \
+ luatexdir/luaffi/parser.c
+
+
# Force Automake to use CXXLD for linking
nodist_EXTRA_luatex_SOURCES = dummy.cxx
nodist_EXTRA_luajittex_SOURCES = dummy.cxx
@@ -3520,7 +3546,7 @@
$(PIXMAN_LIBS) $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \
$(POPPLER_LIBS) $(LDADD) libmputil.a libunilib.a libmd5.a \
$(lua_socketlibs)
-luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) $(luatex_postldadd)
+luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a libluaffi.a $(LUA_LIBS) $(luatex_postldadd)
luajittex_LDADD = libluajittex.a libff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd)
luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) libmputil.a libmd5.a
luatex_DEPENDENCIES = $(luatex_depend) libluatex.a
@@ -3823,7 +3849,7 @@
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(sr
cdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(
srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -3845,7 +3871,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/
../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(sr
cdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -4075,6 +4101,29 @@
$(AM_V_at)-rm -f libkanji.a
$(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
$(AM_V_at)$(RANLIB) libkanji.a
+luatexdir/luaffi/$(am__dirstamp):
+ @$(MKDIR_P) luatexdir/luaffi
+ @: > luatexdir/luaffi/$(am__dirstamp)
+luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) luatexdir/luaffi/$(DEPDIR)
+ @: > luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaffi/libluaffi_a-call.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaffi/libluaffi_a-ctype.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaffi/libluaffi_a-ffi.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+luatexdir/luaffi/libluaffi_a-parser.$(OBJEXT): \
+ luatexdir/luaffi/$(am__dirstamp) \
+ luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+
+libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libluaffi.a
+ $(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libluaffi.a
luatexdir/luafilesystem/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafilesystem/src
@: > luatexdir/luafilesystem/src/$(am__dirstamp)
@@ -5240,6 +5289,7 @@
-rm -f libmd5/*.$(OBJEXT)
-rm -f luatexdir/*.$(OBJEXT)
-rm -f luatexdir/lua/*.$(OBJEXT)
+ -rm -f luatexdir/luaffi/*.$(OBJEXT)
-rm -f luatexdir/luafilesystem/src/*.$(OBJEXT)
-rm -f luatexdir/luafontloader/fontforge/fontforge/*.$(OBJEXT)
-rm -f luatexdir/luafontloader/fontforge/gutils/*.$(OBJEXT)
@@ -5633,6 +5683,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po at am__quote@
@@ -6455,6 +6509,62 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/libkanji_a-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi`
+luatexdir/luaffi/libluaffi_a-call.o: luatexdir/luaffi/call.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-call.o -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Tpo -c -o luatexdir/luaffi/libluaffi_a-call.o `test -f 'luatexdir/luaffi/call.c' || echo '$(srcdir)/'`luatexdir/luaffi/call.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/call.c' object='luatexdir/luaffi/libluaffi_a-call.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-call.o `test -f 'luatexdir/luaffi/call.c' || echo '$(srcdir)/'`luatexdir/luaffi/call.c
+
+luatexdir/luaffi/libluaffi_a-call.obj: luatexdir/luaffi/call.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-call.obj -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Tpo -c -o luatexdir/luaffi/libluaffi_a-call.obj `if test -f 'luatexdir/luaffi/call.c'; then $(CYGPATH_W) 'luatexdir/luaffi/call.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/call.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/call.c' object='luatexdir/luaffi/libluaffi_a-call.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-call.obj `if test -f 'luatexdir/luaffi/call.c'; then $(CYGPATH_W) 'luatexdir/luaffi/call.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/call.c'; fi`
+
+luatexdir/luaffi/libluaffi_a-ctype.o: luatexdir/luaffi/ctype.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-ctype.o -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Tpo -c -o luatexdir/luaffi/libluaffi_a-ctype.o `test -f 'luatexdir/luaffi/ctype.c' || echo '$(srcdir)/'`luatexdir/luaffi/ctype.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/ctype.c' object='luatexdir/luaffi/libluaffi_a-ctype.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-ctype.o `test -f 'luatexdir/luaffi/ctype.c' || echo '$(srcdir)/'`luatexdir/luaffi/ctype.c
+
+luatexdir/luaffi/libluaffi_a-ctype.obj: luatexdir/luaffi/ctype.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-ctype.obj -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Tpo -c -o luatexdir/luaffi/libluaffi_a-ctype.obj `if test -f 'luatexdir/luaffi/ctype.c'; then $(CYGPATH_W) 'luatexdir/luaffi/ctype.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/ctype.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/ctype.c' object='luatexdir/luaffi/libluaffi_a-ctype.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-ctype.obj `if test -f 'luatexdir/luaffi/ctype.c'; then $(CYGPATH_W) 'luatexdir/luaffi/ctype.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/ctype.c'; fi`
+
+luatexdir/luaffi/libluaffi_a-ffi.o: luatexdir/luaffi/ffi.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-ffi.o -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Tpo -c -o luatexdir/luaffi/libluaffi_a-ffi.o `test -f 'luatexdir/luaffi/ffi.c' || echo '$(srcdir)/'`luatexdir/luaffi/ffi.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/ffi.c' object='luatexdir/luaffi/libluaffi_a-ffi.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-ffi.o `test -f 'luatexdir/luaffi/ffi.c' || echo '$(srcdir)/'`luatexdir/luaffi/ffi.c
+
+luatexdir/luaffi/libluaffi_a-ffi.obj: luatexdir/luaffi/ffi.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-ffi.obj -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Tpo -c -o luatexdir/luaffi/libluaffi_a-ffi.obj `if test -f 'luatexdir/luaffi/ffi.c'; then $(CYGPATH_W) 'luatexdir/luaffi/ffi.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/ffi.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/ffi.c' object='luatexdir/luaffi/libluaffi_a-ffi.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-ffi.obj `if test -f 'luatexdir/luaffi/ffi.c'; then $(CYGPATH_W) 'luatexdir/luaffi/ffi.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/ffi.c'; fi`
+
+luatexdir/luaffi/libluaffi_a-parser.o: luatexdir/luaffi/parser.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-parser.o -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Tpo -c -o luatexdir/luaffi/libluaffi_a-parser.o `test -f 'luatexdir/luaffi/parser.c' || echo '$(srcdir)/'`luatexdir/luaffi/parser.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/parser.c' object='luatexdir/luaffi/libluaffi_a-parser.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-parser.o `test -f 'luatexdir/luaffi/parser.c' || echo '$(srcdir)/'`luatexdir/luaffi/parser.c
+
+luatexdir/luaffi/libluaffi_a-parser.obj: luatexdir/luaffi/parser.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -MT luatexdir/luaffi/libluaffi_a-parser.obj -MD -MP -MF luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Tpo -c -o luatexdir/luaffi/libluaffi_a-parser.obj `if test -f 'luatexdir/luaffi/parser.c'; then $(CYGPATH_W) 'luatexdir/luaffi/parser.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/parser.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Tpo luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/luaffi/parser.c' object='luatexdir/luaffi/libluaffi_a-parser.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluaffi_a_CPPFLAGS) $(CPPFLAGS) $(libluaffi_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luaffi/libluaffi_a-parser.obj `if test -f 'luatexdir/luaffi/parser.c'; then $(CYGPATH_W) 'luatexdir/luaffi/parser.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaffi/parser.c'; fi`
+
luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o: luatexdir/luafilesystem/src/lfs.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitmisc_a_CPPFLAGS) $(CPPFLAGS) $(libluajitmisc_a_CFLAGS) $(CFLAGS) -MT luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o -MD -MP -MF luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Tpo -c -o luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o `test -f 'luatexdir/luafilesystem/src/lfs.c' || echo '$(srcdir)/'`luatexdir/luafilesystem/src/lfs.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Tpo luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po
@@ -13960,6 +14070,8 @@
-rm -f luatexdir/$(am__dirstamp)
-rm -f luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
-rm -f luatexdir/lua/$(am__dirstamp)
+ -rm -f luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+ -rm -f luatexdir/luaffi/$(am__dirstamp)
-rm -f luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
-rm -f luatexdir/luafilesystem/src/$(am__dirstamp)
-rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
@@ -14019,7 +14131,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+ -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luaffi/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -14070,7 +14182,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+ -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luaffi/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -15147,6 +15259,12 @@
unistring.c: ctangle$(EXEEXT) luatexdir/utils/unistring.w
$(luatex_utils_ctangle) unistring.w
+#libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND)
+
+$(libluaffi_a_OBJECTS): $(LUA_DEPEND)
+
+#EXTRA_DIST
+
$(luatex_OBJECTS): libluatex.a
$(luajittex_OBJECTS): libluajittex.a
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2016.
+# Generated by GNU Autoconf 2.69 for Web2C 2017/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2016'
-PACKAGE_STRING='Web2C 2016'
+PACKAGE_VERSION='2017/dev'
+PACKAGE_STRING='Web2C 2017/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1608,7 +1608,7 @@
# 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 Web2C 2016 to adapt to many kinds of systems.
+\`configure' configures Web2C 2017/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1682,7 +1682,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2016:";;
+ short | recursive ) echo "Configuration of Web2C 2017/dev:";;
esac
cat <<\_ACEOF
@@ -1903,7 +1903,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2016
+Web2C configure 2017/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2992,7 +2992,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2016, which was
+It was created by Web2C $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3373,7 +3373,7 @@
-WEB2CVERSION=2016
+WEB2CVERSION=2017/dev
am__api_version='1.15'
@@ -8680,7 +8680,7 @@
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2016'
+ VERSION='2017/dev'
cat >>confdefs.h <<_ACEOF
@@ -22501,7 +22501,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Web2C config.lt 2016
+Web2C config.lt 2017/dev
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -25610,7 +25610,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2016, which was
+This file was extended by Web2C $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25680,7 +25680,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C config.status 2016
+Web2C config.status 2017/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/web2c/ctangleboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot.cin 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/ctangleboot.cin 2017-02-16 16:38:15 UTC (rev 766)
@@ -4,7 +4,7 @@
/*5:*/
#line 35 "cwebdir/common.h"
-#line 121 "cwebdir/ctang-w2c.ch"
+#line 120 "cwebdir/ctang-w2c.ch"
#include <kpathsea/kpathsea.h>
#include <stdio.h>
#line 37 "cwebdir/common.h"
@@ -190,7 +190,7 @@
extern name_pointer hash[];
extern hash_pointer hash_end;
extern hash_pointer h;
-#line 148 "cwebdir/ctang-w2c.ch"
+#line 147 "cwebdir/ctang-w2c.ch"
#include "cwebboot.h"
#line 112 "cwebdir/common.h"
@@ -197,7 +197,7 @@
/*:8*//*9:*/
#line 122 "cwebdir/common.h"
-#line 160 "cwebdir/ctang-w2c.ch"
+#line 159 "cwebdir/ctang-w2c.ch"
extern int history;
#line 128 "cwebdir/common.h"
@@ -204,7 +204,7 @@
/*:9*//*10:*/
#line 137 "cwebdir/common.h"
-#line 174 "cwebdir/ctang-w2c.ch"
+#line 173 "cwebdir/ctang-w2c.ch"
extern int include_depth;
#line 139 "cwebdir/common.h"
extern FILE*file[];
@@ -216,7 +216,7 @@
extern char file_name[][max_file_name_length];
extern char change_file_name[];
-#line 181 "cwebdir/ctang-w2c.ch"
+#line 180 "cwebdir/ctang-w2c.ch"
extern int line[];
extern int change_line;
#line 150 "cwebdir/common.h"
@@ -368,7 +368,7 @@
/*40:*/
#line 533 "cwebdir/ctangle.w"
-#line 283 "cwebdir/ctang-w2c.ch"
+#line 282 "cwebdir/ctang-w2c.ch"
static void phase_two(void);
#line 535 "cwebdir/ctangle.w"
@@ -375,7 +375,7 @@
/*:40*//*45:*/
#line 602 "cwebdir/ctangle.w"
-#line 309 "cwebdir/ctang-w2c.ch"
+#line 308 "cwebdir/ctang-w2c.ch"
static void output_defs(void);
#line 604 "cwebdir/ctangle.w"
@@ -382,7 +382,7 @@
/*:45*//*47:*/
#line 648 "cwebdir/ctangle.w"
-#line 327 "cwebdir/ctang-w2c.ch"
+#line 326 "cwebdir/ctang-w2c.ch"
static void out_char(eight_bits);
#line 650 "cwebdir/ctangle.w"
@@ -389,7 +389,7 @@
/*:47*//*89:*/
#line 1457 "cwebdir/ctangle.w"
-#line 441 "cwebdir/ctang-w2c.ch"
+#line 440 "cwebdir/ctang-w2c.ch"
static void phase_one(void);
#line 1459 "cwebdir/ctangle.w"
@@ -396,7 +396,7 @@
/*:89*//*91:*/
#line 1475 "cwebdir/ctangle.w"
-#line 459 "cwebdir/ctang-w2c.ch"
+#line 458 "cwebdir/ctang-w2c.ch"
static void skip_limbo(void);
#line 1477 "cwebdir/ctangle.w"
@@ -409,7 +409,7 @@
/*:1*//*2:*/
#line 91 "cwebdir/ctangle.w"
-#line 70 "cwebdir/ctang-w2c.ch"
+#line 69 "cwebdir/ctang-w2c.ch"
int main(int ac,char**av)
#line 95 "cwebdir/ctangle.w"
{
@@ -472,7 +472,7 @@
#line 98 "cwebdir/ctangle.w"
;
common_init();
-#line 76 "cwebdir/ctang-w2c.ch"
+#line 75 "cwebdir/ctang-w2c.ch"
if(show_banner){
printf("%s%s\n",banner,versionstring);
}
@@ -485,7 +485,7 @@
/*:2*//*20:*/
#line 183 "cwebdir/ctangle.w"
-#line 207 "cwebdir/ctang-w2c.ch"
+#line 206 "cwebdir/ctang-w2c.ch"
int names_match(name_pointer p,const char*first,int l,char t)
#line 188 "cwebdir/ctangle.w"
{
@@ -497,7 +497,7 @@
#line 198 "cwebdir/ctangle.w"
void
-#line 216 "cwebdir/ctang-w2c.ch"
+#line 215 "cwebdir/ctang-w2c.ch"
init_node(name_pointer node)
#line 202 "cwebdir/ctangle.w"
{
@@ -504,7 +504,7 @@
node->equiv= (char*)text_info;
}
void
-#line 222 "cwebdir/ctang-w2c.ch"
+#line 221 "cwebdir/ctang-w2c.ch"
init_p(name_pointer p,char t){}
#line 207 "cwebdir/ctangle.w"
@@ -511,7 +511,7 @@
/*:21*//*25:*/
#line 260 "cwebdir/ctangle.w"
-#line 232 "cwebdir/ctang-w2c.ch"
+#line 231 "cwebdir/ctang-w2c.ch"
static void
store_two_bytes(sixteen_bits x)
#line 264 "cwebdir/ctangle.w"
@@ -524,7 +524,7 @@
/*:25*//*29:*/
#line 336 "cwebdir/ctangle.w"
-#line 243 "cwebdir/ctang-w2c.ch"
+#line 242 "cwebdir/ctang-w2c.ch"
static void
push_level(name_pointer p)
#line 340 "cwebdir/ctangle.w"
@@ -542,7 +542,7 @@
/*:29*//*30:*/
#line 355 "cwebdir/ctangle.w"
-#line 254 "cwebdir/ctang-w2c.ch"
+#line 253 "cwebdir/ctang-w2c.ch"
static void
pop_level(int flag)
#line 359 "cwebdir/ctangle.w"
@@ -559,7 +559,7 @@
/*:30*//*32:*/
#line 391 "cwebdir/ctangle.w"
-#line 264 "cwebdir/ctang-w2c.ch"
+#line 263 "cwebdir/ctang-w2c.ch"
static void
get_output(void)
#line 394 "cwebdir/ctangle.w"
@@ -608,7 +608,7 @@
/*:32*//*36:*/
#line 481 "cwebdir/ctangle.w"
-#line 274 "cwebdir/ctang-w2c.ch"
+#line 273 "cwebdir/ctang-w2c.ch"
static void
flush_buffer(void)
#line 484 "cwebdir/ctangle.w"
@@ -625,7 +625,7 @@
/*:36*//*41:*/
#line 536 "cwebdir/ctangle.w"
-#line 292 "cwebdir/ctang-w2c.ch"
+#line 291 "cwebdir/ctang-w2c.ch"
static void
phase_two(void){
#line 539 "cwebdir/ctangle.w"
@@ -676,7 +676,7 @@
an_output_file--;
sprint_section_name(output_file_name,*an_output_file);
fclose(C_file);
-#line 301 "cwebdir/ctang-w2c.ch"
+#line 300 "cwebdir/ctang-w2c.ch"
C_file= fopen(output_file_name,"wb");
#line 578 "cwebdir/ctangle.w"
if(C_file==0)fatal("! Cannot open output file:",output_file_name);
@@ -702,7 +702,7 @@
/*:41*//*46:*/
#line 605 "cwebdir/ctangle.w"
-#line 318 "cwebdir/ctang-w2c.ch"
+#line 317 "cwebdir/ctang-w2c.ch"
static void
output_defs(void)
#line 608 "cwebdir/ctangle.w"
@@ -745,7 +745,7 @@
#line 651 "cwebdir/ctangle.w"
static void
-#line 336 "cwebdir/ctang-w2c.ch"
+#line 335 "cwebdir/ctang-w2c.ch"
out_char(eight_bits cur_char)
#line 655 "cwebdir/ctangle.w"
{
@@ -846,7 +846,7 @@
/*:48*//*57:*/
#line 813 "cwebdir/ctangle.w"
-#line 345 "cwebdir/ctang-w2c.ch"
+#line 344 "cwebdir/ctang-w2c.ch"
static eight_bits
skip_ahead(void)
#line 816 "cwebdir/ctangle.w"
@@ -866,7 +866,7 @@
/*:57*//*59:*/
#line 848 "cwebdir/ctangle.w"
-#line 355 "cwebdir/ctang-w2c.ch"
+#line 354 "cwebdir/ctang-w2c.ch"
static int
skip_comment(boolean is_long_comment)
#line 851 "cwebdir/ctangle.w"
@@ -902,7 +902,7 @@
/*:59*//*62:*/
#line 900 "cwebdir/ctangle.w"
-#line 372 "cwebdir/ctang-w2c.ch"
+#line 371 "cwebdir/ctang-w2c.ch"
static eight_bits
get_next(void)
#line 903 "cwebdir/ctangle.w"
@@ -924,7 +924,7 @@
id_loc= id_first+strlen(id_first);
if(changing)store_two_bytes((sixteen_bits)change_line);
else store_two_bytes((sixteen_bits)cur_line);
-#line 409 "cwebdir/ctang-w2c.ch"
+#line 408 "cwebdir/ctang-w2c.ch"
{int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
app_repl(a_l%0400);}
#line 1234 "cwebdir/ctangle.w"
@@ -1023,7 +1023,7 @@
#line 972 "cwebdir/ctangle.w"
{
id_first= --loc;
-#line 389 "cwebdir/ctang-w2c.ch"
+#line 388 "cwebdir/ctang-w2c.ch"
while(isalpha((unsigned char)*++loc)||isdigit((unsigned char)*loc)||isxalpha(*loc)||ishigh(*loc));
#line 975 "cwebdir/ctangle.w"
id_loc= loc;return(identifier);
@@ -1190,7 +1190,7 @@
switch(c){
case'+':if(*loc=='+')compress(plus_plus);break;
case'-':if(*loc=='-'){compress(minus_minus);}
-#line 382 "cwebdir/ctang-w2c.ch"
+#line 381 "cwebdir/ctang-w2c.ch"
else if(*loc=='>'){if(*(loc+1)=='*'){loc++;compress(minus_gt_ast);}
else compress(minus_gt);}break;
#line 956 "cwebdir/ctangle.w"
@@ -1220,7 +1220,7 @@
/*:62*//*75:*/
#line 1199 "cwebdir/ctangle.w"
-#line 399 "cwebdir/ctang-w2c.ch"
+#line 398 "cwebdir/ctang-w2c.ch"
static void
scan_repl(eight_bits t)
#line 1203 "cwebdir/ctangle.w"
@@ -1235,7 +1235,7 @@
id_loc= id_first+strlen(id_first);
if(changing)store_two_bytes((sixteen_bits)change_line);
else store_two_bytes((sixteen_bits)cur_line);
-#line 409 "cwebdir/ctang-w2c.ch"
+#line 408 "cwebdir/ctang-w2c.ch"
{int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
app_repl(a_l%0400);}
#line 1234 "cwebdir/ctangle.w"
@@ -1280,7 +1280,7 @@
id_loc= id_first+strlen(id_first);
if(changing)store_two_bytes((sixteen_bits)change_line);
else store_two_bytes((sixteen_bits)cur_line);
-#line 409 "cwebdir/ctang-w2c.ch"
+#line 408 "cwebdir/ctang-w2c.ch"
{int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
app_repl(a_l%0400);}
#line 1234 "cwebdir/ctangle.w"
@@ -1305,7 +1305,7 @@
id_loc= id_first+strlen(id_first);
if(changing)store_two_bytes((sixteen_bits)change_line);
else store_two_bytes((sixteen_bits)cur_line);
-#line 409 "cwebdir/ctang-w2c.ch"
+#line 408 "cwebdir/ctang-w2c.ch"
{int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200);
app_repl(a_l%0400);}
#line 1234 "cwebdir/ctangle.w"
@@ -1361,7 +1361,7 @@
if(xisdigit(*(id_first+1)))c= *(++id_first)-'0';
else if(xisxdigit(*(id_first+1))){
++id_first;
-#line 418 "cwebdir/ctang-w2c.ch"
+#line 417 "cwebdir/ctang-w2c.ch"
c= toupper((unsigned char)*id_first)-'A'+10;
#line 1321 "cwebdir/ctangle.w"
}
@@ -1368,7 +1368,7 @@
if(xisdigit(*(id_first+1)))c= 16*c+*(++id_first)-'0';
else if(xisxdigit(*(id_first+1))){
++id_first;
-#line 423 "cwebdir/ctang-w2c.ch"
+#line 422 "cwebdir/ctang-w2c.ch"
c= 16*c+toupper((unsigned char)*id_first)-'A'+10;
#line 1326 "cwebdir/ctangle.w"
}
@@ -1415,7 +1415,7 @@
/*:75*//*82:*/
#line 1357 "cwebdir/ctangle.w"
-#line 432 "cwebdir/ctang-w2c.ch"
+#line 431 "cwebdir/ctang-w2c.ch"
static void
scan_section(void)
#line 1360 "cwebdir/ctangle.w"
@@ -1528,7 +1528,7 @@
/*:82*//*90:*/
#line 1460 "cwebdir/ctangle.w"
-#line 450 "cwebdir/ctang-w2c.ch"
+#line 449 "cwebdir/ctang-w2c.ch"
static void
phase_one(void){
#line 1463 "cwebdir/ctangle.w"
@@ -1544,7 +1544,7 @@
/*:90*//*92:*/
#line 1478 "cwebdir/ctangle.w"
-#line 468 "cwebdir/ctang-w2c.ch"
+#line 467 "cwebdir/ctang-w2c.ch"
static void
skip_limbo(void)
#line 1481 "cwebdir/ctangle.w"
@@ -1605,7 +1605,7 @@
#line 1533 "cwebdir/ctangle.w"
void
-#line 477 "cwebdir/ctang-w2c.ch"
+#line 476 "cwebdir/ctang-w2c.ch"
print_stats(void){
#line 1536 "cwebdir/ctangle.w"
printf("\nMemory usage statistics:\n");
Modified: branches/stable/source/src/texk/web2c/cwebboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/cwebboot.cin 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebboot.cin 2017-02-16 16:38:15 UTC (rev 766)
@@ -4,7 +4,7 @@
/*5:*/
#line 102 "cwebdir/common.w"
-#line 74 "cwebdir/comm-w2c.ch"
+#line 73 "cwebdir/comm-w2c.ch"
#define CWEB
#include "cpascal.h"
#include <ctype.h>
@@ -18,7 +18,7 @@
/*:8*//*22:*/
#line 471 "cwebdir/common.w"
-#line 213 "cwebdir/comm-w2c.ch"
+#line 212 "cwebdir/comm-w2c.ch"
#include <kpathsea/kpathsea.h>
#include <stdlib.h>
#include "help.h"
@@ -46,7 +46,7 @@
#define minus_gt_ast 027 \
#define buf_size 1000
-#define longest_name 1000
+#define longest_name 10000
#define long_buf_size (buf_size+longest_name)
#define xisspace(c) (isspace((unsigned char) c) &&((unsigned char) c<0200) )
#define xisupper(c) (isupper((unsigned char) c) &&((unsigned char) c<0200) ) \
@@ -226,7 +226,7 @@
hash_pointer hash_end= hash+hash_size-1;
hash_pointer h;
-#line 345 "cwebdir/comm-w2c.ch"
+#line 344 "cwebdir/comm-w2c.ch"
/*:34*//*58:*/
#line 1082 "cwebdir/common.w"
@@ -250,7 +250,7 @@
FILE*tex_file;
FILE*idx_file;
FILE*scn_file;
-#line 731 "cwebdir/comm-w2c.ch"
+#line 730 "cwebdir/comm-w2c.ch"
FILE*active_file;
char*found_filename;
#line 1376 "cwebdir/common.w"
@@ -271,12 +271,12 @@
/*:11*/
#line 62 "cwebdir/common.w"
-#line 38 "cwebdir/comm-w2c.ch"
+#line 37 "cwebdir/comm-w2c.ch"
#include "cwebboot.h"
/*55:*/
#line 1017 "cwebdir/common.w"
-#line 519 "cwebdir/comm-w2c.ch"
+#line 518 "cwebdir/comm-w2c.ch"
static int section_name_cmp(char**,int,name_pointer);
#line 1019 "cwebdir/common.w"
@@ -283,12 +283,12 @@
/*:55*//*71:*/
#line 1251 "cwebdir/common.w"
-#line 648 "cwebdir/comm-w2c.ch"
+#line 647 "cwebdir/comm-w2c.ch"
static void scan_args(void);
#line 1253 "cwebdir/common.w"
/*:71*/
-#line 39 "cwebdir/comm-w2c.ch"
+#line 38 "cwebdir/comm-w2c.ch"
#line 64 "cwebdir/common.w"
@@ -296,11 +296,11 @@
#line 89 "cwebdir/common.w"
void
-#line 59 "cwebdir/comm-w2c.ch"
+#line 58 "cwebdir/comm-w2c.ch"
common_init(void)
#line 92 "cwebdir/common.w"
{
-#line 65 "cwebdir/comm-w2c.ch"
+#line 64 "cwebdir/comm-w2c.ch"
/*32:*/
#line 621 "cwebdir/common.w"
@@ -319,22 +319,22 @@
root= NULL;
/*:43*/
-#line 65 "cwebdir/comm-w2c.ch"
+#line 64 "cwebdir/comm-w2c.ch"
;
/*24:*/
-#line 248 "cwebdir/comm-w2c.ch"
+#line 247 "cwebdir/comm-w2c.ch"
kpse_set_program_name(argv[0],"cweb");
#line 473 "cwebdir/common.w"
/*:24*/
-#line 66 "cwebdir/comm-w2c.ch"
+#line 65 "cwebdir/comm-w2c.ch"
;
#line 94 "cwebdir/common.w"
/*70:*/
#line 1233 "cwebdir/common.w"
-#line 640 "cwebdir/comm-w2c.ch"
+#line 639 "cwebdir/comm-w2c.ch"
show_banner= show_happiness= show_progress= 1;
#line 1235 "cwebdir/common.w"
@@ -346,7 +346,7 @@
scan_args();
if(program==ctangle){
-#line 740 "cwebdir/comm-w2c.ch"
+#line 739 "cwebdir/comm-w2c.ch"
if((C_file= fopen(C_file_name,"wb"))==NULL)
#line 1381 "cwebdir/common.w"
fatal("! Cannot open output file ",C_file_name);
@@ -353,7 +353,7 @@
}
else{
-#line 746 "cwebdir/comm-w2c.ch"
+#line 745 "cwebdir/comm-w2c.ch"
if((tex_file= fopen(tex_file_name,"wb"))==NULL)
#line 1386 "cwebdir/common.w"
fatal("! Cannot open output file ",tex_file_name);
@@ -367,7 +367,7 @@
/*:4*//*9:*/
#line 172 "cwebdir/common.w"
-#line 101 "cwebdir/comm-w2c.ch"
+#line 100 "cwebdir/comm-w2c.ch"
int input_ln(FILE*fp)
#line 175 "cwebdir/common.w"
{
@@ -376,7 +376,7 @@
if(feof(fp))return(0);
limit= k= buffer;
while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n')
-#line 107 "cwebdir/comm-w2c.ch"
+#line 106 "cwebdir/comm-w2c.ch"
if((*(k++)= c)!=' '&&c!='\r')limit= k;
#line 182 "cwebdir/common.w"
if(k> buffer_end)
@@ -392,7 +392,7 @@
/*:9*//*12:*/
#line 251 "cwebdir/common.w"
-#line 129 "cwebdir/comm-w2c.ch"
+#line 128 "cwebdir/comm-w2c.ch"
static void
prime_the_change_buffer(void)
#line 254 "cwebdir/common.w"
@@ -406,7 +406,7 @@
if(!input_ln(change_file))return;
if(limit<buffer+2)continue;
if(buffer[0]!='@')continue;
-#line 136 "cwebdir/comm-w2c.ch"
+#line 135 "cwebdir/comm-w2c.ch"
if(xisupper(buffer[1]))buffer[1]= tolower((unsigned char)buffer[1]);
#line 272 "cwebdir/common.w"
if(buffer[1]=='x')break;
@@ -451,7 +451,7 @@
/*:12*//*16:*/
#line 320 "cwebdir/common.w"
-#line 145 "cwebdir/comm-w2c.ch"
+#line 144 "cwebdir/comm-w2c.ch"
static void
check_change(void)
#line 323 "cwebdir/common.w"
@@ -472,7 +472,7 @@
return;
}
if(limit> buffer+1&&buffer[0]=='@'){
-#line 152 "cwebdir/comm-w2c.ch"
+#line 151 "cwebdir/comm-w2c.ch"
char xyz_code= xisupper(buffer[1])?tolower((unsigned char)buffer[1]):buffer[1];
#line 341 "cwebdir/common.w"
/*17:*/
@@ -525,7 +525,7 @@
#line 378 "cwebdir/common.w"
void
-#line 160 "cwebdir/comm-w2c.ch"
+#line 159 "cwebdir/comm-w2c.ch"
reset_input(void)
#line 381 "cwebdir/common.w"
{
@@ -533,7 +533,7 @@
/*19:*/
#line 393 "cwebdir/common.w"
-#line 172 "cwebdir/comm-w2c.ch"
+#line 171 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(web_file_name))==NULL||
(web_file= fopen(found_filename,"r"))==NULL){
fatal("! Cannot open input file ",web_file_name);
@@ -545,7 +545,7 @@
web_file_open= 1;
-#line 185 "cwebdir/comm-w2c.ch"
+#line 184 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(change_file_name))==NULL||
(change_file= fopen(found_filename,"r"))==NULL){
fatal("! Cannot open change file ",change_file_name);
@@ -567,7 +567,7 @@
/*:18*//*21:*/
#line 426 "cwebdir/common.w"
-#line 205 "cwebdir/comm-w2c.ch"
+#line 204 "cwebdir/comm-w2c.ch"
int get_line(void)
#line 428 "cwebdir/common.w"
{
@@ -591,7 +591,7 @@
}
*limit= ' ';
if(buffer[0]=='@'){
-#line 312 "cwebdir/comm-w2c.ch"
+#line 311 "cwebdir/comm-w2c.ch"
if(xisupper(buffer[1]))buffer[1]= tolower((unsigned char)buffer[1]);
#line 554 "cwebdir/common.w"
if(buffer[1]=='x'||buffer[1]=='y'){
@@ -653,7 +653,7 @@
/*25:*/
#line 474 "cwebdir/common.w"
{
-#line 261 "cwebdir/comm-w2c.ch"
+#line 260 "cwebdir/comm-w2c.ch"
char*cur_file_name_end= cur_file_name+max_file_name_length-1;
char*k= cur_file_name;
#line 479 "cwebdir/common.w"
@@ -667,7 +667,7 @@
if(k> cur_file_name_end)too_long();
*k= '\0';
-#line 268 "cwebdir/comm-w2c.ch"
+#line 267 "cwebdir/comm-w2c.ch"
if((found_filename= kpse_find_cweb(cur_file_name))!=NULL&&
(cur_file= fopen(found_filename,"r"))!=NULL){
@@ -694,7 +694,7 @@
#line 569 "cwebdir/common.w"
void
-#line 318 "cwebdir/comm-w2c.ch"
+#line 317 "cwebdir/comm-w2c.ch"
check_complete(void){
#line 572 "cwebdir/common.w"
if(change_limit!=change_buffer){
@@ -710,14 +710,14 @@
#line 660 "cwebdir/common.w"
name_pointer
-#line 357 "cwebdir/comm-w2c.ch"
+#line 356 "cwebdir/comm-w2c.ch"
id_lookup(const char*first,const char*last,char t)
#line 666 "cwebdir/common.w"
{
-#line 364 "cwebdir/comm-w2c.ch"
+#line 363 "cwebdir/comm-w2c.ch"
const char*i= first;
-#line 370 "cwebdir/comm-w2c.ch"
+#line 369 "cwebdir/comm-w2c.ch"
int h;
#line 669 "cwebdir/common.w"
int l;
@@ -727,7 +727,7 @@
/*38:*/
#line 683 "cwebdir/common.w"
-#line 379 "cwebdir/comm-w2c.ch"
+#line 378 "cwebdir/comm-w2c.ch"
h= (unsigned char)*i;
while(++i<last)h= (h+h+(int)((unsigned char)*i))%hash_size;
#line 686 "cwebdir/common.w"
@@ -739,13 +739,13 @@
/*39:*/
#line 691 "cwebdir/common.w"
-#line 388 "cwebdir/comm-w2c.ch"
+#line 387 "cwebdir/comm-w2c.ch"
p= hash[h];
#line 693 "cwebdir/common.w"
while(p&&!names_match(p,first,l,t))p= p->link;
if(p==NULL){
p= name_ptr;
-#line 394 "cwebdir/comm-w2c.ch"
+#line 393 "cwebdir/comm-w2c.ch"
p->link= hash[h];hash[h]= p;
#line 697 "cwebdir/common.w"
}
@@ -773,7 +773,7 @@
#line 764 "cwebdir/common.w"
void
-#line 413 "cwebdir/comm-w2c.ch"
+#line 412 "cwebdir/comm-w2c.ch"
print_section_name(name_pointer p)
#line 768 "cwebdir/common.w"
{
@@ -795,7 +795,7 @@
#line 783 "cwebdir/common.w"
void
-#line 423 "cwebdir/comm-w2c.ch"
+#line 422 "cwebdir/comm-w2c.ch"
sprint_section_name(char*dest,name_pointer p)
#line 788 "cwebdir/common.w"
{
@@ -817,7 +817,7 @@
/*:45*//*46:*/
#line 804 "cwebdir/common.w"
-#line 433 "cwebdir/comm-w2c.ch"
+#line 432 "cwebdir/comm-w2c.ch"
static void
print_prefix_name(name_pointer p)
#line 808 "cwebdir/common.w"
@@ -831,13 +831,13 @@
/*:46*//*47:*/
#line 825 "cwebdir/common.w"
-#line 444 "cwebdir/comm-w2c.ch"
+#line 443 "cwebdir/comm-w2c.ch"
static int
web_strcmp(char*j,int j_len,char*k,int k_len)
#line 829 "cwebdir/common.w"
{
-#line 456 "cwebdir/comm-w2c.ch"
+#line 455 "cwebdir/comm-w2c.ch"
char*j1= j+j_len,*k1= k+k_len;
while(k<k1&&j<j1&&*j==*k)k++,j++;
if(k==k1)if(j==j1)return equal;
@@ -851,7 +851,7 @@
/*:47*//*49:*/
#line 855 "cwebdir/common.w"
-#line 484 "cwebdir/comm-w2c.ch"
+#line 483 "cwebdir/comm-w2c.ch"
static name_pointer
add_section_name(name_pointer par,int c,char*first,char*last,
int ispref)
@@ -880,7 +880,7 @@
/*:49*//*50:*/
#line 884 "cwebdir/common.w"
-#line 499 "cwebdir/comm-w2c.ch"
+#line 498 "cwebdir/comm-w2c.ch"
static void
extend_section_name(name_pointer p,char*first,char*last,int ispref)
#line 891 "cwebdir/common.w"
@@ -903,7 +903,7 @@
#line 912 "cwebdir/common.w"
name_pointer
-#line 510 "cwebdir/comm-w2c.ch"
+#line 509 "cwebdir/comm-w2c.ch"
section_lookup(char*first,char*last,int ispref)
#line 917 "cwebdir/common.w"
@@ -996,7 +996,7 @@
/*:51*//*56:*/
#line 1020 "cwebdir/common.w"
-#line 530 "cwebdir/comm-w2c.ch"
+#line 529 "cwebdir/comm-w2c.ch"
static int
section_name_cmp(char**pfirst,int len,name_pointer r)
#line 1025 "cwebdir/common.w"
@@ -1031,7 +1031,7 @@
#line 1095 "cwebdir/common.w"
void
-#line 550 "cwebdir/comm-w2c.ch"
+#line 549 "cwebdir/comm-w2c.ch"
err_print(const char*s)
#line 1099 "cwebdir/common.w"
{
@@ -1066,7 +1066,7 @@
/*:60*//*63:*/
#line 1150 "cwebdir/common.w"
-#line 570 "cwebdir/comm-w2c.ch"
+#line 569 "cwebdir/comm-w2c.ch"
int wrap_up(void){
#line 1152 "cwebdir/common.w"
putchar('\n');
@@ -1094,7 +1094,7 @@
/*:63*//*66:*/
#line 1179 "cwebdir/common.w"
void
-#line 590 "cwebdir/comm-w2c.ch"
+#line 589 "cwebdir/comm-w2c.ch"
fatal(const char*s,const char*t)
#line 1182 "cwebdir/common.w"
{
@@ -1106,7 +1106,7 @@
/*:66*//*67:*/
#line 1190 "cwebdir/common.w"
void
-#line 599 "cwebdir/comm-w2c.ch"
+#line 598 "cwebdir/comm-w2c.ch"
overflow(const char*t)
#line 1193 "cwebdir/common.w"
{
@@ -1117,7 +1117,7 @@
/*:67*//*72:*/
#line 1254 "cwebdir/common.w"
-#line 658 "cwebdir/comm-w2c.ch"
+#line 657 "cwebdir/comm-w2c.ch"
static void
scan_args(void)
#line 1257 "cwebdir/common.w"
@@ -1131,22 +1131,22 @@
while(--argc> 0){
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*76:*/
-#line 683 "cwebdir/comm-w2c.ch"
+#line 682 "cwebdir/comm-w2c.ch"
{
if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
/*86:*/
-#line 798 "cwebdir/comm-w2c.ch"
+#line 797 "cwebdir/comm-w2c.ch"
usagehelp(program==ctangle?CTANGLEHELP:CWEAVEHELP,NULL);
/*:86*/
-#line 686 "cwebdir/comm-w2c.ch"
+#line 685 "cwebdir/comm-w2c.ch"
;
if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
/*87:*/
-#line 807 "cwebdir/comm-w2c.ch"
+#line 806 "cwebdir/comm-w2c.ch"
printversionandexit((program==ctangle?ctangle_banner:cweave_banner),
"Silvio Levy and Donald E. Knuth",NULL,NULL);
@@ -1153,11 +1153,11 @@
/*:87*/
-#line 688 "cwebdir/comm-w2c.ch"
+#line 687 "cwebdir/comm-w2c.ch"
;
#line 1346 "cwebdir/common.w"
if(**argv=='-')flag_change= 0;
-#line 694 "cwebdir/comm-w2c.ch"
+#line 693 "cwebdir/comm-w2c.ch"
else flag_change= 1;
if(*(*argv+1)=='d')
if(sscanf(*argv+2,"%u",&kpathsea_debug)!=1)/*77:*/
@@ -1164,7 +1164,7 @@
#line 1352 "cwebdir/common.w"
{
-#line 717 "cwebdir/comm-w2c.ch"
+#line 716 "cwebdir/comm-w2c.ch"
if(program==ctangle){
fprintf(stderr,"ctangle: Need one to three file arguments.\n");
usage("ctangle");
@@ -1176,11 +1176,11 @@
}
/*:77*/
-#line 696 "cwebdir/comm-w2c.ch"
+#line 695 "cwebdir/comm-w2c.ch"
;
#line 1348 "cwebdir/common.w"
for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++)
-#line 702 "cwebdir/comm-w2c.ch"
+#line 701 "cwebdir/comm-w2c.ch"
flags[(unsigned char)*dot_pos]= flag_change;
#line 1350 "cwebdir/common.w"
}
@@ -1280,7 +1280,7 @@
found_out= 1;
}
-#line 683 "cwebdir/comm-w2c.ch"
+#line 682 "cwebdir/comm-w2c.ch"
/*:75*/
#line 1277 "cwebdir/common.w"
@@ -1288,7 +1288,7 @@
#line 1352 "cwebdir/common.w"
{
-#line 717 "cwebdir/comm-w2c.ch"
+#line 716 "cwebdir/comm-w2c.ch"
if(program==ctangle){
fprintf(stderr,"ctangle: Need one to three file arguments.\n");
usage("ctangle");
@@ -1308,7 +1308,7 @@
#line 1352 "cwebdir/common.w"
{
-#line 717 "cwebdir/comm-w2c.ch"
+#line 716 "cwebdir/comm-w2c.ch"
if(program==ctangle){
fprintf(stderr,"ctangle: Need one to three file arguments.\n");
usage("ctangle");
@@ -1322,7 +1322,7 @@
/*:77*/
#line 1281 "cwebdir/common.w"
;
-#line 668 "cwebdir/comm-w2c.ch"
+#line 667 "cwebdir/comm-w2c.ch"
if(found_change<=0)strcpy(change_file_name,DEV_NULL);
#line 1283 "cwebdir/common.w"
}
Modified: branches/stable/source/src/texk/web2c/cwebboot.hin
===================================================================
--- branches/stable/source/src/texk/web2c/cwebboot.hin 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebboot.hin 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,35 +1,35 @@
/*84:*/
-#line 787 "cwebdir/comm-w2c.ch"
+#line 786 "cwebdir/comm-w2c.ch"
/* Prototypes for functions, either
* declared in common.w and used in ctangle.w and cweave.w, or
* used in common.w and declared in ctangle.w and cweave.w. */
/*35:*/
-#line 345 "cwebdir/comm-w2c.ch"
+#line 344 "cwebdir/comm-w2c.ch"
extern int names_match(name_pointer,const char*,int,char);
#line 652 "cwebdir/common.w"
/*:35*//*40:*/
-#line 403 "cwebdir/comm-w2c.ch"
+#line 402 "cwebdir/comm-w2c.ch"
extern void init_p(name_pointer p,char t);
#line 705 "cwebdir/common.w"
/*:40*//*48:*/
-#line 469 "cwebdir/comm-w2c.ch"
+#line 468 "cwebdir/comm-w2c.ch"
extern void init_node(name_pointer node);
#line 854 "cwebdir/common.w"
/*:48*//*59:*/
-#line 540 "cwebdir/comm-w2c.ch"
+#line 539 "cwebdir/comm-w2c.ch"
extern void err_print(const char*);
#line 1094 "cwebdir/common.w"
/*:59*//*62:*/
-#line 560 "cwebdir/comm-w2c.ch"
+#line 559 "cwebdir/comm-w2c.ch"
extern int wrap_up(void);
extern void print_stats(void);
@@ -36,7 +36,7 @@
#line 1143 "cwebdir/common.w"
/*:62*//*65:*/
-#line 579 "cwebdir/comm-w2c.ch"
+#line 578 "cwebdir/comm-w2c.ch"
extern void fatal(const char*,const char*);
extern void overflow(const char*);
@@ -43,7 +43,7 @@
#line 1175 "cwebdir/common.w"
/*:65*//*83:*/
-#line 768 "cwebdir/comm-w2c.ch"
+#line 767 "cwebdir/comm-w2c.ch"
extern void common_init(void);
extern int input_ln(FILE*fp);
@@ -56,9 +56,9 @@
extern name_pointer section_lookup(char*first,char*last,int ispref);
#line 1417 "cwebdir/common.w"
-#line 783 "cwebdir/comm-w2c.ch"
+#line 782 "cwebdir/comm-w2c.ch"
/*:83*/
-#line 791 "cwebdir/comm-w2c.ch"
+#line 790 "cwebdir/comm-w2c.ch"
extern const char*versionstring;
Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,23 @@
+2017-01-29 Karl Berry <karl at tug.org>
+
+ * ../cwebboot.cin,
+ * Makefile,
+ * README,
+ * common.c,
+ * common.h,
+ * common.w,
+ * ctang-bs.ch,
+ * ctangle.w,
+ * cweav-bs.ch,
+ * cweav-w2c.ch,
+ * cweave.w,
+ * cweb.el,
+ * cwebmac.tex,
+ * cwebman.tex,
+ * Master/texmf-dist/tex/plain/cweb/cwebmac.tex: sync all with
+ cweb 3.64ai from DEK, http://ctan.org/pkg/cweb.
+ * cweav-w2c.ch: sync @x blocks with 3.64ai.
+
2014-06-18 Peter Breitenlohner <peb at mppmu.mpg.de>
* comm-w2c.ch, ctang-w2c.ch, cweav-w2c.ch: Avoid useless
Modified: branches/stable/source/src/texk/web2c/cwebdir/Makefile
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/Makefile 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/Makefile 2017-02-16 16:38:15 UTC (rev 766)
@@ -193,3 +193,5 @@
tar cvhf /tmp/cweb.tar $(ALL) examples
gzip -9 /tmp/cweb.tar
+tarball:
+ tar zcvhf /tmp/cweb.tgz $(ALL) examples
Modified: branches/stable/source/src/texk/web2c/cwebdir/README
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -19,7 +19,7 @@
%
% DEK takes no responsibility for the changefiles; they should be
% maintained independently. His job is to correct errors in
-% ctangle.w, cweave.w, common.w, cwebmac.tex, cwebman.tex,
+% ctangle.w, cweave.w, prod.w, common.w, cwebmac.tex, cwebman.tex,
% and in the files of examples/*.w, nothing more.
This directory contains the following files:
@@ -102,3 +102,9 @@
are first bootstrapping to a new system, you may need to edit common.c and
ctangle.c by hand, but the vast majority of the change-file changes are
minor refinements that are not necessary for a rudimentary ctangle.
+
+-----------------------------------------
+These archival sources are maintained only to the extent of fixing
+significant bugs that were unintended at the time of writing.
+A multi-decade ongoing project to improve and extend CWEB can be found at
+ https://github.com/ascherer/cwebbin
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,4 @@
-% Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
-% Copyright 2002 Wlodek Bzyl and Olaf Weber
+% Original Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
% This file is in the Public Domain.
@x l.20
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -39,7 +39,7 @@
#define minus_gt_ast 027 \
#define buf_size 100
-#define longest_name 1000
+#define longest_name 10000
#define long_buf_size (buf_size+longest_name)
#define xisspace(c) (isspace(c) &&((unsigned char) c<0200) )
#define xisupper(c) (isupper(c) &&((unsigned char) c<0200) ) \
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -101,7 +101,7 @@
extern char *byte_mem_end; /* end of |byte_mem| */
extern name_info name_dir[]; /* information about names */
extern name_pointer name_dir_end; /* end of |name_dir| */
-extern name_pointer name_ptr; /* first unused position in |byte_start| */
+extern name_pointer name_ptr; /* first unused position in |name_dir| */
extern char *byte_ptr; /* first unused position in |byte_mem| */
extern name_pointer hash[]; /* heads of hash lists */
extern hash_pointer hash_end; /* end of |hash| */
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.w 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.w 2017-02-16 16:38:15 UTC (rev 766)
@@ -151,7 +151,7 @@
|*(limit+2)| without overstepping the bounds of the array.
@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */
- at d longest_name 1000
+ at d longest_name 10000
@d long_buf_size (buf_size+longest_name) /* for \.{CWEAVE} */
@d xisspace(c) (isspace(c)&&((unsigned char)c<0200))
@d xisupper(c) (isupper(c)&&((unsigned char)c<0200))
@@ -615,7 +615,7 @@
we want to keep |name_ptr<=name_dir_end| and |byte_ptr<=byte_mem_end|.
@<Defini...@>=
-name_pointer name_ptr; /* first unused position in |byte_start| */
+name_pointer name_ptr; /* first unused position in |name_dir| */
char *byte_ptr; /* first unused position in |byte_mem| */
@ @<Init...@>=
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -40,7 +40,7 @@
must be less than 10240; used in |"common.w"| */
@d max_texts 2500 /* number of replacement texts, must be less than 10240 */
@d hash_size 353 /* should be prime; used in |"common.w"| */
- at d longest_name 1000 /* section names shouldn't be longer than this */
+ at d longest_name 10000 /* section names shouldn't be longer than this */
@d stack_size 50 /* number of simultaneous levels of macro expansion */
@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */
@y
@@ -67,7 +67,7 @@
must be less than 10240; used in |"common.w"| */
@d max_texts 2500 /* number of replacement texts, must be less than 10240 */
@d hash_size 353 /* should be prime; used in |"common.w"| */
- at d longest_name 1000 /* section names shouldn't be longer than this */
+ at d longest_name 10000 /* section names shouldn't be longer than this */
@d stack_size 50 /* number of simultaneous levels of macro expansion */
@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */
@z
@@ -93,7 +93,7 @@
extern char *byte_mem_end; /* end of |byte_mem| */
extern name_info name_dir[]; /* information about names */
extern name_pointer name_dir_end; /* end of |name_dir| */
-extern name_pointer name_ptr; /* first unused position in |byte_start| */
+extern name_pointer name_ptr; /* first unused position in |name_dir| */
extern char *byte_ptr; /* first unused position in |byte_mem| */
extern name_pointer hash[]; /* heads of hash lists */
extern hash_pointer hash_end; /* end of |hash| */
@@ -126,7 +126,7 @@
extern char huge* byte_mem_end; /* end of |byte_mem| */
extern name_info name_dir[]; /* information about names */
extern name_pointer name_dir_end; /* end of |name_dir| */
-extern name_pointer name_ptr; /* first unused position in |byte_start| */
+extern name_pointer name_ptr; /* first unused position in |name_dir| */
extern char huge* byte_ptr; /* first unused position in |byte_mem| */
extern name_pointer hash[]; /* heads of hash lists */
extern hash_pointer hash_end; /* end of |hash| */
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,4 @@
-% Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
-% Copyright 2002 Wlodek Bzyl and Olaf Weber
+% Original Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
% This file is in the Public Domain.
@x l.27
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2017-02-16 16:38:15 UTC (rev 766)
@@ -116,7 +116,7 @@
must be less than 10240; used in |"common.w"| */
@d max_texts 2500 /* number of replacement texts, must be less than 10240 */
@d hash_size 353 /* should be prime; used in |"common.w"| */
- at d longest_name 10000 /* section names shouldn't be longer than this */
+ at d longest_name 10000 /* section names and strings shouldn't be longer than this */
@d stack_size 50 /* number of simultaneous levels of macro expansion */
@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -49,7 +49,7 @@
extern char *byte_mem_end; /* end of |byte_mem| */
extern name_info name_dir[]; /* information about names */
extern name_pointer name_dir_end; /* end of |name_dir| */
-extern name_pointer name_ptr; /* first unused position in |byte_start| */
+extern name_pointer name_ptr; /* first unused position in |name_dir| */
extern char *byte_ptr; /* first unused position in |byte_mem| */
extern name_pointer hash[]; /* heads of hash lists */
extern hash_pointer hash_end; /* end of |hash| */
@@ -82,7 +82,7 @@
extern char huge* byte_mem_end; /* end of |byte_mem| */
extern name_info name_dir[]; /* information about names */
extern name_pointer name_dir_end; /* end of |name_dir| */
-extern name_pointer name_ptr; /* first unused position in |byte_start| */
+extern name_pointer name_ptr; /* first unused position in |name_dir| */
extern char huge* byte_ptr; /* first unused position in |byte_mem| */
extern name_pointer hash[]; /* heads of hash lists */
extern hash_pointer hash_end; /* end of |hash| */
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,5 +1,4 @@
-% Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
-% Copyright 2002 Wlodek Bzyl and Olaf Weber
+% Original Kpathsea changes for CWEB by Wlodek Bzyl and Olaf Weber
% This file is in the Public Domain.
@@ -23,7 +22,7 @@
\vfill}
@z
-This change can not be applied when `tie' is used
+This change cannot be applied when `tie' is used
(TOC file can not be typeset).
%@x l.51
@@ -471,7 +470,7 @@
@x l.1322
void
flush_buffer(b,per_cent,carryover)
-char *b; /* outputs from |out_buf+1| to |b|,where |b<=out_ptr| */
+char *b; /* outputs from |out_buf+1| to |b|,where |b<=out_ptr| */
boolean per_cent,carryover;
@y
static void
@@ -582,9 +581,9 @@
Section 93.
@x l.1608
- if (phase==2) app_tok(*(loc++)) else loc++;
+ if (phase==2) app_tok(*(loc++))@; else loc++;
@y
- {if (phase==2) app_tok(*(loc++)) else loc++;}
+ {if (phase==2) app_tok(*(loc++))@; else loc++;}
@z
Section 99.
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2017-02-16 16:38:15 UTC (rev 766)
@@ -5,6 +5,7 @@
% Version 3.64 --- February 2002
% (essentially the same as version 3.6, which added
% recently introduced features of standard C++ to version 3.4)
+% (In November 2016 I made minor adjustments but changed no code -- DEK)
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -1298,7 +1299,7 @@
@<Global...@>=
char out_buf[line_length+1]; /* assembled characters */
-char *out_ptr; /* just after last character in |out_buf| */
+char *out_ptr; /* last character in |out_buf| */
char *out_buf_end = out_buf+line_length; /* end of |out_buf| */
int out_line; /* number of next line to be output */
@@ -1321,7 +1322,7 @@
@c
void
flush_buffer(b,per_cent,carryover)
-char *b; /* outputs from |out_buf+1| to |b|,where |b<=out_ptr| */
+char *b; /* outputs from |out_buf+1| to |b|,where |b<=out_ptr| */
boolean per_cent,carryover;
{
char *j; j=b; /* pointer into |out_buf| */
@@ -1605,7 +1606,7 @@
}
}
else if (c=='\\' && *loc!='@@')
- if (phase==2) app_tok(*(loc++)) else loc++;
+ if (phase==2) app_tok(*(loc++))@; else loc++;
@ We output
enough right braces to keep \TEX/ happy.
@@ -3890,7 +3891,7 @@
@.\\\_@>
default: out(b);
}
- else if (b!='|') out(b)
+ else if (b!='|') out(b)@;
else {
@<Copy the \CEE/ text into the |buffer| array@>;
save_loc=loc; save_limit=limit; loc=limit+2; limit=j+1;
@@ -3922,7 +3923,7 @@
}
b=*(k++);
if (b=='@@' || (b=='\\' && delim!=0))
- @<Copy a quoted character into the buffer@>
+ @<Copy a quoted character into the buffer@>@;
else {
if (b=='\'' || b=='"')
if (delim==0) delim=b;
@@ -4478,7 +4479,7 @@
unbucket(d) /* empties buckets having depth |d| */
eight_bits d;
{
- int c; /* index into |bucket|; cannot be a simple |char| because of sign
+ int c; /* index into |bucket|; cannot be a simple |char| because of sign
comparison below*/
for (c=100+128; c>= 0; c--) if (bucket[collate[c]]) {
@^high-bit character handling@>
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweb.el
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweb.el 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweb.el 2017-02-16 16:38:15 UTC (rev 766)
@@ -110,6 +110,8 @@
(insert ch)
(setq arg (1- arg)))))
(global-set-key "\M-\"" 'ditto)
+; If "ditto" suddenly fails to work, you have probably set goal-column
+; inadvertently. To unset it, say C-u C-x C-n.
;; OK, here's part (2): Changes to TeX mode.
; The WEB modes below are very much like TeX mode, but some improvements were
@@ -210,6 +212,7 @@
(modify-syntax-entry ?% "@")
(setq mode-name "CWEB")
(setq major-mode 'cweb-mode)
+ (setq tex-fontify-script nil) ;; needed in GNU Emacs version 22?
(run-hooks 'cweb-mode-hook))
(setq auto-mode-alist (cons '("\\.w$" . cweb-mode) auto-mode-alist))
(setq auto-mode-alist (cons '("\\.ch$" . cweb-mode) auto-mode-alist))
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,8 +1,8 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 3.68 --- January 2016
+% Version 3.69 --- February 2016
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB3.68}
-\chardef\cwebversion=3 \chardef\cwebrevision=68
+\xdef\fmtversion{\fmtversion+CWEB3.69}
+\chardef\cwebversion=3 \chardef\cwebrevision=69
\newif\ifpdf
\ifx\pdf+\pdftrue\fi
% Uncomment the following line if you want PDF goodies to be the default
@@ -10,7 +10,11 @@
\def\pdflinkcolor{0 0 1} % the RGB values for hyperlink color
\newif\ifpdftex
\ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
-\else \pdftextrue \pdfoutput=1 \input pdfcolor \let\setcolor\pdfsetcolor \fi\fi
+%\else \pdftextrue \pdfoutput=1 \input pdfcolor \let\setcolor\pdfsetcolor \fi\fi
+\else \pdftextrue \pdfoutput=1 % changed in 3.69
+ \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
+ \def\Blue{\pdfliteral{0 0 1 rg 0 0 1 RG}}
+\fi\fi
\newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
\let\:=\. % preserve a way to get the dot accent
@@ -136,7 +140,7 @@
\ifpdftex
\ifx\pdfannotlink\undefined\let\pdfannotlink\pdfstartlink\fi% for pdfTeX 0.14
\def\pdflink#1#2{\hbox{\pdfannotlink height\ht\strutbox depth\dp\strutbox
- attr{/Border [0 0 0]} goto num #1 \BlueGreen #1\Black\pdfendlink}}
+ attr{/Border [0 0 0]} goto num #1 \Blue #1\Black\pdfendlink}} % changed 3.69
\else\def\pdflink#1#2{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
depth \thedepth << /Type /Annot /Subtype /Link
@@ -166,7 +170,7 @@
\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
- << /S /URI /URI (#2) >>}\BlueGreen #1\Black \pdfendlink
+ << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
\else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
\space depth \thedepth\space << /Border [0 0 0]
@@ -473,7 +477,7 @@
\def\I{\par\hangindent 2em}\let\*=*
\ifacro \def\outsecname{Names of the sections} \let\Xpdf\X
% \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68
- \ifpdftex \pdfdest name {NOS} fitb % changed in version 3.68
+ \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69
\pdfoutline goto name {NOS} count -\secno {\outsecname}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,5 @@
% This file generates the user manual; TeX it, don't read it!
+% update 14 Nov 2016 by DEK: corrected obsolete remarks re debugging info
\def\tangref{3} % where the main explanation of CTANGLing is given
\input cwebmac
@@ -1087,9 +1088,9 @@
\begingroup
\verbatim
[...]
-4:*exp ( +exp+ )...
-11:*exp +exp+ int...
-5:*+exp+ int +unorbinop+...
+14:*exp +(+ exp...
+11:*exp +exp+ raw...
+10:*+exp+ raw +ubinop?+...
[...]
60: +fn_decl+*+{+ -stmt- +}-
55:*+fn_decl+ -stmt-
@@ -1098,7 +1099,7 @@
!endgroup
\endgroup
\medskip
-The first line says that grammar rule 4 has just been applied, and \.{CWEAVE}
+The first line says that grammar rule 14 has just been applied, and \.{CWEAVE}
currently has in its memory a sequence of chunks of \TEX/ code (called
``scraps'') that are respectively
of type \\{exp} (for expression), open-parenthesis,
@@ -1514,7 +1515,7 @@
\point 1. Four fonts have been declared in addition to the standard fonts of
\.{PLAIN} format: You can say `\.{\{\\mc UNIX\}}' to get {\mc UNIX} in
-xmedium-size caps; you can say `\.{\{\\sc STUFF\}}' to get {\sc STUFF}
+medium-size caps; you can say `\.{\{\\sc STUFF\}}' to get {\sc STUFF}
in small caps; and you can select the largish fonts \.{\\titlefont}
and \.{\\ttitlefont} in the title of your document, where \.{\\ttitlefont}
is a typewriter style of type. There are macros \.{\\UNIX/} and \.{\\CEE/}
Modified: branches/stable/source/src/texk/web2c/help.h
===================================================================
--- branches/stable/source/src/texk/web2c/help.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/help.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -77,7 +77,7 @@
"-f do not force a newline after every C statement in output",
"-h suppress success message on completion",
"-p suppress progress report messages",
- "-x omit indices and table of contents",
+ "-x omit indices, section names, table of contents",
"+e enclose C material in \\PB{...}",
"+s print usage statistics",
"--help display this help and exit",
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,3 +1,21 @@
+2017-02-13 Akira Kakuto <kakuto at fuk.kinidai.ac.jp>
+
+ * texmfmp.c: unsigned long long >= 0. Thanks Luigi.
+
+2017-02-01 Akira Kakuto <kakuto at fuk.kinidai.ac.jp>
+
+ * texmfmp.c: Avoid a crash in xelatex for
+ http://tug.org/pipermail/xetex/2017-January/026975.html.
+ It is not a fix but a stopgap.
+
+2017-01-02 Akira Kakuto <kakuto at fuk.kinidai.ac.jp>
+
+ * printversion.c: 2016 ---> 2017.
+
+2016-11-14 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * texmfmp.c: Change a condition to support new primitives in e(u)ptex.
+
2016-06-12 Karl Berry <karl at freefriends.org>
* texmfmp.c (get_date_and_time):
Modified: branches/stable/source/src/texk/web2c/lib/printversion.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/printversion.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/lib/printversion.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -51,7 +51,7 @@
#endif
if (copyright_holder) {
- printf ("Copyright 2016 %s.\n", copyright_holder);
+ printf ("Copyright 2017 %s.\n", copyright_holder);
if (!author)
author = copyright_holder;
}
Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c 2017-02-16 16:38:15 UTC (rev 766)
@@ -2218,7 +2218,7 @@
if (source_date_epoch) {
errno = 0;
epoch = strtoull(source_date_epoch, &endptr, 10);
- if (epoch < 0 || *endptr != '\0' || errno != 0) {
+ if (*endptr != '\0' || errno != 0) {
FATAL1 ("invalid epoch-seconds-timezone value for environment variable $SOURCE_DATE_EPOCH: %s",
source_date_epoch);
}
@@ -2305,7 +2305,7 @@
}
}
-#if defined(pdfTeX)
+#if defined(pdfTeX) || defined(epTeX) || defined(eupTeX)
/*
Getting a high resolution time.
*/
@@ -2818,6 +2818,8 @@
unsigned bytesToWrite = 0;
poolpointer len, i, j;
string name;
+ if (strstart[s + 1 - 65536L] < strstart[s - 65536L])
+ return NULL;
len = strstart[s + 1 - 65536L] - strstart[s - 65536L];
name = xmalloc(len * 3 + 1); /* max UTF16->UTF8 expansion
(code units, not bytes) */
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,9 +1,20 @@
-2017-02-02 Karl Berry <karl at freefriends.org>
+2017-02-16 Karl Berry <karl at freefriends.org>
* regex/regex_internal.h (alloca) [!alloca]: do not try
to #define if already #defined.
Report from Vincent Torri on tex-live list, 7 Jul 2016 10:48:15.
+ (pdftex r765)
+2016-11-05 Karl Berry <karl at tug.org>
+
+ * pdftoepdf.cc: doc fix.
+
+2016-07-16 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * pdftoepdf.cc: Use zround(stemV->getNum()) instead of stemV->getInt()
+ in epdf_create_fontdescriptor(), since the value of stemV may be real
+ in general.
+
2016-06-12 Karl Berry <karl at freefriends.org>
and Akira Kakuto <kakuto at fuk.kindai.ac.jp>
@@ -13,7 +24,18 @@
plus check that rm_eo >= rm_so.
Original bug report from David Carlisle,
http://tug.org/pipermail/tex-live/2016-June/038664.html
+ (pdftex r759)
+2016-06-12 Karl Berry <karl at freefriends.org>
+ and Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * utils.c (last_match_succeeded): new static boolean.
+ (matchstrings): set it.
+ (getmatch): use it, plus check for non-NULL match_string sooner,
+ plus check that rm_eo >= rm_so.
+ Original bug report from David Carlisle,
+ http://tug.org/pipermail/tex-live/2016-June/038664.html
+
2016-05-20 Karl Berry <karl at tug.org>
* TeX Live 2016 release.
@@ -332,7 +354,7 @@
2012-08-08 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* ptexlib.h: extern void writestreamlength(longinteger, longinteger);
- for largefile.
+ for largefile.
extern void storepacket(internalfontnumber, integer, strnumber); to
avoid a compiler warning.
* utils.c: void writestreamlength(longinteger length, longinteger offset)
@@ -417,7 +439,7 @@
(escape_eol): new fn, replacing print_str, now returning a string.
* writettf.c (ttf_reindex_glyphs): use %n to sscanf forms
- uniABCD and index123.
+ uniABCD and index123.
* mapfile.c (suppress_warn): way to avoid dup warnings.
@@ -590,7 +612,7 @@
* pdftexextra.c (new): #include <pdftexd.h> and <lib/texmfmp.c>.
* am/pdftex.am: pdftexextra.[ch] are now distributed;
- create {e,pdf}tex_version.h instead of {e,pdf}tex.version.
+ create {e,pdf}tex_version.h instead of {e,pdf}tex.version.
2010-12-01 Peter Breitenlohner <peb at mppmu.mpg.de>
@@ -799,7 +821,7 @@
* writet1.c (append_cs_return): Drop unused local variable 'k'.
- * avlstuff.c (destroy_oentry, PdfObjTree_free),
+ * avlstuff.c (destroy_oentry, PdfObjTree_free),
writet1.c (free_glyph_names):
Skip unused static functions (via #if 0 ... #endif).
@@ -912,7 +934,7 @@
2009-06-25 Peter Breitenlohner <peb at mppmu.mpg.de>
- * epdf.h, ttf2afm.c, writet1.c:
+ * epdf.h, ttf2afm.c, writet1.c:
removed #include <kpathsea/c-proto.h>.
* avlstuff.c, epdf.c: removed #include <kpathsea/c-proto.h> and
#include <stdarg.h>.
Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2017-02-16 16:38:15 UTC (rev 766)
@@ -3,7 +3,7 @@
no changes in functionality.
- bugfixes:
- - \pdflastmatch more reliable when there was no preceding match.
+ - \pdflastmatch more reliable when there was no match
---------------------------------------------------
pdfTeX 3.14159265-2.6-1.40.17 (TeX Live 2016) (May 20, 2016)
- changes:
Modified: branches/stable/source/src/texk/web2c/tex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tex.ch 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/tex.ch 2017-02-16 16:38:15 UTC (rev 766)
@@ -3477,7 +3477,8 @@
format_debug('string pool checksum')(x);
if x<>@$ then begin {check that strings are the same}
wake_up_terminal;
- wterm_ln('---! ', stringcast(name_of_file+1), ' doesn''t match ', pool_name);
+ wterm_ln('---! ', stringcast(name_of_file+1),
+ ' made by different executable version');
goto bad_fmt;
end;
@<Undump |xord|, |xchr|, and |xprn|@>;
Modified: branches/stable/source/src/texk/web2c/texmfmp.h
===================================================================
--- branches/stable/source/src/texk/web2c/texmfmp.h 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/texmfmp.h 2017-02-16 16:38:15 UTC (rev 766)
@@ -220,7 +220,7 @@
#define dateandtime(i,j,k,l) get_date_and_time (&(i), &(j), &(k), &(l))
extern void get_date_and_time (integer *, integer *, integer *, integer *);
-#if defined(pdfTeX)
+#if defined(pdfTeX) || defined(epTeX) || defined(eupTeX)
/* Get high-res time info. */
#define secondsandmicros(i,j) get_seconds_and_micros (&(i), &(j))
extern void get_seconds_and_micros (integer *, integer *);
Modified: branches/stable/source/src/texk/web2c/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/texk/web2c/web2c/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2016.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2017/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C Tools'
PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2016'
-PACKAGE_STRING='Web2C Tools 2016'
+PACKAGE_VERSION='2017/dev'
+PACKAGE_STRING='Web2C Tools 2017/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@
# 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 Web2C Tools 2016 to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2017/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C Tools 2016:";;
+ short | recursive ) echo "Configuration of Web2C Tools 2017/dev:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C Tools configure 2016
+Web2C Tools configure 2017/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C Tools $as_me 2016, which was
+It was created by Web2C Tools $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8045,7 +8045,7 @@
# Define the identity of the package.
PACKAGE='web2c-tools'
- VERSION='2016'
+ VERSION='2017/dev'
cat >>confdefs.h <<_ACEOF
@@ -14574,7 +14574,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C Tools $as_me 2016, which was
+This file was extended by Web2C Tools $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14640,7 +14640,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C Tools config.status 2016
+Web2C Tools config.status 2017/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/utils/README 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-$Id: README 41077 2016-05-12 23:14:19Z karl $
+$Id: README 42657 2016-12-09 07:19:10Z kakuto $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -21,7 +21,7 @@
m-tx 0.62 - checked 10feb16
http://ctan.org/pkg/m-tx/
-pmx 2.7.4 - checked 13may16
+pmx 2.7.6 - checked 09dec16
http://ctan.org/pkg/pmx/
ps2eps 1.68 - checked 10may12
Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/utils/configure 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2016.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2017/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live utils'
PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2016'
-PACKAGE_STRING='TeX Live utils 2016'
+PACKAGE_VERSION='2017/dev'
+PACKAGE_STRING='TeX Live utils 2017/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1411,7 +1411,7 @@
# 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 TeX Live utils 2016 to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2017/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1481,7 +1481,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live utils 2016:";;
+ short | recursive ) echo "Configuration of TeX Live utils 2017/dev:";;
esac
cat <<\_ACEOF
@@ -1776,7 +1776,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live utils configure 2016
+TeX Live utils configure 2017/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1877,7 +1877,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live utils $as_me 2016, which was
+It was created by TeX Live utils $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -6119,7 +6119,7 @@
# Define the identity of the package.
PACKAGE='tex-live-utils'
- VERSION='2016'
+ VERSION='2017/dev'
cat >>confdefs.h <<_ACEOF
@@ -7129,7 +7129,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live utils $as_me 2016, which was
+This file was extended by TeX Live utils $as_me 2017/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7186,7 +7186,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live utils config.status 2016
+TeX Live utils config.status 2017/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/version.ac
===================================================================
--- branches/stable/source/src/version.ac 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/src/version.ac 2017-02-16 16:38:15 UTC (rev 766)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 39950 2016-03-06 21:56:59Z karl $
+dnl $Id: version.ac 41571 2016-06-29 23:09:13Z karl $
dnl Copyright 2016 Karl Berry <tex-live at tug.org>
dnl Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -9,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2016])
+m4_define([tex_live_version], [2017/dev])
Modified: branches/stable/source/sync-pdftex.sh
===================================================================
--- branches/stable/source/sync-pdftex.sh 2017-02-16 16:23:42 UTC (rev 765)
+++ branches/stable/source/sync-pdftex.sh 2017-02-16 16:38:15 UTC (rev 766)
@@ -121,8 +121,8 @@
if $chicken; then
cat <<CHICKEN
$0: Before doing this for real,
- ensure that any changes in the pdftex repo have been preserved;
- they will be overwritten with the TL versions.
+ merge any changes in the pdftex repo into TL or otherwise preserve them;
+ all files will be overwritten with the TL versions.
CHICKEN
fi
@@ -131,12 +131,12 @@
cat <<TRAILER
done.
-After doing for real, try a svn status:
- specifically, ! entries from svn status should be svn removed,
- and ? entries should be svn added.
+After doing for real, run svn status:
+ ! entries from svn status should be svn removed, and
+ ? entries should be svn added.
make svnstatus at the top level makes three temp files for this job;
see comments there.
-Do not do svn update first, or the removes just done will be lost.
+Do not do svn update before committing, or the rm's just done will be lost.
Sadly, the sync script does not remove directories, only all the files
inside. Please fix. Need to remove by hand until fixed.
More information about the pdftex-commits
mailing list