0.48poppler-0.48

10 files changed, 22 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c86922a0..1a694a3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "47")
+set(POPPLER_MINOR_VERSION "48")
 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 63.0.0 SOVERSION 63)
+set_target_properties(poppler PROPERTIES VERSION 64.0.0 SOVERSION 64)
 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 3ae7b349..6d98bbf1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+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
diff --git a/configure.ac b/configure.ac
index f0303e03..2ff66bea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[47])
+m4_define([poppler_version_minor],[48])
 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 a4a06147..5230fb33 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.47.0
+PROJECT_NUMBER         = 0.48.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 26cc82c6..aa70853b 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -327,7 +327,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 63:0:0			\
+	-version-info 64:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/poppler/Outline.cc b/poppler/Outline.cc
index cc1bc1ad..707ffdbc 100644
--- a/poppler/Outline.cc
+++ b/poppler/Outline.cc
@@ -16,6 +16,7 @@
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
 // Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com>
+// Copyright (C) 2016 Jason Crain <jason@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
diff --git a/poppler/UTF.cc b/poppler/UTF.cc
index c140bd47..f7b02d14 100644
--- a/poppler/UTF.cc
+++ b/poppler/UTF.cc
@@ -17,6 +17,7 @@
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2016 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2016 Jason Crain <jason@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
diff --git a/poppler/UTF.h b/poppler/UTF.h
index 5a479020..c82e165a 100644
--- a/poppler/UTF.h
+++ b/poppler/UTF.h
@@ -5,6 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
 //
 //========================================================================
 
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 75266041..edbe4b24 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.47.0
+PROJECT_NUMBER         = 0.48.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 b8118447..17f302e9 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.47.0
+PROJECT_NUMBER         = 0.48.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.