http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ffab3a
)
gdi32: Fix handling of bitmap header size for V4/V5 bitmaps.
author
Alexandre Julliard
<julliard@winehq.org>
Wed, 21 Apr 2010 12:56:22 +0000
(14:56 +0200)
committer
Alexandre Julliard
<julliard@winehq.org>
Wed, 21 Apr 2010 12:56:22 +0000
(14:56 +0200)
dlls/gdi32/dib.c
patch
|
blob
|
blame
|
history
diff --git
a/dlls/gdi32/dib.c
b/dlls/gdi32/dib.c
index eebc321765fd0fa8b31fafe8910b47ac852fb03a..1b34a341043649e6521ec5181f05623b4ec2554e 100644
(file)
--- a/
dlls/gdi32/dib.c
+++ b/
dlls/gdi32/dib.c
@@
-139,7
+139,7
@@
int bitmap_info_size( const BITMAPINFO * info, WORD coloruse )
if (!colors && (info->bmiHeader.biBitCount <= 8))
colors = 1 << info->bmiHeader.biBitCount;
if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;
- return
sizeof(BITMAPINFOHEADER)
+ masks * sizeof(DWORD) + colors *
+ return
info->bmiHeader.biSize
+ masks * sizeof(DWORD) + colors *
((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD));
}
}