[maemo-commits] [maemo-commits] r17445 - in projects/haf/trunk/clutter: clutter/cogl/common debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-02-17 12:21:42 +0200 (Tue, 17 Feb 2009)
New Revision: 17445

Modified:
   projects/haf/trunk/clutter/clutter/cogl/common/cogl-bitmap-fallback.c
   projects/haf/trunk/clutter/debian/changelog
Log:
Added A8 texture format conversion


Modified: projects/haf/trunk/clutter/clutter/cogl/common/cogl-bitmap-fallback.c
===================================================================
--- projects/haf/trunk/clutter/clutter/cogl/common/cogl-bitmap-fallback.c	2009-02-17 09:00:01 UTC (rev 17444)
+++ projects/haf/trunk/clutter/clutter/cogl/common/cogl-bitmap-fallback.c	2009-02-17 10:21:42 UTC (rev 17445)
@@ -274,6 +274,7 @@
 
 #define TRY_CONVERSIONS(TFROM, SWAP) \
   {                              \
+  TRY_CONVERSION(TFROM, a, SWAP, COGL_PIXEL_FORMAT_A_8) \
   TRY_CONVERSION(TFROM, g, SWAP, COGL_PIXEL_FORMAT_G_8) \
   TRY_CONVERSION(TFROM, rgb565, SWAP, COGL_PIXEL_FORMAT_RGB_565)  \
   TRY_CONVERSION(TFROM, rgb565, !SWAP, COGL_PIXEL_FORMAT_BGR_565)  \
@@ -291,6 +292,8 @@
 
   switch (bmp->format & COGL_UNPREMULT_MASK)
   {
+  case COGL_PIXEL_FORMAT_A_8:
+      TRY_CONVERSIONS(a, FALSE); break;
   case COGL_PIXEL_FORMAT_G_8:
     TRY_CONVERSIONS(g, FALSE); break;
   case COGL_PIXEL_FORMAT_RGB_565:

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-02-17 09:00:01 UTC (rev 17444)
+++ projects/haf/trunk/clutter/debian/changelog	2009-02-17 10:21:42 UTC (rev 17445)
@@ -4,6 +4,7 @@
     enough testing for the code without checking code (which can affect the
     behaviour).
   * committed patch from http://bugzilla.openedhand.com/show_bug.cgi?id=1228
+  * Added conversion to A8 that got missed out of conversion code
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Sat, 14 Feb 2009 14:15:52 +0200