[poppler] Branch 'poppler-0.16' - 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/PageLabelInfo.cc qt4/src

[Albert Astals Cid]

 CMakeLists.txt           |    2 +-
 NEWS                     |   18 ++++++++++++++++++
 configure.ac             |    2 +-
 cpp/Doxyfile             |    2 +-
 poppler/PageLabelInfo.cc |    7 +++----
 qt4/src/Doxyfile         |    2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit 41d5fe603741eb4668946ad1c169b6f714a94fb2
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jan 27 19:54:14 2011 +0000

    0.16.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b904690..951adfc 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 "16")
-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 9d44318..6d3132b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Release 0.16.1
+	core:
+	 * Fix colorspace issues in the Cairo backend (Bug #32746)
+	 * Remove declaration of function without implementation
+	 * Do not crash in case jpeg_create_decompress fails (Bug #32890)
+	 * Fix variable access mismatch (Bug #33063)
+	 * Fix converting some pdf to ps with -level1sep (Bug #32365)
+	 * Fix line selection, dont check y for Line selections
+	 * Include zlib header in PNGWriter.cc
+	 * Fix leak in Splash backend when doing axial shaded fills
+
+	glib:
+	 * Use NULL instead of FALSE for functions returning a pointer
+	 * Fix memory leak in poppler_page_get_text_layout() for pages with no text
+
+	qt4:
+	 * Fix unicodeToQString() to correctly decode the Unicode sequence
+
 Release 0.16.0
 
 	core:
diff --git a/configure.ac b/configure.ac
index 831452b..4d43326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[16])
-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 f6f70d0..9be73ff 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.16.0
+PROJECT_NUMBER         = 0.16.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 b1dc4d5..f2f64d6 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.16.0
+PROJECT_NUMBER         = 0.16.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit 357a990b7554c79259125ae34c795e170ba4a80f
Author: Simon Kellner <kellner at kit.edu>
Date:   Wed Jan 26 22:59:49 2011 +0000

    fix labelToIndex on multiple prefixes
    
    A PDF document can use page label prefixes, for example, to label
    only inside a chapter ("A-1" .. "A-<n>", "B-1" .. "B-<m>" et cetera).
    When calculating a page index for a given label, poppler would
    disregard the page range for all preceding prefixes that do not
    match the given prefix.

diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc
index 84cb50f..1330988 100644
--- a/poppler/PageLabelInfo.cc
+++ b/poppler/PageLabelInfo.cc
@@ -4,6 +4,7 @@
 //
 // Copyright (C) 2005-2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2005, 2009 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2011 Simon Kellner <kellner at kit.edu>
 //
 // 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
@@ -258,11 +259,11 @@ GBool PageLabelInfo::labelToIndex(GooString *label, int *index)
   Interval *interval;
   char *str = label->getCString(), *end;
   int prefixLength;
-  int i, base, number;
+  int i, number;
 
-  base = 0;
   for (i = 0; i < intervals.getLength(); i++) {
     interval = (Interval *) intervals.get(i);
+    const int base = interval->base;
     prefixLength = interval->prefix->getLength();
     if (label->cmpN(interval->prefix, prefixLength) != 0)
       continue;
@@ -294,8 +295,6 @@ GBool PageLabelInfo::labelToIndex(GooString *label, int *index)
     case Interval::None:
       break;
     }
-
-    base += interval->length;
   }
 
   return gFalse;