Andrew Talbot : gdi: Cast-qual warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Sep 14 10:10:19 CDT 2006
Module: wine
Branch: master
Commit: 6d070ea250c765ce901a993939585f06801dae32
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d070ea250c765ce901a993939585f06801dae32
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Thu Sep 14 00:58:30 2006 +0100
gdi: Cast-qual warnings fix.
---
dlls/gdi/bitmap.c | 2 +-
dlls/gdi/brush.c | 2 +-
dlls/gdi/dib.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c
index 3caa55f..9581032 100644
--- a/dlls/gdi/bitmap.c
+++ b/dlls/gdi/bitmap.c
@@ -439,7 +439,7 @@ LONG WINAPI SetBitmapBits(
{
dest -= dib->dsBm.bmWidthBytes;
memcpy( dest, bits, min( count, dib->dsBm.bmWidthBytes ) );
- bits = (char *)bits + dib->dsBm.bmWidthBytes;
+ bits = (const char *)bits + dib->dsBm.bmWidthBytes;
count -= dib->dsBm.bmWidthBytes;
}
}
diff --git a/dlls/gdi/brush.c b/dlls/gdi/brush.c
index 95c580f..309ece5 100644
--- a/dlls/gdi/brush.c
+++ b/dlls/gdi/brush.c
@@ -273,7 +273,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGL
*/
HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse )
{
- BITMAPINFO *info=(BITMAPINFO*)data;
+ const BITMAPINFO *info=(const BITMAPINFO*)data;
LOGBRUSH logbrush;
if (!data)
diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c
index 82d0042..724b755 100644
--- a/dlls/gdi/dib.c
+++ b/dlls/gdi/dib.c
@@ -129,7 +129,7 @@ int DIB_BitmapInfoSize( const BITMAPINFO
if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{
- BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)info;
+ const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info;
colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0;
return sizeof(BITMAPCOREHEADER) + colors *
((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD));
@@ -168,7 +168,7 @@ static int DIB_GetBitmapInfo( const BITM
}
if (header->biSize == sizeof(BITMAPCOREHEADER))
{
- BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header;
+ const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header;
*width = core->bcWidth;
*height = core->bcHeight;
*planes = core->bcPlanes;
@@ -179,7 +179,7 @@ static int DIB_GetBitmapInfo( const BITM
}
if (header->biSize == sizeof(BITMAPV4HEADER))
{
- BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header;
+ const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header;
*width = v4hdr->bV4Width;
*height = v4hdr->bV4Height;
*planes = v4hdr->bV4Planes;
@@ -190,7 +190,7 @@ static int DIB_GetBitmapInfo( const BITM
}
if (header->biSize == sizeof(BITMAPV5HEADER))
{
- BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header;
+ const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header;
*width = v5hdr->bV5Width;
*height = v5hdr->bV5Height;
*planes = v5hdr->bV5Planes;
More information about the wine-cvs
mailing list