Commit 6d070ea2 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

gdi: Cast-qual warnings fix.

parent 3ad3f8de
...@@ -439,7 +439,7 @@ LONG WINAPI SetBitmapBits( ...@@ -439,7 +439,7 @@ LONG WINAPI SetBitmapBits(
{ {
dest -= dib->dsBm.bmWidthBytes; dest -= dib->dsBm.bmWidthBytes;
memcpy( dest, bits, min( count, 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; count -= dib->dsBm.bmWidthBytes;
} }
} }
......
...@@ -273,7 +273,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) ...@@ -273,7 +273,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse )
*/ */
HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse )
{ {
BITMAPINFO *info=(BITMAPINFO*)data; const BITMAPINFO *info=(const BITMAPINFO*)data;
LOGBRUSH logbrush; LOGBRUSH logbrush;
if (!data) if (!data)
......
...@@ -129,7 +129,7 @@ int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse ) ...@@ -129,7 +129,7 @@ int DIB_BitmapInfoSize( const BITMAPINFO * info, WORD coloruse )
if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{ {
BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)info; const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info;
colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0;
return sizeof(BITMAPCOREHEADER) + colors * return sizeof(BITMAPCOREHEADER) + colors *
((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD));
...@@ -168,7 +168,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, ...@@ -168,7 +168,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
} }
if (header->biSize == sizeof(BITMAPCOREHEADER)) if (header->biSize == sizeof(BITMAPCOREHEADER))
{ {
BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header;
*width = core->bcWidth; *width = core->bcWidth;
*height = core->bcHeight; *height = core->bcHeight;
*planes = core->bcPlanes; *planes = core->bcPlanes;
...@@ -179,7 +179,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, ...@@ -179,7 +179,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
} }
if (header->biSize == sizeof(BITMAPV4HEADER)) if (header->biSize == sizeof(BITMAPV4HEADER))
{ {
BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header;
*width = v4hdr->bV4Width; *width = v4hdr->bV4Width;
*height = v4hdr->bV4Height; *height = v4hdr->bV4Height;
*planes = v4hdr->bV4Planes; *planes = v4hdr->bV4Planes;
...@@ -190,7 +190,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, ...@@ -190,7 +190,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
} }
if (header->biSize == sizeof(BITMAPV5HEADER)) if (header->biSize == sizeof(BITMAPV5HEADER))
{ {
BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header;
*width = v5hdr->bV5Width; *width = v5hdr->bV5Width;
*height = v5hdr->bV5Height; *height = v5hdr->bV5Height;
*planes = v5hdr->bV5Planes; *planes = v5hdr->bV5Planes;
......
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