Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 16:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GDI32]

Browse source 
- Header describes the bitmap to be created, not the bits we are passed.
  - Circumvent gcc weirdness (sigh...)

svn path=/branches/reactos-yarotows/; revision=47702
This commit is contained in:
Jérôme Gardou 2010-06-09 00:18:29 +00:00
parent 974e9c0c41
commit 54e2569bf0
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/gdi32/include/gdi32p.h
View file

@ -279,7 +279,7 @@ WINAPI
GdiSetLastError( DWORD dwErrCode );
DWORD WINAPI GdiGetCodePage(HDC);
UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO );
UINT FASTCALL DIB_BitmapBitsSize( CONST BITMAPINFO* );
int
WINAPI

5
dll/win32/gdi32/objects/bitmap.c
View file

@ -34,7 +34,7 @@ DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines )
UINT
FASTCALL
DIB_BitmapBitsSize( PBITMAPINFO Info )
DIB_BitmapBitsSize( CONST BITMAPINFO* Info )
{
UINT Ret;
@ -476,7 +476,8 @@ CreateDIBitmap( HDC hDC,
// For Icm support.
// GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header);
/* Mmmh, this is not really safe */
cjBmpScanSize = DIB_BitmapBitsSize(Data);
DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize);
if ( !width || !height )