From 1b6e594f0802cb3b781cf8733527bff0c17cdd36 Mon Sep 17 00:00:00 2001 From: bae Date: Wed, 20 Jul 2011 16:18:08 +0400 Subject: [PATCH] 7044285: 64 bit VM crashes in Java_sun_java2d_loops_MaskFill_MaskFill Reviewed-by: jgodinez, prr --- src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h b/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h index 3efdc272e..5085028c2 100644 --- a/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h +++ b/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h @@ -30,6 +30,8 @@ extern "C" { #endif +#include + #include "java_awt_AlphaComposite.h" #include "SurfaceData.h" @@ -484,7 +486,9 @@ extern struct _CompositeTypes { #define ArraySize(A) (sizeof(A) / sizeof(A[0])) #define PtrAddBytes(p, b) ((void *) (((intptr_t) (p)) + (b))) -#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, (y)*(yinc) + (x)*(xinc)) +#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, \ + ((ptrdiff_t)(y))*(yinc) + \ + ((ptrdiff_t)(x))*(xinc)) /* * The function to call with an array of NativePrimitive structures -- GitLab