Mercurial > hg > openjdk > jdk8u > jdk
changeset 11350:ff73e114d682 jdk8u72-b09
Merge
author | asaha |
---|---|
date | Mon, 16 Nov 2015 12:23:03 -0800 |
parents | ec19d8db2f0a (current diff) e494e93d48f9 (diff) |
children | 38d14566c465 |
files | .hgtags |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Nov 09 13:54:50 2015 -0800 +++ b/.hgtags Mon Nov 16 12:23:03 2015 -0800 @@ -505,6 +505,7 @@ be9d91d310a02c2974d2bdabc31d8a6df8ad596e jdk8u71-b06 f556d4c82ef13430e2708053caa9e11a74b2aebf jdk8u71-b07 a81edad7e1e16c2b3cf2e60a8a98e232ebcaf3b1 jdk8u71-b08 +eac13ca04cc5c9adb4f14a76856376db0187f7dc jdk8u71-b09 be5faa9c77042f202106c18f4e8ea211137b4a3b jdk8u72-b00 5ad1e9e8e8417f80c91d7e0f1f44cdf89b34ead3 jdk8u72-b01 ab0c1040414d038ccbcfcc8ceb1ccf2f44ead8e4 jdk8u72-b02
--- a/src/share/native/sun/awt/image/jpeg/jpegdecoder.c Mon Nov 09 13:54:50 2015 -0800 +++ b/src/share/native/sun/awt/image/jpeg/jpegdecoder.c Mon Nov 16 12:23:03 2015 -0800 @@ -234,9 +234,9 @@ } if (src->hOutputBuffer) { assert(src->outbuf.ip == 0); + src->outbufSize = (*env)->GetArrayLength(env, src->hOutputBuffer); src->outbuf.ip = (int *)(*env)->GetPrimitiveArrayCritical (env, src->hOutputBuffer, 0); - src->outbufSize = (*env)->GetArrayLength(env, src->hOutputBuffer); if (src->outbuf.ip == 0) { RELEASE_ARRAYS(env, src); return 0;