gdiplus: Use signed types in convert_pixels to avoid problems on 64-bit.

oldstable
Alexandre Julliard 2011-03-10 14:09:56 +01:00
parent a2793d62ad
commit b3c333e916
2 changed files with 3 additions and 3 deletions

View File

@ -112,7 +112,7 @@ extern const char *debugstr_pointf(CONST PointF* pt);
extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height,
BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride);
extern GpStatus convert_pixels(UINT width, UINT height,
extern GpStatus convert_pixels(INT width, INT height,
INT dst_stride, BYTE *dst_bits, PixelFormat dst_format,
INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette);

View File

@ -498,11 +498,11 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y,
return Ok;
}
GpStatus convert_pixels(UINT width, UINT height,
GpStatus convert_pixels(INT width, INT height,
INT dst_stride, BYTE *dst_bits, PixelFormat dst_format,
INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette)
{
UINT x, y;
INT x, y;
if (src_format == dst_format ||
(dst_format == PixelFormat32bppRGB && PIXELFORMATBPP(src_format) == 32))