Changeset 252Tweet

Timestamp:

Dec 15, 2003, 4:02:50 PM (17 years ago)

Author:

Sam Hocevar

Message:

• src/bitmap.c: + If the alpha mask is 0, ignore alpha information. + Ditto if no alpha information is given with the palette.

File:

• libcaca/trunk/src/bitmap.c (modified) (8 diffs)

libcaca/trunk/src/bitmap.c

@@ -87 +87 @@
 struct caca_bitmap
 {
-    int bpp, palette;
+    int bpp, has_palette, has_alpha;
     int w, h, pitch;
     int rmask, gmask, bmask, amask;
@@ -137 +137 @@
 
     bitmap->bpp = bpp;
-    bitmap->palette = 0;
+    bitmap->has_palette = 0;
+    bitmap->has_alpha = amask ? 1 : 0;
 
     bitmap->w = w;
@@ -161 +162 @@
     {
         int i;
-        bitmap->palette = 1;
+        bitmap->has_palette = 1;
+        bitmap->has_alpha = 0;
         for(i = 0; i < 256; i++)
         {
@@ -167 +169 @@
             bitmap->green[i] = i * 0xfff / 256;
             bitmap->blue[i] = i * 0xfff / 256;
-            bitmap->alpha[i] = 0xfff;
         }
     }
@@ -178 +179 @@
                              unsigned int blue[], unsigned int alpha[])
 {
-    int i;
+    int i, has_alpha = 0;
 
     if(bitmap->bpp != 8)
@@ -193 +194 @@
             bitmap->green[i] = green[i];
             bitmap->blue[i] = blue[i];
-            bitmap->alpha[i] = alpha[i];
+            if(alpha[i])
+            {
+                bitmap->alpha[i] = alpha[i];
+                has_alpha = 1;
+            }
         }
     }
+
+    if(has_alpha)
+        bitmap->has_alpha = has_alpha;
 }
 
@@ -246 +254 @@
     }
 
-    if(bitmap->palette)
+    if(bitmap->has_palette)
     {
         *r += bitmap->red[bits];
@@ -457 +465 @@
         }
 
-        if(a < 0x100)
+        if(bitmap->has_alpha && a < 0x800)
             continue;