[poppler] Branch 'poppler-0.18' - 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/GfxFont.cc poppler/GlobalParams.cc qt4/src utils/parseargs.cc

[Albert Astals Cid]

 CMakeLists.txt          |    2 +-
 NEWS                    |   15 +++++++++++++++
 configure.ac            |    2 +-
 cpp/Doxyfile            |    2 +-
 poppler/GfxFont.cc      |    1 +
 poppler/GlobalParams.cc |    1 +
 qt4/src/Doxyfile        |    2 +-
 utils/parseargs.cc      |    2 +-
 8 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit be59afb19e83c5040ea0d993cfb238aefc06abb1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jan 15 15:21:06 2012 +0100

    0.18.3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38db6c2..d8abc4b 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 "18")
-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/NEWS b/NEWS
index af2efc6..05c8de1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Release 0.18.3
+        core:
+         * Do not fail if we are trying to save a file with Encrypt that has not been modified. KDE Bug #288045
+         * Include .otf fonts when finding substitute fonts. Bug #44412
+         * Fix stack overflow in PDFDoc::markObject(). Bug #44660
+         * Include strings.h as we use memcpy. Bug #43558
+
+        utils:
+         * pdfunite: Properly initialize globalParams. Bug #44659
+         * pdfseparate: Properly initialize globalParams
+         * Fix iniliazialization of GooString arguments
+
+        build system:
+         * autoconf: Check for cairo-ft and other cairo backends. Bug #43969
+        
 Release 0.18.2
         core:
          * Fix leak in GooString when resizing to a smaller string
diff --git a/configure.ac b/configure.ac
index 28e30db..3890690 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[18])
-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 d972ca4..838aa74 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.18.2
+PROJECT_NUMBER         = 0.18.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 b1adf77..51aaa6d 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.18.2
+PROJECT_NUMBER         = 0.18.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit d4bff411d0d42064a617812d4e1bf2353fd79e1c
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jan 15 15:13:59 2012 +0100

    Add copyrights since last release

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 01325a8..33c894c 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -27,6 +27,7 @@
 // Copyright (C) 2009, 2010 David Benjamin <davidben at mit.edu>
 // Copyright (C) 2011 Axel Strübing <axel.struebing at freenet.de>
 // Copyright (C) 2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Yi Yang <ahyangyi at gmail.com>
 //
 // 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/GlobalParams.cc b/poppler/GlobalParams.cc
index 1e0ddc0..687fd25 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -30,6 +30,7 @@
 // Copyright (C) 2010 Jakub Wilk <ubanus at users.sf.net>
 // Copyright (C) 2011 Pino Toscano <pino at kde.org>
 // Copyright (C) 2011 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2012 Yi Yang <ahyangyi at gmail.com>
 //
 // 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/utils/parseargs.cc b/utils/parseargs.cc
index 52c7f0c..6ba3871 100644
--- a/utils/parseargs.cc
+++ b/utils/parseargs.cc
@@ -16,7 +16,7 @@
  under GPL version 2 or later
 
  Copyright (C) 2008, 2009 Albert Astals Cid <aacid at kde.org>
- Copyright (C) 2011 Adrian Johnson <ajohnson at redneon.com>
+ Copyright (C) 2011, 2012 Adrian Johnson <ajohnson at redneon.com>
 
  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