summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2013-06-16 18:55:15 +0200
committerAlbert Astals Cid <aacid@kde.org>2013-06-16 18:55:15 +0200
commite40cd9995e24613f28a0e4272999df49aa81c6ae (patch)
treea51daf5338c496fc8ada93c57d8e52a26d42d7c0
parent25f453ef49004452ac4c201d59d9ce2ef52ffeee (diff)
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS14
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--qt4/src/Doxyfile2
5 files changed, 18 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c5715e8..e0d128e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN)
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "22")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MICRO_VERSION "5")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/NEWS b/NEWS
index b374a9c5..4a11b3ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 0.22.5
+ core:
+ * PSOutputDev: Make sure that Title: doesn't contain \n or \r (Bug #63862)
+ * Fix slowlyness reading malformed files (Bug #46703)
+ * Fix infinite loop while feeding wrong data in stdin (Bug #64967)
+ * Fix crash on malformed file (Bug #65221)
+ * Fix mismatched delete (Bug #65553)
+
+ qt4:
+ * Fix mismatched delete (Bug #65551)
+
+ utils:
+ * pdftohtml: Fix memory leak
+
Release 0.22.4
core:
* Always consider a softmask transfer function (Bug #63587)
diff --git a/configure.ac b/configure.ac
index 86aa19c8..82bfc402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[22])
-m4_define([poppler_version_micro],[4])
+m4_define([poppler_version_micro],[5])
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 a651685a..849f5579 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.22.4
+PROJECT_NUMBER = 0.22.5
# 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 90a0645c..66b921a6 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.22.4
+PROJECT_NUMBER = 0.22.5
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.