CMakeLists.txt | 4 ++-- NEWS | 16 ++++++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- poppler/Makefile.am | 2 +- poppler/Stream.h | 3 ++- qt4/src/Doxyfile | 2 +- 7 files changed, 24 insertions(+), 7 deletions(-)
New commits: commit 75849a0d7c205c048714b90883695b6bebd2298c Merge: ec7140b 5a51812 Author: Albert Astals Cid <[email protected]> Date: Tue Mar 12 20:27:59 2013 +0100 Merge remote-tracking branch 'origin/poppler-0.22' Conflicts: poppler/Stream.h diff --cc poppler/Stream.h index 7581d04,76d6a1f..dfcd530 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@@ -22,7 -22,7 +22,8 @@@ // Copyright (C) 2011, 2012 William Bader <[email protected]> // Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2013 Adrian Johnson <[email protected]> + // Copyright (C) 2013 Peter Breitenlohner <[email protected]> // // 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 commit 5a51812b7c1457feb8acaa106f43d7d5252b3980 Author: Peter Breitenlohner <[email protected]> Date: Tue Mar 12 20:25:50 2013 +0100 Fix compile when not using libjpeg diff --git a/poppler/Stream.h b/poppler/Stream.h index 7a5ff1c..76d6a1f 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -22,6 +22,7 @@ // Copyright (C) 2011, 2012 William Bader <[email protected]> // Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2013 Peter Breitenlohner <[email protected]> // // 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 @@ -850,7 +851,7 @@ struct DCTHuffTable { class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA); + DCTStream(Stream *strA, int colorXformA, Object *dict); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); commit 341e863d65fdd5619a071e4fd903fa82bf33c757 Author: Albert Astals Cid <[email protected]> Date: Mon Mar 11 19:20:06 2013 +0100 0.22.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index b439153..4643ae0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN) set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "22") -set(POPPLER_MICRO_VERSION "1") +set(POPPLER_MICRO_VERSION "2") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34) +set_target_properties(poppler PROPERTIES VERSION 35.0.0 SOVERSION 35) target_link_libraries(poppler ${poppler_LIBS}) target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/NEWS b/NEWS index 36c0398..c386557 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +Release 0.22.2 + core: + * Correct rendering of underline and strike out annotations (Bug #61518) + * Workaround broken jpeg stream definitions (Bug #61994) + * SplashOutputDev: Restore CTM on early exits (Bug #61413) + * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432) + * Fix latin page labels. (Bug #61034) + * Fix compilation with jpeglib9 + * Fix minor valgrind warning + + utils: + * pdfimages: Fix extraction of some images (Bug #61168) + + build system: + * Fix the build with automake-1.13 + Release 0.22.1 core: * Fix crash in some pdf files when extracting text (Bug #59561) diff --git a/configure.ac b/configure.ac index 7653523..fc77b22 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[22]) -m4_define([poppler_version_micro],[1]) +m4_define([poppler_version_micro],[2]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) diff --git a/cpp/Doxyfile b/cpp/Doxyfile index 2001c0c..513f287 100644 --- a/cpp/Doxyfile +++ b/cpp/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.22.1 +PROJECT_NUMBER = 0.22.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/poppler/Makefile.am b/poppler/Makefile.am index c25ab03..9b29591 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -177,7 +177,7 @@ libpoppler_la_LIBADD = \ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 35:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile index 2c4bfb9..065c643 100644 --- a/qt4/src/Doxyfile +++ b/qt4/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 " # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.22.1 +PROJECT_NUMBER = 0.22.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
