Changeset 3090 in orxonox.OLD for orxonox/branches/images/importer/material.h

Timestamp:

Dec 5, 2004, 12:10:08 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/images: new bmp-readin-Function (no more SDL)

File:

• orxonox/branches/images/importer/material.h (modified) (2 diffs)

orxonox/branches/images/importer/material.h

@@ -66 +66 @@
 
  private:
-  struct tImageJPG
+  struct Image
   {
     int rowSpan;
-    int sizeX;
-    int sizeY;
+    unsigned long sizeX;
+    unsigned long sizeY;
     GLubyte *data;
   };
@@ -90 +90 @@
 
   bool loadJPG (char* jpgName, GLuint* texture);
-  void decodeJPG(jpeg_decompress_struct* cinfo, tImageJPG *pImageData);
+  void decodeJPG(jpeg_decompress_struct* cinfo, Image *pImageData);
 
   bool loadTexToGL (int hight, int width, void* rawImage, GLuint* texture);