From dba24b2e59eb739e73228dbcf707e943905a9e5a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 27 Dec 2012 22:43:59 +0300 Subject: Fix text size if it was not power of two. --- src/resources/openglimagehelper.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/resources/openglimagehelper.cpp') diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index badaf0223..5eae5c667 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -132,12 +132,13 @@ Image *OpenGLImageHelper::load(SDL_Surface *const tmpImage) } Image *OpenGLImageHelper::createTextSurface(SDL_Surface *const tmpImage, + int width, int height, const float alpha) { if (!tmpImage) return nullptr; - Image *const img = glLoad(tmpImage); + Image *const img = glLoad(tmpImage, width, height); if (img) img->setAlpha(alpha); return img; @@ -159,7 +160,7 @@ int OpenGLImageHelper::powerOfTwo(int input) const return value >= mTextureSize ? mTextureSize : value; } -Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) +Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, int width, int height) { if (!tmpImage) return nullptr; @@ -167,8 +168,10 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) // Flush current error flag. glGetError(); - int width = tmpImage->w; - int height = tmpImage->h; + if (!width) + width = tmpImage->w; + if (!height) + height = tmpImage->h; int realWidth = powerOfTwo(width); int realHeight = powerOfTwo(height); -- cgit v1.2.3-70-g09d2