Changeset 15Tweet

Timestamp:

Nov 10, 2005, 8:04:02 PM (17 years ago)

Author:

Sam Hocevar

Message:

• fixed 64 bit issues in palette::getquad and palette::fade_to.

Location:

abuse/trunk/src/imlib

Files:

• include/palette.hpp (modified) (1 diff)
• palette.cpp (modified) (3 diffs)

abuse/trunk/src/imlib/include/palette.hpp

@@ -28 +28 @@
   void set(int x, unsigned char red, unsigned char green, unsigned char blue);
   void get(int x, unsigned char &red, unsigned char &green, unsigned char &blue);
-  long getquad(int x);
+  uint32_t getquad(int x);
   unsigned int red(int x) { return pal[x].red; }
   unsigned int green(int x) { return pal[x].green; }

abuse/trunk/src/imlib/palette.cpp

@@ -89 +89 @@
 }
 
-long palette::getquad(int x)
+uint32_t palette::getquad(int x)
 { char entry[4];
   entry[3]=0;
@@ -95 +95 @@
   entry[1]=pal[x].green;
   entry[0]=pal[x].blue;
-  return *((long *)entry);
+  return *((uint32_t *)entry);
 }
 
@@ -523 +523 @@
 void palette::fade_to(int total_fades, int fade_on, int dest_r, int dest_g, int dest_b)
 {
-  unsigned char *sl=(unsigned char *)addr();
-  int i;  
+  uint8_t *sl=(uint8_t *)addr();
+  uint8_t x;
+  int i;
   for (i=0;i<ncolors;i++)
   {
-    *(sl++)=(( dest_r-(int)*sl)*fade_on/total_fades+*sl);
-    *(sl++)=(( dest_g-(int)*sl)*fade_on/total_fades+*sl);
-    *(sl++)=(( dest_b-(int)*sl)*fade_on/total_fades+*sl);    
+    x=(( dest_r-(int)*sl)*fade_on/total_fades+*sl);
+    *(sl++)=x;
+    x=(( dest_g-(int)*sl)*fade_on/total_fades+*sl);
+    *(sl++)=x;
+    x=(( dest_b-(int)*sl)*fade_on/total_fades+*sl);    
+    *(sl++)=x;
   }  
 }