diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src')
10 files changed, 182 insertions, 17 deletions
diff --git a/Build/source/libs/poppler/poppler-src/CMakeLists.txt b/Build/source/libs/poppler/poppler-src/CMakeLists.txt index 54294e12828..5074a1a1740 100644 --- a/Build/source/libs/poppler/poppler-src/CMakeLists.txt +++ b/Build/source/libs/poppler/poppler-src/CMakeLists.txt @@ -22,7 +22,7 @@ if (ECM_FOUND) endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "50") +set(POPPLER_MINOR_VERSION "51") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") diff --git a/Build/source/libs/poppler/poppler-src/ChangeLog b/Build/source/libs/poppler/poppler-src/ChangeLog index 65f10f3facd..b77d9d95a7d 100644 --- a/Build/source/libs/poppler/poppler-src/ChangeLog +++ b/Build/source/libs/poppler/poppler-src/ChangeLog @@ -1,4 +1,132 @@ -commit 281f3a2ec4be515a8876a66575341f404a6a0208 +commit dc8edecc437f33305257b6cb208dc2da367b7868 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 15 18:27:49 2017 +0100 + + Poppler 0.51 + + CMakeLists.txt | 2 +- + NEWS | 15 ++++++++++++++- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 8 files changed, 21 insertions(+), 8 deletions(-) + +commit c4de00a93c470020c6c96eb343854039bfc0a424 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 14 23:42:32 2017 +0100 + + Forgot to update the \since value + + qt5/src/poppler-form.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0eb28e216fc45fe5ceed1c093a541ceca0dc0397 +Author: Christoph Cullmann <cullmann@kde.org> +Date: Fri Jan 13 00:03:27 2017 +0100 + + qt5: Fix segfault/assert if LinkDestination is constructed with + invalid input string. + + Bug #99357 + + qt5/src/poppler-link.cc | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit 4db6507320b51e060f73f7fb0eab364e8a1fee77 +Author: Sebastian Rasmussen <sebras@gmail.com> +Date: Wed Jan 11 23:37:54 2017 +0100 + + Check for error from NSS in SignatureHandler construct. + + And cascading effects in other SignalHandler members. + + Bug #99363 + + poppler/SignatureHandler.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 8bb90fc828a3400a2464a38f0ec9e592754197dd +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 10 17:20:18 2017 +0100 + + Qt5: Minor api refinements to the new signature classes + + qt5/src/poppler-form.cc | 32 +++++++++++++++++++++----------- + qt5/src/poppler-form.h | 22 +++++++++++----------- + qt5/tests/poppler-forms.cpp | 14 +++++++------- + 3 files changed, 39 insertions(+), 29 deletions(-) + +commit aa63debdaa6001ed68333b31cd06c2f9958fd8d2 +Author: Hanno Meyer-Thurow <h.mth@web.de> +Date: Tue Jan 10 16:28:14 2017 +0100 + + Qt5: Implement digital signature support + + Bug #94378 + + qt5/src/poppler-form.cc | 121 + ++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 106 ++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-page.cc | 7 +++ + qt5/tests/poppler-forms.cpp | 47 ++++++++++++++++- + 4 files changed, 280 insertions(+), 1 deletion(-) + +commit 2f831d5b9481e5ab06178409f7fccf74eda6e1a2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 9 00:30:42 2017 +0100 + + New year! + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b6c4d6d1312f63e5e6dcfa28ea48ff3e6935daa9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 9 00:28:37 2017 +0100 + + Fix memory leak in PDFDoc::markAnnotations + + poppler/PDFDoc.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3cae7773d2f8ad6506e2712689c56fa6975e01d3 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Mon Jan 9 00:25:53 2017 +0100 + + pdfunite: add fields to AcroForm dict + + Bug #99141 + + utils/pdfunite.cc | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +commit c301f6c675784a65fb2ebdf99ded5d5d3f8defdd +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 19 22:53:47 2016 +0100 + + qt5: Add Poppler::FormField::setName + + qt5/src/poppler-form.cc | 9 ++++++++- + qt5/src/poppler-form.h | 10 ++++++++-- + 2 files changed, 16 insertions(+), 3 deletions(-) + +commit 86c99de95cd16199e0f9f1fb82999c27d54c5b76 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 19 22:53:10 2016 +0100 + + Add Form[Field|Widget]::setPartialName + + Useful to repair/tweak pdf files + + poppler/Form.cc | 16 ++++++++++++++++ + poppler/Form.h | 2 ++ + 2 files changed, 18 insertions(+) + +commit 56dfa44960b9ab9fb4dcc01d8e3861a9293b0ee0 Author: Albert Astals Cid <aacid@kde.org> Date: Thu Dec 15 23:32:41 2016 +0100 @@ -11,11 +139,11 @@ Date: Thu Dec 15 23:32:41 2016 +0100 poppler/Makefile.am | 2 +- qt4/src/CMakeLists.txt | 2 +- qt4/src/Doxyfile | 2 +- - qt4/src/Makefile.am | 2 +- + qt4/src/Makefile.am | 3 ++- qt5/src/CMakeLists.txt | 2 +- qt5/src/Doxyfile | 2 +- - qt5/src/Makefile.am | 2 +- - 11 files changed, 36 insertions(+), 11 deletions(-) + qt5/src/Makefile.am | 3 ++- + 11 files changed, 38 insertions(+), 11 deletions(-) commit 1511523450f40b539fb1d58950a907f3712fd5c7 Author: Albert Astals Cid <aacid@kde.org> diff --git a/Build/source/libs/poppler/poppler-src/NEWS b/Build/source/libs/poppler/poppler-src/NEWS index bc92685f668..9139ff610cb 100644 --- a/Build/source/libs/poppler/poppler-src/NEWS +++ b/Build/source/libs/poppler/poppler-src/NEWS @@ -1,3 +1,17 @@ +Release 0.51.0 + core: + * Check for error from NSS in SignatureHandler construct. Bug #99363 + * Add Form[Field|Widget]::setPartialName + * Fix memory leak in PDFDoc::markAnnotations + + qt5: + * Implement digital signature support. Bug #94378 + * Add Poppler::FormField::setName + * Fix segfault/assert if LinkDestination is constructed with invalid input string. Bug #99357 + + utils: + * pdfunite: add fields to AcroForm dict. Bug #99141 + Release 0.50.0 core: * PSOutputDev: Fix PS conversion for some files. Bug #63963 @@ -22,7 +36,6 @@ Release 0.50.0 glib: * Use g_slice_new0 for PopplerActionLayer. Bug #98786 - Release 0.49.0 core: * Merge type3 glyph handling from xpdf 3.04. Bug #96667 diff --git a/Build/source/libs/poppler/poppler-src/configure.ac b/Build/source/libs/poppler/poppler-src/configure.ac index 94dfa062ed5..90c8b511d4f 100644 --- a/Build/source/libs/poppler/poppler-src/configure.ac +++ b/Build/source/libs/poppler/poppler-src/configure.ac @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[50]) +m4_define([poppler_version_minor],[51]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff --git a/Build/source/libs/poppler/poppler-src/poppler/Form.cc b/Build/source/libs/poppler/poppler-src/poppler/Form.cc index dd62aaf1d18..8f8d14c4ebd 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/Form.cc +++ b/Build/source/libs/poppler/poppler-src/poppler/Form.cc @@ -147,6 +147,11 @@ GooString *FormWidget::getPartialName() const { return field->getPartialName(); } +void FormWidget::setPartialName(const GooString &name) +{ + field->setPartialName(name); +} + GooString *FormWidget::getAlternateUiName() const { return field->getAlternateUiName(); } @@ -611,6 +616,17 @@ FormField::FormField(PDFDoc *docA, Object *aobj, const Ref& aref, FormField *par obj1.free(); } +void FormField::setPartialName(const GooString &name) +{ + delete partialName; + partialName = name.copy(); + + Object obj1; + obj1.initString(name.copy()); + obj.getDict()->set("T", &obj1); + xref->setModifiedObject(&obj, ref); +} + FormField::~FormField() { if (!terminal) { diff --git a/Build/source/libs/poppler/poppler-src/poppler/Form.h b/Build/source/libs/poppler/poppler-src/poppler/Form.h index 4628dbfe328..52651336249 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/Form.h +++ b/Build/source/libs/poppler/poppler-src/poppler/Form.h @@ -98,6 +98,7 @@ public: double getFontSize() const; GooString *getPartialName() const; + void setPartialName(const GooString &name); GooString *getAlternateUiName() const; GooString *getMappingName() const; GooString *getFullyQualifiedName(); @@ -279,6 +280,7 @@ public: VariableTextQuadding getTextQuadding() const { return quadding; } GooString *getPartialName() const { return partialName; } + void setPartialName(const GooString &name); GooString *getAlternateUiName() const { return alternateUiName; } GooString *getMappingName() const { return mappingName; } GooString *getFullyQualifiedName(); diff --git a/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc index f28bdec89cd..f02f192f554 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc +++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net> -// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2005, 2007-2009, 2011-2017 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org> // Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org> // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org> @@ -1735,9 +1735,9 @@ GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Gui Object obj3; array->getNF(i, &obj3); if (obj3.isRef()) { - Object *newRef = new Object(); - newRef->initRef(newPageNum, 0); - dict->set("P", newRef); + Object newRef; + newRef.initRef(newPageNum, 0); + dict->set("P", &newRef); getXRef()->setModifiedObject(&obj1, obj3.getRef()); } obj3.free(); diff --git a/Build/source/libs/poppler/poppler-src/poppler/SignatureHandler.cc b/Build/source/libs/poppler/poppler-src/poppler/SignatureHandler.cc index a5132a489d1..71644e54dc2 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/SignatureHandler.cc +++ b/Build/source/libs/poppler/poppler-src/poppler/SignatureHandler.cc @@ -8,6 +8,7 @@ // Copyright 2015 André Esser <bepandre@hotmail.com> // Copyright 2015, 2016 Albert Astals Cid <aacid@kde.org> // Copyright 2015 Markus Kilås <digital@markuspage.com> +// Copyright 2017 Sebastian Rasmussen <sebras@gmail.com> // //======================================================================== @@ -105,7 +106,8 @@ void SignatureHandler::init_nss() SignatureHandler::SignatureHandler(unsigned char *p7, int p7_length) - : CMSMessage(NULL), + : hash_context(NULL), + CMSMessage(NULL), CMSSignedData(NULL), CMSSignerInfo(NULL), temp_certs(NULL) @@ -115,8 +117,10 @@ SignatureHandler::SignatureHandler(unsigned char *p7, int p7_length) CMSitem.len = p7_length; CMSMessage = CMS_MessageCreate(&CMSitem); CMSSignedData = CMS_SignedDataCreate(CMSMessage); - CMSSignerInfo = CMS_SignerInfoCreate(CMSSignedData); - hash_context = initHashContext(); + if (CMSSignedData) { + CMSSignerInfo = CMS_SignerInfoCreate(CMSSignedData); + hash_context = initHashContext(); + } } HASHContext * SignatureHandler::initHashContext() @@ -131,7 +135,9 @@ HASHContext * SignatureHandler::initHashContext() void SignatureHandler::updateHash(unsigned char * data_block, int data_len) { - HASH_Update(hash_context, data_block, data_len); + if (hash_context) { + HASH_Update(hash_context, data_block, data_len); + } } SignatureHandler::~SignatureHandler() diff --git a/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake index 773f3ffd0ce..01c9a48280b 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake +++ b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake @@ -135,7 +135,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in index 8e1f71958f6..0d0aa9e52b4 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in @@ -135,7 +135,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2016 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ |