CMakeLists.txt | 2 +- NEWS | 12 ++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- goo/gfile.cc | 6 +----- poppler/Annot.cc | 1 + poppler/CairoOutputDev.cc | 2 +- qt4/src/Doxyfile | 2 +- qt5/src/Doxyfile | 2 +- 9 files changed, 20 insertions(+), 11 deletions(-)
New commits: commit fe67324d450c356b7c876cf50da705156112513a Merge: e62e18e f74a596 Author: Albert Astals Cid <[email protected]> Date: Thu Aug 21 21:39:52 2014 +0200 Merge remote-tracking branch 'origin/poppler-0.26' commit f74a5964078224c01bd5642aabc928d185bb0b69 Author: Albert Astals Cid <[email protected]> Date: Thu Aug 21 20:07:54 2014 +0200 0.26.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index e100cd3..24902ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS() set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "26") -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 diff --git a/NEWS b/NEWS index 11ac79d..3e0e4fd 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +Release 0.26.4 + core: + * CairoOutputDev: Make sure we always push a transparency group in setSoftMaskFromImageMask(). Bug #81624 + * Fix a crash when adding Annotation without contents + * Improve non-latin characters in inline notes. Bug #65956 + * Don't check for inlineImg twice. Bug #82059 + * printf() -> error() + + glib: + * Return NULL in poppler_annot_get_contents also for empty strings + * Fix a memory leak when getting text layout and attributes + Release 0.26.3 qt5: * autoconf: Improve moc-qt5 detection diff --git a/configure.ac b/configure.ac index 94eeb5b..b38a2f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[26]) -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 8abfd3a..b73d953 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.26.3 +PROJECT_NUMBER = 0.26.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/qt4/src/Doxyfile b/qt4/src/Doxyfile index c6c67e3..4af5519 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.26.3 +PROJECT_NUMBER = 0.26.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/qt5/src/Doxyfile b/qt5/src/Doxyfile index 70cc8ca..677c9f6 100644 --- a/qt5/src/Doxyfile +++ b/qt5/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.26.3 +PROJECT_NUMBER = 0.26.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit ce92e4ccefc7dad79db7f0af7a792ffa47824849 Author: Albert Astals Cid <[email protected]> Date: Thu Aug 21 20:03:42 2014 +0200 Update (C) years diff --git a/poppler/Annot.cc b/poppler/Annot.cc index fa98b69..d35cb9b 100644 --- a/poppler/Annot.cc +++ b/poppler/Annot.cc @@ -31,6 +31,7 @@ // Copyright (C) 2013 Adrian Johnson <[email protected]> // Copyright (C) 2014 Marek Kasik <[email protected]> // Copyright (C) 2014 Jiri Slaby <[email protected]> +// Copyright (C) 2014 Anuj Khare <[email protected]> // // 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 diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc index c2827c6..1c67b5c 100644 --- a/poppler/CairoOutputDev.cc +++ b/poppler/CairoOutputDev.cc @@ -18,7 +18,7 @@ // Copyright (C) 2005, 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2005, 2009, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Nickolay V. Shmyrev <[email protected]> -// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2006-2011, 2013, 2014 Carlos Garcia Campos <[email protected]> // Copyright (C) 2008 Carl Worth <[email protected]> // Copyright (C) 2008-2014 Adrian Johnson <[email protected]> // Copyright (C) 2008 Michael Vrable <[email protected]> commit 42315c28809e62da7872add917e82853cf8c7e33 Author: Albert Astals Cid <[email protected]> Date: Thu Aug 21 19:58:35 2014 +0200 Make sure e is always initialized diff --git a/goo/gfile.cc b/goo/gfile.cc index 6fd4cba..3528bb3 100644 --- a/goo/gfile.cc +++ b/goo/gfile.cc @@ -748,7 +748,7 @@ GDir::~GDir() { } GDirEntry *GDir::getNextEntry() { - GDirEntry *e; + GDirEntry *e = NULL; #if defined(_WIN32) if (hnd != INVALID_HANDLE_VALUE) { @@ -757,14 +757,11 @@ GDirEntry *GDir::getNextEntry() { FindClose(hnd); hnd = INVALID_HANDLE_VALUE; } - } else { - e = NULL; } #elif defined(ACORN) #elif defined(MACOS) #elif defined(VMS) struct dirent *ent; - e = NULL; if (dir) { if (needParent) { e = new GDirEntry(path->getCString(), "-", doStat); @@ -778,7 +775,6 @@ GDirEntry *GDir::getNextEntry() { } #else struct dirent *ent; - e = NULL; if (dir) { do { ent = readdir(dir);
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
