changeset 3426:155d91257957

Merge
author lana
date Thu, 23 Dec 2010 08:47:30 -0800
parents cb3c0ffb27bb 78d0a8d449fd
children 7fff69f28bf4
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c	Thu Dec 23 00:03:46 2010 -0800
+++ b/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c	Thu Dec 23 08:47:30 2010 -0800
@@ -119,7 +119,8 @@
                 PtrCoord(srcInfo.rasBase,
                          srcInfo.bounds.x1, srcInfo.pixelStride,
                          srcInfo.bounds.y1, srcInfo.scanStride);
-            unsigned char *pMask =
+            unsigned char *pMask, *pMaskAlloc;
+            pMask = pMaskAlloc =
                 (*env)->GetPrimitiveArrayCritical(env, maskArray, 0);
             if (pMask == NULL) {
                 J2dRlsTraceLn(J2D_TRACE_ERROR,
@@ -274,7 +275,7 @@
             bpos += width * height * sizeof(jint);
 
             (*env)->ReleasePrimitiveArrayCritical(env, maskArray,
-                                                  pMask, JNI_ABORT);
+                                                  pMaskAlloc, JNI_ABORT);
         }
         SurfaceData_InvokeRelease(env, srcOps, &srcInfo);
     }