diff options
| author | Albert Astals Cid <aacid@kde.org> | 2014-01-03 00:04:29 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-01-03 00:04:29 +0100 |
| commit | 381ae2877acace4e8908b07ee5fb442bc19bf814 (patch) | |
| tree | f92bda4f8cb744efd05f0f03688cbe3b21642908 | |
| parent | 64100e7f1f6b550e952838fce38615ec3788e17c (diff) | |
| parent | a2f0e4b1fd8b3d9675cc00a561094bd78a63d048 (diff) | |
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
CMakeLists.txt
NEWS
configure.ac
cpp/Doxyfile
qt4/src/Doxyfile
qt5/src/Doxyfile
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | poppler/JBIG2Stream.cc | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -21,6 +21,10 @@ Release 0.25.0 * 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 dbc7bdca..bda7d523 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 |