poppler/BuiltinFontTables.cc | 16 +++++++++++++++- poppler/BuiltinFontTables.h | 16 +++++++++++++++- poppler/GfxFont.cc | 4 ++-- 3 files changed, 32 insertions(+), 4 deletions(-)
New commits: commit 0aba2e2b13f27cfa88074258900d571c42751c0a Author: Albert Astals Cid <[email protected]> Date: Tue Jan 7 23:58:37 2020 +0100 builtinFontSubst can be const diff --git a/poppler/BuiltinFontTables.cc b/poppler/BuiltinFontTables.cc index 00f8b2f3..421975f1 100644 --- a/poppler/BuiltinFontTables.cc +++ b/poppler/BuiltinFontTables.cc @@ -6,6 +6,20 @@ // //======================================================================== +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2020 Albert Astals Cid <[email protected]> +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git +// +//======================================================================== + #include <config.h> #include <cstdlib> #include "FontEncodingTables.h" @@ -4243,7 +4257,7 @@ BuiltinFont builtinFonts[] = { { "ZapfDingbats", zapfDingbatsEncoding, 820, -143, { -1, -143, 981, 820}, nullptr } }; -BuiltinFont *builtinFontSubst[] = { +const BuiltinFont *builtinFontSubst[] = { &builtinFonts[0], &builtinFonts[3], &builtinFonts[1], diff --git a/poppler/BuiltinFontTables.h b/poppler/BuiltinFontTables.h index eb45549e..b6f619c7 100644 --- a/poppler/BuiltinFontTables.h +++ b/poppler/BuiltinFontTables.h @@ -6,6 +6,20 @@ // //======================================================================== +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2020 Albert Astals Cid <[email protected]> +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git +// +//======================================================================== + #ifndef BUILTINFONTTABLES_H #define BUILTINFONTTABLES_H @@ -15,7 +29,7 @@ #define nBuiltinFontSubsts 12 extern BuiltinFont builtinFonts[nBuiltinFonts]; -extern BuiltinFont *builtinFontSubst[nBuiltinFontSubsts]; +extern const BuiltinFont *builtinFontSubst[nBuiltinFontSubsts]; extern void initBuiltinFontTables(); extern void freeBuiltinFontTables(); diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc index ccac72c0..60a8f7bc 100644 --- a/poppler/GfxFont.cc +++ b/poppler/GfxFont.cc @@ -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, 2006, 2008-2010, 2012, 2014, 2015, 2017-2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014, 2015, 2017-2020 Albert Astals Cid <[email protected]> // Copyright (C) 2005, 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2006 Takashi Iwai <[email protected]> // Copyright (C) 2007 Julien Rebetez <[email protected]> @@ -946,7 +946,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA GfxFontType typeA, Ref embFontIDA, Dict *fontDict): GfxFont(tagA, idA, nameA, typeA, embFontIDA) { GooString *name2; - BuiltinFont *builtinFont; + const BuiltinFont *builtinFont; const char **baseEnc; bool baseEncFromFontFile; char *buf; _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
