[poppler] 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Makefile.am poppler/XRef.cc qt4/src

[Albert Astals Cid]

 CMakeLists.txt      |    4 ++--
 NEWS                |   17 +++++++++++++++++
 configure.ac        |    2 +-
 cpp/Doxyfile        |    2 +-
 poppler/Makefile.am |    2 +-
 poppler/XRef.cc     |    2 +-
 qt4/src/Doxyfile    |    2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit 800cb9ec7189a539d64b99fa181cd4126496c1ec
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
Date:   Sat Apr 28 17:15:30 2012 +0200

    Reconstruct xref table if xref needed but missing
    
    Bug #40719

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 1574371..3564807 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1406,7 +1406,7 @@ XRefEntry *XRef::getEntry(int i, GBool complainIfMissing)
 
         // if there was a problem with the xref table,
         // try to reconstruct it
-        if (!ok) {
+        if (!ok || (!prevXRefOffset && entries[i].type == xrefEntryNone)) {
            GBool wasReconstructed = false;
            if (!(ok = constructXRef(&wasReconstructed))) {
                errCode = errDamaged;
commit 410822d7013ce1f61325afdb61d75ea64666755e
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Apr 27 01:10:22 2012 +0200

    0.19.4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af894d1..1754813 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 "19")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MICRO_VERSION "4")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
@@ -386,7 +386,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 23.0.0 SOVERSION 23)
+set_target_properties(poppler PROPERTIES VERSION 24.0.0 SOVERSION 24)
 target_link_libraries(poppler ${poppler_LIBS})
 target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/NEWS b/NEWS
index 7cdf67e..e048381 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Release 0.19.4
+        core:
+         * Annotation improvements
+         * More compatible file writing
+         * SplashOutputDev: Fix slow rendering of pdf with a lot of image masks in pattern colorspace
+         * Fix crashes in broken documents
+         * Fix spurious warning messages
+        
+        utils:
+         * pdftotext: Add missing section heading to man page
+         * pdftohtml: Fix crash when the destination file does not exist
+        
+        build system:
+         * autoconf: Do not append "-ansi" to CXXFLAG, if "-std=XXX" is already specified.
+         * autoconf: Do not clear FREETYPE_CFLAGS, FREETYPE_LIBS before PKG_CHECK_MODULES()
+         * autoconf: Copying graphics library CFLAGS to cpp frontend Makefile.am
+
 Release 0.19.3
         core:
          * Annotation improvements
diff --git a/configure.ac b/configure.ac
index 71cd3b9..ee11ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[19])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_micro],[4])
 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 844f52f..acb8fac 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.19.3
+PROJECT_NUMBER         = 0.19.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 05c5db1..c536987 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -177,7 +177,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 23:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 24:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 8289463..d137577 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.19.3
+PROJECT_NUMBER         = 0.19.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.