From 7b26645c1b28b212c011f98a5420c0989a7f0adc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 15 Apr 2013 20:54:59 +0300
Subject: improve imagehelper class.

---
 src/resources/openglimagehelper.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/resources/openglimagehelper.cpp')

diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 9843d5026..a107b0099 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -51,7 +51,7 @@ bool OpenGLImageHelper::mBlur = true;
 int OpenGLImageHelper::mUseOpenGL = 0;
 bool OpenGLImageHelper::mUseTextureSampler = false;
 
-Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
+Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const
 {
     SDL_Surface *const tmpImage = loadPng(rw);
     if (!tmpImage)
@@ -125,14 +125,14 @@ Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
     return image;
 }
 
-Image *OpenGLImageHelper::load(SDL_Surface *const tmpImage)
+Image *OpenGLImageHelper::load(SDL_Surface *const tmpImage) const
 {
     return glLoad(tmpImage);
 }
 
 Image *OpenGLImageHelper::createTextSurface(SDL_Surface *const tmpImage,
-                                            int width, int height,
-                                            const float alpha)
+                                            const int width, const int height,
+                                            const float alpha) const
 {
     if (!tmpImage)
         return nullptr;
@@ -143,7 +143,7 @@ Image *OpenGLImageHelper::createTextSurface(SDL_Surface *const tmpImage,
     return img;
 }
 
-int OpenGLImageHelper::powerOfTwo(int input) const
+int OpenGLImageHelper::powerOfTwo(const int input) const
 {
     int value;
     if (mTextureType == GL_TEXTURE_2D)
@@ -159,7 +159,8 @@ int OpenGLImageHelper::powerOfTwo(int input) const
     return value >= mTextureSize ? mTextureSize : value;
 }
 
-Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, int width, int height)
+Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage,
+                                 int width, int height) const
 {
     if (!tmpImage)
         return nullptr;
@@ -297,17 +298,17 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, int width, int height)
     return new Image(texture, width, height, realWidth, realHeight);
 }
 
-void OpenGLImageHelper::setLoadAsOpenGL(int useOpenGL)
+void OpenGLImageHelper::setLoadAsOpenGL(const int useOpenGL)
 {
     OpenGLImageHelper::mUseOpenGL = useOpenGL;
 }
 
-int OpenGLImageHelper::useOpenGL()
+int OpenGLImageHelper::useOpenGL() const
 {
     return mUseOpenGL;
 }
 
-void OpenGLImageHelper::initTextureSampler(GLint id)
+void OpenGLImageHelper::initTextureSampler(const GLint id)
 {
     if (mBlur)
     {
@@ -321,7 +322,7 @@ void OpenGLImageHelper::initTextureSampler(GLint id)
     }
 }
 
-SDL_Surface *OpenGLImageHelper::create32BitSurface(int width, int height)
+SDL_Surface *OpenGLImageHelper::create32BitSurface(int width, int height) const
 {
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
     const int rmask = 0xff000000;
-- 
cgit v1.2.3-60-g2f50