marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Set bitmap has alpha flag based on format.

oldstable
Vincent Povirk 2010-07-02 17:12:07 -04:00 committed by Alexandre Julliard
parent 18a4e24368
commit 517059f3f5
2 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gdiplus/image.c
View File

@ -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)

109
dlls/gdiplus/tests/image.c
View File

@ -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)