Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
CMakeLists.txt
NEWS
configure.ac
cpp/Doxyfile
qt4/src/Doxyfile
qt5/src/Doxyfile
diff --git a/NEWS b/NEWS
index fb08f79..6d5140e 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@
* Add API to get text, text layout and text attributes for a given area
* demo improvements
+Release 0.24.5
+ core:
+ * Fix crash due to wrong formatting of error message. KDE Bug #328511
+
Release 0.24.4
core:
* Fix regression in broken endstream detection. Bug #70854
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index dbc7bdc..bda7d52 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -21,6 +21,7 @@
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
//
// 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
