infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-12 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

8025309: [parfait] JNI-related warnings from b107 for jdk.src.share.native.sun.java2d.pipe

Browse Source 
Reviewed-by: prr, jgodinez
This commit is contained in:
Johnny Chen 2013-10-03 13:35:26 -07:00
parent fa90ce8bf8
commit 3a01c9493e
4 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c
View File

@ -53,6 +53,7 @@ Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans
unsigned char *bbuf;
jint *ibuf;
jint ipos;
jboolean hasException;
J2dTraceLn2(J2D_TRACE_INFO,
"BufferedRenderPipe_fillSpans: bpos=%d limit=%d",
@ -104,7 +105,10 @@ Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans
ibuf[1] = spanCount;
// flush the queue
JNU_CallMethodByName(env, NULL, rq, "flushNow", "(I)V", bpos);
JNU_CallMethodByName(env, &hasException, rq, "flushNow", "(I)V", bpos);
if (hasException) {
break;
}
// now start a new operation
ibuf = (jint *)bbuf;

4
jdk/src/share/native/sun/java2d/pipe/Region.c
View File

@ -260,6 +260,10 @@ RegionToYXBandedRectangles(JNIEnv *env,
/* return; REMIND: What to do here? */
}
Region_StartIteration(env, &clipInfo);
if ((*env)->ExceptionCheck(env)) {
return 0;
}
numrects = Region_CountIterationRects(&clipInfo);
if ((unsigned long)numrects > initialBufferSize) {
*pRect = (RECT_T *) SAFE_SIZE_ARRAY_ALLOC(malloc, numrects, sizeof(RECT_T));

11
jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c
View File

@ -653,12 +653,15 @@ Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly
pd->curx = x;
pd->cury = y;
}
(*env)->ReleasePrimitiveArrayCritical(env, yArray,
yPoints, JNI_ABORT);
}
(*env)->ReleasePrimitiveArrayCritical(env, yArray,
yPoints, JNI_ABORT);
(*env)->ReleasePrimitiveArrayCritical(env, xArray,
xPoints, JNI_ABORT);
}
if (xPoints == NULL || yPoints == NULL) {
return;
}
(*env)->ReleasePrimitiveArrayCritical(env, xArray,
xPoints, JNI_ABORT);
}
if (!oom) {
HANDLEENDPATH(pd, {oom = JNI_TRUE;});

45
jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c
View File

@ -44,21 +44,27 @@ Java_sun_java2d_pipe_SpanClipRenderer_initIDs
{
/* Region fields */
pBandsArrayID = (*env)->GetFieldID(env, rc, "bands", "[I");
if (pBandsArrayID == NULL) {
return;
}
pEndIndexID = (*env)->GetFieldID(env, rc, "endIndex", "I");
if (pEndIndexID == NULL) {
return;
}
/* RegionIterator fields */
pRegionID = (*env)->GetFieldID(env, ric, "region",
"Lsun/java2d/pipe/Region;");
if (pRegionID == NULL) {
return;
}
pCurIndexID = (*env)->GetFieldID(env, ric, "curIndex", "I");
if (pCurIndexID == NULL) {
return;
}
pNumXbandsID = (*env)->GetFieldID(env, ric, "numXbands", "I");
if((pBandsArrayID == NULL)
|| (pEndIndexID == NULL)
|| (pRegionID == NULL)
|| (pCurIndexID == NULL)
|| (pNumXbandsID == NULL))
{
JNU_ThrowInternalError(env, "NULL field ID");
if (pNumXbandsID == NULL) {
return;
}
}
@ -129,10 +135,14 @@ Java_sun_java2d_pipe_SpanClipRenderer_fillTile
if ((*env)->GetArrayLength(env, boxArray) < 4) {
JNU_ThrowArrayIndexOutOfBoundsException(env, "band array");
return;
}
alphalen = (*env)->GetArrayLength(env, alphaTile);
box = (*env)->GetPrimitiveArrayCritical(env, boxArray, 0);
if (box == NULL) {
return;
}
w = box[2] - box[0];
h = box[3] - box[1];
@ -140,9 +150,14 @@ Java_sun_java2d_pipe_SpanClipRenderer_fillTile
if (alphalen < offset || (alphalen - offset) / tsize < h) {
(*env)->ReleasePrimitiveArrayCritical(env, boxArray, box, 0);
JNU_ThrowArrayIndexOutOfBoundsException(env, "alpha tile array");
return;
}
alpha = (*env)->GetPrimitiveArrayCritical(env, alphaTile, 0);
if (alpha == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, boxArray, box, 0);
return;
}
fill(alpha, offset, tsize, 0, 0, w, h, (jbyte) 0xff);
@ -182,6 +197,7 @@ Java_sun_java2d_pipe_SpanClipRenderer_eraseTile
if ((*env)->GetArrayLength(env, boxArray) < 4) {
JNU_ThrowArrayIndexOutOfBoundsException(env, "band array");
return;
}
alphalen = (*env)->GetArrayLength(env, alphaTile);
@ -196,6 +212,9 @@ Java_sun_java2d_pipe_SpanClipRenderer_eraseTile
}
box = (*env)->GetPrimitiveArrayCritical(env, boxArray, 0);
if (box == NULL) {
return;
}
lox = box[0];
loy = box[1];
@ -207,10 +226,20 @@ Java_sun_java2d_pipe_SpanClipRenderer_eraseTile
(alphalen - offset - (hix-lox)) / tsize < (hiy - loy - 1)) {
(*env)->ReleasePrimitiveArrayCritical(env, boxArray, box, 0);
JNU_ThrowArrayIndexOutOfBoundsException(env, "alpha tile array");
return;
}
bands = (*env)->GetPrimitiveArrayCritical(env, bandsArray, 0);
if (bands == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, boxArray, box, 0);
return;
}
alpha = (*env)->GetPrimitiveArrayCritical(env, alphaTile, 0);
if (alpha == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, bandsArray, bands, 0);
(*env)->ReleasePrimitiveArrayCritical(env, boxArray, box, 0);
return;
}
curIndex = saveCurIndex;
numXbands = saveNumXbands;