Mercurial > hg > icedtea7-forest > jdk
changeset 9205:98b0dbc4bc08
8037287: Windows build failed after JDK-8030787
Reviewed-by: serb, bagiras
author | pchelko |
---|---|
date | Thu, 13 Mar 2014 15:33:43 +0400 |
parents | 986500b85859 |
children | 03a56cf98284 |
files | src/share/native/sun/awt/image/awt_parseImage.c |
diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/awt/image/awt_parseImage.c Tue Jul 11 21:06:17 2017 +0100 +++ b/src/share/native/sun/awt/image/awt_parseImage.c Thu Mar 13 15:33:43 2014 +0400 @@ -182,6 +182,11 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) { jobject joffs = NULL; /* int status;*/ + jclass singlePixelPackedSampleModelClass = NULL; + jclass integerComponentRasterClass = NULL; + jclass byteComponentRasterClass = NULL; + jclass shortComponentRasterClass = NULL; + jclass bytePackedRasterClass = NULL; if (JNU_IsNull(env, jraster)) { JNU_ThrowNullPointerException(env, "null Raster object"); @@ -226,7 +231,7 @@ rasterP->sppsm.isUsed = 0; - jclass singlePixelPackedSampleModelClass = (*env)->FindClass(env, + singlePixelPackedSampleModelClass = (*env)->FindClass(env, "java/awt/image/SinglePixelPackedSampleModel"); CHECK_NULL_RETURN(singlePixelPackedSampleModelClass, -1); if ((*env)->IsInstanceOf(env, rasterP->jsampleModel, @@ -264,17 +269,13 @@ rasterP->jsampleModel, g_SMHeightID); - jclass integerComponentRasterClass = (*env)->FindClass(env, - "sun/awt/image/IntegerComponentRaster"); + integerComponentRasterClass = (*env)->FindClass(env, "sun/awt/image/IntegerComponentRaster"); CHECK_NULL_RETURN(integerComponentRasterClass, -1); - jclass byteComponentRasterClass = (*env)->FindClass(env, - "sun/awt/image/ByteComponentRaster"); + byteComponentRasterClass = (*env)->FindClass(env, "sun/awt/image/ByteComponentRaster"); CHECK_NULL_RETURN(byteComponentRasterClass, -1); - jclass shortComponentRasterClass = (*env)->FindClass(env, - "sun/awt/image/ShortComponentRaster"); + shortComponentRasterClass = (*env)->FindClass(env,"sun/awt/image/ShortComponentRaster"); CHECK_NULL_RETURN(shortComponentRasterClass, -1); - jclass bytePackedRasterClass = (*env)->FindClass(env, - "sun/awt/image/BytePackedRaster"); + bytePackedRasterClass = (*env)->FindClass(env, "sun/awt/image/BytePackedRaster"); CHECK_NULL_RETURN(bytePackedRasterClass, -1); if ((*env)->IsInstanceOf(env, jraster, integerComponentRasterClass)){ rasterP->jdata = (*env)->GetObjectField(env, jraster, g_ICRdataID);