stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8037287: Windows build failed after JDK-8030787

Browse Source 
Reviewed-by: serb, bagiras
This commit is contained in:
Petr Pchelko 2014-03-13 15:33:43 +04:00
parent 8294a35add
commit ff28ead70b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/share/native/sun/awt/image/awt_parseImage.c
View File

@ -182,6 +182,11 @@ static int checkChannelOffsets(RasterS_t *rasterP, int dataArrayLength) {
int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) { int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
jobject joffs = NULL; jobject joffs = NULL;
/* int status;*/ /* int status;*/
jclass singlePixelPackedSampleModelClass = NULL;
jclass integerComponentRasterClass = NULL;
jclass byteComponentRasterClass = NULL;
jclass shortComponentRasterClass = NULL;
jclass bytePackedRasterClass = NULL;
if (JNU_IsNull(env, jraster)) { if (JNU_IsNull(env, jraster)) {
JNU_ThrowNullPointerException(env, "null Raster object"); JNU_ThrowNullPointerException(env, "null Raster object");
@ -226,7 +231,7 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
rasterP->sppsm.isUsed = 0; rasterP->sppsm.isUsed = 0;
jclass singlePixelPackedSampleModelClass = (*env)->FindClass(env, singlePixelPackedSampleModelClass = (*env)->FindClass(env,
"java/awt/image/SinglePixelPackedSampleModel"); "java/awt/image/SinglePixelPackedSampleModel");
CHECK_NULL_RETURN(singlePixelPackedSampleModelClass, -1); CHECK_NULL_RETURN(singlePixelPackedSampleModelClass, -1);
if ((*env)->IsInstanceOf(env, rasterP->jsampleModel, if ((*env)->IsInstanceOf(env, rasterP->jsampleModel,
@ -264,17 +269,13 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
rasterP->jsampleModel, rasterP->jsampleModel,
g_SMHeightID); g_SMHeightID);
jclass integerComponentRasterClass = (*env)->FindClass(env, integerComponentRasterClass = (*env)->FindClass(env, "sun/awt/image/IntegerComponentRaster");
"sun/awt/image/IntegerComponentRaster");
CHECK_NULL_RETURN(integerComponentRasterClass, -1); CHECK_NULL_RETURN(integerComponentRasterClass, -1);
jclass byteComponentRasterClass = (*env)->FindClass(env, byteComponentRasterClass = (*env)->FindClass(env, "sun/awt/image/ByteComponentRaster");
"sun/awt/image/ByteComponentRaster");
CHECK_NULL_RETURN(byteComponentRasterClass, -1); CHECK_NULL_RETURN(byteComponentRasterClass, -1);
jclass shortComponentRasterClass = (*env)->FindClass(env, shortComponentRasterClass = (*env)->FindClass(env,"sun/awt/image/ShortComponentRaster");
"sun/awt/image/ShortComponentRaster");
CHECK_NULL_RETURN(shortComponentRasterClass, -1); CHECK_NULL_RETURN(shortComponentRasterClass, -1);
jclass bytePackedRasterClass = (*env)->FindClass(env, bytePackedRasterClass = (*env)->FindClass(env, "sun/awt/image/BytePackedRaster");
"sun/awt/image/BytePackedRaster");
CHECK_NULL_RETURN(bytePackedRasterClass, -1); CHECK_NULL_RETURN(bytePackedRasterClass, -1);
if ((*env)->IsInstanceOf(env, jraster, integerComponentRasterClass)){ if ((*env)->IsInstanceOf(env, jraster, integerComponentRasterClass)){
rasterP->jdata = (*env)->GetObjectField(env, jraster, g_ICRdataID); rasterP->jdata = (*env)->GetObjectField(env, jraster, g_ICRdataID);