[poppler] Branch 'poppler-0.22' - 3 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Parser.cc poppler/poppler-config.h.cmake poppler/poppler-config.h.in qt4/src

[Albert Astals Cid]

 CMakeLists.txt                 |    2 +-
 NEWS                           |    9 +++++++++
 configure.ac                   |    2 +-
 cpp/Doxyfile                   |    2 +-
 poppler/Parser.cc              |    1 +
 poppler/poppler-config.h.cmake |    2 +-
 poppler/poppler-config.h.in    |    2 +-
 qt4/src/Doxyfile               |    2 +-
 8 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit dca21f86359b6b2a925f7b05a2f36ab854cefbce
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Feb 10 11:47:21 2013 +0100

    0.22.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 913615c..b439153 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 "0")
+set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 22e9a0b..36c0398 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Release 0.22.1
+        core:
+         * Fix crash in some pdf files when extracting text (Bug #59561)
+         * Fix crashes in wrongly formed files
+         * Fix wrong warning when opening some files (Bug #58966)
+
+        build system:
+         * Improve autoconf jpeglib.h detection (Bug #59186)
+
 Release 0.22.0
         core:
          * Fix crash in invalid files that define a <= 0 bits per image value
diff --git a/configure.ac b/configure.ac
index c2d6bdd..a512782 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],[0])
+m4_define([poppler_version_micro],[1])
 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 f0f5618..2001c0c 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.0
+PROJECT_NUMBER         = 0.22.1
 
 # 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 30e73e5..2c4bfb9 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.0
+PROJECT_NUMBER         = 0.22.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit e8e9245f6a4884da3940fc281b7ff1a42d7f5964
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Feb 10 11:43:14 2013 +0100

    Update C year here too

diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index 2425f6a..13a92fe 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -117,7 +117,7 @@
 //------------------------------------------------------------------------
 
 // copyright notice
-#define popplerCopyright "Copyright 2005-2012 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"
 #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
 
 //------------------------------------------------------------------------
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 5c56ea4..11b5691 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -117,7 +117,7 @@
 //------------------------------------------------------------------------
 
 // copyright notice
-#define popplerCopyright "Copyright 2005-2012 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"
 #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
 
 //------------------------------------------------------------------------
commit ebbacd897e2b529d1c3637b6af438b8dcc1d7ce8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Feb 10 11:42:21 2013 +0100

    Update C

diff --git a/poppler/Parser.cc b/poppler/Parser.cc
index 431a279..69304c4 100644
--- a/poppler/Parser.cc
+++ b/poppler/Parser.cc
@@ -17,6 +17,7 @@
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
 // Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.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