Skip to content

W
wine-winehq
Commit c73a1fd6 authored by Karl Lessard's avatar Karl Lessard Committed by Alexandre Julliard
Browse files
Options

Some more minor GDI fixes.

parent 27492598
Expand all Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 78 deletions
objects/dib.c
View file @ c73a1fd6
...@@ -592,8 +592,8 @@ INT WINAPI GetDIBits( ...@@ -592,8 +592,8 @@ INT WINAPI GetDIBits(
for( y = 0; y < lines; y++) { for( y = 0; y < lines; y++) {
for( x = 0; x < srcwidth; x++ ) { for( x = 0; x < srcwidth; x++ ) {
val = *srcbits++; val = *srcbits++;
*dstbits++ = (WORD)(((val >> 19) & bmask) | ((val >> 6) & gmask) | *dstbits++ = (WORD)(((val >> 3) & bmask) | ((val >> 6) & gmask) |
((val << 7) & rmask)); ((val >> 9) & rmask));
} }
dstbits = (LPWORD)(dbits+=dstwidthb); dstbits = (LPWORD)(dbits+=dstwidthb);
srcbits = (LPDWORD)(sbits+=srcwidthb); srcbits = (LPDWORD)(sbits+=srcwidthb);
...@@ -624,9 +624,9 @@ INT WINAPI GetDIBits( ...@@ -624,9 +624,9 @@ INT WINAPI GetDIBits(
for( y = 0; y < lines; y++) { for( y = 0; y < lines; y++) {
for( x = 0; x < srcwidth; x++ ) { for( x = 0; x < srcwidth; x++ ) {
val = *srcbits++; val = *srcbits++;
*dstbits++ = (BYTE)(((val >> 7) & 0xf8) | ((val >> 12) & 0x07));
*dstbits++ = (BYTE)(((val >> 2) & 0xf8) | ((val >> 7) & 0x07));
*dstbits++ = (BYTE)(((val << 3) & 0xf8) | ((val >> 2) & 0x07)); *dstbits++ = (BYTE)(((val << 3) & 0xf8) | ((val >> 2) & 0x07));
*dstbits++ = (BYTE)(((val >> 2) & 0xf8) | ((val >> 7) & 0x07));
*dstbits++ = (BYTE)(((val >> 7) & 0xf8) | ((val >> 12) & 0x07));
} }
dstbits = (LPBYTE)(dbits+=dstwidthb); dstbits = (LPBYTE)(dbits+=dstwidthb);
srcbits = (LPWORD)(sbits+=srcwidthb); srcbits = (LPWORD)(sbits+=srcwidthb);
...@@ -668,7 +668,6 @@ INT WINAPI GetDIBits( ...@@ -668,7 +668,6 @@ INT WINAPI GetDIBits(
case 32: /* 32 bpp dstDIB */ case 32: /* 32 bpp dstDIB */
{ {
LPDWORD dstbits = (LPDWORD)dbits; LPDWORD dstbits = (LPDWORD)dbits;
DWORD rmask = 0xff, gmask = 0xff00, bmask = 0xff0000;
/* FIXME: BI_BITFIELDS not supported yet */ /* FIXME: BI_BITFIELDS not supported yet */
...@@ -682,9 +681,9 @@ INT WINAPI GetDIBits( ...@@ -682,9 +681,9 @@ INT WINAPI GetDIBits(
for( y = 0; y < lines; y++) { for( y = 0; y < lines; y++) {
for( x = 0; x < srcwidth; x++ ) { for( x = 0; x < srcwidth; x++ ) {
val = (DWORD)*srcbits++; val = (DWORD)*srcbits++;
*dstbits++ = ((val >> 7) & 0xf8) | ((val >> 12) & 0x07) | *dstbits++ = ((val << 3) & 0xf8) | ((val >> 2) & 0x07) |
((val << 6) & 0xf800) | ((val << 1) & 0x0700) | ((val << 6) & 0xf800) | ((val << 1) & 0x0700) |
((val << 19) & 0xf800) | ((val << 14) & 0x070000); ((val << 9) & 0xf80000) | ((val << 4) & 0x070000);
} }
dstbits=(LPDWORD)(dbits+=dstwidthb); dstbits=(LPDWORD)(dbits+=dstwidthb);
srcbits=(LPWORD)(sbits+=srcwidthb); srcbits=(LPWORD)(sbits+=srcwidthb);
...@@ -697,10 +696,8 @@ INT WINAPI GetDIBits( ...@@ -697,10 +696,8 @@ INT WINAPI GetDIBits(
LPBYTE srcbits = sbits; LPBYTE srcbits = sbits;
for( y = 0; y < lines; y++) { for( y = 0; y < lines; y++) {
for( x = 0; x < srcwidth; x++ ) for( x = 0; x < srcwidth; x++, srcbits+=3 )
*dstbits++ = ((DWORD)*srcbits++ & rmask) | *dstbits++ = ((DWORD)*srcbits) & 0x00ffffff;
(((DWORD)*srcbits++ << 8) & gmask) |
(((DWORD)*srcbits++ << 7) & bmask);
dstbits=(LPDWORD)(dbits+=dstwidthb); dstbits=(LPDWORD)(dbits+=dstwidthb);
srcbits=(sbits+=srcwidthb); srcbits=(sbits+=srcwidthb);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment