summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/TLpatches/ChangeLog6
-rw-r--r--Build/source/libs/poppler/TLpatches/TL-Changes2
-rw-r--r--Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX6
-rw-r--r--Build/source/libs/poppler/TLpatches/patch-03-Object-functions6
-rwxr-xr-xBuild/source/libs/poppler/configure22
-rw-r--r--Build/source/libs/poppler/poppler-src/CMakeLists.txt2
-rw-r--r--Build/source/libs/poppler/poppler-src/ChangeLog62
-rw-r--r--Build/source/libs/poppler/poppler-src/NEWS16
-rw-r--r--Build/source/libs/poppler/poppler-src/configure.ac2
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Annot.cc33
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc6
-rw-r--r--Build/source/libs/poppler/version.ac2
14 files changed, 131 insertions, 41 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 5b762bf3dc9..99aecc4ed8e 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -49,7 +49,7 @@ mpfr 3.1.5 - checked 28sep16
pixman 0.34.0 - checked 04feb16
http://cairographics.org/releases/
-poppler 0.51.0 - checked 15jan17
+poppler 0.52.0 - checked 17feb17
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.13 - checked 28dec15
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 388e9a4aa6e..02dd81b55b5 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import poppler-0.52.0.
+ * version.ac: Adjust.
+
2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import poppler-0.51.0.
diff --git a/Build/source/libs/poppler/TLpatches/ChangeLog b/Build/source/libs/poppler/TLpatches/ChangeLog
index 7beafc5db27..99a400e24f6 100644
--- a/Build/source/libs/poppler/TLpatches/ChangeLog
+++ b/Build/source/libs/poppler/TLpatches/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Imported poppler-0.52.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Imported poppler-0.51.0 source tree from:
diff --git a/Build/source/libs/poppler/TLpatches/TL-Changes b/Build/source/libs/poppler/TLpatches/TL-Changes
index 0fd4201ee14..883eb5f752a 100644
--- a/Build/source/libs/poppler/TLpatches/TL-Changes
+++ b/Build/source/libs/poppler/TLpatches/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.51.0 tree as obtained from:
+Changes applied to the poppler-0.52.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX b/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX
index 1e6f0282cb0..318417ea40d 100644
--- a/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.51.0.orig/goo/GooString.h poppler-0.51.0/goo/GooString.h
---- poppler-0.51.0.orig/goo/GooString.h Fri Dec 16 04:08:06 2016
-+++ poppler-0.51.0/goo/GooString.h Mon Jan 16 08:28:38 2017
+diff -ur poppler-0.52.0.orig/goo/GooString.h poppler-0.52.0/goo/GooString.h
+--- poppler-0.52.0.orig/goo/GooString.h Tue Jan 17 06:36:57 2017
++++ poppler-0.52.0/goo/GooString.h Fri Feb 17 08:54:28 2017
@@ -36,6 +36,21 @@
#endif
diff --git a/Build/source/libs/poppler/TLpatches/patch-03-Object-functions b/Build/source/libs/poppler/TLpatches/patch-03-Object-functions
index 00fae66add6..2e038362f1a 100644
--- a/Build/source/libs/poppler/TLpatches/patch-03-Object-functions
+++ b/Build/source/libs/poppler/TLpatches/patch-03-Object-functions
@@ -1,6 +1,6 @@
-diff -ur poppler-0.51.0.orig/poppler/Object.h poppler-0.51.0/poppler/Object.h
---- poppler-0.51.0.orig/poppler/Object.h Fri Dec 16 04:08:06 2016
-+++ poppler-0.51.0/poppler/Object.h Mon Jan 16 08:31:27 2017
+diff -ur poppler-0.52.0.orig/poppler/Object.h poppler-0.52.0/poppler/Object.h
+--- poppler-0.52.0.orig/poppler/Object.h Tue Jan 17 06:36:58 2017
++++ poppler-0.52.0/poppler/Object.h Fri Feb 17 08:57:36 2017
@@ -148,7 +148,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index a55fa399b99..090e0eb1a38 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.51.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.52.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.51.0'
-PACKAGE_STRING='poppler (TeX Live) 0.51.0'
+PACKAGE_VERSION='0.52.0'
+PACKAGE_STRING='poppler (TeX Live) 0.52.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.51.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.52.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.51.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.52.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.51.0
+poppler (TeX Live) configure 0.52.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.51.0, which was
+It was created by poppler (TeX Live) $as_me 0.52.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.51.0'
+ VERSION='0.52.0'
# Some tools Automake needs.
@@ -6578,7 +6578,7 @@ ac_config_headers="$ac_config_headers poppler-config.h:poppler-src/poppler/poppl
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.51.0"
+#define POPPLER_VERSION "0.52.0"
_ACEOF
@@ -7272,7 +7272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.51.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.52.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.51.0
+poppler (TeX Live) config.status 0.52.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/poppler/poppler-src/CMakeLists.txt b/Build/source/libs/poppler/poppler-src/CMakeLists.txt
index 5074a1a1740..d36e06e35c7 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 "51")
+set(POPPLER_MINOR_VERSION "52")
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 b77d9d95a7d..b485fb46a50 100644
--- a/Build/source/libs/poppler/poppler-src/ChangeLog
+++ b/Build/source/libs/poppler/poppler-src/ChangeLog
@@ -1,3 +1,65 @@
+commit baad9bd0406f63cffa8054c5831ccc3cb5d207e3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 15 23:05:55 2017 +0100
+
+ Update C years
+
+ poppler/Annot.cc | 2 +-
+ poppler/OptionalContent.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 83d4d3ee56b22ef4c0899514abcfc4c220fb4031
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 13 20:47:05 2017 +0100
+
+ Properly initialize some RichMedia variables in corner cases
+
+ Bug #99767
+
+ poppler/Annot.cc | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+commit 8de4b3595a80d8880b842599cb25ab5fd5367689
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 13 01:15:04 2017 +0100
+
+ Fix assert on reading some OCGs
+
+ Check the object is a ref before calling getRef
+
+ Bug #99768
+
+ poppler/OptionalContent.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 0b7c235c3ebe2a7a8d7bd6bfb22e605bf770a022
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Feb 9 21:23:04 2017 +1030
+
+ pdftocairo.1: typo
+
+ utils/pdftocairo.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e7aad35dcba3449bc8a56de070fea7e09cb64833
+Author: Hubert Figuière <hub@figuiere.net>
+Date: Tue Jan 17 23:58:00 2017 -0500
+
+ Qt: fix memory leaks found when running tests
+
+ -cleanup objects in tests to fix memory leaks.
+ -optcontent was leaking the headers items
+
+ Bug #99449
+
+ qt4/src/poppler-optcontent-private.h | 2 ++
+ qt4/src/poppler-optcontent.cc | 3 +++
+ qt4/tests/check_links.cpp | 2 ++
+ qt5/src/poppler-optcontent-private.h | 2 ++
+ qt5/src/poppler-optcontent.cc | 3 +++
+ qt5/tests/check_links.cpp | 2 ++
+ 6 files changed, 14 insertions(+)
+
commit dc8edecc437f33305257b6cb208dc2da367b7868
Author: Albert Astals Cid <aacid@kde.org>
Date: Sun Jan 15 18:27:49 2017 +0100
diff --git a/Build/source/libs/poppler/poppler-src/NEWS b/Build/source/libs/poppler/poppler-src/NEWS
index 9139ff610cb..cf7de77bf94 100644
--- a/Build/source/libs/poppler/poppler-src/NEWS
+++ b/Build/source/libs/poppler/poppler-src/NEWS
@@ -1,3 +1,19 @@
+Release 0.52.0
+ core:
+ * Fix assert on reading some OCGs. Bug #99768
+ * Properly initialize some RichMedia variables in corner cases. Bug #99767
+
+ qt4:
+ * optcontent structure was leaking the headers items. Bug #99449
+ * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+ qt5:
+ * optcontent structure was leaking the headers items. Bug #99449
+ * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+ utils:
+ * pdftocairo.1: Fix typo
+
Release 0.51.0
core:
* Check for error from NSS in SignatureHandler construct. Bug #99363
diff --git a/Build/source/libs/poppler/poppler-src/configure.ac b/Build/source/libs/poppler/poppler-src/configure.ac
index 90c8b511d4f..5caa8ae5167 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],[51])
+m4_define([poppler_version_minor],[52])
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/Annot.cc b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
index 51a80e5d9c2..279f650d186 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2013, 2015, 2016 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2013, 2015-2017 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
@@ -6854,6 +6854,8 @@ AnnotRichMedia::Content::Content(Dict *dict) {
}
obj1.free();
+ nAssets = 0;
+ assets = NULL;
if (dict->lookup("Assets", &obj1)->isDict()) {
Object obj2;
@@ -6878,10 +6880,6 @@ AnnotRichMedia::Content::Content(Dict *dict) {
}
}
obj2.free();
-
- } else {
- nAssets = 0;
- assets = NULL;
}
obj1.free();
}
@@ -7044,20 +7042,19 @@ AnnotRichMedia::Instance::Instance(Dict *dict)
{
Object obj1;
- if (dict->lookup("Subtype", &obj1)->isName()) {
- const char *name = obj1.getName();
+ dict->lookup("Subtype", &obj1);
+ const char *name = obj1.isName() ? obj1.getName() : "";
- if (!strcmp(name, "3D")) {
- type = type3D;
- } else if (!strcmp(name, "Flash")) {
- type = typeFlash;
- } else if (!strcmp(name, "Sound")) {
- type = typeSound;
- } else if (!strcmp(name, "Video")) {
- type = typeVideo;
- } else {
- type = typeFlash;
- }
+ if (!strcmp(name, "3D")) {
+ type = type3D;
+ } else if (!strcmp(name, "Flash")) {
+ type = typeFlash;
+ } else if (!strcmp(name, "Sound")) {
+ type = typeSound;
+ } else if (!strcmp(name, "Video")) {
+ type = typeVideo;
+ } else {
+ type = typeFlash;
}
obj1.free();
diff --git a/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
index e0d49bc9a5f..44eef194dda 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
@@ -5,7 +5,7 @@
// Copyright 2007 Brad Hards <bradh@kde.org>
// Copyright 2008 Pino Toscano <pino@kde.org>
// Copyright 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008, 2010, 2011, 2017 Albert Astals Cid <aacid@kde.org>
// Copyright 2008 Mark Kaplan <mkaplan@finjan.com>
//
// Released under the GPL (version 2, or later, at your option)
@@ -63,6 +63,10 @@ OCGs::OCGs(Object *ocgObject, XRef *xref) :
OptionalContentGroup *thisOptionalContentGroup = new OptionalContentGroup(ocg.getDict());
ocg.free();
ocgList.arrayGetNF(i, &ocg);
+ if (!ocg.isRef()) {
+ ocg.free();
+ break;
+ }
// TODO: we should create a lookup map from Ref to the OptionalContentGroup
thisOptionalContentGroup->setRef( ocg.getRef() );
ocg.free();
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 5945ca941ce..5f16b7877e6 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.51.0])
+m4_define([poppler_version], [0.52.0])
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 06:48:36 +0000