[poppler] 3 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Makefile.am poppler/poppler-config.h.cmake poppler/poppler-config.h.in poppler/PSOutputDev.cc qt4/src qt5/src utils/pdfseparate.cc

Albert Astals Cid aacid at kemper.freedesktop.org
Mon Nov 14 23:52:52 UTC 2016


 CMakeLists.txt                 |    4 ++--
 NEWS                           |   16 ++++++++++++++++
 configure.ac                   |    2 +-
 cpp/Doxyfile                   |    2 +-
 poppler/Makefile.am            |    2 +-
 poppler/PSOutputDev.cc         |    1 +
 poppler/poppler-config.h.cmake |    3 ++-
 poppler/poppler-config.h.in    |    1 +
 qt4/src/Doxyfile               |    2 +-
 qt5/src/Doxyfile               |    2 +-
 utils/pdfseparate.cc           |    2 +-
 11 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 02e2d8e2c3004c36d1f8f798e5a7a30166f48f37
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Nov 15 00:10:43 2016 +0100

    0.49

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a694a3..c25e961 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "48")
+set(POPPLER_MINOR_VERSION "49")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -502,7 +502,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 64.0.0 SOVERSION 64)
+set_target_properties(poppler PROPERTIES VERSION 65.0.0 SOVERSION 65)
 target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
diff --git a/NEWS b/NEWS
index d5c16a8..619d7f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 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
-         * VS 2013 has fmin() and fmax()
+         * Fix UBSAN warning
+         * Misc compile fixes
 
         utils:
          * pdfseparate: remove extra '%' in error message
diff --git a/configure.ac b/configure.ac
index c6c3c93..0ba420a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[48])
+m4_define([poppler_version_minor],[49])
 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 5230fb3..e0e073e 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.48.0
+PROJECT_NUMBER         = 0.49.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/Makefile.am b/poppler/Makefile.am
index aa70853..15aa546 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -327,7 +327,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 64:0:0			\
+	-version-info 65:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index edbe4b2..6111443 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.48.0
+PROJECT_NUMBER         = 0.49.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 17f302e..f078e10 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.48.0
+PROJECT_NUMBER         = 0.49.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit f7f0f14e095425d171456a697804f2f34ed26426
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 15 00:06:26 2016 +0100

    VS 2013 has fmin() and fmax()

diff --git a/NEWS b/NEWS
index 6d98bbf..d5c16a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Release 0.49.0
+        core:
+         * 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
+         * VS 2013 has fmin() and fmax()
+
+        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.
diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index e3e2cfb..773f3ff 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -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
@@ -186,7 +187,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 #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
commit 07ac68603552b36a2a6b8ea5982f22f24f5835b1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Nov 15 00:03:24 2016 +0100

    Update (C)

diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 51d899f..9124c49 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -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
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index d3891fe..8e1f719 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -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
diff --git a/utils/pdfseparate.cc b/utils/pdfseparate.cc
index 469f568..45274ec 100644
--- a/utils/pdfseparate.cc
+++ b/utils/pdfseparate.cc
@@ -6,7 +6,7 @@
 //
 // Copyright (C) 2011, 2012, 2015 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2012-2014 Albert Astals Cid <aacid at kde.org>
-// Copyright (C) 2013 Pino Toscano <pino at kde.org>
+// Copyright (C) 2013, 2016 Pino Toscano <pino at kde.org>
 // Copyright (C) 2013 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
 // Copyright (C) 2013 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 //


More information about the poppler mailing list