fofi/FoFiTrueType.cc | 4 ++-- fofi/FoFiType1C.cc | 6 +++--- splash/Splash.cc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit fad2b7341c6a0cb8f2e0ff2e856739cb389d21ef Author: Albert Astals Cid <[email protected]> Date: Tue Jan 7 17:52:27 2020 +0100 More static -> static const diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index 24624352..ae8e3db5 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -16,7 +16,7 @@ // Copyright (C) 2006 Takashi Iwai <[email protected]> // Copyright (C) 2007 Koji Otani <[email protected]> // Copyright (C) 2007 Carlos Garcia Campos <[email protected]> -// Copyright (C) 2008, 2009, 2012, 2014-2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2008, 2009, 2012, 2014-2020 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Tomas Are Haavet <[email protected]> // Copyright (C) 2012 Suzuki Toshiya <[email protected]> // Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> @@ -171,7 +171,7 @@ struct T42Table { // TrueType tables to be embedded in Type 42 fonts. // NB: the table names must be in alphabetical order here. #define nT42Tables 11 -static T42Table t42Tables[nT42Tables] = { +static const T42Table t42Tables[nT42Tables] = { { "cvt ", true }, { "fpgm", true }, { "glyf", true }, diff --git a/fofi/FoFiType1C.cc b/fofi/FoFiType1C.cc index 7a4ed86f..79da746f 100644 --- a/fofi/FoFiType1C.cc +++ b/fofi/FoFiType1C.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) 2009, 2010, 2017-2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2009, 2010, 2017-2020 Albert Astals Cid <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2018 Adam Reichold <[email protected]> // Copyright (C) 2019 Tomoyuki Kubota <[email protected]> @@ -39,7 +39,7 @@ //------------------------------------------------------------------------ -static char hexChars[17] = "0123456789ABCDEF"; +static const char hexChars[17] = "0123456789ABCDEF"; //------------------------------------------------------------------------ // FoFiType1C @@ -2567,7 +2567,7 @@ bool FoFiType1C::readCharset() { } int FoFiType1C::getOp(int pos, bool charstring, bool *ok) { - static char nybChars[16] = "0123456789.ee -"; + static const char nybChars[16] = "0123456789.ee -"; Type1COp op; char buf[65]; int b0, b1, nyb0, nyb1, x, i; diff --git a/splash/Splash.cc b/splash/Splash.cc index 3d80b5c4..3d4e6177 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005-2019 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2020 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Marco Pesenti Gritti <[email protected]> // Copyright (C) 2010-2016 Thomas Freitag <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> @@ -1378,7 +1378,7 @@ inline void Splash::drawAAPixelInit() { inline void Splash::drawAAPixel(SplashPipe *pipe, int x, int y) { #if splashAASize == 4 - static int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, + static const int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; int w; #else @@ -1461,7 +1461,7 @@ inline void Splash::drawSpan(SplashPipe *pipe, int x0, int x1, int y, inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y, bool adjustLine, unsigned char lineOpacity) { #if splashAASize == 4 - static int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, + static const int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; SplashColorPtr p0, p1, p2, p3; int t; _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
