CMakeLists.txt | 2 +- NEWS | 21 +++++++++++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- glib/poppler-media.h | 2 +- poppler/Catalog.cc | 3 ++- qt4/src/Doxyfile | 2 +- qt5/src/Doxyfile | 2 +- splash/SplashXPathScanner.cc | 2 +- splash/SplashXPathScanner.h | 2 +- 10 files changed, 31 insertions(+), 9 deletions(-)
New commits: commit ce782112746f629a8e7be6f2daf6ece6ab19917d Merge: 2c0cb68 26372cf Author: Albert Astals Cid <[email protected]> Date: Sun Jul 20 20:35:13 2014 +0200 Merge remote-tracking branch 'origin/poppler-0.26' commit 26372cfae029a1124e042855c58bf5b70f281c76 Author: Ed Porras <[email protected]> Date: Sun Jul 20 20:33:48 2014 +0200 printf -> error Bug #81513 diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc index 4464346..039f63e 100644 --- a/poppler/Catalog.cc +++ b/poppler/Catalog.cc @@ -30,6 +30,7 @@ // Copyright (C) 2013 Adrian Perez de Castro <[email protected]> // Copyright (C) 2013 Adrian Johnson <[email protected]> // Copyright (C) 2013 José Aliste <[email protected]> +// Copyright (C) 2014 Ed Porras <[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 @@ -731,7 +732,7 @@ GBool NameTree::lookup(GooString *name, Object *obj) (*entry)->value.fetch(xref, obj); return gTrue; } else { - printf("failed to look up %s\n", name->getCString()); + error(errSyntaxError, -1, "failed to look up ({0:s})", name->getCString()); obj->initNull(); return gFalse; } commit 87d12c09281e3d12cda0fadcd65ab78928dff283 Author: Albert Astals Cid <[email protected]> Date: Sun Jul 20 18:20:57 2014 +0200 0.26.3 diff --git a/CMakeLists.txt b/CMakeLists.txt index cc7a8c6..e100cd3 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 "2") +set(POPPLER_MICRO_VERSION "3") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches diff --git a/configure.ac b/configure.ac index 9b66986..94eeb5b 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],[2]) +m4_define([poppler_version_micro],[3]) 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 ee6c048..8abfd3a 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.2 +PROJECT_NUMBER = 0.26.3 # 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 bfb9184..c6c67e3 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.2 +PROJECT_NUMBER = 0.26.3 # 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 53ac3f1..70cc8ca 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.2 +PROJECT_NUMBER = 0.26.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit 69e5b81640c9bb31f0876fa8eb7ba28dbf38923f Author: Albert Astals Cid <[email protected]> Date: Sun Jul 20 18:18:29 2014 +0200 News for 0.26.3 diff --git a/NEWS b/NEWS index afa01d9..11ac79d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,24 @@ +Release 0.26.3 + qt5: + * autoconf: Improve moc-qt5 detection + * Fix compilation with MinGW + + glib: + * Fix typo in api docs + * use C90-style comments in public headers + + core: + * Error out instead of exiting if allInter grows too much. Bug #78714 + + qt4: + * Update required version to Qt 4.7.0 + + build system: + * Include stdio.h from poppler-config.h + + misc: + * Update .gitignore files + Release 0.26.2 core: * Make sure we have an xref before using. KDE Bug #335413 commit c368c0714d57c089057d974908295d850a1b5108 Author: Albert Astals Cid <[email protected]> Date: Sun Jul 20 18:15:22 2014 +0200 Update Thomas' (C) diff --git a/splash/SplashXPathScanner.cc b/splash/SplashXPathScanner.cc index 5ca1811..ac47881 100644 --- a/splash/SplashXPathScanner.cc +++ b/splash/SplashXPathScanner.cc @@ -13,7 +13,7 @@ // // Copyright (C) 2008, 2010, 2014 Albert Astals Cid <[email protected]> // Copyright (C) 2010 PaweŠWiejacha <[email protected]> -// Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2013, 2014 Thomas Freitag <[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/splash/SplashXPathScanner.h b/splash/SplashXPathScanner.h index 53bd22d..cc295cb 100644 --- a/splash/SplashXPathScanner.h +++ b/splash/SplashXPathScanner.h @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2013, 2014 Thomas Freitag <[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 commit 639179318c43a907a27e86778b720d33d481a9f9 Author: Pino Toscano <[email protected]> Date: Thu Jul 17 07:33:10 2014 +0200 glib: use C90-style comments in public headers diff --git a/glib/poppler-media.h b/glib/poppler-media.h index f324e1b..292d386 100644 --- a/glib/poppler-media.h +++ b/glib/poppler-media.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS #define POPPLER_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), POPPLER_TYPE_MEDIA, PopplerMedia)) #define POPPLER_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), POPPLER_TYPE_MEDIA)) -// FIXME: this should be generic (PopplerSaveToCallbackFunc) +/* FIXME: this should be generic (PopplerSaveToCallbackFunc) */ /** * PopplerMediaSaveFunc:
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
