Some more const

3 files changed, 9 insertions, 9 deletions

diff --git a/splash/SplashFTFont.cc b/splash/SplashFTFont.cc
index 1eafd3ee..48cfb39d 100644
--- a/splash/SplashFTFont.cc
+++ b/splash/SplashFTFont.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, 2007-2011, 2014, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2011, 2014, 2018, 2020 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Kristian Høgsberg <krh@bitplanet.net>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
@@ -327,7 +327,7 @@ struct SplashFTFontPath {
 };
 
 SplashPath *SplashFTFont::getGlyphPath(int c) {
-  static FT_Outline_Funcs outlineFuncs = {
+  static const FT_Outline_Funcs outlineFuncs = {
 #if FREETYPE_MINOR <= 1
     (int (*)(FT_Vector *, void *))&glyphPathMoveTo,
     (int (*)(FT_Vector *, void *))&glyphPathLineTo,
diff --git a/splash/SplashScreen.cc b/splash/SplashScreen.cc
index 28a9917e..eac54587 100644
--- a/splash/SplashScreen.cc
+++ b/splash/SplashScreen.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) 2009, 2016, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2016, 2018, 2020 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 //
 // To see a description of the changes please see the Changelog file that
@@ -30,7 +30,7 @@
 #include "SplashMath.h"
 #include "SplashScreen.h"
 
-static SplashScreenParams defaultParams = {
+static const SplashScreenParams defaultParams = {
   splashScreenDispersed,	// type
   2,				// size
   2,				// dotRadius
@@ -62,7 +62,7 @@ struct cmpDistancesFunctor {
 // sqrt(2)).  If <clustered> is false, this generates an optimal
 // threshold matrix using recursive tesselation.  Gamma correction
 // (gamma = 1 / 1.33) is also computed here.
-SplashScreen::SplashScreen(SplashScreenParams *params) {
+SplashScreen::SplashScreen(const SplashScreenParams *params) {
 
   if (!params) {
     params = &defaultParams;
@@ -80,7 +80,7 @@ void SplashScreen::createMatrix()
   unsigned char u;
   int black, white, i;
   
-  SplashScreenParams *params = screenParams;
+  const SplashScreenParams *params = screenParams;
 
   // size must be a power of 2, and at least 2
   for (size = 2, log2Size = 1; size < params->size; size <<= 1, ++log2Size) ;
diff --git a/splash/SplashScreen.h b/splash/SplashScreen.h
index ef12cc0a..27b48b50 100644
--- a/splash/SplashScreen.h
+++ b/splash/SplashScreen.h
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2009, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2018, 2020 Albert Astals Cid <aacid@kde.org>
 //
 // 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
@@ -32,7 +32,7 @@
 class SplashScreen {
 public:
 
-  SplashScreen(SplashScreenParams *params);
+  SplashScreen(const SplashScreenParams *params);
   SplashScreen(SplashScreen *screen);
   ~SplashScreen();
 
@@ -65,7 +65,7 @@ private:
   int distance(int x0, int y0, int x1, int y1);
   void buildSCDMatrix(int r);
 
-  SplashScreenParams *screenParams;	// params to create the other members
+  const SplashScreenParams *screenParams;	// params to create the other members
   unsigned char *mat;			// threshold matrix
   int size;			// size of the threshold matrix
   int sizeM1;			// size - 1