From 7a0bf2c78c026d69baa992f89e62abbfae9b6984 Mon Sep 17 00:00:00 2001
From: Xawotihs <Xawotihs@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 22 Dec 2010 22:20:20 +0000
Subject: [PATCH] Changed the Qt images to load in buffers using dimensions
 multiple of power 2. Simplified the memory management as well.

---
 JGE/include/JTypes.h |  4 ----
 JGE/src/pc/JGfx.cpp  | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h
index 7256a0096..a874a6275 100644
--- a/JGE/include/JTypes.h
+++ b/JGE/include/JTypes.h
@@ -338,10 +338,6 @@ public:
 
 	int mFilter;
 
-#if defined (QT_CONFIG)
-  QImage mImage;
-#endif
-
 #if defined (WIN32) || defined (LINUX) || defined (IOS) 	
 	GLuint mTexId;
     u8* mBuffer;
diff --git a/JGE/src/pc/JGfx.cpp b/JGE/src/pc/JGfx.cpp
index 7e82629ac..2ef9accf8 100644
--- a/JGE/src/pc/JGfx.cpp
+++ b/JGE/src/pc/JGfx.cpp
@@ -353,9 +353,7 @@ JTexture::~JTexture()
 
     if (mBuffer)
     {
-#ifndef QT_CONFIG
         delete [] mBuffer;
-#endif
         mBuffer = NULL;
     }
 }
@@ -2118,18 +2116,22 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
     if (tex)
     {
       tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
-      tex->mImage = tmpImage.rgbSwapped();
+      tmpImage = tmpImage.rgbSwapped();
 
       if (mImageFilter != NULL)
-          mImageFilter->ProcessImage((PIXEL_TYPE*)tex->mImage.bits(), tex->mImage.width(), tex->mImage.height());
+          mImageFilter->ProcessImage((PIXEL_TYPE*)tmpImage.bits(), tmpImage.width(), tmpImage.height());
 
       tex->mFilter = TEX_FILTER_LINEAR;
-      tex->mWidth = tex->mImage.width();
-      tex->mHeight = tex->mImage.height();
-      tex->mTexWidth = tex->mImage.width();
-      tex->mTexHeight = tex->mImage.height();
+      tex->mWidth = tmpImage.width();
+      tex->mHeight = tmpImage.height();
+      tex->mTexWidth = getNextPower2(tmpImage.width());
+      tex->mTexHeight = getNextPower2(tmpImage.height());;
+      tex->mBuffer = new BYTE[tex->mTexWidth*tex->mTexHeight*4];
 
-      tex->mBuffer = tex->mImage.bits();
+      for(int i=0; i < tex->mHeight; i++)
+      {
+        memcpy(tex->mBuffer+(i*4*tex->mTexWidth), tmpImage.constScanLine(i), tmpImage.bytesPerLine());
+      }
     }
   } while(false);
 
@@ -2187,9 +2189,7 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
                 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, inTexture.mTexWidth, inTexture.mTexHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, inTexture.mBuffer);
             }
         }
-#ifndef QT_CONFIG
         delete [] inTexture.mBuffer;
-#endif
         inTexture.mBuffer = NULL;
 
         checkGlError();