Changeset 8316 in orxonox.OLD for trunk/src/lib/graphics/importer/texture.cc

Timestamp:

Jun 11, 2006, 1:57:27 PM (18 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

File:

• trunk/src/lib/graphics/importer/texture.cc (modified) (6 diffs)

trunk/src/lib/graphics/importer/texture.cc

@@ -33 +33 @@
 /*
  * On the BIG_ENDIAN architecture, the 24 and 32bit bitmaps have
- * different masks. If you don't do this distinction properly, 
+ * different masks. If you don't do this distinction properly,
  * you will get weird-looking textures.
  */
@@ -161 +161 @@
   unsigned int* pixels = new unsigned int[width * height * channels];
   memset(pixels, 0, width * height * channels * sizeof(unsigned int));
-  
-  
+
+
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -169 +169 @@
 
   glTexImage2D(target, 0, channels, width, height, 0, type, GL_UNSIGNED_INT, pixels);
-  
-  
-  
+
+
+
   delete[] pixels;
 
@@ -309 +309 @@
 
         Uint32* mask = opaqueMask;
-        
+
   /* Save the alpha blending attributes */
   saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
@@ -320 +320 @@
                 mask = alphaMask;
   }
-                
+
   retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                     surface->w, surface->h,
@@ -360 +360 @@
   int      errorCode = 0;           //!< the error code for the texture loading functions
   GLuint   texture = 0;             //!< the OpenGL texture handle
-  int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
-  int      mipmapWidth = 0;         //!< the width of the mipmap
-  int      mipmapHight = 0;         //!< the height of the mipmap
+  //int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
+  //int      mipmapWidth = 0;         //!< the width of the mipmap
+  //int      mipmapHight = 0;         //!< the height of the mipmap
   GLenum   format = GL_RGB;
   if (surface->format->BitsPerPixel == 32)