texlive[43564] Build/source/libs: poppler: revert to 0.52.0
commits+kakuto at tug.org
commits+kakuto at tug.org
Tue Mar 21 04:36:56 CET 2017
Revision: 43564
http://tug.org/svn/texlive?view=revision&revision=43564
Author: kakuto
Date: 2017-03-21 04:36:55 +0100 (Tue, 21 Mar 2017)
Log Message:
-----------
poppler: revert to 0.52.0
Modified Paths:
--------------
trunk/Build/source/libs/README
trunk/Build/source/libs/poppler/ChangeLog
trunk/Build/source/libs/poppler/TLpatches/ChangeLog
trunk/Build/source/libs/poppler/TLpatches/TL-Changes
trunk/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX
trunk/Build/source/libs/poppler/TLpatches/patch-03-Object-functions
trunk/Build/source/libs/poppler/configure
trunk/Build/source/libs/poppler/poppler-src/CMakeLists.txt
trunk/Build/source/libs/poppler/poppler-src/ChangeLog
trunk/Build/source/libs/poppler/poppler-src/NEWS
trunk/Build/source/libs/poppler/poppler-src/configure.ac
trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc
trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h
trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h
trunk/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h
trunk/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h
trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc
trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h
trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc
trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Annot.h
trunk/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h
trunk/Build/source/libs/poppler/poppler-src/poppler/FlateEncoder.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Form.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/Form.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Function.h
trunk/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h
trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.h
trunk/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h
trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h
trunk/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Link.h
trunk/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Makefile.am
trunk/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h
trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h
trunk/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h
trunk/Build/source/libs/poppler/poppler-src/poppler/Stream.h
trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h
trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.cc
trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.h
trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h
trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
trunk/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h
trunk/Build/source/libs/poppler/version.ac
Modified: trunk/Build/source/libs/README
===================================================================
--- trunk/Build/source/libs/README 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/README 2017-03-21 03:36:55 UTC (rev 43564)
@@ -49,7 +49,7 @@
pixman 0.34.0 - checked 04feb16
http://cairographics.org/releases/
-poppler 0.53.0 - checked 19mar17
+poppler 0.52.0 - checked 17feb17
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.14 - checked 22feb17
Modified: trunk/Build/source/libs/poppler/ChangeLog
===================================================================
--- trunk/Build/source/libs/poppler/ChangeLog 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/ChangeLog 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,8 +1,3 @@
-2017-03-19 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
-
- Import poppler-0.53.0.
- * version.ac: Adjust.
-
2017-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import poppler-0.52.0.
Modified: trunk/Build/source/libs/poppler/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/ChangeLog 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/TLpatches/ChangeLog 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,9 +1,3 @@
-2017-03-19 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
-
- Imported poppler-0.53.0 source tree from:
- http://poppler.freedesktop.org/
- * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
-
2017-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Imported poppler-0.52.0 source tree from:
Modified: trunk/Build/source/libs/poppler/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/TL-Changes 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/TLpatches/TL-Changes 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.53.0 tree as obtained from:
+Changes applied to the poppler-0.52.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
Modified: trunk/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,6 +1,6 @@
-diff -ur poppler-0.53.0.orig/goo/GooString.h poppler-0.53.0/goo/GooString.h
---- poppler-0.53.0.orig/goo/GooString.h Tue Jan 17 06:36:57 2017
-+++ poppler-0.53.0/goo/GooString.h Mon Mar 20 07:18:06 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 Tue Mar 21 12:18:41 2017
@@ -36,6 +36,21 @@
#endif
Modified: trunk/Build/source/libs/poppler/TLpatches/patch-03-Object-functions
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-03-Object-functions 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-03-Object-functions 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,6 +1,6 @@
-diff -ur poppler-0.53.0.orig/poppler/Object.h poppler-0.53.0/poppler/Object.h
---- poppler-0.53.0.orig/poppler/Object.h Tue Jan 17 06:36:58 2017
-+++ poppler-0.53.0/poppler/Object.h Mon Mar 20 07:20:49 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 Tue Mar 21 12:21:07 2017
@@ -148,7 +148,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)
Modified: trunk/Build/source/libs/poppler/configure
===================================================================
--- trunk/Build/source/libs/poppler/configure 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/configure 2017-03-21 03:36:55 UTC (rev 43564)
@@ -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.53.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.52.0.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.53.0'
-PACKAGE_STRING='poppler (TeX Live) 0.53.0'
+PACKAGE_VERSION='0.52.0'
+PACKAGE_STRING='poppler (TeX Live) 0.52.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1306,7 +1306,7 @@
# 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.53.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 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.53.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.52.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.53.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 @@
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.53.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 @@
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.53.0'
+ VERSION='0.52.0'
# Some tools Automake needs.
@@ -6578,7 +6578,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.53.0"
+#define POPPLER_VERSION "0.52.0"
_ACEOF
@@ -7272,7 +7272,7 @@
# 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.53.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 @@
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.53.0
+poppler (TeX Live) config.status 0.52.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/libs/poppler/poppler-src/CMakeLists.txt
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/CMakeLists.txt 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/CMakeLists.txt 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,6 +1,6 @@
project(poppler)
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
@@ -22,12 +22,10 @@
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "53")
+set(POPPLER_MINOR_VERSION "52")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
-set (CMAKE_CXX_STANDARD 11)
-
# command line switches
option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
@@ -504,7 +502,7 @@
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 67.0.0 SOVERSION 67)
+set_target_properties(poppler PROPERTIES VERSION 66.0.0 SOVERSION 66)
target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
Modified: trunk/Build/source/libs/poppler/poppler-src/ChangeLog
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/ChangeLog 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/ChangeLog 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,247 +1,3 @@
-commit 411c963a9fe7d0d51bc96f046792688a020bfc66
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Mar 19 12:40:37 2017 +0100
-
- Update (C)
-
- goo/PNGWriter.cc | 2 +-
- goo/PNGWriter.h | 2 +-
- goo/TiffWriter.cc | 2 +-
- goo/TiffWriter.h | 2 +-
- poppler/GfxState.h | 2 +-
- utils/ImageOutputDev.cc | 2 +-
- utils/ImageOutputDev.h | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-commit 96333f6dcd93afadea35f9301c7a919545037ed4
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 8 23:33:00 2017 +0100
-
- Add override markers
-
- cmake/modules/PopplerMacros.cmake | 4 +
- fofi/FoFiIdentifier.cc | 42 +--
- fofi/FoFiTrueType.h | 2 +-
- fofi/FoFiType1.h | 2 +-
- glib/poppler-cached-file-loader.h | 4 +-
- glib/poppler-input-stream.h | 34 +--
- goo/JpegWriter.h | 10 +-
- goo/NetPBMWriter.h | 8 +-
- goo/PNGWriter.h | 8 +-
- goo/TiffWriter.h | 10 +-
- poppler/Annot.h | 50 ++--
- poppler/CairoFontEngine.h | 6 +-
- poppler/CairoOutputDev.cc | 2 +-
- poppler/CairoOutputDev.h | 344 +++++++++++-----------
- poppler/DCTStream.h | 18 +-
- poppler/Decrypt.h | 24 +-
- poppler/FlateEncoder.h | 16 +-
- poppler/Form.h | 18 +-
- poppler/Function.h | 52 ++--
- poppler/GfxFont.h | 20 +-
- poppler/GfxState.cc | 2 +-
- poppler/GfxState.h | 366
- +++++++++++------------
- poppler/JBIG2Stream.cc | 16 +-
- poppler/JBIG2Stream.h | 22 +-
- poppler/JPEG2000Stream.h | 24 +-
- poppler/Link.h | 66 ++---
- poppler/LocalPDFDocBuilder.h | 5 +-
- poppler/MarkedContentOutputDev.h | 22 +-
- poppler/PSOutputDev.cc | 16 +-
- poppler/PSOutputDev.h | 142 ++++-----
- poppler/PopplerCache.cc | 2 +-
- poppler/PreScanOutputDev.h | 110 +++----
- poppler/SecurityHandler.h | 30 +-
- poppler/SplashOutputDev.cc | 2 +-
- poppler/SplashOutputDev.h | 210 ++++++-------
- poppler/StdinCachedFile.h | 5 +-
- poppler/StdinPDFDocBuilder.h | 5 +-
- poppler/Stream.h | 422
- +++++++++++++--------------
- poppler/TextOutputDev.cc | 38 +--
- poppler/TextOutputDev.h | 46 +--
- poppler/XRef.cc | 2 +-
- poppler/XRef.h | 12 +-
- qt4/CMakeLists.txt | 3 +
- qt4/src/poppler-annotation.h | 8 +-
- qt4/src/poppler-link.h | 2 +-
- qt5/demos/abstractinfodock.h | 6 +-
- qt5/demos/embeddedfiles.h | 6 +-
- qt5/demos/fonts.h | 4 +-
- qt5/demos/info.h | 4 +-
- qt5/demos/metadata.h | 4 +-
- qt5/demos/navigationtoolbar.h | 6 +-
- qt5/demos/optcontent.h | 6 +-
- qt5/demos/pageview.h | 6 +-
- qt5/demos/permissions.h | 4 +-
- qt5/demos/thumbnails.h | 4 +-
- qt5/demos/toc.h | 4 +-
- qt5/demos/viewer.h | 2 +-
- qt5/src/ArthurOutputDev.cc | 2 +-
- qt5/src/ArthurOutputDev.h | 90 +++---
- qt5/src/poppler-annotation.cc | 56 ++--
- qt5/src/poppler-annotation.h | 84 +++---
- qt5/src/poppler-form.h | 16 +-
- qt5/src/poppler-link-extractor-private.h | 10 +-
- qt5/src/poppler-link.h | 24 +-
- qt5/src/poppler-optcontent.h | 18 +-
- qt5/src/poppler-qiodeviceoutstream-private.h | 10 +-
- qt5/src/poppler-qt5.h | 6 +-
- qt5/tests/stress-threads-qt5.cpp | 4 +-
- qt5/tests/test-password-qt5.cpp | 4 +-
- qt5/tests/test-poppler-qt5.cpp | 6 +-
- splash/SplashFTFont.h | 12 +-
- splash/SplashFTFontFile.h | 6 +-
- splash/SplashPattern.h | 12 +-
- test/gtk-test.cc | 6 +-
- utils/HtmlOutputDev.h | 56 ++--
- utils/ImageOutputDev.h | 62 ++--
- utils/pdftohtml.cc | 12 +-
- 77 files changed, 1404 insertions(+), 1400 deletions(-)
-
-commit da490581b1b4d50efdba1e25115697e17bb0ef51
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Mar 8 22:07:34 2017 +0100
-
- Compile in C++11 mode
-
- I tried using AX_CXX_COMPILE_STDCXX_11 for the autotools side but
- could not get it to fill CXXFLAGS or any other variable i could find,
- help welcome
-
- CMakeLists.txt | 4 +++-
- configure.ac | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-commit aa8633267d1d0e2079bb4a2b82bc7b36a4d306f5
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 6 22:45:52 2017 +0100
-
- pdfinfo: Fix memory leak when printing JS
-
- utils/JSInfo.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-commit d30e66cf39ef69a81bdd91e21203c876f38d9a09
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 6 22:43:27 2017 +0100
-
- pdfinfo: fix leak when printing JS
-
- utils/JSInfo.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-commit a7632c5db6875828500dce7c984ec933d5349f26
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 6 22:34:20 2017 +0100
-
- pdftohtml: fix small memory leak when constructing some filenames
-
- utils/HtmlOutputDev.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-commit 8ebec831c2abea9f13761474990c0d94346c1a35
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Mon Mar 6 22:24:06 2017 +0100
-
- SplashOutputDev: Fix memory leak when rendering images with colormap
- and matte color
-
- poppler/SplashOutputDev.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-commit cfaeeadbc642a297486481d9efd6068fd9ef7ea3
-Author: Adrian Johnson <ajohnson at redneon.com>
-Date: Sat Mar 4 10:54:29 2017 +1030
-
- pdfimages: support 16bpc png and tiff images
-
- bug 99988
-
- goo/PNGWriter.cc | 4 ++++
- goo/PNGWriter.h | 3 ++-
- goo/TiffWriter.cc | 6 ++++++
- goo/TiffWriter.h | 3 ++-
- poppler/GfxState.h | 4 ++++
- utils/ImageOutputDev.cc | 38 +++++++++++++++++++++++++++++++++++++-
- utils/ImageOutputDev.h | 1 +
- 7 files changed, 56 insertions(+), 3 deletions(-)
-
-commit 1b0653ce395242547b2b34b99034a19cd2d3ea6b
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 2 01:00:12 2017 +0100
-
- Qt5: Expose Form additional actions
-
- qt5/src/poppler-form.cc | 20 ++++++++++++++++++++
- qt5/src/poppler-form.h | 19 +++++++++++++++++++
- 2 files changed, 39 insertions(+)
-
-commit a4c6433c423bd0dcc5056d9ee0375188fea9a0bc
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 2 00:56:43 2017 +0100
-
- Update (C) of previous commit
-
- poppler/Form.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-commit 0151e6e3824a6db907d871a2e56f5c20c001b588
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 2 00:56:27 2017 +0100
-
- Qt5: expose form calculate order
-
- qt5/src/poppler-document.cc | 18 +++++++++++++++++-
- qt5/src/poppler-qt5.h | 9 ++++++++-
- 2 files changed, 25 insertions(+), 2 deletions(-)
-
-commit 0ae3d40a79c25feb5cb9bce6fc8cc48c30bfd1b6
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 2 00:52:21 2017 +0100
-
- Parse AcroForm CO (calculateOrder)
-
- poppler/Form.cc | 19 +++++++++++++++++++
- poppler/Form.h | 4 ++++
- 2 files changed, 23 insertions(+)
-
-commit bbfc56b3c9a1e613e6db008a56c9c3333ae1427a
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Thu Mar 2 00:45:44 2017 +0100
-
- Make FormWidget* setters ignore isReadOnly
-
- isReadOnly is for the user but poppler needs to be able to set the
- value for example for fields whose value is autocalculated
-
- poppler/Form.cc | 23 +----------------------
- 1 file changed, 1 insertion(+), 22 deletions(-)
-
-commit f853145556a61a3d1104d6fd62261924d9fc9e50
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Sun Feb 19 23:25:47 2017 +0100
-
- There's no config file
-
- poppler/GlobalParams.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-commit c7a7c34fcb875414eb3092df84f8e8e8e523648d
-Author: Albert Astals Cid <aacid at kde.org>
-Date: Wed Feb 15 23:26:10 2017 +0100
-
- Poppler 0.52.0
-
- CMakeLists.txt | 2 +-
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
- 6 files changed, 21 insertions(+), 5 deletions(-)
-
commit baad9bd0406f63cffa8054c5831ccc3cb5d207e3
Author: Albert Astals Cid <aacid at kde.org>
Date: Wed Feb 15 23:05:55 2017 +0100
Modified: trunk/Build/source/libs/poppler/poppler-src/NEWS
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/NEWS 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/NEWS 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,21 +1,3 @@
-Release 0.53.0
- core:
- * Form support improvements
- * SplashOutputDev: Fix memory leak when rendering images with colormap and matte color
- * Minor fix in GlobalParams documentation
-
- qt5:
- * Expose form calculate order
- * Expose Form additional actions
-
- utils:
- * pdfimages: support 16bpc png and tiff images. Bug #99988
- * pdftohtml: fix small memory leak when constructing some filenames
- * pdfinfo: fix leak when printing JS
-
- build sytem:
- * Compile in C++11 mode
-
Release 0.52.0
core:
* Fix assert on reading some OCGs. Bug #99768
Modified: trunk/Build/source/libs/poppler/poppler-src/configure.ac
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/configure.ac 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/configure.ac 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[53])
+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])
@@ -26,7 +26,6 @@
#fi
AC_PROG_CXX
AC_PROG_INSTALL
-CXXFLAGS="$CXXFLAGS -std=c++11"
dnl ##### Check for pkgconfig
PKG_PROG_PKG_CONFIG
Modified: trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -69,13 +69,13 @@
public:
static MemReader *make(char *bufA, int lenA);
- ~MemReader();
- int getByte(int pos) override;
- GBool getU16BE(int pos, int *val) override;
- GBool getU32BE(int pos, Guint *val) override;
- GBool getU32LE(int pos, Guint *val) override;
- GBool getUVarBE(int pos, int size, Guint *val) override;
- GBool cmp(int pos, const char *s) override;
+ virtual ~MemReader();
+ virtual int getByte(int pos);
+ virtual GBool getU16BE(int pos, int *val);
+ virtual GBool getU32BE(int pos, Guint *val);
+ virtual GBool getU32LE(int pos, Guint *val);
+ virtual GBool getUVarBE(int pos, int size, Guint *val);
+ virtual GBool cmp(int pos, const char *s);
private:
@@ -164,13 +164,13 @@
public:
static FileReader *make(char *fileName);
- ~FileReader();
- int getByte(int pos) override;
- GBool getU16BE(int pos, int *val) override;
- GBool getU32BE(int pos, Guint *val) override;
- GBool getU32LE(int pos, Guint *val) override;
- GBool getUVarBE(int pos, int size, Guint *val) override;
- GBool cmp(int pos, const char *s) override;
+ virtual ~FileReader();
+ virtual int getByte(int pos);
+ virtual GBool getU16BE(int pos, int *val);
+ virtual GBool getU32BE(int pos, Guint *val);
+ virtual GBool getU32LE(int pos, Guint *val);
+ virtual GBool getUVarBE(int pos, int size, Guint *val);
+ virtual GBool cmp(int pos, const char *s);
private:
@@ -287,13 +287,13 @@
public:
static StreamReader *make(int (*getCharA)(void *data), void *dataA);
- ~StreamReader();
- int getByte(int pos) override;
- GBool getU16BE(int pos, int *val) override;
- GBool getU32BE(int pos, Guint *val) override;
- GBool getU32LE(int pos, Guint *val) override;
- GBool getUVarBE(int pos, int size, Guint *val) override;
- GBool cmp(int pos, const char *s) override;
+ virtual ~StreamReader();
+ virtual int getByte(int pos);
+ virtual GBool getU16BE(int pos, int *val);
+ virtual GBool getU32BE(int pos, Guint *val);
+ virtual GBool getU32LE(int pos, Guint *val);
+ virtual GBool getUVarBE(int pos, int size, Guint *val);
+ virtual GBool cmp(int pos, const char *s);
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -53,7 +53,7 @@
// Create a FoFiTrueType object from a file on disk.
static FoFiTrueType *load(char *fileName, int faceIndexA=0);
- ~FoFiTrueType();
+ virtual ~FoFiTrueType();
// Returns true if this an OpenType font containing CFF data, false
// if it's a TrueType font (or OpenType font with TrueType data).
Modified: trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -29,7 +29,7 @@
// Create a FoFiType1 object from a file on disk.
static FoFiType1 *load(char *fileName);
- ~FoFiType1();
+ virtual ~FoFiType1();
// Return the font name.
char *getName();
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -39,13 +39,13 @@
JpegWriter(Format format = RGB);
~JpegWriter();
- bool init(FILE *f, int width, int height, int hDPI, int vDPI) override;
+ bool init(FILE *f, int width, int height, int hDPI, int vDPI);
- bool writePointers(unsigned char **rowPointers, int rowCount) override;
- bool writeRow(unsigned char **row) override;
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **row);
- bool close() override;
- bool supportCMYK() override;
+ bool close();
+ bool supportCMYK();
private:
JpegWriter(const JpegWriter &other);
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -36,12 +36,12 @@
NetPBMWriter(Format formatA = RGB);
~NetPBMWriter() {};
- bool init(FILE *f, int width, int height, int hDPI, int vDPI) override;
+ bool init(FILE *f, int width, int height, int hDPI, int vDPI);
- bool writePointers(unsigned char **rowPointers, int rowCount) override;
- bool writeRow(unsigned char **row) override;
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **row);
- bool close() override;
+ bool close();
private:
FILE *file;
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -8,7 +8,7 @@
// Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
// Copyright (C) 2009, 2011 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
-// Copyright (C) 2010, 2011, 2013, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2011, 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2011 Thomas Klausner <wiz at danbala.tuwien.ac.at>
// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
@@ -117,10 +117,6 @@
bit_depth = 8;
color_type = PNG_COLOR_TYPE_RGB;
break;
- case RGB48:
- bit_depth = 16;
- color_type = PNG_COLOR_TYPE_RGB;
- break;
case RGBA:
bit_depth = 8;
color_type = PNG_COLOR_TYPE_RGB_ALPHA;
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -8,7 +8,7 @@
// Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
// Copyright (C) 2009, 2011-2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
-// Copyright (C) 2010, 2011, 2013, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2011, 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
@@ -32,9 +32,8 @@
* RGBA - 4 bytes/pixel
* GRAY - 1 byte/pixel
* MONOCHROME - 8 pixels/byte
- * RGB48 - 6 bytes/pixel
*/
- enum Format { RGB, RGBA, GRAY, MONOCHROME, RGB48 };
+ enum Format { RGB, RGBA, GRAY, MONOCHROME };
PNGWriter(Format format = RGB);
~PNGWriter();
@@ -43,12 +42,12 @@
void setSRGBProfile();
- bool init(FILE *f, int width, int height, int hDPI, int vDPI) override;
+ bool init(FILE *f, int width, int height, int hDPI, int vDPI);
- bool writePointers(unsigned char **rowPointers, int rowCount) override;
- bool writeRow(unsigned char **row) override;
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **row);
- bool close() override;
+ bool close();
private:
PNGWriter(const PNGWriter &other);
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -6,7 +6,7 @@
//
// Copyright (C) 2010, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
-// Copyright (C) 2012, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Pino Toscano <pino at kde.org>
// Copyright (C) 2014 Steven Lee <roc.sky at gmail.com>
//
@@ -147,12 +147,6 @@
samplesperpixel = 4;
photometric = PHOTOMETRIC_SEPARATED;
break;
-
- case RGB48:
- samplesperpixel = 3;
- bitspersample = 16;
- photometric = PHOTOMETRIC_RGB;
- break;
}
// Open the file
Modified: trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -6,7 +6,7 @@
//
// Copyright (C) 2010, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2011, 2012 Albert Astals Cid <aacid at kde.org>
-// Copyright (C) 2012, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
@@ -31,9 +31,8 @@
* GRAY - 1 byte/pixel
* MONOCHROME - 8 pixels/byte
* CMYK - 4 bytes/pixel
- * RGB48 - 6 bytes/pixel
*/
- enum Format { RGB, RGBA_PREMULTIPLIED, GRAY, MONOCHROME, CMYK, RGB48 };
+ enum Format { RGB, RGBA_PREMULTIPLIED, GRAY, MONOCHROME, CMYK };
TiffWriter(Format format = RGB);
~TiffWriter();
@@ -40,14 +39,14 @@
void setCompressionString(const char *compressionStringArg);
- bool init(FILE *openedFile, int width, int height, int hDPI, int vDPI) override;
+ bool init(FILE *openedFile, int width, int height, int hDPI, int vDPI);
- bool writePointers(unsigned char **rowPointers, int rowCount) override;
- bool writeRow(unsigned char **rowData) override;
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **rowData);
- bool supportCMYK() override { return true; }
+ bool supportCMYK() { return true; }
- bool close() override;
+ bool close();
private:
TiffWriter(const TiffWriter &other);
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Annot.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Annot.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Annot.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -270,8 +270,8 @@
double getVerticalCorner() const { return verticalCorner; }
private:
- AnnotBorderType getType() const override { return typeArray; }
- void writeToObject(XRef *xref, Object *obj1) const override;
+ virtual AnnotBorderType getType() const { return typeArray; }
+ virtual void writeToObject(XRef *xref, Object *obj1) const;
double horizontalCorner; // (Default 0)
double verticalCorner; // (Default 0)
@@ -289,8 +289,8 @@
AnnotBorderBS(Dict *dict);
private:
- AnnotBorderType getType() const override { return typeBS; }
- void writeToObject(XRef *xref, Object *obj1) const override;
+ virtual AnnotBorderType getType() const { return typeBS; }
+ virtual void writeToObject(XRef *xref, Object *obj1) const;
const char *getStyleName() const;
@@ -725,7 +725,7 @@
AnnotMarkup(PDFDoc *docA, PDFRectangle *rect);
AnnotMarkup(PDFDoc *docA, Dict *dict, Object *obj);
- ~AnnotMarkup();
+ virtual ~AnnotMarkup();
// getters
GooString *getLabel() const { return label; }
@@ -745,7 +745,7 @@
void setDate(GooString *new_date);
protected:
- void removeReferencedObjects() override;
+ virtual void removeReferencedObjects();
GooString *label; // T (Default autor)
AnnotPopup *popup; // Popup
@@ -787,7 +787,7 @@
AnnotText(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotText();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
// getters
GBool getOpen() const { return open; }
@@ -820,7 +820,7 @@
AnnotMovie(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotMovie();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
GooString* getTitle() { return title; }
Movie* getMovie() { return movie; }
@@ -878,9 +878,9 @@
AnnotLink(PDFDoc *docA, PDFRectangle *rect);
AnnotLink(PDFDoc *docA, Dict *dict, Object *obj);
- ~AnnotLink();
+ virtual ~AnnotLink();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
// getters
LinkAction *getAction() const { return action; }
@@ -922,9 +922,9 @@
AnnotFreeText(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotFreeText();
- void draw(Gfx *gfx, GBool printing) override;
- Object *getAppearanceResDict(Object *dest) override;
- void setContents(GooString *new_content) override;
+ virtual void draw(Gfx *gfx, GBool printing);
+ virtual Object *getAppearanceResDict(Object *dest);
+ virtual void setContents(GooString *new_content);
void setAppearanceString(GooString *new_string);
void setQuadding(AnnotFreeTextQuadding new_quadding);
@@ -986,9 +986,9 @@
AnnotLine(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotLine();
- void draw(Gfx *gfx, GBool printing) override;
- Object *getAppearanceResDict(Object *dest) override;
- void setContents(GooString *new_content) override;
+ virtual void draw(Gfx *gfx, GBool printing);
+ virtual Object *getAppearanceResDict(Object *dest);
+ virtual void setContents(GooString *new_content);
void setVertices(double x1, double y1, double x2, double y2);
void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end);
@@ -1050,9 +1050,9 @@
AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType);
AnnotTextMarkup(PDFDoc *docA, Dict *dict, Object *obj);
- ~AnnotTextMarkup();
+ virtual ~AnnotTextMarkup();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
// typeHighlight, typeUnderline, typeSquiggly or typeStrikeOut
void setType(AnnotSubtype new_type);
@@ -1102,7 +1102,7 @@
AnnotGeometry(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotGeometry();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
void setType(AnnotSubtype new_type); // typeSquare or typeCircle
void setInteriorColor(AnnotColor *new_color);
@@ -1138,7 +1138,7 @@
AnnotPolygon(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotPolygon();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
void setType(AnnotSubtype new_type); // typePolygon or typePolyLine
void setVertices(AnnotPath *path);
@@ -1213,7 +1213,7 @@
AnnotInk(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotInk();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
void setInkList(AnnotPath **paths, int n_paths);
@@ -1248,7 +1248,7 @@
AnnotFileAttachment(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotFileAttachment();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
// getters
Object *getFile() { return &file; }
@@ -1276,7 +1276,7 @@
AnnotSound(PDFDoc *docA, Dict *dict, Object *obj);
~AnnotSound();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
// getters
Sound *getSound() { return sound; }
@@ -1309,9 +1309,9 @@
AnnotWidget(PDFDoc *docA, Dict *dict, Object *obj);
AnnotWidget(PDFDoc *docA, Dict *dict, Object *obj, FormField *fieldA);
- ~AnnotWidget();
+ virtual ~AnnotWidget();
- void draw(Gfx *gfx, GBool printing) override;
+ virtual void draw(Gfx *gfx, GBool printing);
void drawBorder();
void drawFormFieldButton(GfxResources *resources, GooString *da);
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -74,7 +74,7 @@
class CairoFreeTypeFont : public CairoFont {
public:
static CairoFreeTypeFont *create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
- ~CairoFreeTypeFont();
+ virtual ~CairoFreeTypeFont();
private:
CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
@@ -88,9 +88,9 @@
static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc,
CairoFontEngine *fontEngine,
GBool printing, XRef *xref);
- ~CairoType3Font();
+ virtual ~CairoType3Font();
- GBool matches(Ref &other, GBool printing) override;
+ virtual GBool matches(Ref &other, GBool printing);
private:
CairoType3Font(Ref ref, PDFDoc *doc,
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -3119,7 +3119,7 @@
return image;
}
- void getRow(int row_num, uint32_t *row_data) override {
+ void getRow(int row_num, uint32_t *row_data) {
int i;
Guchar *pix;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -97,121 +97,121 @@
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return gTrue; }
+ virtual GBool upsideDown() { return gTrue; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gTrue; }
+ virtual GBool useDrawChar() { return gTrue; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
- GBool useTilingPatternFill() override { return gTrue; }
+ virtual GBool useTilingPatternFill() { return gTrue; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
- GBool useShadedFills(int type) override { return type <= 7; }
+ virtual GBool useShadedFills(int type) { return type <= 7; }
#else
- GBool useShadedFills(int type) override { return type > 1 && type < 4; }
+ virtual GBool useShadedFills(int type) { return type > 1 && type < 4; }
#endif
// Does this device use FillColorStop()?
- GBool useFillColorStop() override { return gTrue; }
+ virtual GBool useFillColorStop() { return gTrue; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gFalse; }
+ virtual GBool interpretType3Chars() { return gFalse; }
// Does this device need to clip pages to the crop box even when the
// box is the crop box?
- GBool needClipToCropBox() override { return gTrue; }
+ virtual GBool needClipToCropBox() { return gTrue; }
//----- initialization and control
// Start a page.
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
- void endPage() override;
+ virtual void endPage();
//----- save/restore graphics state
- void saveState(GfxState *state) override;
- void restoreState(GfxState *state) override;
+ virtual void saveState(GfxState *state);
+ virtual void restoreState(GfxState *state);
//----- update graphics state
- void updateAll(GfxState *state) override;
- void setDefaultCTM(double *ctm) override;
- void updateCTM(GfxState *state, double m11, double m12,
- double m21, double m22, double m31, double m32) override;
- void updateLineDash(GfxState *state) override;
- void updateFlatness(GfxState *state) override;
- void updateLineJoin(GfxState *state) override;
- void updateLineCap(GfxState *state) override;
- void updateMiterLimit(GfxState *state) override;
- void updateLineWidth(GfxState *state) override;
- void updateFillColor(GfxState *state) override;
- void updateStrokeColor(GfxState *state) override;
- void updateFillOpacity(GfxState *state) override;
- void updateStrokeOpacity(GfxState *state) override;
- void updateFillColorStop(GfxState *state, double offset) override;
- void updateBlendMode(GfxState *state) override;
+ virtual void updateAll(GfxState *state);
+ virtual void setDefaultCTM(double *ctm);
+ virtual void updateCTM(GfxState *state, double m11, double m12,
+ double m21, double m22, double m31, double m32);
+ virtual void updateLineDash(GfxState *state);
+ virtual void updateFlatness(GfxState *state);
+ virtual void updateLineJoin(GfxState *state);
+ virtual void updateLineCap(GfxState *state);
+ virtual void updateMiterLimit(GfxState *state);
+ virtual void updateLineWidth(GfxState *state);
+ virtual void updateFillColor(GfxState *state);
+ virtual void updateStrokeColor(GfxState *state);
+ virtual void updateFillOpacity(GfxState *state);
+ virtual void updateStrokeOpacity(GfxState *state);
+ virtual void updateFillColorStop(GfxState *state, double offset);
+ virtual void updateBlendMode(GfxState *state);
//----- update text state
- void updateFont(GfxState *state) override;
+ virtual void updateFont(GfxState *state);
//----- path painting
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
- void clipToStrokePath(GfxState *state) override;
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
- double *pmat, int paintType, int tilingType, Dict *resDict,
- double *mat, double *bbox,
- int x0, int y0, int x1, int y1,
- double xStep, double yStep) override;
+ virtual void stroke(GfxState *state);
+ virtual void fill(GfxState *state);
+ virtual void eoFill(GfxState *state);
+ virtual void clipToStrokePath(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
- GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading) override;
+ virtual GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading);
#endif
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
- GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override;
- GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) override;
- GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) override;
+ virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
+ virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading);
+ virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
+ virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading);
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
- GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) override;
- GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) override;
+ virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
+ virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
#endif
//----- path clipping
- void clip(GfxState *state) override;
- void eoClip(GfxState *state) override;
+ virtual void clip(GfxState *state);
+ virtual void eoClip(GfxState *state);
//----- text drawing
- void beginString(GfxState *state, GooString *s) override;
- void endString(GfxState *state) override;
+ void beginString(GfxState *state, GooString *s);
+ void endString(GfxState *state);
void drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen) override;
- void beginActualText(GfxState *state, GooString *text) override;
- void endActualText(GfxState *state) override;
+ CharCode code, int nBytes, Unicode *u, int uLen);
+ void beginActualText(GfxState *state, GooString *text);
+ void endActualText(GfxState *state);
- GBool beginType3Char(GfxState *state, double x, double y,
- double dx, double dy,
- CharCode code, Unicode *u, int uLen) override;
- void endType3Char(GfxState *state) override;
- void beginTextObject(GfxState *state) override;
- void endTextObject(GfxState *state) override;
+ virtual GBool beginType3Char(GfxState *state, double x, double y,
+ double dx, double dy,
+ CharCode code, Unicode *u, int uLen);
+ virtual void endType3Char(GfxState *state);
+ virtual void beginTextObject(GfxState *state);
+ virtual void endTextObject(GfxState *state);
//----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str,
- int width, int height, GBool invert, GBool interpolate,
- GBool inlineImg) override;
- void setSoftMaskFromImageMask(GfxState *state,
- Object *ref, Stream *str,
- int width, int height, GBool invert,
- GBool inlineImg, double *baseMatrix) override;
- void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override;
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GBool invert, GBool interpolate,
+ GBool inlineImg);
+ virtual void setSoftMaskFromImageMask(GfxState *state,
+ Object *ref, Stream *str,
+ int width, int height, GBool invert,
+ GBool inlineImg, double *baseMatrix);
+ virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix);
void drawImageMaskPrescaled(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert, GBool interpolate,
GBool inlineImg);
@@ -219,42 +219,42 @@
int width, int height, GBool invert, GBool interpolate,
GBool inlineImg);
- void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
- GBool interpolate, int *maskColors, GBool inlineImg) override;
- void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr,
- int maskWidth, int maskHeight,
- GfxImageColorMap *maskColorMap,
- GBool maskInterpolate) override;
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+ GBool interpolate, int *maskColors, GBool inlineImg);
+ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap *maskColorMap,
+ GBool maskInterpolate);
- void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr,
- int maskWidth, int maskHeight,
- GBool maskInvert, GBool maskInterpolate) override;
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GBool maskInvert, GBool maskInterpolate);
//----- transparency groups and soft masks
- void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
+ virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
GfxColorSpace * /*blendingColorSpace*/,
GBool /*isolated*/, GBool /*knockout*/,
- GBool /*forSoftMask*/) override;
- void endTransparencyGroup(GfxState * /*state*/) override;
+ GBool /*forSoftMask*/);
+ virtual void endTransparencyGroup(GfxState * /*state*/);
void popTransparencyGroup();
- void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) override;
- void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
- Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override;
- void clearSoftMask(GfxState * /*state*/) override;
+ virtual void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/);
+ virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
+ Function * /*transferFunc*/, GfxColor * /*backdropColor*/);
+ virtual void clearSoftMask(GfxState * /*state*/);
//----- Type 3 font operators
- void type3D0(GfxState *state, double wx, double wy) override;
- void type3D1(GfxState *state, double wx, double wy,
- double llx, double lly, double urx, double ury) override;
+ virtual void type3D0(GfxState *state, double wx, double wy);
+ virtual void type3D1(GfxState *state, double wx, double wy,
+ double llx, double lly, double urx, double ury);
//----- special access
@@ -388,118 +388,118 @@
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return gTrue; }
+ virtual GBool upsideDown() { return gTrue; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gFalse; }
+ virtual GBool useDrawChar() { return gFalse; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
- GBool useTilingPatternFill() override { return gTrue; }
+ virtual GBool useTilingPatternFill() { return gTrue; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
- GBool useShadedFills(int type) override { return type <= 7; }
+ virtual GBool useShadedFills(int type) { return type <= 7; }
#else
- GBool useShadedFills(int type) override { return type < 4; }
+ virtual GBool useShadedFills(int type) { return type < 4; }
#endif
// Does this device use FillColorStop()?
- GBool useFillColorStop() override { return gFalse; }
+ virtual GBool useFillColorStop() { return gFalse; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gFalse; }
+ virtual GBool interpretType3Chars() { return gFalse; }
// Does this device need non-text content?
- GBool needNonText() override { return gTrue; }
+ virtual GBool needNonText() { return gTrue; }
//----- save/restore graphics state
- void saveState(GfxState *state) override { }
- void restoreState(GfxState *state) override { }
+ virtual void saveState(GfxState *state) { }
+ virtual void restoreState(GfxState *state) { }
//----- update graphics state
- void updateAll(GfxState *state) override { }
- void setDefaultCTM(double *ctm) override { }
- void updateCTM(GfxState *state, double m11, double m12,
- double m21, double m22, double m31, double m32) override { }
- void updateLineDash(GfxState *state) override { }
- void updateFlatness(GfxState *state) override { }
- void updateLineJoin(GfxState *state) override { }
- void updateLineCap(GfxState *state) override { }
- void updateMiterLimit(GfxState *state) override { }
- void updateLineWidth(GfxState *state) override { }
- void updateFillColor(GfxState *state) override { }
- void updateStrokeColor(GfxState *state) override { }
- void updateFillOpacity(GfxState *state) override { }
- void updateStrokeOpacity(GfxState *state) override { }
- void updateBlendMode(GfxState *state) override { }
+ virtual void updateAll(GfxState *state) { }
+ virtual void setDefaultCTM(double *ctm) { }
+ virtual void updateCTM(GfxState *state, double m11, double m12,
+ double m21, double m22, double m31, double m32) { }
+ virtual void updateLineDash(GfxState *state) { }
+ virtual void updateFlatness(GfxState *state) { }
+ virtual void updateLineJoin(GfxState *state) { }
+ virtual void updateLineCap(GfxState *state) { }
+ virtual void updateMiterLimit(GfxState *state) { }
+ virtual void updateLineWidth(GfxState *state) { }
+ virtual void updateFillColor(GfxState *state) { }
+ virtual void updateStrokeColor(GfxState *state) { }
+ virtual void updateFillOpacity(GfxState *state) { }
+ virtual void updateStrokeOpacity(GfxState *state) { }
+ virtual void updateBlendMode(GfxState *state) { }
//----- update text state
- void updateFont(GfxState *state) override { }
+ virtual void updateFont(GfxState *state) { }
//----- path painting
- void stroke(GfxState *state) override { }
- void fill(GfxState *state) override { }
- void eoFill(GfxState *state) override { }
- void clipToStrokePath(GfxState *state) override { }
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
- double *pmat, int paintType, int tilingType, Dict *resDict,
- double *mat, double *bbox,
- int x0, int y0, int x1, int y1,
- double xStep, double yStep) override { return gTrue; }
- GBool axialShadedFill(GfxState *state,
- GfxAxialShading *shading,
- double tMin, double tMax) override { return gTrue; }
- GBool radialShadedFill(GfxState *state,
- GfxRadialShading *shading,
- double sMin, double sMax) override { return gTrue; }
+ virtual void stroke(GfxState *state) { }
+ virtual void fill(GfxState *state) { }
+ virtual void eoFill(GfxState *state) { }
+ virtual void clipToStrokePath(GfxState *state) { }
+ virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep) { return gTrue; }
+ virtual GBool axialShadedFill(GfxState *state,
+ GfxAxialShading *shading,
+ double tMin, double tMax) { return gTrue; }
+ virtual GBool radialShadedFill(GfxState *state,
+ GfxRadialShading *shading,
+ double sMin, double sMax) { return gTrue; }
//----- path clipping
- void clip(GfxState *state) override { }
- void eoClip(GfxState *state) override { }
+ virtual void clip(GfxState *state) { }
+ virtual void eoClip(GfxState *state) { }
//----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str,
- int width, int height, GBool invert,
- GBool interpolate, GBool inlineImg) override;
- void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
- GBool interpolate, int *maskColors, GBool inlineImg) override;
- void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr,
- int maskWidth, int maskHeight,
- GfxImageColorMap *maskColorMap,
- GBool maskInterpolate) override;
- void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr,
- int maskWidth, int maskHeight,
- GBool maskInvert, GBool maskInterpolate) override;
- void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
- int width, int height, GBool invert,
- GBool inlineImg, double *baseMatrix) override;
- void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override {}
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GBool invert,
+ GBool interpolate, GBool inlineImg);
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+ GBool interpolate, int *maskColors, GBool inlineImg);
+ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap *maskColorMap,
+ GBool maskInterpolate);
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GBool maskInvert, GBool maskInterpolate);
+ virtual void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GBool invert,
+ GBool inlineImg, double *baseMatrix);
+ virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) {}
//----- transparency groups and soft masks
- void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
- GfxColorSpace * /*blendingColorSpace*/,
- GBool /*isolated*/, GBool /*knockout*/,
- GBool /*forSoftMask*/) override {}
- void endTransparencyGroup(GfxState * /*state*/) override {}
- void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) override {}
- void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
- Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override {}
- void clearSoftMask(GfxState * /*state*/) override {}
+ virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
+ GfxColorSpace * /*blendingColorSpace*/,
+ GBool /*isolated*/, GBool /*knockout*/,
+ GBool /*forSoftMask*/) {}
+ virtual void endTransparencyGroup(GfxState * /*state*/) {}
+ virtual void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) {}
+ virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
+ Function * /*transferFunc*/, GfxColor * /*backdropColor*/) {}
+ virtual void clearSoftMask(GfxState * /*state*/) {}
//----- Image list
// By default images are not rendred
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -65,19 +65,19 @@
public:
DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion);
- ~DCTStream();
- StreamKind getKind() override { return strDCT; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual ~DCTStream();
+ virtual StreamKind getKind() { return strDCT; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
private:
void init();
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
int colorXform;
JSAMPLE *current;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -105,14 +105,14 @@
BaseCryptStream(Stream *strA, Guchar *fileKey, CryptAlgorithm algoA,
int keyLength, int objNum, int objGen);
- ~BaseCryptStream();
- StreamKind getKind() override { return strCrypt; }
- void reset() override;
- int getChar() override;
- int lookChar() override = 0;
- Goffset getPos() override;
- GBool isBinary(GBool last) override;
- Stream *getUndecodedStream() override { return this; }
+ virtual ~BaseCryptStream();
+ virtual StreamKind getKind() { return strCrypt; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar() = 0;
+ virtual Goffset getPos();
+ virtual GBool isBinary(GBool last);
+ virtual Stream *getUndecodedStream() { return this; }
void setAutoDelete(GBool val);
protected:
@@ -140,8 +140,8 @@
EncryptStream(Stream *strA, Guchar *fileKey, CryptAlgorithm algoA,
int keyLength, int objNum, int objGen);
~EncryptStream();
- void reset() override;
- int lookChar() override;
+ virtual void reset();
+ virtual int lookChar();
};
class DecryptStream : public BaseCryptStream {
@@ -150,8 +150,8 @@
DecryptStream(Stream *strA, Guchar *fileKey, CryptAlgorithm algoA,
int keyLength, int objNum, int objGen);
~DecryptStream();
- void reset() override;
- int lookChar() override;
+ virtual void reset();
+ virtual int lookChar();
};
//------------------------------------------------------------------------
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/FlateEncoder.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/FlateEncoder.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/FlateEncoder.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -44,16 +44,16 @@
public:
FlateEncoder(Stream *strA);
- ~FlateEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~FlateEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr & 0xff); }
- GooString *getPSFilter(int psLevel, const char *indent) override { return NULL; }
- GBool isBinary(GBool last = gTrue) override { return gTrue; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int psLevel, const char *indent) { return NULL; }
+ virtual GBool isBinary(GBool last = gTrue) { return gTrue; }
+ virtual GBool isEncoder() { return gTrue; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Form.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Form.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Form.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2006-2008 Julien Rebetez <julienr at svn.gnome.org>
-// Copyright 2007-2012, 2015-2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2007-2012, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2007-2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright 2007, 2013, 2016 Adrian Johnson <ajohnson at redneon.com>
// Copyright 2007 Iñigo Martínez <inigomartinez at gmail.com>
@@ -317,6 +317,11 @@
void FormWidgetText::setContent(GooString* new_content)
{
+ if (isReadOnly()) {
+ error(errInternal, -1, "FormWidgetText::setContentCopy called on a read only field\n");
+ return;
+ }
+
parent()->setContentCopy(new_content);
}
@@ -346,6 +351,10 @@
void FormWidgetChoice::select (int i)
{
+ if (isReadOnly()) {
+ error(errInternal, -1, "FormWidgetChoice::select called on a read only field\n");
+ return;
+ }
if (!_checkRange(i)) return;
parent()->select(i);
}
@@ -352,6 +361,10 @@
void FormWidgetChoice::toggle (int i)
{
+ if (isReadOnly()) {
+ error(errInternal, -1, "FormWidgetChoice::toggle called on a read only field\n");
+ return;
+ }
if (!_checkRange(i)) return;
parent()->toggle(i);
}
@@ -358,6 +371,10 @@
void FormWidgetChoice::deselectAll ()
{
+ if (isReadOnly()) {
+ error(errInternal, -1, "FormWidgetChoice::deselectAll called on a read only field\n");
+ return;
+ }
parent()->deselectAll();
}
@@ -384,6 +401,10 @@
void FormWidgetChoice::setEditChoice (GooString* new_content)
{
+ if (isReadOnly()) {
+ error(errInternal, -1, "FormWidgetText::setEditChoice called on a read only field\n");
+ return;
+ }
if (!hasEdit()) {
error(errInternal, -1, "FormFieldChoice::setEditChoice : trying to edit an non-editable choice\n");
return;
@@ -1640,25 +1661,6 @@
}
obj1.free ();
- acroForm->dictLookup("CO", &obj1);
- if (obj1.isArray()) {
- Array *array = obj1.getArray();
- calculateOrder.reserve(array->getLength());
- for(int i=0; i<array->getLength(); i++) {
- Object oref;
- array->getNF(i, &oref);
- if (!oref.isRef()) {
- error(errSyntaxWarning, -1, "Direct object in CO");
- oref.free();
- continue;
- }
- calculateOrder.push_back(oref.getRef());
-
- oref.free();
- }
- }
- obj1.free ();
-
#ifdef DEBUG_FORMS
for (int i = 0; i < numFields; i++)
rootFields[i]->printTree();
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Form.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Form.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Form.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -6,7 +6,7 @@
//
// Copyright 2006 Julien Rebetez <julienr at svn.gnome.org>
// Copyright 2007, 2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2007-2010, 2012, 2015-2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2007-2010, 2012, 2015, 2016 Albert Astals Cid <aacid at kde.org>
// Copyright 2010 Mark Riedesel <mark at klowner.com>
// Copyright 2011 Pino Toscano <pino at kde.org>
// Copyright 2012 Fabio D'Urso <fabiodurso at hotmail.it>
@@ -165,7 +165,7 @@
char* getOnStr();
void setAppearanceState(const char *state);
- void updateWidgetAppearance() override;
+ void updateWidgetAppearance();
protected:
FormFieldButton *parent() const;
@@ -187,7 +187,7 @@
//except a UTF16BE string
void setContent(GooString* new_content);
- void updateWidgetAppearance() override;
+ void updateWidgetAppearance();
bool isMultiline () const;
bool isPassword () const;
@@ -228,7 +228,7 @@
GooString* getEditChoice ();
- void updateWidgetAppearance() override;
+ void updateWidgetAppearance();
bool isSelected (int i);
bool isCombo () const;
@@ -249,7 +249,7 @@
class FormWidgetSignature: public FormWidget {
public:
FormWidgetSignature(PDFDoc *docA, Object *dict, unsigned num, Ref ref, FormField *p);
- void updateWidgetAppearance() override;
+ void updateWidgetAppearance();
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
};
@@ -350,7 +350,7 @@
char *getAppearanceState() { return appearanceState.isName() ? appearanceState.getName() : NULL; }
- void fillChildrenSiblingsID () override;
+ void fillChildrenSiblingsID ();
void setNumSiblings (int num);
void setSibling (int i, FormFieldButton *id) { siblings[i] = id; }
@@ -363,7 +363,7 @@
void print(int indent = 0);
#endif
- ~FormFieldButton();
+ virtual ~FormFieldButton();
protected:
void updateState(char *state);
@@ -389,7 +389,7 @@
GooString* getContent () { return content; }
GooString* getContentCopy ();
void setContentCopy (GooString* new_content);
- ~FormFieldText();
+ virtual ~FormFieldText();
bool isMultiline () const { return multiline; }
bool isPassword () const { return password; }
@@ -424,7 +424,7 @@
public:
FormFieldChoice(PDFDoc *docA, Object *aobj, const Ref& ref, FormField *parent, std::set<int> *usedParents);
- ~FormFieldChoice();
+ virtual ~FormFieldChoice();
int getNumChoices() { return numChoices; }
GooString* getChoice(int i) { return choices ? choices[i].optionName : NULL; }
@@ -495,7 +495,7 @@
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
- ~FormFieldSignature();
+ virtual ~FormFieldSignature();
private:
void parseInfo();
@@ -540,9 +540,6 @@
FormWidget* findWidgetByRef (Ref aref);
void postWidgetsLoad();
-
- const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
-
private:
FormField** rootFields;
int numFields;
@@ -553,7 +550,6 @@
GBool needAppearances;
GfxResources *defaultResources;
Object resDict;
- std::vector<Ref> calculateOrder;
// Variable Text
GooString *defaultAppearance;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Function.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Function.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Function.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -109,11 +109,11 @@
public:
IdentityFunction();
- ~IdentityFunction();
- Function *copy() override { return new IdentityFunction(); }
- int getType() override { return -1; }
- void transform(double *in, double *out) override;
- GBool isOk() override { return gTrue; }
+ virtual ~IdentityFunction();
+ virtual Function *copy() { return new IdentityFunction(); }
+ virtual int getType() { return -1; }
+ virtual void transform(double *in, double *out);
+ virtual GBool isOk() { return gTrue; }
private:
};
@@ -126,12 +126,12 @@
public:
SampledFunction(Object *funcObj, Dict *dict);
- ~SampledFunction();
- Function *copy() override { return new SampledFunction(this); }
- int getType() override { return 0; }
- void transform(double *in, double *out) override;
- GBool isOk() override { return ok; }
- GBool hasDifferentResultSet(Function *func) override;
+ virtual ~SampledFunction();
+ virtual Function *copy() { return new SampledFunction(this); }
+ virtual int getType() { return 0; }
+ virtual void transform(double *in, double *out);
+ virtual GBool isOk() { return ok; }
+ virtual GBool hasDifferentResultSet(Function *func);
int getSampleSize(int i) { return sampleSize[i]; }
double getEncodeMin(int i) { return encode[i][0]; }
@@ -170,11 +170,11 @@
public:
ExponentialFunction(Object *funcObj, Dict *dict);
- ~ExponentialFunction();
- Function *copy() override { return new ExponentialFunction(this); }
- int getType() override { return 2; }
- void transform(double *in, double *out) override;
- GBool isOk() override { return ok; }
+ virtual ~ExponentialFunction();
+ virtual Function *copy() { return new ExponentialFunction(this); }
+ virtual int getType() { return 2; }
+ virtual void transform(double *in, double *out);
+ virtual GBool isOk() { return ok; }
double *getC0() { return c0; }
double *getC1() { return c1; }
@@ -199,11 +199,11 @@
public:
StitchingFunction(Object *funcObj, Dict *dict, std::set<int> *usedParents);
- ~StitchingFunction();
- Function *copy() override { return new StitchingFunction(this); }
- int getType() override { return 3; }
- void transform(double *in, double *out) override;
- GBool isOk() override { return ok; }
+ virtual ~StitchingFunction();
+ virtual Function *copy() { return new StitchingFunction(this); }
+ virtual int getType() { return 3; }
+ virtual void transform(double *in, double *out);
+ virtual GBool isOk() { return ok; }
int getNumFuncs() { return k; }
Function *getFunc(int i) { return funcs[i]; }
@@ -231,11 +231,11 @@
public:
PostScriptFunction(Object *funcObj, Dict *dict);
- ~PostScriptFunction();
- Function *copy() override { return new PostScriptFunction(this); }
- int getType() override { return 4; }
- void transform(double *in, double *out) override;
- GBool isOk() override { return ok; }
+ virtual ~PostScriptFunction();
+ virtual Function *copy() { return new PostScriptFunction(this); }
+ virtual int getType() { return 4; }
+ virtual void transform(double *in, double *out);
+ virtual GBool isOk() { return ok; }
GooString *getCodeString() { return codeString; }
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -322,15 +322,15 @@
Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
GfxFontType typeA, Ref embFontIDA, Dict *fontDict);
- int getNextChar(char *s, int len, CharCode *code,
+ virtual int getNextChar(char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) override;
+ double *dx, double *dy, double *ox, double *oy);
// Return the encoding.
char **getEncoding() { return enc; }
// Return the Unicode map.
- CharCodeToUnicode *getToUnicode() override;
+ CharCodeToUnicode *getToUnicode();
// Return the character name associated with <code>.
char *getCharName(int code) { return enc[code]; }
@@ -358,7 +358,7 @@
Dict *getResources();
private:
- ~Gfx8BitFont();
+ virtual ~Gfx8BitFont();
const Base14FontMapEntry *base14; // for Base-14 fonts only; NULL otherwise
char *enc[256]; // char code --> char name
@@ -384,17 +384,17 @@
GfxCIDFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
GfxFontType typeA, Ref embFontIDA, Dict *fontDict);
- GBool isCIDFont() override { return gTrue; }
+ virtual GBool isCIDFont() { return gTrue; }
- int getNextChar(char *s, int len, CharCode *code,
+ virtual int getNextChar(char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) override;
+ double *dx, double *dy, double *ox, double *oy);
// Return the writing mode (0=horizontal, 1=vertical).
- int getWMode() override;
+ virtual int getWMode();
// Return the Unicode map.
- CharCodeToUnicode *getToUnicode() override;
+ CharCodeToUnicode *getToUnicode();
// Get the collection name (<registry>-<ordering>).
GooString *getCollection();
@@ -409,7 +409,7 @@
double getWidth(char* s, int len);
private:
- ~GfxCIDFont();
+ virtual ~GfxCIDFont();
int mapCodeToGID(FoFiTrueType *ff, int cmapi,
Unicode unicode, GBool wmode);
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -1855,7 +1855,7 @@
{
}
- bool operator==(const PopplerCacheKey &key) const override
+ bool operator==(const PopplerCacheKey &key) const
{
const GfxICCBasedColorSpaceKey *k = static_cast<const GfxICCBasedColorSpaceKey*>(&key);
return k->num == num && k->gen == gen;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/GfxState.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -22,7 +22,7 @@
// Copyright (C) 2011 Andrea Canciani <ranma42 at gmail.com>
// Copyright (C) 2011-2014, 2016 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013 Lu Wang <coolwanglu at gmail.com>
-// Copyright (C) 2015, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2015 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
@@ -132,10 +132,6 @@
return (Guchar)(((x << 8) - x + 0x8000) >> 16);
}
-static inline Gushort colToShort(GfxColorComp x) {
- return (Gushort)(x);
-}
-
//------------------------------------------------------------------------
// GfxColor
//------------------------------------------------------------------------
@@ -292,28 +288,28 @@
public:
GfxDeviceGrayColorSpace();
- ~GfxDeviceGrayColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csDeviceGray; }
+ virtual ~GfxDeviceGrayColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csDeviceGray; }
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
- void getGrayLine(Guchar *in, Guchar *out, int length) override;
- void getRGBLine(Guchar *in, unsigned int *out, int length) override;
- void getRGBLine(Guchar *in, Guchar *out, int length) override;
- void getRGBXLine(Guchar *in, Guchar *out, int length) override;
- void getCMYKLine(Guchar *in, Guchar *out, int length) override;
- void getDeviceNLine(Guchar *in, Guchar *out, int length) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
+ virtual void getGrayLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual void getCMYKLine(Guchar *in, Guchar *out, int length);
+ virtual void getDeviceNLine(Guchar *in, Guchar *out, int length);
- GBool useGetRGBLine() override { return gTrue; }
- GBool useGetGrayLine() override { return gTrue; }
- GBool useGetCMYKLine() override { return gTrue; }
- GBool useGetDeviceNLine() override { return gTrue; }
+ virtual GBool useGetRGBLine() { return gTrue; }
+ virtual GBool useGetGrayLine() { return gTrue; }
+ virtual GBool useGetCMYKLine() { return gTrue; }
+ virtual GBool useGetDeviceNLine() { return gTrue; }
- int getNComps() override { return 1; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 1; }
+ virtual void getDefaultColor(GfxColor *color);
private:
};
@@ -326,20 +322,20 @@
public:
GfxCalGrayColorSpace();
- ~GfxCalGrayColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csCalGray; }
+ virtual ~GfxCalGrayColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csCalGray; }
// Construct a CalGray color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- int getNComps() override { return 1; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 1; }
+ virtual void getDefaultColor(GfxColor *color);
// CalGray-specific access.
double getWhiteX() { return whiteX; }
@@ -370,28 +366,28 @@
public:
GfxDeviceRGBColorSpace();
- ~GfxDeviceRGBColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csDeviceRGB; }
+ virtual ~GfxDeviceRGBColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csDeviceRGB; }
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
- void getGrayLine(Guchar *in, Guchar *out, int length) override;
- void getRGBLine(Guchar *in, unsigned int *out, int length) override;
- void getRGBLine(Guchar *in, Guchar *out, int length) override;
- void getRGBXLine(Guchar *in, Guchar *out, int length) override;
- void getCMYKLine(Guchar *in, Guchar *out, int length) override;
- void getDeviceNLine(Guchar *in, Guchar *out, int length) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
+ virtual void getGrayLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual void getCMYKLine(Guchar *in, Guchar *out, int length);
+ virtual void getDeviceNLine(Guchar *in, Guchar *out, int length);
- GBool useGetRGBLine() override { return gTrue; }
- GBool useGetGrayLine() override { return gTrue; }
- GBool useGetCMYKLine() override { return gTrue; }
- GBool useGetDeviceNLine() override { return gTrue; }
+ virtual GBool useGetRGBLine() { return gTrue; }
+ virtual GBool useGetGrayLine() { return gTrue; }
+ virtual GBool useGetCMYKLine() { return gTrue; }
+ virtual GBool useGetDeviceNLine() { return gTrue; }
- int getNComps() override { return 3; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 3; }
+ virtual void getDefaultColor(GfxColor *color);
private:
};
@@ -404,20 +400,20 @@
public:
GfxCalRGBColorSpace();
- ~GfxCalRGBColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csCalRGB; }
+ virtual ~GfxCalRGBColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csCalRGB; }
// Construct a CalRGB color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- int getNComps() override { return 3; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 3; }
+ virtual void getDefaultColor(GfxColor *color);
// CalRGB-specific access.
double getWhiteX() { return whiteX; }
@@ -452,25 +448,25 @@
public:
GfxDeviceCMYKColorSpace();
- ~GfxDeviceCMYKColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csDeviceCMYK; }
+ virtual ~GfxDeviceCMYKColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csDeviceCMYK; }
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
- void getRGBLine(Guchar *in, unsigned int *out, int length) override;
- void getRGBLine(Guchar *, Guchar *out, int length) override;
- void getRGBXLine(Guchar *in, Guchar *out, int length) override;
- void getCMYKLine(Guchar *in, Guchar *out, int length) override;
- void getDeviceNLine(Guchar *in, Guchar *out, int length) override;
- GBool useGetRGBLine() override { return gTrue; }
- GBool useGetCMYKLine() override { return gTrue; }
- GBool useGetDeviceNLine() override { return gTrue; }
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual void getCMYKLine(Guchar *in, Guchar *out, int length);
+ virtual void getDeviceNLine(Guchar *in, Guchar *out, int length);
+ virtual GBool useGetRGBLine() { return gTrue; }
+ virtual GBool useGetCMYKLine() { return gTrue; }
+ virtual GBool useGetDeviceNLine() { return gTrue; }
- int getNComps() override { return 4; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 4; }
+ virtual void getDefaultColor(GfxColor *color);
private:
};
@@ -483,23 +479,23 @@
public:
GfxLabColorSpace();
- ~GfxLabColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csLab; }
+ virtual ~GfxLabColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csLab; }
// Construct a Lab color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(Array *arr, GfxState *state);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- int getNComps() override { return 3; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 3; }
+ virtual void getDefaultColor(GfxColor *color);
- void getDefaultRanges(double *decodeLow, double *decodeRange,
- int maxImgPixel) override;
+ virtual void getDefaultRanges(double *decodeLow, double *decodeRange,
+ int maxImgPixel);
// Lab-specific access.
double getWhiteX() { return whiteX; }
@@ -534,32 +530,32 @@
GfxICCBasedColorSpace(int nCompsA, GfxColorSpace *altA,
Ref *iccProfileStreamA);
- ~GfxICCBasedColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csICCBased; }
+ virtual ~GfxICCBasedColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csICCBased; }
// Construct an ICCBased color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
- void getRGBLine(Guchar *in, unsigned int *out, int length) override;
- void getRGBLine(Guchar *in, Guchar *out, int length) override;
- void getRGBXLine(Guchar *in, Guchar *out, int length) override;
- void getCMYKLine(Guchar *in, Guchar *out, int length) override;
- void getDeviceNLine(Guchar *in, Guchar *out, int length) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual void getCMYKLine(Guchar *in, Guchar *out, int length);
+ virtual void getDeviceNLine(Guchar *in, Guchar *out, int length);
- GBool useGetRGBLine() override;
- GBool useGetCMYKLine() override;
- GBool useGetDeviceNLine() override;
+ virtual GBool useGetRGBLine();
+ virtual GBool useGetCMYKLine();
+ virtual GBool useGetDeviceNLine();
- int getNComps() override { return nComps; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return nComps; }
+ virtual void getDefaultColor(GfxColor *color);
- void getDefaultRanges(double *decodeLow, double *decodeRange,
- int maxImgPixel) override;
+ virtual void getDefaultRanges(double *decodeLow, double *decodeRange,
+ int maxImgPixel);
// ICCBased-specific access.
GfxColorSpace *getAlt() { return alt; }
@@ -586,32 +582,32 @@
public:
GfxIndexedColorSpace(GfxColorSpace *baseA, int indexHighA);
- ~GfxIndexedColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csIndexed; }
+ virtual ~GfxIndexedColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csIndexed; }
// Construct an Indexed color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
- void getRGBLine(Guchar *in, unsigned int *out, int length) override;
- void getRGBLine(Guchar *in, Guchar *out, int length) override;
- void getRGBXLine(Guchar *in, Guchar *out, int length) override;
- void getCMYKLine(Guchar *in, Guchar *out, int length) override;
- void getDeviceNLine(Guchar *in, Guchar *out, int length) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual void getCMYKLine(Guchar *in, Guchar *out, int length);
+ virtual void getDeviceNLine(Guchar *in, Guchar *out, int length);
- GBool useGetRGBLine() override { return gTrue; }
- GBool useGetCMYKLine() override { return gTrue; }
- GBool useGetDeviceNLine() override { return gTrue; }
+ virtual GBool useGetRGBLine() { return gTrue; }
+ virtual GBool useGetCMYKLine() { return gTrue; }
+ virtual GBool useGetDeviceNLine() { return gTrue; }
- int getNComps() override { return 1; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 1; }
+ virtual void getDefaultColor(GfxColor *color);
- void getDefaultRanges(double *decodeLow, double *decodeRange,
- int maxImgPixel) override;
+ virtual void getDefaultRanges(double *decodeLow, double *decodeRange,
+ int maxImgPixel);
// Indexed-specific access.
GfxColorSpace *getBase() { return base; }
@@ -619,7 +615,7 @@
Guchar *getLookup() { return lookup; }
GfxColor *mapColorToBase(GfxColor *color, GfxColor *baseColor);
Guint getOverprintMask() { return base->getOverprintMask(); }
- void createMapping(GooList *separationList, int maxSepComps) override
+ virtual void createMapping(GooList *separationList, int maxSepComps)
{ base->createMapping(separationList, maxSepComps); }
@@ -639,24 +635,24 @@
GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA,
Function *funcA);
- ~GfxSeparationColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csSeparation; }
+ virtual ~GfxSeparationColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csSeparation; }
// Construct a Separation color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- void createMapping(GooList *separationList, int maxSepComps) override;
+ virtual void createMapping(GooList *separationList, int maxSepComps);
- int getNComps() override { return 1; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 1; }
+ virtual void getDefaultColor(GfxColor *color);
- GBool isNonMarking() override { return nonMarking; }
+ virtual GBool isNonMarking() { return nonMarking; }
// Separation-specific access.
GooString *getName() { return name; }
@@ -684,24 +680,24 @@
GfxDeviceNColorSpace(int nCompsA, GooString **namesA,
GfxColorSpace *alt, Function *func, GooList *sepsCS);
- ~GfxDeviceNColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csDeviceN; }
+ virtual ~GfxDeviceNColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csDeviceN; }
// Construct a DeviceN color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- void createMapping(GooList *separationList, int maxSepComps) override;
+ virtual void createMapping(GooList *separationList, int maxSepComps);
- int getNComps() override { return nComps; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return nComps; }
+ virtual void getDefaultColor(GfxColor *color);
- GBool isNonMarking() override { return nonMarking; }
+ virtual GBool isNonMarking() { return nonMarking; }
// DeviceN-specific access.
GooString *getColorantName(int i) { return names[i]; }
@@ -731,20 +727,20 @@
public:
GfxPatternColorSpace(GfxColorSpace *underA);
- ~GfxPatternColorSpace();
- GfxColorSpace *copy() override;
- GfxColorSpaceMode getMode() override { return csPattern; }
+ virtual ~GfxPatternColorSpace();
+ virtual GfxColorSpace *copy();
+ virtual GfxColorSpaceMode getMode() { return csPattern; }
// Construct a Pattern color space. Returns NULL if unsuccessful.
static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
- void getGray(GfxColor *color, GfxGray *gray) override;
- void getRGB(GfxColor *color, GfxRGB *rgb) override;
- void getCMYK(GfxColor *color, GfxCMYK *cmyk) override;
- void getDeviceN(GfxColor *color, GfxColor *deviceN) override;
+ virtual void getGray(GfxColor *color, GfxGray *gray);
+ virtual void getRGB(GfxColor *color, GfxRGB *rgb);
+ virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getDeviceN(GfxColor *color, GfxColor *deviceN);
- int getNComps() override { return 0; }
- void getDefaultColor(GfxColor *color) override;
+ virtual int getNComps() { return 0; }
+ virtual void getDefaultColor(GfxColor *color);
// Pattern-specific access.
GfxColorSpace *getUnder() { return under; }
@@ -784,9 +780,9 @@
public:
static GfxTilingPattern *parse(Object *patObj);
- ~GfxTilingPattern();
+ virtual ~GfxTilingPattern();
- GfxPattern *copy() override;
+ virtual GfxPattern *copy();
int getPaintType() { return paintType; }
int getTilingType() { return tilingType; }
@@ -822,9 +818,9 @@
public:
static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state);
- ~GfxShadingPattern();
+ virtual ~GfxShadingPattern();
- GfxPattern *copy() override;
+ virtual GfxPattern *copy();
GfxShading *getShading() { return shading; }
double *getMatrix() { return matrix; }
@@ -884,7 +880,7 @@
Function **funcsA, int nFuncsA,
GBool extend0A, GBool extend1A);
GfxUnivariateShading(GfxUnivariateShading *shading);
- ~GfxUnivariateShading();
+ virtual ~GfxUnivariateShading();
double getDomain0() { return t0; }
double getDomain1() { return t1; }
@@ -929,11 +925,11 @@
double *matrixA,
Function **funcsA, int nFuncsA);
GfxFunctionShading(GfxFunctionShading *shading);
- ~GfxFunctionShading();
+ virtual ~GfxFunctionShading();
static GfxFunctionShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
- GfxShading *copy() override;
+ virtual GfxShading *copy();
void getDomain(double *x0A, double *y0A, double *x1A, double *y1A)
{ *x0A = x0; *y0A = y0; *x1A = x1; *y1A = y1; }
@@ -963,20 +959,20 @@
Function **funcsA, int nFuncsA,
GBool extend0A, GBool extend1A);
GfxAxialShading(GfxAxialShading *shading);
- ~GfxAxialShading();
+ virtual ~GfxAxialShading();
static GfxAxialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
- GfxShading *copy() override;
+ virtual GfxShading *copy();
void getCoords(double *x0A, double *y0A, double *x1A, double *y1A)
{ *x0A = x0; *y0A = y0; *x1A = x1; *y1A = y1; }
- void getParameterRange(double *lower, double *upper,
+ virtual void getParameterRange(double *lower, double *upper,
double xMin, double yMin,
- double xMax, double yMax) override;
+ double xMax, double yMax);
- double getDistance(double tMin, double tMax) override;
+ virtual double getDistance(double tMin, double tMax);
private:
@@ -996,21 +992,21 @@
Function **funcsA, int nFuncsA,
GBool extend0A, GBool extend1A);
GfxRadialShading(GfxRadialShading *shading);
- ~GfxRadialShading();
+ virtual ~GfxRadialShading();
static GfxRadialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
- GfxShading *copy() override;
+ virtual GfxShading *copy();
void getCoords(double *x0A, double *y0A, double *r0A,
double *x1A, double *y1A, double *r1A)
{ *x0A = x0; *y0A = y0; *r0A = r0; *x1A = x1; *y1A = y1; *r1A = r1; }
- void getParameterRange(double *lower, double *upper,
+ virtual void getParameterRange(double *lower, double *upper,
double xMin, double yMin,
- double xMax, double yMax) override;
+ double xMax, double yMax);
- double getDistance(double tMin, double tMax) override;
+ virtual double getDistance(double tMin, double tMax);
private:
@@ -1034,11 +1030,11 @@
int (*trianglesA)[3], int nTrianglesA,
Function **funcsA, int nFuncsA);
GfxGouraudTriangleShading(GfxGouraudTriangleShading *shading);
- ~GfxGouraudTriangleShading();
+ virtual ~GfxGouraudTriangleShading();
static GfxGouraudTriangleShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
- GfxShading *copy() override;
+ virtual GfxShading *copy();
int getNTriangles() { return nTriangles; }
@@ -1120,11 +1116,11 @@
GfxPatchMeshShading(int typeA, GfxPatch *patchesA, int nPatchesA,
Function **funcsA, int nFuncsA);
GfxPatchMeshShading(GfxPatchMeshShading *shading);
- ~GfxPatchMeshShading();
+ virtual ~GfxPatchMeshShading();
static GfxPatchMeshShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
- GfxShading *copy() override;
+ virtual GfxShading *copy();
int getNPatches() { return nPatches; }
GfxPatch *getPatch(int i) { return &patches[i]; }
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2007-2010, 2012, 2015 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
@@ -128,7 +128,8 @@
class GlobalParams {
public:
- // Initialize the global parameters
+ // Initialize the global parameters by attempting to read a config
+ // file.
GlobalParams(const char *customPopplerDataDir = NULL);
~GlobalParams();
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -674,8 +674,8 @@
public:
JBIG2Bitmap(Guint segNumA, int wA, int hA);
- ~JBIG2Bitmap();
- JBIG2SegmentType getType() override { return jbig2SegBitmap; }
+ virtual ~JBIG2Bitmap();
+ virtual JBIG2SegmentType getType() { return jbig2SegBitmap; }
JBIG2Bitmap *copy() { return new JBIG2Bitmap(0, this); }
JBIG2Bitmap *getSlice(Guint x, Guint y, Guint wA, Guint hA);
void expand(int newH, Guint pixel);
@@ -1046,8 +1046,8 @@
public:
JBIG2SymbolDict(Guint segNumA, Guint sizeA);
- ~JBIG2SymbolDict();
- JBIG2SegmentType getType() override { return jbig2SegSymbolDict; }
+ virtual ~JBIG2SymbolDict();
+ virtual JBIG2SegmentType getType() { return jbig2SegSymbolDict; }
Guint getSize() { return size; }
void setBitmap(Guint idx, JBIG2Bitmap *bitmap) { bitmaps[idx] = bitmap; }
JBIG2Bitmap *getBitmap(Guint idx) { return bitmaps[idx]; }
@@ -1107,8 +1107,8 @@
public:
JBIG2PatternDict(Guint segNumA, Guint sizeA);
- ~JBIG2PatternDict();
- JBIG2SegmentType getType() override { return jbig2SegPatternDict; }
+ virtual ~JBIG2PatternDict();
+ virtual JBIG2SegmentType getType() { return jbig2SegPatternDict; }
Guint getSize() { return size; }
void setBitmap(Guint idx, JBIG2Bitmap *bitmap) { if (likely(idx < size)) bitmaps[idx] = bitmap; }
JBIG2Bitmap *getBitmap(Guint idx) { return (idx < size) ? bitmaps[idx] : NULL; }
@@ -1148,8 +1148,8 @@
public:
JBIG2CodeTable(Guint segNumA, JBIG2HuffmanTable *tableA);
- ~JBIG2CodeTable();
- JBIG2SegmentType getType() override { return jbig2SegCodeTable; }
+ virtual ~JBIG2CodeTable();
+ virtual JBIG2SegmentType getType() { return jbig2SegCodeTable; }
JBIG2HuffmanTable *getHuffTable() { return table; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -48,21 +48,21 @@
public:
JBIG2Stream(Stream *strA, Object *globalsStreamA, Object *globalsStreamRefA);
- ~JBIG2Stream();
- StreamKind getKind() override { return strJBIG2; }
- void reset() override;
- void close() override;
- Goffset getPos() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual ~JBIG2Stream();
+ virtual StreamKind getKind() { return strJBIG2; }
+ virtual void reset();
+ virtual void close();
+ virtual Goffset getPos();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
virtual Object *getGlobalsStream() { return &globalsStream; }
virtual Ref getGlobalsStreamRef() { return globalsStreamRef; }
private:
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
void readSegments();
GBool readSymbolDictSeg(Guint segNum, Guint length,
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -28,16 +28,16 @@
public:
JPXStream(Stream *strA);
- ~JPXStream();
- StreamKind getKind() override { return strJPX; }
- void reset() override;
- void close() override;
- Goffset getPos() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
- void getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) override;
+ virtual ~JPXStream();
+ virtual StreamKind getKind() { return strJPX; }
+ virtual void reset();
+ virtual void close();
+ virtual Goffset getPos();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
+ virtual void getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode);
int readStream(int nChars, Guchar *buffer) {
return str->doGetChars(nChars, buffer);
@@ -48,8 +48,8 @@
JPXStreamPrivate *priv;
void init();
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
};
#endif
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Link.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Link.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Link.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -150,13 +150,13 @@
LinkGoTo(Object *destObj);
// Destructor.
- ~LinkGoTo();
+ virtual ~LinkGoTo();
// Was the LinkGoTo created successfully?
- GBool isOk() override { return dest || namedDest; }
+ virtual GBool isOk() { return dest || namedDest; }
// Accessors.
- LinkActionKind getKind() override { return actionGoTo; }
+ virtual LinkActionKind getKind() { return actionGoTo; }
LinkDest *getDest() { return dest; }
GooString *getNamedDest() { return namedDest; }
@@ -180,13 +180,13 @@
LinkGoToR(Object *fileSpecObj, Object *destObj);
// Destructor.
- ~LinkGoToR();
+ virtual ~LinkGoToR();
// Was the LinkGoToR created successfully?
- GBool isOk() override { return fileName && (dest || namedDest); }
+ virtual GBool isOk() { return fileName && (dest || namedDest); }
// Accessors.
- LinkActionKind getKind() override { return actionGoToR; }
+ virtual LinkActionKind getKind() { return actionGoToR; }
GooString *getFileName() { return fileName; }
LinkDest *getDest() { return dest; }
GooString *getNamedDest() { return namedDest; }
@@ -211,13 +211,13 @@
LinkLaunch(Object *actionObj);
// Destructor.
- ~LinkLaunch();
+ virtual ~LinkLaunch();
// Was the LinkLaunch created successfully?
- GBool isOk() override { return fileName != NULL; }
+ virtual GBool isOk() { return fileName != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionLaunch; }
+ virtual LinkActionKind getKind() { return actionLaunch; }
GooString *getFileName() { return fileName; }
GooString *getParams() { return params; }
@@ -238,13 +238,13 @@
LinkURI(Object *uriObj, GooString *baseURI);
// Destructor.
- ~LinkURI();
+ virtual ~LinkURI();
// Was the LinkURI created successfully?
- GBool isOk() override { return uri != NULL; }
+ virtual GBool isOk() { return uri != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionURI; }
+ virtual LinkActionKind getKind() { return actionURI; }
GooString *getURI() { return uri; }
private:
@@ -262,11 +262,11 @@
// Build a LinkNamed given the action name.
LinkNamed(Object *nameObj);
- ~LinkNamed();
+ virtual ~LinkNamed();
- GBool isOk() override { return name != NULL; }
+ virtual GBool isOk() { return name != NULL; }
- LinkActionKind getKind() override { return actionNamed; }
+ virtual LinkActionKind getKind() { return actionNamed; }
GooString *getName() { return name; }
private:
@@ -290,10 +290,10 @@
};
LinkMovie(Object *obj);
- ~LinkMovie();
+ virtual ~LinkMovie();
- GBool isOk() override { return annotRef.num >= 0 || annotTitle != NULL; }
- LinkActionKind getKind() override { return actionMovie; }
+ virtual GBool isOk() { return annotRef.num >= 0 || annotTitle != NULL; }
+ virtual LinkActionKind getKind() { return actionMovie; }
// a movie action stores either an indirect reference to a movie annotation
// or the movie annotation title
@@ -333,11 +333,11 @@
LinkRendition(Object *Obj);
- ~LinkRendition();
+ virtual ~LinkRendition();
- GBool isOk() override { return true; }
+ virtual GBool isOk() { return true; }
- LinkActionKind getKind() override { return actionRendition; }
+ virtual LinkActionKind getKind() { return actionRendition; }
GBool hasRenditionObject() { return renditionObj.isDict(); }
Object* getRenditionObject() { return &renditionObj; }
@@ -371,11 +371,11 @@
LinkSound(Object *soundObj);
- ~LinkSound();
+ virtual ~LinkSound();
- GBool isOk() override { return sound != NULL; }
+ virtual GBool isOk() { return sound != NULL; }
- LinkActionKind getKind() override { return actionSound; }
+ virtual LinkActionKind getKind() { return actionSound; }
double getVolume() { return volume; }
GBool getSynchronous() { return sync; }
@@ -402,11 +402,11 @@
// Build a LinkJavaScript given the action name.
LinkJavaScript(Object *jsObj);
- ~LinkJavaScript();
+ virtual ~LinkJavaScript();
- GBool isOk() override { return js != NULL; }
+ virtual GBool isOk() { return js != NULL; }
- LinkActionKind getKind() override { return actionJavaScript; }
+ virtual LinkActionKind getKind() { return actionJavaScript; }
GooString *getScript() { return js; }
private:
@@ -421,11 +421,11 @@
public:
LinkOCGState(Object *obj);
- ~LinkOCGState();
+ virtual ~LinkOCGState();
- GBool isOk() override { return stateList != NULL; }
+ virtual GBool isOk() { return stateList != NULL; }
- LinkActionKind getKind() override { return actionOCGState; }
+ virtual LinkActionKind getKind() { return actionOCGState; }
enum State { On, Off, Toggle};
struct StateList {
@@ -454,13 +454,13 @@
LinkUnknown(char *actionA);
// Destructor.
- ~LinkUnknown();
+ virtual ~LinkUnknown();
// Was the LinkUnknown create successfully?
- GBool isOk() override { return action != NULL; }
+ virtual GBool isOk() { return action != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionUnknown; }
+ virtual LinkActionKind getKind() { return actionUnknown; }
GooString *getAction() { return action; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -23,9 +23,10 @@
class LocalPDFDocBuilder : public PDFDocBuilder {
public:
+
PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) override;
- GBool supports(const GooString &uri) override;
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+ GBool supports(const GooString &uri);
};
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Makefile.am
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Makefile.am 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Makefile.am 2017-03-21 03:36:55 UTC (rev 43564)
@@ -327,7 +327,7 @@
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 67:0:0 \
+ -version-info 66:0:0 \
@create_shared_lib@ \
@auto_import_flags@
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -89,24 +89,24 @@
virtual ~MarkedContentOutputDev();
virtual GBool isOk() { return gTrue; }
- GBool upsideDown() override { return gTrue; }
- GBool useDrawChar() override { return gTrue; }
- GBool interpretType3Chars() override { return gFalse; }
- GBool needNonText() override { return gFalse; }
- GBool needCharCount() override { return gFalse; }
+ virtual GBool upsideDown() { return gTrue; }
+ virtual GBool useDrawChar() { return gTrue; }
+ virtual GBool interpretType3Chars() { return gFalse; }
+ virtual GBool needNonText() { return gFalse; }
+ virtual GBool needCharCount() { return gFalse; }
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
- void endPage() override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+ virtual void endPage();
- void drawChar(GfxState *state,
+ virtual void drawChar(GfxState *state,
double xx, double yy,
double dx, double dy,
double ox, double oy,
CharCode c, int nBytes,
- Unicode *u, int uLen) override;
+ Unicode *u, int uLen);
- void beginMarkedContent(char *name, Dict *properties) override;
- void endMarkedContent(GfxState *state) override;
+ virtual void beginMarkedContent(char *name, Dict *properties);
+ virtual void endMarkedContent(GfxState *state);
const TextSpanArray& getTextSpans() const;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -989,16 +989,16 @@
DeviceNRecoder(Stream *strA, int widthA, int heightA,
GfxImageColorMap *colorMapA);
- ~DeviceNRecoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~DeviceNRecoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufIdx >= bufSize && !fillBuf()) ? EOF : buf[bufIdx++]; }
- int lookChar() override
+ virtual int lookChar()
{ return (bufIdx >= bufSize && !fillBuf()) ? EOF : buf[bufIdx]; }
- GooString *getPSFilter(int psLevel, const char *indent) override { return NULL; }
- GBool isBinary(GBool last = gTrue) override { return gTrue; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int psLevel, const char *indent) { return NULL; }
+ virtual GBool isBinary(GBool last = gTrue) { return gTrue; }
+ virtual GBool isEncoder() { return gTrue; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -134,31 +134,31 @@
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return gFalse; }
+ virtual GBool upsideDown() { return gFalse; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gFalse; }
+ virtual GBool useDrawChar() { return gFalse; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
- GBool useTilingPatternFill() override { return gTrue; }
+ virtual GBool useTilingPatternFill() { return gTrue; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- GBool useShadedFills(int type) override
+ virtual GBool useShadedFills(int type)
{ return type < 4 && level >= psLevel2; }
// Does this device use drawForm()? If this returns false,
// form-type XObjects will be interpreted (i.e., unrolled).
- GBool useDrawForm() override { return preloadImagesForms; }
+ virtual GBool useDrawForm() { return preloadImagesForms; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gFalse; }
+ virtual GBool interpretType3Chars() { return gFalse; }
- GBool needClipToCropBox() override { return mode == psModeEPS; }
+ virtual GBool needClipToCropBox() { return mode == psModeEPS; }
//----- header/trailer (used only if manualCtrl is true)
@@ -182,7 +182,7 @@
// returns false, the page display is aborted. Typically, an
// OutputDev will use some alternate means to display the page
// before returning false.
- GBool checkPageSlice(Page *page, double hDPI, double vDPI,
+ virtual GBool checkPageSlice(Page *page, double hDPI, double vDPI,
int rotate, GBool useMediaBox, GBool crop,
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
@@ -189,108 +189,108 @@
GBool (*abortCheckCbk)(void *data) = NULL,
void *abortCheckCbkData = NULL,
GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
- void *annotDisplayDecideCbkData = NULL) override;
+ void *annotDisplayDecideCbkData = NULL);
// Start a page.
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
- void endPage() override;
+ virtual void endPage();
//----- save/restore graphics state
- void saveState(GfxState *state) override;
- void restoreState(GfxState *state) override;
+ virtual void saveState(GfxState *state);
+ virtual void restoreState(GfxState *state);
//----- update graphics state
- void updateCTM(GfxState *state, double m11, double m12,
- double m21, double m22, double m31, double m32) override;
- void updateLineDash(GfxState *state) override;
- void updateFlatness(GfxState *state) override;
- void updateLineJoin(GfxState *state) override;
- void updateLineCap(GfxState *state) override;
- void updateMiterLimit(GfxState *state) override;
- void updateLineWidth(GfxState *state) override;
- void updateFillColorSpace(GfxState *state) override;
- void updateStrokeColorSpace(GfxState *state) override;
- void updateFillColor(GfxState *state) override;
- void updateStrokeColor(GfxState *state) override;
- void updateFillOverprint(GfxState *state) override;
- void updateStrokeOverprint(GfxState *state) override;
- void updateOverprintMode(GfxState *state) override;
- void updateTransfer(GfxState *state) override;
+ virtual void updateCTM(GfxState *state, double m11, double m12,
+ double m21, double m22, double m31, double m32);
+ virtual void updateLineDash(GfxState *state);
+ virtual void updateFlatness(GfxState *state);
+ virtual void updateLineJoin(GfxState *state);
+ virtual void updateLineCap(GfxState *state);
+ virtual void updateMiterLimit(GfxState *state);
+ virtual void updateLineWidth(GfxState *state);
+ virtual void updateFillColorSpace(GfxState *state);
+ virtual void updateStrokeColorSpace(GfxState *state);
+ virtual void updateFillColor(GfxState *state);
+ virtual void updateStrokeColor(GfxState *state);
+ virtual void updateFillOverprint(GfxState *state);
+ virtual void updateStrokeOverprint(GfxState *state);
+ virtual void updateOverprintMode(GfxState *state);
+ virtual void updateTransfer(GfxState *state);
//----- update text state
- void updateFont(GfxState *state) override;
- void updateTextMat(GfxState *state) override;
- void updateCharSpace(GfxState *state) override;
- void updateRender(GfxState *state) override;
- void updateRise(GfxState *state) override;
- void updateWordSpace(GfxState *state) override;
- void updateHorizScaling(GfxState *state) override;
- void updateTextPos(GfxState *state) override;
- void updateTextShift(GfxState *state, double shift) override;
- void saveTextPos(GfxState *state) override;
- void restoreTextPos(GfxState *state) override;
+ virtual void updateFont(GfxState *state);
+ virtual void updateTextMat(GfxState *state);
+ virtual void updateCharSpace(GfxState *state);
+ virtual void updateRender(GfxState *state);
+ virtual void updateRise(GfxState *state);
+ virtual void updateWordSpace(GfxState *state);
+ virtual void updateHorizScaling(GfxState *state);
+ virtual void updateTextPos(GfxState *state);
+ virtual void updateTextShift(GfxState *state, double shift);
+ virtual void saveTextPos(GfxState *state);
+ virtual void restoreTextPos(GfxState *state);
//----- path painting
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+ virtual void stroke(GfxState *state);
+ virtual void fill(GfxState *state);
+ virtual void eoFill(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
double *pmat, int paintType, int tilingType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
- double xStep, double yStep) override;
- GBool functionShadedFill(GfxState *state,
- GfxFunctionShading *shading) override;
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double /*tMin*/, double /*tMax*/) override;
- GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double /*sMin*/, double /*sMax*/) override;
+ double xStep, double yStep);
+ virtual GBool functionShadedFill(GfxState *state,
+ GfxFunctionShading *shading);
+ virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double /*tMin*/, double /*tMax*/);
+ virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double /*sMin*/, double /*sMax*/);
//----- path clipping
- void clip(GfxState *state) override;
- void eoClip(GfxState *state) override;
- void clipToStrokePath(GfxState *state) override;
+ virtual void clip(GfxState *state);
+ virtual void eoClip(GfxState *state);
+ virtual void clipToStrokePath(GfxState *state);
//----- text drawing
- void drawString(GfxState *state, GooString *s) override;
- void beginTextObject(GfxState *state) override;
- void endTextObject(GfxState *state) override;
+ virtual void drawString(GfxState *state, GooString *s);
+ virtual void beginTextObject(GfxState *state);
+ virtual void endTextObject(GfxState *state);
//----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str,
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
- GBool interpolate, GBool inlineImg) override;
- void setSoftMaskFromImageMask(GfxState *state,
+ GBool interpolate, GBool inlineImg);
+ virtual void setSoftMaskFromImageMask(GfxState *state,
Object *ref, Stream *str,
int width, int height, GBool invert,
- GBool inlineImg, double *baseMatrix) override;
- void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override;
- void drawImage(GfxState *state, Object *ref, Stream *str,
+ GBool inlineImg, double *baseMatrix);
+ virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix);
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
- GBool interpolate, int *maskColors, GBool inlineImg) override;
- void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ GBool interpolate, int *maskColors, GBool inlineImg);
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
GBool interpolate,
Stream *maskStr, int maskWidth, int maskHeight,
- GBool maskInvert, GBool maskInterpolate) override;
+ GBool maskInvert, GBool maskInterpolate);
#if OPI_SUPPORT
//----- OPI functions
- void opiBegin(GfxState *state, Dict *opiDict) override;
- void opiEnd(GfxState *state, Dict *opiDict) override;
+ virtual void opiBegin(GfxState *state, Dict *opiDict);
+ virtual void opiEnd(GfxState *state, Dict *opiDict);
#endif
//----- Type 3 font operators
- void type3D0(GfxState *state, double wx, double wy) override;
- void type3D1(GfxState *state, double wx, double wy,
- double llx, double lly, double urx, double ury) override;
+ virtual void type3D0(GfxState *state, double wx, double wy);
+ virtual void type3D1(GfxState *state, double wx, double wy,
+ double llx, double lly, double urx, double ury);
//----- form XObjects
- void drawForm(Ref ref) override;
+ virtual void drawForm(Ref ref);
//----- PostScript XObjects
- void psXObject(Stream *psStream, Stream *level1Stream) override;
+ virtual void psXObject(Stream *psStream, Stream *level1Stream);
//----- miscellaneous
void setOffset(double x, double y)
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -110,7 +110,7 @@
{
}
- bool operator==(const PopplerCacheKey &key) const override
+ bool operator==(const PopplerCacheKey &key) const
{
const ObjectKey *k = static_cast<const ObjectKey*>(&key);
return k->num == num && k->gen == gen;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -48,95 +48,95 @@
PreScanOutputDev(PDFDoc *docA);
// Destructor.
- ~PreScanOutputDev();
+ virtual ~PreScanOutputDev();
//----- get info about output device
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return gTrue; }
+ virtual GBool upsideDown() { return gTrue; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gTrue; }
+ virtual GBool useDrawChar() { return gTrue; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
- GBool useTilingPatternFill() override { return gTrue; }
+ virtual GBool useTilingPatternFill() { return gTrue; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- GBool useShadedFills(int type) override { return gTrue; }
+ virtual GBool useShadedFills(int type) { return gTrue; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gTrue; }
+ virtual GBool interpretType3Chars() { return gTrue; }
//----- initialization and control
// Start a page.
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
- void endPage() override;
+ virtual void endPage();
//----- path painting
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
- double *pmat, int paintType, int tilingType, Dict *resDict,
- double *mat, double *bbox,
- int x0, int y0, int x1, int y1,
- double xStep, double yStep) override;
- GBool functionShadedFill(GfxState *state,
- GfxFunctionShading *shading) override;
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
- GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax) override;
+ virtual void stroke(GfxState *state);
+ virtual void fill(GfxState *state);
+ virtual void eoFill(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
+ virtual GBool functionShadedFill(GfxState *state,
+ GfxFunctionShading *shading);
+ virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
+ virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax);
//----- path clipping
- void clip(GfxState *state) override;
- void eoClip(GfxState *state) override;
+ virtual void clip(GfxState *state);
+ virtual void eoClip(GfxState *state);
//----- text drawing
- void beginStringOp(GfxState *state) override;
- void endStringOp(GfxState *state) override;
- GBool beginType3Char(GfxState *state, double x, double y,
- double dx, double dy,
- CharCode code, Unicode *u, int uLen) override;
- void endType3Char(GfxState *state) override;
+ virtual void beginStringOp(GfxState *state);
+ virtual void endStringOp(GfxState *state);
+ virtual GBool beginType3Char(GfxState *state, double x, double y,
+ double dx, double dy,
+ CharCode code, Unicode *u, int uLen);
+ virtual void endType3Char(GfxState *state);
//----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str,
- int width, int height, GBool invert,
- GBool interpolate, GBool inlineImg) override;
- void drawImage(GfxState *state, Object *ref, Stream *str,
- int width, int height, GfxImageColorMap *colorMap,
- GBool interpolate, int *maskColors, GBool inlineImg) override;
- void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr, int maskWidth, int maskHeight,
- GBool maskInvert, GBool maskInterpolate) override;
- void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
- int width, int height,
- GfxImageColorMap *colorMap,
- GBool interpolate,
- Stream *maskStr,
- int maskWidth, int maskHeight,
- GfxImageColorMap *maskColorMap,
- GBool maskInterpolate) override;
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GBool invert,
+ GBool interpolate, GBool inlineImg);
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+ GBool interpolate, int *maskColors, GBool inlineImg);
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr, int maskWidth, int maskHeight,
+ GBool maskInvert, GBool maskInterpolate);
+ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+ GBool interpolate,
+ Stream *maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap *maskColorMap,
+ GBool maskInterpolate);
//----- transparency groups and soft masks
- void beginTransparencyGroup(GfxState *state, double *bbox,
- GfxColorSpace *blendingColorSpace,
- GBool isolated, GBool knockout,
- GBool forSoftMask) override;
- void paintTransparencyGroup(GfxState *state, double *bbox) override;
- void setSoftMask(GfxState *state, double *bbox, GBool alpha,
- Function *transferFunc, GfxColor *backdropColor) override;
+ virtual void beginTransparencyGroup(GfxState *state, double *bbox,
+ GfxColorSpace *blendingColorSpace,
+ GBool isolated, GBool knockout,
+ GBool forSoftMask);
+ virtual void paintTransparencyGroup(GfxState *state, double *bbox);
+ virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha,
+ Function *transferFunc, GfxColor *backdropColor);
//----- special access
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -107,21 +107,21 @@
public:
StandardSecurityHandler(PDFDoc *docA, Object *encryptDictA);
- ~StandardSecurityHandler();
+ virtual ~StandardSecurityHandler();
- GBool isUnencrypted() override;
- void *makeAuthData(GooString *ownerPassword,
- GooString *userPassword) override;
- void *getAuthData() override;
- void freeAuthData(void *authData) override;
- GBool authorize(void *authData) override;
- int getPermissionFlags() override { return permFlags; }
- GBool getOwnerPasswordOk() override { return ownerPasswordOk; }
- Guchar *getFileKey() override { return fileKey; }
- int getFileKeyLength() override { return fileKeyLength; }
- int getEncVersion() override { return encVersion; }
- int getEncRevision() override { return encRevision; }
- CryptAlgorithm getEncAlgorithm() override { return encAlgorithm; }
+ virtual GBool isUnencrypted();
+ virtual void *makeAuthData(GooString *ownerPassword,
+ GooString *userPassword);
+ virtual void *getAuthData();
+ virtual void freeAuthData(void *authData);
+ virtual GBool authorize(void *authData);
+ virtual int getPermissionFlags() { return permFlags; }
+ virtual GBool getOwnerPasswordOk() { return ownerPasswordOk; }
+ virtual Guchar *getFileKey() { return fileKey; }
+ virtual int getFileKeyLength() { return fileKeyLength; }
+ virtual int getEncVersion() { return encVersion; }
+ virtual int getEncRevision() { return encRevision; }
+ virtual CryptAlgorithm getEncAlgorithm() { return encAlgorithm; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
// Copyright (C) 2006 Stefan Schweizer <genstef at gentoo.org>
-// Copyright (C) 2006-2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2016 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
@@ -1215,7 +1215,7 @@
~SplashOutFontFileID() {}
- GBool matches(SplashFontFileID *id) override {
+ GBool matches(SplashFontFileID *id) {
return ((SplashOutFontFileID *)id)->r.num == r.num &&
((SplashOutFontFileID *)id)->r.gen == r.gen;
}
@@ -4020,9 +4020,9 @@
maskStr->reset();
maskStr->doGetChars(maskWidth * maskHeight, data);
maskStr->close();
- Object maskDict;
- maskDict.initDict(maskStr->getDict());
- maskStr = new MemStream((char *)data, 0, maskWidth * maskHeight, &maskDict);
+ Object *maskDict = new Object();
+ maskDict->initDict(maskStr->getDict());
+ maskStr = new MemStream((char *)data, 0, maskWidth * maskHeight, maskDict);
((MemStream *) maskStr)->setNeedFree(gTrue);
}
imgMaskData.imgStr = new ImageStream(maskStr, maskWidth,
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -64,19 +64,19 @@
SplashFunctionPattern(SplashColorMode colorMode, GfxState *state, GfxFunctionShading *shading);
- SplashPattern *copy() override { return new SplashFunctionPattern(colorMode, state, (GfxFunctionShading *) shading); }
+ virtual SplashPattern *copy() { return new SplashFunctionPattern(colorMode, state, (GfxFunctionShading *) shading); }
- ~SplashFunctionPattern();
+ virtual ~SplashFunctionPattern();
- GBool testPosition(int x, int y) override { return gTrue; }
+ virtual GBool testPosition(int x, int y) { return gTrue; }
- GBool isStatic() override { return gFalse; }
+ virtual GBool isStatic() { return gFalse; }
- GBool getColor(int x, int y, SplashColorPtr c) override;
+ virtual GBool getColor(int x, int y, SplashColorPtr c);
virtual GfxFunctionShading *getShading() { return shading; }
- GBool isCMYK() override { return gfxMode == csDeviceCMYK; }
+ virtual GBool isCMYK() { return gfxMode == csDeviceCMYK; }
protected:
Matrix ictm;
@@ -92,19 +92,19 @@
SplashUnivariatePattern(SplashColorMode colorMode, GfxState *state, GfxUnivariateShading *shading);
- ~SplashUnivariatePattern();
+ virtual ~SplashUnivariatePattern();
- GBool getColor(int x, int y, SplashColorPtr c) override;
+ virtual GBool getColor(int x, int y, SplashColorPtr c);
- GBool testPosition(int x, int y) override;
+ virtual GBool testPosition(int x, int y);
- GBool isStatic() override { return gFalse; }
+ virtual GBool isStatic() { return gFalse; }
virtual GBool getParameter(double xs, double ys, double *t) = 0;
virtual GfxUnivariateShading *getShading() { return shading; }
- GBool isCMYK() override { return gfxMode == csDeviceCMYK; }
+ virtual GBool isCMYK() { return gfxMode == csDeviceCMYK; }
protected:
Matrix ictm;
@@ -120,11 +120,11 @@
SplashAxialPattern(SplashColorMode colorMode, GfxState *state, GfxAxialShading *shading);
- SplashPattern *copy() override { return new SplashAxialPattern(colorMode, state, (GfxAxialShading *) shading); }
+ virtual SplashPattern *copy() { return new SplashAxialPattern(colorMode, state, (GfxAxialShading *) shading); }
- ~SplashAxialPattern();
+ virtual ~SplashAxialPattern();
- GBool getParameter(double xs, double ys, double *t) override;
+ virtual GBool getParameter(double xs, double ys, double *t);
private:
double x0, y0, x1, y1;
@@ -137,26 +137,26 @@
SplashGouraudPattern(GBool bDirectColorTranslation, GfxState *state, GfxGouraudTriangleShading *shading, SplashColorMode mode);
- SplashPattern *copy() override { return new SplashGouraudPattern(bDirectColorTranslation, state, shading, mode); }
+ virtual SplashPattern *copy() { return new SplashGouraudPattern(bDirectColorTranslation, state, shading, mode); }
- ~SplashGouraudPattern();
+ virtual ~SplashGouraudPattern();
- GBool getColor(int x, int y, SplashColorPtr c) override { return gFalse; }
+ virtual GBool getColor(int x, int y, SplashColorPtr c) { return gFalse; }
- GBool testPosition(int x, int y) override { return gFalse; }
+ virtual GBool testPosition(int x, int y) { return gFalse; }
- GBool isStatic() override { return gFalse; }
+ virtual GBool isStatic() { return gFalse; }
- GBool isCMYK() override { return gfxMode == csDeviceCMYK; }
+ virtual GBool isCMYK() { return gfxMode == csDeviceCMYK; }
- GBool isParameterized() override { return shading->isParameterized(); }
- int getNTriangles() override { return shading->getNTriangles(); }
- void getTriangle(int i, double *x0, double *y0, double *color0,
+ virtual GBool isParameterized() { return shading->isParameterized(); }
+ virtual int getNTriangles() { return shading->getNTriangles(); }
+ virtual void getTriangle(int i, double *x0, double *y0, double *color0,
double *x1, double *y1, double *color1,
- double *x2, double *y2, double *color2) override
+ double *x2, double *y2, double *color2)
{ return shading->getTriangle(i, x0, y0, color0, x1, y1, color1, x2, y2, color2); }
- void getParameterizedColor(double t, SplashColorMode mode, SplashColorPtr c) override;
+ virtual void getParameterizedColor(double t, SplashColorMode mode, SplashColorPtr c);
private:
GfxGouraudTriangleShading *shading;
@@ -172,11 +172,11 @@
SplashRadialPattern(SplashColorMode colorMode, GfxState *state, GfxRadialShading *shading);
- SplashPattern *copy() override { return new SplashRadialPattern(colorMode, state, (GfxRadialShading *) shading); }
+ virtual SplashPattern *copy() { return new SplashRadialPattern(colorMode, state, (GfxRadialShading *) shading); }
- ~SplashRadialPattern();
+ virtual ~SplashRadialPattern();
- GBool getParameter(double xs, double ys, double *t) override;
+ virtual GBool getParameter(double xs, double ys, double *t);
private:
double x0, y0, r0, dx, dy, dr;
@@ -203,7 +203,7 @@
GBool overprintPreviewA = globalParams->getOverprintPreview());
// Destructor.
- ~SplashOutputDev();
+ virtual ~SplashOutputDev();
//----- get info about output device
@@ -210,115 +210,115 @@
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
- GBool useTilingPatternFill() override { return gTrue; }
+ virtual GBool useTilingPatternFill() { return gTrue; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- GBool useShadedFills(int type) override
+ virtual GBool useShadedFills(int type)
{ return (type >= 1 && type <= 5) ? gTrue : gFalse; }
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return bitmapTopDown ^ bitmapUpsideDown; }
+ virtual GBool upsideDown() { return bitmapTopDown ^ bitmapUpsideDown; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gTrue; }
+ virtual GBool useDrawChar() { return gTrue; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gTrue; }
+ virtual GBool interpretType3Chars() { return gTrue; }
//----- initialization and control
// Start a page.
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
- void endPage() override;
+ virtual void endPage();
//----- save/restore graphics state
- void saveState(GfxState *state) override;
- void restoreState(GfxState *state) override;
+ virtual void saveState(GfxState *state);
+ virtual void restoreState(GfxState *state);
//----- update graphics state
- void updateAll(GfxState *state) override;
- void updateCTM(GfxState *state, double m11, double m12,
- double m21, double m22, double m31, double m32) override;
- void updateLineDash(GfxState *state) override;
- void updateFlatness(GfxState *state) override;
- void updateLineJoin(GfxState *state) override;
- void updateLineCap(GfxState *state) override;
- void updateMiterLimit(GfxState *state) override;
- void updateLineWidth(GfxState *state) override;
- void updateStrokeAdjust(GfxState *state) override;
- void updateFillColorSpace(GfxState *state) override;
- void updateStrokeColorSpace(GfxState *state) override;
- void updateFillColor(GfxState *state) override;
- void updateStrokeColor(GfxState *state) override;
- void updateBlendMode(GfxState *state) override;
- void updateFillOpacity(GfxState *state) override;
- void updateStrokeOpacity(GfxState *state) override;
- void updatePatternOpacity(GfxState *state) override;
- void clearPatternOpacity(GfxState *state) override;
- void updateFillOverprint(GfxState *state) override;
- void updateStrokeOverprint(GfxState *state) override;
- void updateOverprintMode(GfxState *state) override;
- void updateTransfer(GfxState *state) override;
+ virtual void updateAll(GfxState *state);
+ virtual void updateCTM(GfxState *state, double m11, double m12,
+ double m21, double m22, double m31, double m32);
+ virtual void updateLineDash(GfxState *state);
+ virtual void updateFlatness(GfxState *state);
+ virtual void updateLineJoin(GfxState *state);
+ virtual void updateLineCap(GfxState *state);
+ virtual void updateMiterLimit(GfxState *state);
+ virtual void updateLineWidth(GfxState *state);
+ virtual void updateStrokeAdjust(GfxState *state);
+ virtual void updateFillColorSpace(GfxState *state);
+ virtual void updateStrokeColorSpace(GfxState *state);
+ virtual void updateFillColor(GfxState *state);
+ virtual void updateStrokeColor(GfxState *state);
+ virtual void updateBlendMode(GfxState *state);
+ virtual void updateFillOpacity(GfxState *state);
+ virtual void updateStrokeOpacity(GfxState *state);
+ virtual void updatePatternOpacity(GfxState *state);
+ virtual void clearPatternOpacity(GfxState *state);
+ virtual void updateFillOverprint(GfxState *state);
+ virtual void updateStrokeOverprint(GfxState *state);
+ virtual void updateOverprintMode(GfxState *state);
+ virtual void updateTransfer(GfxState *state);
//----- update text state
- void updateFont(GfxState *state) override;
+ virtual void updateFont(GfxState *state);
//----- path painting
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *catalog, Object *str,
+ virtual void stroke(GfxState *state);
+ virtual void fill(GfxState *state);
+ virtual void eoFill(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *catalog, Object *str,
double *pmat, int paintType, int tilingType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
- double xStep, double yStep) override;
- GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading) override;
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
- GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax) override;
- GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) override;
+ double xStep, double yStep);
+ virtual GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading);
+ virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
+ virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax);
+ virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
//----- path clipping
- void clip(GfxState *state) override;
- void eoClip(GfxState *state) override;
- void clipToStrokePath(GfxState *state) override;
+ virtual void clip(GfxState *state);
+ virtual void eoClip(GfxState *state);
+ virtual void clipToStrokePath(GfxState *state);
//----- text drawing
- void drawChar(GfxState *state, double x, double y,
+ virtual void drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen) override;
- GBool beginType3Char(GfxState *state, double x, double y,
+ CharCode code, int nBytes, Unicode *u, int uLen);
+ virtual GBool beginType3Char(GfxState *state, double x, double y,
double dx, double dy,
- CharCode code, Unicode *u, int uLen) override;
- void endType3Char(GfxState *state) override;
- void beginTextObject(GfxState *state) override;
- void endTextObject(GfxState *state) override;
+ CharCode code, Unicode *u, int uLen);
+ virtual void endType3Char(GfxState *state);
+ virtual void beginTextObject(GfxState *state);
+ virtual void endTextObject(GfxState *state);
//----- image drawing
- void drawImageMask(GfxState *state, Object *ref, Stream *str,
+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
- GBool interpolate, GBool inlineImg) override;
- void setSoftMaskFromImageMask(GfxState *state,
+ GBool interpolate, GBool inlineImg);
+ virtual void setSoftMaskFromImageMask(GfxState *state,
Object *ref, Stream *str,
int width, int height, GBool invert,
- GBool inlineImg, double *baseMatrix) override;
- void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override;
- void drawImage(GfxState *state, Object *ref, Stream *str,
+ GBool inlineImg, double *baseMatrix);
+ virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix);
+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
- GBool interpolate, int *maskColors, GBool inlineImg) override;
- void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+ GBool interpolate, int *maskColors, GBool inlineImg);
+ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
GBool interpolate,
Stream *maskStr, int maskWidth, int maskHeight,
- GBool maskInvert, GBool maskInterpolate) override;
- void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ GBool maskInvert, GBool maskInterpolate);
+ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
GBool interpolate,
@@ -325,24 +325,24 @@
Stream *maskStr,
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap,
- GBool maskInterpolate) override;
+ GBool maskInterpolate);
//----- Type 3 font operators
- void type3D0(GfxState *state, double wx, double wy) override;
- void type3D1(GfxState *state, double wx, double wy,
- double llx, double lly, double urx, double ury) override;
+ virtual void type3D0(GfxState *state, double wx, double wy);
+ virtual void type3D1(GfxState *state, double wx, double wy,
+ double llx, double lly, double urx, double ury);
//----- transparency groups and soft masks
- GBool checkTransparencyGroup(GfxState *state, GBool knockout) override;
- void beginTransparencyGroup(GfxState *state, double *bbox,
+ virtual GBool checkTransparencyGroup(GfxState *state, GBool knockout);
+ virtual void beginTransparencyGroup(GfxState *state, double *bbox,
GfxColorSpace *blendingColorSpace,
GBool isolated, GBool knockout,
- GBool forSoftMask) override;
- void endTransparencyGroup(GfxState *state) override;
- void paintTransparencyGroup(GfxState *state, double *bbox) override;
- void setSoftMask(GfxState *state, double *bbox, GBool alpha,
- Function *transferFunc, GfxColor *backdropColor) override;
- void clearSoftMask(GfxState *state) override;
+ GBool forSoftMask);
+ virtual void endTransparencyGroup(GfxState *state);
+ virtual void paintTransparencyGroup(GfxState *state, double *bbox);
+ virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha,
+ Function *transferFunc, GfxColor *backdropColor);
+ virtual void clearSoftMask(GfxState *state);
//----- special access
@@ -386,8 +386,8 @@
int getNestCount() { return nestCount; }
#if 1 //~tmp: turn off anti-aliasing temporarily
- GBool getVectorAntialias() override;
- void setVectorAntialias(GBool vaa) override;
+ virtual GBool getVectorAntialias();
+ virtual void setVectorAntialias(GBool vaa);
#endif
GBool getFontAntialias() { return fontAntialias; }
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -17,9 +17,10 @@
class StdinCacheLoader : public CachedFileLoader {
public:
- size_t init(GooString *dummy, CachedFile* cachedFile) override;
- int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) override;
+ size_t init(GooString *dummy, CachedFile* cachedFile);
+ int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer);
+
};
#endif
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -23,9 +23,10 @@
class StdinPDFDocBuilder : public PDFDocBuilder {
public:
+
PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
- GooString *userPassword = NULL, void *guiDataA = NULL) override;
- GBool supports(const GooString &uri) override;
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+ GBool supports(const GooString &uri);
};
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/Stream.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/Stream.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/Stream.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -281,15 +281,15 @@
public:
FileOutStream (FILE* fa, Goffset startA);
- ~FileOutStream ();
+ virtual ~FileOutStream ();
- void close() override;
+ virtual void close();
- Goffset getPos() override;
+ virtual Goffset getPos();
- void put (char c) override;
+ virtual void put (char c);
- void printf (const char *format, ...) override;
+ virtual void printf (const char *format, ...);
private:
FILE *f;
Goffset start;
@@ -307,15 +307,15 @@
public:
BaseStream(Object *dictA, Goffset lengthA);
- ~BaseStream();
+ virtual ~BaseStream();
virtual BaseStream *copy() = 0;
virtual Stream *makeSubStream(Goffset start, GBool limited,
Goffset length, Object *dict) = 0;
- void setPos(Goffset pos, int dir = 0) override = 0;
- GBool isBinary(GBool last = gTrue) override { return last; }
- BaseStream *getBaseStream() override { return this; }
- Stream *getUndecodedStream() override { return this; }
- Dict *getDict() override { return dict.getDict(); }
+ virtual void setPos(Goffset pos, int dir = 0) = 0;
+ virtual GBool isBinary(GBool last = gTrue) { return last; }
+ virtual BaseStream *getBaseStream() { return this; }
+ virtual Stream *getUndecodedStream() { return this; }
+ virtual Dict *getDict() { return dict.getDict(); }
virtual GooString *getFileName() { return NULL; }
virtual Goffset getLength() { return length; }
@@ -339,17 +339,17 @@
public:
FilterStream(Stream *strA);
- ~FilterStream();
- void close() override;
- Goffset getPos() override { return str->getPos(); }
- void setPos(Goffset pos, int dir = 0) override;
- BaseStream *getBaseStream() override { return str->getBaseStream(); }
- Stream *getUndecodedStream() override { return str->getUndecodedStream(); }
- Dict *getDict() override { return str->getDict(); }
- Stream *getNextStream() override { return str; }
+ virtual ~FilterStream();
+ virtual void close();
+ virtual Goffset getPos() { return str->getPos(); }
+ virtual void setPos(Goffset pos, int dir = 0);
+ virtual BaseStream *getBaseStream() { return str->getBaseStream(); }
+ virtual Stream *getUndecodedStream() { return str->getUndecodedStream(); }
+ virtual Dict *getDict() { return str->getDict(); }
+ virtual Stream *getNextStream() { return str; }
- int getUnfilteredChar () override { return str->getUnfilteredChar(); }
- void unfilteredReset () override { str->unfilteredReset(); }
+ virtual int getUnfilteredChar () { return str->getUnfilteredChar(); }
+ virtual void unfilteredReset () { str->unfilteredReset(); }
protected:
@@ -448,31 +448,31 @@
FileStream(GooFile* fileA, Goffset startA, GBool limitedA,
Goffset lengthA, Object *dictA);
- ~FileStream();
- BaseStream *copy() override;
- Stream *makeSubStream(Goffset startA, GBool limitedA,
- Goffset lengthA, Object *dictA) override;
- StreamKind getKind() override { return strFile; }
- void reset() override;
- void close() override;
- int getChar() override
+ virtual ~FileStream();
+ virtual BaseStream *copy();
+ virtual Stream *makeSubStream(Goffset startA, GBool limitedA,
+ Goffset lengthA, Object *dictA);
+ virtual StreamKind getKind() { return strFile; }
+ virtual void reset();
+ virtual void close();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- Goffset getPos() override { return bufPos + (bufPtr - buf); }
- void setPos(Goffset pos, int dir = 0) override;
- Goffset getStart() override { return start; }
- void moveStart(Goffset delta) override;
+ virtual Goffset getPos() { return bufPos + (bufPtr - buf); }
+ virtual void setPos(Goffset pos, int dir = 0);
+ virtual Goffset getStart() { return start; }
+ virtual void moveStart(Goffset delta);
- int getUnfilteredChar () override { return getChar(); }
- void unfilteredReset () override { reset(); }
+ virtual int getUnfilteredChar () { return getChar(); }
+ virtual void unfilteredReset () { reset(); }
private:
GBool fillBuf();
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer)
{
int n, m;
@@ -518,24 +518,24 @@
CachedFileStream(CachedFile *ccA, Goffset startA, GBool limitedA,
Goffset lengthA, Object *dictA);
- ~CachedFileStream();
- BaseStream *copy() override;
- Stream *makeSubStream(Goffset startA, GBool limitedA,
- Goffset lengthA, Object *dictA) override;
- StreamKind getKind() override { return strCachedFile; }
- void reset() override;
- void close() override;
- int getChar() override
+ virtual ~CachedFileStream();
+ virtual BaseStream *copy();
+ virtual Stream *makeSubStream(Goffset startA, GBool limitedA,
+ Goffset lengthA, Object *dictA);
+ virtual StreamKind getKind() { return strCachedFile; }
+ virtual void reset();
+ virtual void close();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- Goffset getPos() override { return bufPos + (bufPtr - buf); }
- void setPos(Goffset pos, int dir = 0) override;
- Goffset getStart() override { return start; }
- void moveStart(Goffset delta) override;
+ virtual Goffset getPos() { return bufPos + (bufPtr - buf); }
+ virtual void setPos(Goffset pos, int dir = 0);
+ virtual Goffset getStart() { return start; }
+ virtual void moveStart(Goffset delta);
- int getUnfilteredChar () override { return getChar(); }
- void unfilteredReset () override { reset(); }
+ virtual int getUnfilteredChar () { return getChar(); }
+ virtual void unfilteredReset () { reset(); }
private:
@@ -561,33 +561,33 @@
public:
MemStream(char *bufA, Goffset startA, Goffset lengthA, Object *dictA);
- ~MemStream();
- BaseStream *copy() override;
- Stream *makeSubStream(Goffset start, GBool limited,
- Goffset lengthA, Object *dictA) override;
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- void close() override;
- int getChar() override
+ virtual ~MemStream();
+ virtual BaseStream *copy();
+ virtual Stream *makeSubStream(Goffset start, GBool limited,
+ Goffset lengthA, Object *dictA);
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual void close();
+ virtual int getChar()
{ return (bufPtr < bufEnd) ? (*bufPtr++ & 0xff) : EOF; }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr < bufEnd) ? (*bufPtr & 0xff) : EOF; }
- Goffset getPos() override { return (int)(bufPtr - buf); }
- void setPos(Goffset pos, int dir = 0) override;
- Goffset getStart() override { return start; }
- void moveStart(Goffset delta) override;
+ virtual Goffset getPos() { return (int)(bufPtr - buf); }
+ virtual void setPos(Goffset pos, int dir = 0);
+ virtual Goffset getStart() { return start; }
+ virtual void moveStart(Goffset delta);
//if needFree = true, the stream will delete buf when it is destroyed
//otherwise it will not touch it. Default value is false
virtual void setNeedFree (GBool val) { needFree = val; }
- int getUnfilteredChar () override { return getChar(); }
- void unfilteredReset () override { reset (); }
+ virtual int getUnfilteredChar () { return getChar(); }
+ virtual void unfilteredReset () { reset (); }
private:
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
char *buf;
Goffset start;
@@ -610,27 +610,27 @@
public:
EmbedStream(Stream *strA, Object *dictA, GBool limitedA, Goffset lengthA);
- ~EmbedStream();
- BaseStream *copy() override;
- Stream *makeSubStream(Goffset start, GBool limitedA,
- Goffset lengthA, Object *dictA) override;
- StreamKind getKind() override { return str->getKind(); }
- void reset() override {}
- int getChar() override;
- int lookChar() override;
- Goffset getPos() override { return str->getPos(); }
- void setPos(Goffset pos, int dir = 0) override;
- Goffset getStart() override;
- void moveStart(Goffset delta) override;
+ virtual ~EmbedStream();
+ virtual BaseStream *copy();
+ virtual Stream *makeSubStream(Goffset start, GBool limitedA,
+ Goffset lengthA, Object *dictA);
+ virtual StreamKind getKind() { return str->getKind(); }
+ virtual void reset() {}
+ virtual int getChar();
+ virtual int lookChar();
+ virtual Goffset getPos() { return str->getPos(); }
+ virtual void setPos(Goffset pos, int dir = 0);
+ virtual Goffset getStart();
+ virtual void moveStart(Goffset delta);
- int getUnfilteredChar () override { return str->getUnfilteredChar(); }
- void unfilteredReset () override { str->unfilteredReset(); }
+ virtual int getUnfilteredChar () { return str->getUnfilteredChar(); }
+ virtual void unfilteredReset () { str->unfilteredReset(); }
private:
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
Stream *str;
GBool limited;
@@ -644,14 +644,14 @@
public:
ASCIIHexStream(Stream *strA);
- ~ASCIIHexStream();
- StreamKind getKind() override { return strASCIIHex; }
- void reset() override;
- int getChar() override
+ virtual ~ASCIIHexStream();
+ virtual StreamKind getKind() { return strASCIIHex; }
+ virtual void reset();
+ virtual int getChar()
{ int c = lookChar(); buf = EOF; return c; }
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
private:
@@ -667,14 +667,14 @@
public:
ASCII85Stream(Stream *strA);
- ~ASCII85Stream();
- StreamKind getKind() override { return strASCII85; }
- void reset() override;
- int getChar() override
+ virtual ~ASCII85Stream();
+ virtual StreamKind getKind() { return strASCII85; }
+ virtual void reset();
+ virtual int getChar()
{ int ch = lookChar(); ++index; return ch; }
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
private:
@@ -693,20 +693,20 @@
LZWStream(Stream *strA, int predictor, int columns, int colors,
int bits, int earlyA);
- ~LZWStream();
- StreamKind getKind() override { return strLZW; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- int getRawChar() override;
- void getRawChars(int nChars, int *buffer) override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual ~LZWStream();
+ virtual StreamKind getKind() { return strLZW; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
private:
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
inline int doGetRawChar() {
if (eof) {
@@ -752,20 +752,20 @@
public:
RunLengthStream(Stream *strA);
- ~RunLengthStream();
- StreamKind getKind() override { return strRunLength; }
- void reset() override;
- int getChar() override
+ virtual ~RunLengthStream();
+ virtual StreamKind getKind() { return strRunLength; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
private:
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
char buf[128]; // buffer
char *bufPtr; // next char to read
@@ -787,16 +787,16 @@
CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
GBool byteAlignA, int columnsA, int rowsA,
GBool endOfBlockA, GBool blackA);
- ~CCITTFaxStream();
- StreamKind getKind() override { return strCCITTFax; }
- void reset() override;
- int getChar() override
+ virtual ~CCITTFaxStream();
+ virtual StreamKind getKind() { return strCCITTFax; }
+ virtual void reset();
+ virtual int getChar()
{ int c = lookChar(); buf = EOF; return c; }
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
- void unfilteredReset () override;
+ virtual void unfilteredReset ();
int getEncoding() { return encoding; }
GBool getEndOfLine() { return endOfLine; }
@@ -977,16 +977,16 @@
FlateStream(Stream *strA, int predictor, int columns,
int colors, int bits);
- ~FlateStream();
- StreamKind getKind() override { return strFlate; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- int getRawChar() override;
- void getRawChars(int nChars, int *buffer) override;
- GooString *getPSFilter(int psLevel, const char *indent) override;
- GBool isBinary(GBool last = gTrue) override;
- void unfilteredReset () override;
+ virtual ~FlateStream();
+ virtual StreamKind getKind() { return strFlate; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
+ virtual GooString *getPSFilter(int psLevel, const char *indent);
+ virtual GBool isBinary(GBool last = gTrue);
+ virtual void unfilteredReset ();
private:
void flateReset(GBool unfiltered);
@@ -1004,8 +1004,8 @@
return c;
}
- GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
StreamPredictor *pred; // predictor
Guchar buf[flateWindow]; // output data buffer
@@ -1051,13 +1051,13 @@
public:
EOFStream(Stream *strA);
- ~EOFStream();
- StreamKind getKind() override { return strWeird; }
- void reset() override {}
- int getChar() override { return EOF; }
- int lookChar() override { return EOF; }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
+ virtual ~EOFStream();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset() {}
+ virtual int getChar() { return EOF; }
+ virtual int lookChar() { return EOF; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
};
//------------------------------------------------------------------------
@@ -1068,14 +1068,14 @@
public:
BufStream(Stream *strA, int bufSizeA);
- ~BufStream();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override
+ virtual ~BufStream();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent)
{ return NULL; }
- GBool isBinary(GBool last = gTrue) override;
+ virtual GBool isBinary(GBool last = gTrue);
int lookChar(int idx);
@@ -1094,13 +1094,13 @@
FixedLengthEncoder(Stream *strA, int lengthA);
~FixedLengthEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override;
- GBool isEncoder() override { return gTrue; }
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/);
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1116,16 +1116,16 @@
public:
ASCIIHexEncoder(Stream *strA);
- ~ASCIIHexEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~ASCIIHexEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1146,16 +1146,16 @@
public:
ASCII85Encoder(Stream *strA);
- ~ASCII85Encoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~ASCII85Encoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1176,16 +1176,16 @@
public:
RunLengthEncoder(Stream *strA);
- ~RunLengthEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~RunLengthEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gTrue; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gTrue; }
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1212,15 +1212,15 @@
public:
LZWEncoder(Stream *strA);
- ~LZWEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override;
- int lookChar() override;
- GooString *getPSFilter(int psLevel, const char *indent) override
+ virtual ~LZWEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar();
+ virtual int lookChar();
+ virtual GooString *getPSFilter(int psLevel, const char *indent)
{ return NULL; }
- GBool isBinary(GBool last = gTrue) override { return gTrue; }
- GBool isEncoder() override { return gTrue; }
+ virtual GBool isBinary(GBool last = gTrue) { return gTrue; }
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1244,16 +1244,16 @@
public:
CMYKGrayEncoder(Stream *strA);
- ~CMYKGrayEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~CMYKGrayEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
+ virtual GBool isEncoder() { return gTrue; }
private:
@@ -1273,16 +1273,16 @@
public:
RGBGrayEncoder(Stream *strA);
- ~RGBGrayEncoder();
- StreamKind getKind() override { return strWeird; }
- void reset() override;
- int getChar() override
+ virtual ~RGBGrayEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
- int lookChar() override
+ virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
- GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) override { return NULL; }
- GBool isBinary(GBool /*last = gTrue*/) override { return gFalse; }
- GBool isEncoder() override { return gTrue; }
+ virtual GooString *getPSFilter(int /*psLevel*/, const char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
+ virtual GBool isEncoder() { return gTrue; }
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -4327,20 +4327,20 @@
class TextSelectionDumper : public TextSelectionVisitor {
public:
TextSelectionDumper(TextPage *page);
- ~TextSelectionDumper();
+ virtual ~TextSelectionDumper();
- void visitBlock (TextBlock *block,
+ virtual void visitBlock (TextBlock *block,
TextLine *begin,
TextLine *end,
- PDFRectangle *selection) override { };
- void visitLine (TextLine *line,
+ PDFRectangle *selection) { };
+ virtual void visitLine (TextLine *line,
TextWord *begin,
TextWord *end,
int edge_begin,
int edge_end,
- PDFRectangle *selection) override;
- void visitWord (TextWord *word, int begin, int end,
- PDFRectangle *selection) override;
+ PDFRectangle *selection);
+ virtual void visitWord (TextWord *word, int begin, int end,
+ PDFRectangle *selection);
void endPage();
GooString *getText(void);
@@ -4498,18 +4498,18 @@
TextSelectionSizer(TextPage *page, double scale);
~TextSelectionSizer() { }
- void visitBlock (TextBlock *block,
+ virtual void visitBlock (TextBlock *block,
TextLine *begin,
TextLine *end,
- PDFRectangle *selection) override { };
- void visitLine (TextLine *line,
+ PDFRectangle *selection) { };
+ virtual void visitLine (TextLine *line,
TextWord *begin,
TextWord *end,
int edge_begin,
int edge_end,
- PDFRectangle *selection) override;
- void visitWord (TextWord *word, int begin, int end,
- PDFRectangle *selection) override { };
+ PDFRectangle *selection);
+ virtual void visitWord (TextWord *word, int begin, int end,
+ PDFRectangle *selection) { };
GooList *getRegion () { return list; }
@@ -4559,18 +4559,18 @@
GfxColor *glyph_color);
~TextSelectionPainter();
- void visitBlock (TextBlock *block,
+ virtual void visitBlock (TextBlock *block,
TextLine *begin,
TextLine *end,
- PDFRectangle *selection) override { };
- void visitLine (TextLine *line,
+ PDFRectangle *selection) { };
+ virtual void visitLine (TextLine *line,
TextWord *begin,
TextWord *end,
int edge_begin,
int edge_end,
- PDFRectangle *selection) override;
- void visitWord (TextWord *word, int begin, int end,
- PDFRectangle *selection) override;
+ PDFRectangle *selection);
+ virtual void visitWord (TextWord *word, int begin, int end,
+ PDFRectangle *selection);
void endPage();
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -745,7 +745,7 @@
GBool rawOrderA);
// Destructor.
- ~TextOutputDev();
+ virtual ~TextOutputDev();
// Check if file was successfully created.
virtual GBool isOk() { return ok; }
@@ -754,54 +754,54 @@
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
- GBool upsideDown() override { return gTrue; }
+ virtual GBool upsideDown() { return gTrue; }
// Does this device use drawChar() or drawString()?
- GBool useDrawChar() override { return gTrue; }
+ virtual GBool useDrawChar() { return gTrue; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
- GBool interpretType3Chars() override { return gFalse; }
+ virtual GBool interpretType3Chars() { return gFalse; }
// Does this device need non-text content?
- GBool needNonText() override { return gFalse; }
+ virtual GBool needNonText() { return gFalse; }
// Does this device require incCharCount to be called for text on
// non-shown layers?
- GBool needCharCount() override { return gTrue; }
+ virtual GBool needCharCount() { return gTrue; }
//----- initialization and control
// Start a page.
- void startPage(int pageNum, GfxState *state, XRef *xref) override;
+ virtual void startPage(int pageNum, GfxState *state, XRef *xref);
// End a page.
- void endPage() override;
+ virtual void endPage();
//----- save/restore graphics state
- void restoreState(GfxState *state) override;
+ virtual void restoreState(GfxState *state);
//----- update text state
- void updateFont(GfxState *state) override;
+ virtual void updateFont(GfxState *state);
//----- text drawing
- void beginString(GfxState *state, GooString *s) override;
- void endString(GfxState *state) override;
- void drawChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
- CharCode c, int nBytes, Unicode *u, int uLen) override;
- void incCharCount(int nChars) override;
- void beginActualText(GfxState *state, GooString *text) override;
- void endActualText(GfxState *state) override;
+ virtual void beginString(GfxState *state, GooString *s);
+ virtual void endString(GfxState *state);
+ virtual void drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
+ CharCode c, int nBytes, Unicode *u, int uLen);
+ virtual void incCharCount(int nChars);
+ virtual void beginActualText(GfxState *state, GooString *text);
+ virtual void endActualText(GfxState *state);
//----- path painting
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
+ virtual void stroke(GfxState *state);
+ virtual void fill(GfxState *state);
+ virtual void eoFill(GfxState *state);
//----- link borders
- void processLink(AnnotLink *link) override;
+ virtual void processLink(AnnotLink *link);
//----- special access
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.cc 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.cc 2017-03-21 03:36:55 UTC (rev 43564)
@@ -117,7 +117,7 @@
{
}
- bool operator==(const PopplerCacheKey &key) const override
+ bool operator==(const PopplerCacheKey &key) const
{
const ObjectStreamKey *k = static_cast<const ObjectStreamKey*>(&key);
return objStrNum == k->objStrNum;
Modified: trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/poppler/XRef.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -262,8 +262,8 @@
class XRefTableWriter: public XRefWriter {
public:
XRefTableWriter(OutStream* outStrA);
- void startSection(int first, int count) override;
- void writeEntry(Goffset offset, int gen, XRefEntryType type) override;
+ void startSection(int first, int count);
+ void writeEntry(Goffset offset, int gen, XRefEntryType type);
private:
OutStream* outStr;
};
@@ -272,8 +272,8 @@
class XRefStreamWriter: public XRefWriter {
public:
XRefStreamWriter(Object *index, GooString *stmBuf, int offsetSize);
- void startSection(int first, int count) override;
- void writeEntry(Goffset offset, int gen, XRefEntryType type) override;
+ void startSection(int first, int count);
+ void writeEntry(Goffset offset, int gen, XRefEntryType type);
private:
Object *index;
GooString *stmBuf;
@@ -284,8 +284,8 @@
class XRefPreScanWriter: public XRefWriter {
public:
XRefPreScanWriter();
- void startSection(int first, int count) override;
- void writeEntry(Goffset offset, int gen, XRefEntryType type) override;
+ void startSection(int first, int count);
+ void writeEntry(Goffset offset, int gen, XRefEntryType type);
GBool hasOffsetsBeyond4GB;
};
Modified: trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -50,19 +50,19 @@
virtual ~SplashFTFont();
// Munge xFrac and yFrac before calling SplashFont::getGlyph.
- GBool getGlyph(int c, int xFrac, int yFrac,
- SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) override;
+ virtual GBool getGlyph(int c, int xFrac, int yFrac,
+ SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
// Rasterize a glyph. The <xFrac> and <yFrac> values are the same
// as described for getGlyph.
- GBool makeGlyph(int c, int xFrac, int yFrac,
- SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) override;
+ virtual GBool makeGlyph(int c, int xFrac, int yFrac,
+ SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
// Return the path for a glyph.
- SplashPath *getGlyphPath(int c) override;
+ virtual SplashPath *getGlyphPath(int c);
// Return the advance of a glyph. (in 0..1 range)
- double getGlyphAdvance(int c) override;
+ virtual double getGlyphAdvance(int c);
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -55,12 +55,12 @@
int codeToGIDLenA,
int faceIndexA=0);
- ~SplashFTFontFile();
+ virtual ~SplashFTFontFile();
// Create a new SplashFTFont, i.e., a scaled instance of this font
// file.
- SplashFont *makeFont(SplashCoord *mat,
- SplashCoord *textMat) override;
+ virtual SplashFont *makeFont(SplashCoord *mat,
+ SplashCoord *textMat);
private:
Modified: trunk/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h 2017-03-21 03:36:55 UTC (rev 43564)
@@ -66,17 +66,17 @@
SplashSolidColor(SplashColorPtr colorA);
- SplashPattern *copy() override { return new SplashSolidColor(color); }
+ virtual SplashPattern *copy() { return new SplashSolidColor(color); }
- ~SplashSolidColor();
+ virtual ~SplashSolidColor();
- GBool getColor(int x, int y, SplashColorPtr c) override;
+ virtual GBool getColor(int x, int y, SplashColorPtr c);
- GBool testPosition(int x, int y) override { return gFalse; }
+ virtual GBool testPosition(int x, int y) { return gFalse; }
- GBool isStatic() override { return gTrue; }
+ virtual GBool isStatic() { return gTrue; }
- GBool isCMYK() override { return gFalse; }
+ virtual GBool isCMYK() { return gFalse; }
private:
Modified: trunk/Build/source/libs/poppler/version.ac
===================================================================
--- trunk/Build/source/libs/poppler/version.ac 2017-03-21 01:05:42 UTC (rev 43563)
+++ trunk/Build/source/libs/poppler/version.ac 2017-03-21 03:36:55 UTC (rev 43564)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.53.0])
+m4_define([poppler_version], [0.52.0])
More information about the tex-live-commits
mailing list