[poppler] Branch 'poppler-0.10' - 3 commits - CMakeLists.txt configure.ac msvc/config.h NEWS poppler/DCTStream.cc qt4/src

[Albert Astals Cid]

 CMakeLists.txt       |    2 +-
 NEWS                 |   17 +++++++++++++++++
 configure.ac         |    2 +-
 msvc/config.h        |    6 +++---
 poppler/DCTStream.cc |    2 +-
 qt4/src/Doxyfile     |    2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit f3b4a1ef1c9f12f99a693192d998eff0a2601759
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Mar 12 00:21:45 2009 +0100

    Update NEWS

diff --git a/NEWS b/NEWS
index 9c6b1b5..886a324 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Release 0.10.5
+
+	core:
+	 * Read the UF entry if present and prefer it over F in Filespec dictionary
+	 * Fix typo that was making CairoOutputDev crash on some files. Bug #17337
+	 * Make JBIG2Stream more robust to corrupt input data
+	 * Do not blindly follow loops parsing OutlineItem. Bug #18364
+	 * Set up the error manager before calling jpeg_create_decompress. Bug #20484
+	 * Check there is an optional content config before using it. Bug #20587
+	 * Fix rendering of some PDF with OpenType fonts. Bug #20605
+
+	build system:
+	 * Yet more support for build on windows
+	 * Use AC_CHECK_HEADER to find headers. Bug #20538
+	 * Check for pkgconfig before using it
+	 * General autotools improvements
+
 Release 0.10.4
 
 	core:
commit 4ae74d921773f5e5b45aa9b3cd89779abaf8e7c9
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Mar 12 00:10:31 2009 +0100

    Increase verison to 0.10.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 415b109..fdceaa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(PkgConfig)
 include(MacroEnsureVersion)
 include(MacroBoolTo01)
 
-set(POPPLER_VERSION "0.10.4")
+set(POPPLER_VERSION "0.10.5")
 
 # command line switches
 option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
diff --git a/configure.ac b/configure.ac
index cc4f59c..6e11ae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(poppler, 0.10.4)
+AC_INIT(poppler, 0.10.5)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(config.h)
diff --git a/msvc/config.h b/msvc/config.h
index aa37dc9..9aabb19 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -32,13 +32,13 @@
 #define PACKAGE_NAME "poppler"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "poppler 0.10.4"
+#define PACKAGE_STRING "poppler 0.10.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "poppler"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.4"
+#define PACKAGE_VERSION "0.10.5"
 
 /* Poppler data dir */
 #define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -53,7 +53,7 @@
 /* #undef USE_EXCEPTIONS */
 
 /* Version number of package */
-#define VERSION "0.10.4"
+#define VERSION "0.10.5"
 
 #define snprintf _snprintf
 #define unlink _unlink
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 30c2744..6f3615d 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.10.4
+PROJECT_NUMBER         = 0.10.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
commit 23eeefda07b3f8c106e7e9be8e3fead7f0d393b2
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Mar 12 00:09:03 2009 +0100

    Really fix jpeg lib init order?

diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index aab2df8..de37d34 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -88,8 +88,8 @@ void DCTStream::init()
   src.index = 0;
   src.abort = false;
   
-  jpeg_create_decompress(&cinfo);
   cinfo.err = &jerr;
+  jpeg_create_decompress(&cinfo);
   cinfo.src = (jpeg_source_mgr *)&src;
   x = 0;
   row_buffer = NULL;