Vincent Povirk : gdiplus: Set bitmap has alpha flag based on format.
Alexandre Julliard
julliard at winehq.org
Mon Aug 23 10:50:16 CDT 2010
Module: wine
Branch: master
Commit: 517059f3f5b98b08d71075087dc1fe21a4e4b6c5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=517059f3f5b98b08d71075087dc1fe21a4e4b6c5
Author: Vincent Povirk <madewokherd at gmail.com>
Date: Fri Jul 2 17:12:07 2010 -0400
gdiplus: Set bitmap has alpha flag based on format.
---
dlls/gdiplus/image.c | 4 ++
dlls/gdiplus/tests/image.c | 109 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 113 insertions(+), 0 deletions(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 536eebb..7b50f53 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1742,6 +1742,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,
(*bitmap)->stride = dib_stride;
(*bitmap)->own_bits = own_bits;
+ /* set format-related flags */
+ if (format & (PixelFormatAlpha|PixelFormatPAlpha|PixelFormatIndexed))
+ (*bitmap)->image.flags |= ImageFlagsHasAlpha;
+
if (format == PixelFormat1bppIndexed ||
format == PixelFormat4bppIndexed ||
format == PixelFormat8bppIndexed)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 0e33049..f00d003 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -734,6 +734,115 @@ static void test_GdipGetImageFlags(void)
stat = GdipGetImageFlags(img, NULL);
expect(InvalidParameter, stat);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat1bppIndexed, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat4bppIndexed, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat8bppIndexed, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppGrayScale, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB555, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB565, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppARGB1555, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppRGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppARGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppPARGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat48bppRGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ if (stat == Ok)
+ {
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsNone, flags);
+ GdipDisposeImage(img);
+ }
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ if (stat == Ok)
+ {
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+ }
+
+ stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, (GpBitmap**)&img);
+ expect(Ok, stat);
+ if (stat == Ok)
+ {
+ expect(Ok, stat);
+ stat = GdipGetImageFlags(img, &flags);
+ expect(Ok, stat);
+ expect(ImageFlagsHasAlpha, flags);
+ GdipDisposeImage(img);
+ }
}
static void test_GdipCloneImage(void)
More information about the wine-cvs
mailing list