CMakeLists.txt | 2 +- NEWS | 11 +++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- poppler/Catalog.cc | 12 +++++------- poppler/Catalog.h | 2 +- qt4/src/Doxyfile | 2 +- 7 files changed, 21 insertions(+), 12 deletions(-)
New commits: commit dab9cdf795d6caead555326958e86e844ace067b Author: Albert Astals Cid <[email protected]> Date: Sat May 7 11:10:11 2011 +0100 Do not free a shallow copy of an object we'll free later Make sure we have our own copy we can free Fixes KDE BUG #268816 diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc index 297cac5..7decc72 100644 --- a/poppler/Catalog.cc +++ b/poppler/Catalog.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Kristian Høgsberg <[email protected]> -// Copyright (C) 2005-2010 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2011 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Jeff Muizelaar <[email protected]> // Copyright (C) 2005 Jonathan Blandford <[email protected]> // Copyright (C) 2005 Marco Pesenti Gritti <[email protected]> @@ -459,12 +459,10 @@ EmbFile *Catalog::embeddedFile(int i) GooString *Catalog::getJS(int i) { - Object obj = getJSNameTree()->getValue(i); - if (obj.isRef()) { - Ref r = obj.getRef(); - obj.free(); - xref->fetch(r.num, r.gen, &obj); - } + Object obj; + // getJSNameTree()->getValue(i) returns a shallow copy of the object so we + // do not need to free it + getJSNameTree()->getValue(i).fetch(xref, &obj); if (!obj.isDict()) { obj.free(); diff --git a/poppler/Catalog.h b/poppler/Catalog.h index cea808c..d534ab2 100644 --- a/poppler/Catalog.h +++ b/poppler/Catalog.h @@ -57,7 +57,7 @@ public: void parse(Object *tree); GBool lookup(GooString *name, Object *obj); int numEntries() { return length; }; - // iterator accessor + // iterator accessor, note it returns a shallow copy, do not free the object Object getValue(int i); GooString *getName(int i); commit 7b5d5716273f8e0071852b77af2aaf149e2c6640 Author: Albert Astals Cid <[email protected]> Date: Wed Apr 27 21:49:08 2011 +0100 0.16.5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fee9df..7e5e07e 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 "4") +set(POPPLER_MICRO_VERSION "5") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches diff --git a/NEWS b/NEWS index 0a2f5a6..1a8b6d7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Release 0.16.5 + core: + * Fix a memleak in AnnotScreen::initialize + * Properly initialize pageObjectNum to 0. Bug #35925 + + utils: + * pdftotext: bbox coordinates are relative to MediaBox size, not CropBox size + + cpp: + * Fix page_transition::operator= + Release 0.16.4 core: * Small improvements in Annot parsing diff --git a/configure.ac b/configure.ac index 75f173b..eb7403f 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],[4]) +m4_define([poppler_version_micro],[5]) 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 cbc7508..723e840 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.4 +PROJECT_NUMBER = 0.16.5 # 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 eeba59d..f48b117 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.4 +PROJECT_NUMBER = 0.16.5 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put.
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
