[poppler] Branch 'poppler-0.18' - CMakeLists.txt NEWS configure.ac cpp/Doxyfile qt4/src

[Albert Astals Cid]

 CMakeLists.txt   |    2 +-
 NEWS             |   17 +++++++++++++++++
 configure.ac     |    2 +-
 cpp/Doxyfile     |    2 +-
 qt4/src/Doxyfile |    2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 447a958ce43b697ab99084ba1371b989331c6ccc
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Dec 4 15:44:52 2011 +0100

    0.18.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b96580..38db6c2 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 "18")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MICRO_VERSION "2")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index ff8418f..af2efc6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Release 0.18.2
+        core:
+         * Fix leak in GooString when resizing to a smaller string
+         * Fix crash if failing to parse the colorspace. Bug #42793
+         * Make GfxColorSpace::parse accept dicts
+
+        qt4:
+         * Use PDFDoc(wchar_t *, ...) on Windows. Bug #35378
+         * Add missing include
+         * Minor fixes in documentation
+
+        utils:
+         * pdftocairo: Fix crash when rendering only odd/even pages in a printing format
+        
+        build system:
+         * Fix pkg-config files
+        
 Release 0.18.1
         core:
          * PSOutputDev: Output PS that does not confuse libspectre
diff --git a/configure.ac b/configure.ac
index c4f5b92..e828f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[18])
-m4_define([poppler_version_micro],[1])
+m4_define([poppler_version_micro],[2])
 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 3cbb044..d972ca4 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.18.1
+PROJECT_NUMBER         = 0.18.2
 
 # 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 a56c6ca..b1adf77 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.18.1
+PROJECT_NUMBER         = 0.18.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.