summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-08-21 20:07:54 +0200
committerAlbert Astals Cid <aacid@kde.org>2014-08-21 20:07:54 +0200
commitf74a5964078224c01bd5642aabc928d185bb0b69 (patch)
treeb46ff961581fd620bf149467af0fa07943b5f9d6
parentce92e4ccefc7dad79db7f0af7a792ffa47824849 (diff)
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS12
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--qt4/src/Doxyfile2
-rw-r--r--qt5/src/Doxyfile2
6 files changed, 17 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e100cd30..24902bad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "26")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MICRO_VERSION "4")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/NEWS b/NEWS
index 11ac79d0..3e0e4fd0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 0.26.4
+ core:
+ * CairoOutputDev: Make sure we always push a transparency group in setSoftMaskFromImageMask(). Bug #81624
+ * Fix a crash when adding Annotation without contents
+ * Improve non-latin characters in inline notes. Bug #65956
+ * Don't check for inlineImg twice. Bug #82059
+ * printf() -> error()
+
+ glib:
+ * Return NULL in poppler_annot_get_contents also for empty strings
+ * Fix a memory leak when getting text layout and attributes
+
Release 0.26.3
qt5:
* autoconf: Improve moc-qt5 detection
diff --git a/configure.ac b/configure.ac
index 94eeb5b8..b38a2f88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[26])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_micro],[4])
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 8abfd3af..b73d9531 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.26.3
+PROJECT_NUMBER = 0.26.4
# 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/Doxyfile b/qt4/src/Doxyfile
index c6c67e31..4af55194 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.26.3
+PROJECT_NUMBER = 0.26.4
# 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 70cc8ca5..677c9f61 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.26.3
+PROJECT_NUMBER = 0.26.4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.