Changeset 3346 in orxonox.OLD

Timestamp:

Jan 5, 2005, 6:27:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: SLD_Surface now gets deleted in loadImage(SLD_image)

Location:

orxonox/branches/parenting/src/importer

Files:

• texture.cc (modified) (3 diffs)
• texture.h (modified) (1 diff)

orxonox/branches/parenting/src/importer/texture.cc

@@ -122 +122 @@
   this->pImage = new Image;
   this->pImage->data = NULL;
+  this->map = NULL;
   this->texture = 0;
 }
@@ -214 +215 @@
   if (imgNameWithPath)
     {
-      SDL_Surface* map;
-      map=IMG_Load(imgNameWithPath);
+      this->map=IMG_Load(imgNameWithPath);
       if(!map)
         {
@@ -239 +239 @@
  
       this->loadTexToGL (this->pImage);
+      SDL_FreeSurface(map);
+      this->pImage->data = NULL;
     }
   else

orxonox/branches/parenting/src/importer/texture.h

@@ -66 +66 @@
   Image* pImage;
   GLuint texture;
+  SDL_Surface* map;
   char* searchTextureInPaths(char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);