Author: gonzalo
Date: 2006-05-18 19:30:05 -0400 (Thu, 18 May 2006)
New Revision: 60852
Modified:
trunk/libgdiplus/src/ChangeLog
trunk/libgdiplus/src/bmpcodec.c
trunk/libgdiplus/src/image.c
Log:
2006-05-18 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* bmpcodec.c: don't change the PixelFormat to 32bpp when it's a 24bpp.
* image.c: 24bpp bitmaps are 4-bytes (cairo dixit).
Fixes the 24bpp test again.
Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog 2006-05-18 23:22:50 UTC (rev 60851)
+++ trunk/libgdiplus/src/ChangeLog 2006-05-18 23:30:05 UTC (rev 60852)
@@ -1,3 +1,9 @@
+2006-05-18 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * bmpcodec.c: don't change the PixelFormat to 32bpp when it's a 24bpp.
+ * image.c: 24bpp bitmaps are 4-bytes (cairo dixit).
+ Fixes the 24bpp test again.
+
2006-05-17 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* bitmap.c: speed up the 8bppIndexed -> 32bpp conversion.
Modified: trunk/libgdiplus/src/bmpcodec.c
===================================================================
--- trunk/libgdiplus/src/bmpcodec.c 2006-05-18 23:22:50 UTC (rev 60851)
+++ trunk/libgdiplus/src/bmpcodec.c 2006-05-18 23:30:05 UTC (rev 60852)
@@ -923,6 +923,7 @@
case Format1bppIndexed: result->active_bitmap->stride =
(result->active_bitmap->width + 7) / 8; break;
case Format4bppIndexed: result->active_bitmap->stride =
(result->active_bitmap->width + 1) / 2; break;
case Format8bppIndexed: result->active_bitmap->stride =
result->active_bitmap->width; break;
+ case Format24bppRgb: result->active_bitmap->stride =
result->active_bitmap->width * 4; break;
default:
/* For other types, we assume 32 bit and translate into
32 bit from source format */
result->active_bitmap->pixel_format = Format32bppArgb;
Modified: trunk/libgdiplus/src/image.c
===================================================================
--- trunk/libgdiplus/src/image.c 2006-05-18 23:22:50 UTC (rev 60851)
+++ trunk/libgdiplus/src/image.c 2006-05-18 23:30:05 UTC (rev 60852)
@@ -1785,9 +1785,9 @@
case Format64bppArgb:
case Format64bppPArgb:
case Format32bppRgb: /* Cairo uses four bytes for 32BPP*/
+ case Format24bppRgb:
return 4;
- case Format24bppRgb:
case Format16bppRgb555:
case Format16bppRgb565:
case Format48bppRgb:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches