ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Fixes GetDIBits for top-down destination bitmaps.

This commit is contained in:
John Edmonds 2011-03-01 22:29:51 -05:00 committed by Alexandre Julliard
parent 374db9240b
commit 0d0d4f394f
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gdi32/dib.c
View File

@ -874,7 +874,7 @@ INT WINAPI GetDIBits(
unsigned int srcwidth = bmp->dib->dsBm.bmWidth; unsigned int srcwidth = bmp->dib->dsBm.bmWidth;
int srcwidthb = bmp->dib->dsBm.bmWidthBytes; int srcwidthb = bmp->dib->dsBm.bmWidthBytes;
unsigned int dstwidth = width; unsigned int dstwidth = width;
unsigned int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); int dstwidthb = DIB_GetDIBWidthBytes( width, bpp );
LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb); LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb);
unsigned int x, y, width, widthb; unsigned int x, y, width, widthb;
@ -888,6 +888,12 @@ INT WINAPI GetDIBits(
sbits += (srcwidthb * (int)(abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); sbits += (srcwidthb * (int)(abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1));
srcwidthb = -srcwidthb; srcwidthb = -srcwidthb;
} }
/*Same for the destination.*/
if (height < 0)
{
dbits = (LPBYTE)bits + (dstwidthb * (lines - 1));
dstwidthb = -dstwidthb;
}
switch( bpp ) { switch( bpp ) {
case 15: case 15:
@ -902,7 +908,7 @@ INT WINAPI GetDIBits(
case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */ case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */
{ {
widthb = min(abs(srcwidthb), dstwidthb); widthb = min(abs(srcwidthb), abs(dstwidthb));
/* FIXME: BI_BITFIELDS not supported yet */ /* FIXME: BI_BITFIELDS not supported yet */
for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb)
memcpy(dbits, sbits, widthb); memcpy(dbits, sbits, widthb);
@ -980,7 +986,7 @@ INT WINAPI GetDIBits(
case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */ case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */
{ {
widthb = min(abs(srcwidthb), dstwidthb); widthb = min(abs(srcwidthb), abs(dstwidthb));
for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb)
memcpy(dbits, sbits, widthb); memcpy(dbits, sbits, widthb);
} }
@ -1056,7 +1062,7 @@ INT WINAPI GetDIBits(
case 32: /* 32 bpp srcDIB -> 32 bpp dstDIB */ case 32: /* 32 bpp srcDIB -> 32 bpp dstDIB */
{ {
widthb = min(abs(srcwidthb), dstwidthb); widthb = min(abs(srcwidthb), abs(dstwidthb));
/* FIXME: BI_BITFIELDS not supported yet */ /* FIXME: BI_BITFIELDS not supported yet */
for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) { for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) {
memcpy(dbits, sbits, widthb); memcpy(dbits, sbits, widthb);

8
dlls/gdi32/tests/bitmap.c
View File

@ -3057,12 +3057,12 @@ static void test_GetDIBits_top_down(int bpp)
/*Check both scanlines.*/ /*Check both scanlines.*/
statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS);
ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode);
todo_wine ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]);
todo_wine ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]);
statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS);
ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode);
todo_wine ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]);
todo_wine ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]);
DeleteObject(bmpbt); DeleteObject(bmpbt);
DeleteObject(bmptb); DeleteObject(bmptb);