[poppler] CMakeLists.txt configure.ac cpp/CMakeLists.txt cpp/Doxyfile cpp/Makefile.am NEWS poppler/Makefile.am poppler/PDFDoc.cc poppler/poppler-config.h.cmake poppler/poppler-config.h.in poppler/TextOutputDev.cc qt4/src qt5/src
Albert Astals Cid
aacid at kemper.freedesktop.org
Sun Jan 4 14:42:29 PST 2015
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 +-
13 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit c13bffe92963c4969037695992f4c2776bbe973f
Author: Albert Astals Cid <aacid at kde.org>
Date: Sun Jan 4 23:17:42 2015 +0100
0.30
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8845d00..5ed0b44 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 "29")
+set(POPPLER_MINOR_VERSION "30")
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 48.0.0 SOVERSION 48)
+set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49)
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 4bfd589..2ff8e17 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Release 0.30.0
+ core:
+ * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906
+ * Fix potential memory corruption on TextSelectionDumper. Bug #84555
+ * Check for invalid matrix in annotation. Bug #84990
+ * Open some not conforming files. Bug #85919
+ * PSOutputDev: Accept a list of pages indeces instead of first, last. Bug #84833
+ * Fix memory leak on error condition
+
+ cpp:
+ * New API to set debug output function
+
+ build system:
+ * configure: Improve support with older clang versions. Bug #76963
+
+ utils:
+ * pdfunite: Support output intents, optional content and acroform
+
Release 0.29.0
core:
* Use correct LAB byte array for lcms input. Bug #86388
diff --git a/configure.ac b/configure.ac
index 47e8aac..b6429cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[29])
+m4_define([poppler_version_minor],[30])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index e606988..5a94219 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -23,7 +23,7 @@ set(poppler_cpp_SRCS
)
add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
-set_target_properties(poppler-cpp PROPERTIES VERSION 0.2.0 SOVERSION 0)
+set_target_properties(poppler-cpp PROPERTIES VERSION 0.2.1 SOVERSION 0)
target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES})
if(MSVC)
target_link_libraries(poppler-cpp ${poppler_LIBS})
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index f3c5b1b..4d42884 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.29.0
+PROJECT_NUMBER = 0.30.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/cpp/Makefile.am b/cpp/Makefile.am
index 2b23e05..98e2af0 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -69,6 +69,6 @@ libpoppler_cpp_la_LIBADD = \
$(LIBICONV)
libpoppler_cpp_la_LDFLAGS = \
- -version-info 2:0:2 \
+ -version-info 2:1:2 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 01fe01e..e0c98d8 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 48:0:0 \
+ -version-info 49:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index b6af8e8..71a1efe 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -31,6 +31,7 @@
// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
// Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2015 Li Junling <lijunling at sina.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
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 9ed955e..c9db1e7 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2011 Sam Liao <phyomh at gmail.com>
// Copyright (C) 2012 Horst Prote <prote at fmi.uni-stuttgart.de>
-// Copyright (C) 2012, 2013 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2012, 2013, 2014 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2012 Peter Breitenlohner <peb at mppmu.mpg.de>
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index d7918bc..b087a69 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index a7d2efe..f73d0f6 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 7b8fcbe..e63e521 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.29.0
+PROJECT_NUMBER = 0.30.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/Doxyfile b/qt5/src/Doxyfile
index 58b8e8d..4f4bbcd 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.29.0
+PROJECT_NUMBER = 0.30.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
More information about the poppler
mailing list