Changeset 17 for abuse/trunk/src/imlib/targa.cppTweet

Timestamp:

Nov 10, 2005, 9:41:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• absolute shitloads of 64 bit fixes.

File:

• abuse/trunk/src/imlib/targa.cpp (modified) (4 diffs)

abuse/trunk/src/imlib/targa.cpp

@@ -14 +14 @@
   }
   
-  unsigned char id,color_map,im_type;
+  uint8_t id,color_map,im_type;
 
-  id=fp->read_byte();
-  color_map=fp->read_byte();
-  im_type=fp->read_byte();
+  id=fp->read_uint8();
+  color_map=fp->read_uint8();
+  im_type=fp->read_uint8();
 
   if (color_map!=0)
@@ -32 +32 @@
   }
 
-  fp->read_short();
-  fp->read_short();
-  fp->read_byte();
+  fp->read_uint16();
+  fp->read_uint16();
+  fp->read_uint8();
 
-  fp->read_short();
-  fp->read_short();
+  fp->read_uint16();
+  fp->read_uint16();
 
 
-  int w=fp->read_short();
-  int h=fp->read_short();
-  unsigned char bpp=fp->read_byte();
-  unsigned char im_des=fp->read_byte();
+  int w=fp->read_uint16();
+  int h=fp->read_uint16();
+  uint8_t bpp=fp->read_uint8();
+  uint8_t im_des=fp->read_uint8();
 
   if (bpp!=32)
@@ -54 +54 @@
 
   int x,y;
-  unsigned char ctrl;
-  unsigned char bgra[4],*sl,c,lr=0,lg=0,lb=0,ll=0,lc=0;
+  uint8_t ctrl;
+  uint8_t bgra[4],*sl,c,lr=0,lg=0,lb=0,ll=0,lc=0;
   
   
@@ -68 +68 @@
       for (x=0;x<w;)
       {
-        ctrl=fp->read_byte();
+        ctrl=fp->read_uint8();
         if (ctrl&0x80)
         {