Alexandre Julliard : gdiplus: Use signed types in convert_pixels to avoid problems on 64-bit.
Alexandre Julliard
julliard at winehq.org
Thu Mar 10 11:30:24 CST 2011
Module: wine
Branch: master
Commit: b3c333e91633cdcd34e6a1ba2d7755aa883938b5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c333e91633cdcd34e6a1ba2d7755aa883938b5
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Mar 10 14:09:56 2011 +0100
gdiplus: Use signed types in convert_pixels to avoid problems on 64-bit.
---
dlls/gdiplus/gdiplus_private.h | 2 +-
dlls/gdiplus/image.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 68998df..4575875 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -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);
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 2582ae2..1916524 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -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))
More information about the wine-cvs
mailing list