From 9d3aa576045ce0aea51ef767b74596bb4582570f Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Sun, 7 Jun 2009 15:58:56 +0100
Subject: [PATCH] [bitmap] Fixes _cogl_bitmap_fallback_unpremult

The _cogl_unpremult_alpha_{first,last} functions which
_cogl_bitmap_fallback_unpremult depends on were incorrectly casting each
of the byte components of a texel to a gulong and performing shifts as
if it were dealing with the whole texel.

It now just uses array indexing to access the byte components without
needing to cast or manually shift any bits around.

Even though we used to depend on unpremult whenever we used a
ClutterCairoTexture, clutter_cairo_texture_context_destroy had it's own
unpremult code which worked which is why this bug wouldn't have been noticed
before.
---
 clutter/cogl/common/cogl-bitmap-fallback.c | 60 +++++++++++-----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/clutter/cogl/common/cogl-bitmap-fallback.c b/clutter/cogl/common/cogl-bitmap-fallback.c
index e750a7ccf..ddff6ea40 100644
--- a/clutter/cogl/common/cogl-bitmap-fallback.c
+++ b/clutter/cogl/common/cogl-bitmap-fallback.c
@@ -163,9 +163,9 @@ _cogl_unpremult_alpha_last (const guchar *src, guchar *dst)
 {
   guchar alpha = src[3];
 
-  dst[0] = ((((gulong) src[0] >> 16) & 0xff) * 255 ) / alpha;
-  dst[1] = ((((gulong) src[1] >> 8) & 0xff) * 255 ) / alpha;
-  dst[2] = ((((gulong) src[2] >> 0) & 0xff) * 255 ) / alpha;
+  dst[0] = (src[0] * 255) / alpha;
+  dst[1] = (src[1] * 255) / alpha;
+  dst[2] = (src[2] * 255) / alpha;
   dst[3] = alpha;
 }
 
@@ -175,9 +175,9 @@ _cogl_unpremult_alpha_first (const guchar *src, guchar *dst)
   guchar alpha = src[0];
 
   dst[0] = alpha;
-  dst[1] = ((((gulong) src[1] >> 16) & 0xff) * 255 ) / alpha;
-  dst[2] = ((((gulong) src[2] >> 8) & 0xff) * 255 ) / alpha;
-  dst[3] = ((((gulong) src[3] >> 0) & 0xff) * 255 ) / alpha;
+  dst[1] = (src[1] * 255) / alpha;
+  dst[2] = (src[2] * 255) / alpha;
+  dst[3] = (src[3] * 255) / alpha;
 }
 
 /* No division form of floor((c*a + 128)/255) (I first encountered
@@ -365,35 +365,35 @@ _cogl_bitmap_fallback_unpremult (const CoglBitmap *bmp,
 			    * dst_bmp->height
 			    * dst_bmp->rowstride);
 
-  /* FIXME: Optimize */
   for (y = 0; y < bmp->height; y++)
     {
       src = (guchar*)bmp->data      + y * bmp->rowstride;
       dst = (guchar*)dst_bmp->data  + y * dst_bmp->rowstride;
 
-      for (x = 0; x < bmp->width; x++)
-	{
-	  /* FIXME: Would be nice to at least remove this inner
-           * branching, but not sure it can be done without
-           * rewriting of the whole loop */
-	  if (bmp->format & COGL_AFIRST_BIT)
-	    {
-	      if (src[0] == 0)
-		_cogl_unpremult_alpha_0 (src, dst);
-	      else
-		_cogl_unpremult_alpha_first (src, dst);
-	    }
-	  else
-	    {
-	      if (src[3] == 0)
-		_cogl_unpremult_alpha_0 (src, dst);
-	      else
-		_cogl_unpremult_alpha_last (src, dst);
-	    }
-
-	  src += bpp;
-	  dst += bpp;
-	}
+      if (bmp->format & COGL_AFIRST_BIT)
+        {
+          for (x = 0; x < bmp->width; x++)
+            {
+              if (src[0] == 0)
+                _cogl_unpremult_alpha_0 (src, dst);
+              else
+                _cogl_unpremult_alpha_first (src, dst);
+              src += bpp;
+              dst += bpp;
+            }
+        }
+      else
+        {
+          for (x = 0; x < bmp->width; x++)
+            {
+              if (src[0] == 0)
+                _cogl_unpremult_alpha_0 (src, dst);
+              else
+                _cogl_unpremult_alpha_last (src, dst);
+              src += bpp;
+              dst += bpp;
+            }
+        }
     }
 
   return TRUE;