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 + 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 +- 16 files changed, 33 insertions(+), 11 deletions(-)
New commits: commit 8e16e423a718b92514885e771e31048f1ae2a766 Author: Albert Astals Cid <[email protected]> Date: Thu Feb 5 20:18:13 2015 +0100 0.31.0 And copyright updating diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ed0b44..7d34c69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ include(CheckFileOffsetBits) CHECK_FILE_OFFSET_BITS() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "30") +set(POPPLER_MINOR_VERSION "31") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -469,7 +469,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49) +set_target_properties(poppler PROPERTIES VERSION 50.0.0 SOVERSION 50) 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 2ff8e17..01f4a66 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +Release 0.31.0 + core: + * CairoOutputDev: support embedding JBIG2 image data + * Accept malformed documents whose root is a Page instead of a Pages. Bug #88172 + * Fix crash on broken documents + * JPEG2000Stream: Inline doGetChar and doLookChar + * GlobalParams cleaning + + utils: + * pdftops: Add rasterization option. Bug #85934 + + qt4: + * Expose whole-words search option + + qt5: + * Expose whole-words search option + Release 0.30.0 core: * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906 diff --git a/configure.ac b/configure.ac index b6429cf..3f43c0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[30]) +m4_define([poppler_version_minor],[31]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff --git a/cpp/Doxyfile b/cpp/Doxyfile index 4d42884..842b667 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.30.0 +PROJECT_NUMBER = 0.31.0 # 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/CairoOutputDev.cc b/poppler/CairoOutputDev.cc index a770320..a86ec12 100644 --- a/poppler/CairoOutputDev.cc +++ b/poppler/CairoOutputDev.cc @@ -28,6 +28,7 @@ // Copyright (C) 2011-2014 Thomas Freitag <[email protected]> // Copyright (C) 2012 Patrick Pfeifer <[email protected]> // Copyright (C) 2012 Jason Crain <[email protected]> +// Copyright (C) 2015 Suzuki Toshiya <[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 diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h index cc29846..33dde0c 100644 --- a/poppler/CairoOutputDev.h +++ b/poppler/CairoOutputDev.h @@ -21,6 +21,7 @@ // Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <[email protected]> // Copyright (C) 2008 Michael Vrable <[email protected]> // Copyright (C) 2010-2013 Thomas Freitag <[email protected]> +// Copyright (C) 2015 Suzuki Toshiya <[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 diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc index 8e1c12f..66c1d25 100644 --- a/poppler/JBIG2Stream.cc +++ b/poppler/JBIG2Stream.cc @@ -22,6 +22,7 @@ // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2013 Adrian Johnson <[email protected]> // Copyright (C) 2013, 2014 Fabio D'Urso <[email protected]> +// Copyright (C) 2015 Suzuki Toshiya <[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 diff --git a/poppler/JBIG2Stream.h b/poppler/JBIG2Stream.h index 7ffc441..1e14c5c 100644 --- a/poppler/JBIG2Stream.h +++ b/poppler/JBIG2Stream.h @@ -15,6 +15,7 @@ // // Copyright (C) 2009 David Benjamin <[email protected]> // Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2015 Suzuki Toshiya <[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 diff --git a/poppler/Makefile.am b/poppler/Makefile.am index e0c98d8..9a623af 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 49:0:0 \ + -version-info 50:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff --git a/poppler/Stream.cc b/poppler/Stream.cc index 8996e29..d2dd761 100644 --- a/poppler/Stream.cc +++ b/poppler/Stream.cc @@ -30,6 +30,7 @@ // Copyright (C) 2013 Adrian Johnson <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2013 Pino Toscano <[email protected]> +// Copyright (C) 2015 Suzuki Toshiya <[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 diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt index fe7d620..4a2c69a 100644 --- a/qt4/src/CMakeLists.txt +++ b/qt4/src/CMakeLists.txt @@ -30,7 +30,7 @@ set(poppler_qt4_SRCS ) qt4_automoc(${poppler_qt4_SRCS}) add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS}) -set_target_properties(poppler-qt4 PROPERTIES VERSION 4.5.0 SOVERSION 4) +set_target_properties(poppler-qt4 PROPERTIES VERSION 4.6.0 SOVERSION 4) target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY}) if(MSVC) target_link_libraries(poppler-qt4 poppler ${poppler_LIBS}) diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile index e63e521..eee8a78 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.30.0 +PROJECT_NUMBER = 0.31.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index fc5412e..f993aa8 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -60,7 +60,7 @@ libpoppler_qt4_la_LIBADD = \ $(POPPLER_QT4_LIBS) libpoppler_qt4_la_LDFLAGS = \ - -version-info 9:0:5 \ + -version-info 10:0:6 \ @create_shared_lib@ \ @auto_import_flags@ diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt index 423c77e..da01f07 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -32,7 +32,7 @@ set(poppler_qt5_SRCS ArthurOutputDev.cc ) add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS}) -set_target_properties(poppler-qt5 PROPERTIES VERSION 1.2.0 SOVERSION 1) +set_target_properties(poppler-qt5 PROPERTIES VERSION 1.3.0 SOVERSION 1) target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES}) if(MSVC) target_link_libraries(poppler-qt5 poppler ${poppler_LIBS}) diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile index 4f4bbcd..43253df 100644 --- a/qt5/src/Doxyfile +++ b/qt5/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.30.0 +PROJECT_NUMBER = 0.31.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am index 73e62af..03df30f 100644 --- a/qt5/src/Makefile.am +++ b/qt5/src/Makefile.am @@ -60,7 +60,7 @@ libpoppler_qt5_la_LIBADD = \ $(POPPLER_QT5_LIBS) libpoppler_qt5_la_LDFLAGS = \ - -version-info 3:0:2 \ + -version-info 4:0:3 \ @create_shared_lib@ \ @auto_import_flags@ _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
