changeset 8159:fdcee3cb638e

8043123: Hard crash with access violation exception when blitting to very large image Reviewed-by: prr, mschoene
author bae
date Mon, 09 Feb 2015 14:21:07 +0400
parents 10acd8698f4f
children 4ced6a9ddaaa
files src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Thu Oct 09 16:20:53 2014 +0200
+++ b/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Mon Feb 09 14:21:07 2015 +0400
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <stddef.h>
+
 #include "java_awt_AlphaComposite.h"
 
 #include "SurfaceData.h"
@@ -484,7 +486,9 @@
 #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