/hg/icedtea6: Backport a number of JPEG fixes from 7u.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Aug 31 09:42:31 PDT 2013
changeset de0023a3d26d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=de0023a3d26d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Aug 31 17:42:12 2013 +0100
Backport a number of JPEG fixes from 7u.
S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
S6793818: JpegImageReader is too greedy creating color profiles
S6888215: memory leak in jpeg plugin
S6989760: cmm native compiler warnings
S6989774: imageio compiler warnings in native code
S7013519: [parfait] Integer overflows in 2D code
S7018912: [parfait] potential buffer overruns in imageio jpeg
S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated with new patches.
* patches/imageiojpeg_sync.patch:
Bring in changes to imageioJPEG.c made between
the start of OpenJDK 6 and the start of OpenJDK 7's
hg repositories.
* patches/libraries.patch: Updated against patches below.
* patches/openjdk/4893408-jpegreader_byte_gray.patch,
* patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
* patches/openjdk/6791502-invalid_icc_profile.patch,
* patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
* patches/openjdk/6888215-jpeg_memory_leak.patch,
* patches/openjdk/6989760-native_warnings.patch,
* patches/openjdk/6989774-imageio_compiler_warnings.patch,
* patches/openjdk/7013519-integer_overflows.patch,
* patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch,
* patches/openjdk/8005194-scale_memory_leak.patch,
* patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch:
New backports from OpenJDK 7u.
diffstat:
ChangeLog | 23 +
Makefile.am | 14 +-
NEWS | 11 +
patches/imageiojpeg_sync.patch | 217 ++
patches/libraries.patch | 178 +-
patches/openjdk/4893408-jpegreader_byte_gray.patch | 747 ++++++++++
patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch | 562 +++++++
patches/openjdk/6791502-invalid_icc_profile.patch | 269 +++
patches/openjdk/6793818-jpegimagereader_too_greedy.patch | 228 +++
patches/openjdk/6888215-jpeg_memory_leak.patch | 56 +
patches/openjdk/6989760-native_warnings.patch | 42 +
patches/openjdk/6989774-imageio_compiler_warnings.patch | 649 ++++++++
patches/openjdk/7013519-integer_overflows.patch | 17 +
patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch | 21 +
patches/openjdk/8005194-scale_memory_leak.patch | 25 +
patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch | 320 ++++
16 files changed, 3290 insertions(+), 89 deletions(-)
diffs (truncated from 3942 to 500 lines):
diff -r 7eeaaf0ac806 -r de0023a3d26d ChangeLog
--- a/ChangeLog Fri Aug 30 14:41:42 2013 +0100
+++ b/ChangeLog Sat Aug 31 17:42:12 2013 +0100
@@ -1,3 +1,26 @@
+2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated with new patches.
+ * patches/imageiojpeg_sync.patch:
+ Bring in changes to imageioJPEG.c made between
+ the start of OpenJDK 6 and the start of OpenJDK 7's
+ hg repositories.
+ * patches/libraries.patch: Updated against patches below.
+ * patches/openjdk/4893408-jpegreader_byte_gray.patch,
+ * patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
+ * patches/openjdk/6791502-invalid_icc_profile.patch,
+ * patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
+ * patches/openjdk/6888215-jpeg_memory_leak.patch,
+ * patches/openjdk/6989760-native_warnings.patch,
+ * patches/openjdk/6989774-imageio_compiler_warnings.patch,
+ * patches/openjdk/7013519-integer_overflows.patch,
+ * patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch,
+ * patches/openjdk/8005194-scale_memory_leak.patch,
+ * patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch:
+ New backports from OpenJDK 7u.
+
2013-08-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 7eeaaf0ac806 -r de0023a3d26d Makefile.am
--- a/Makefile.am Fri Aug 30 14:41:42 2013 +0100
+++ b/Makefile.am Sat Aug 31 17:42:12 2013 +0100
@@ -489,6 +489,16 @@
patches/openjdk/6693253-security_warning.patch \
patches/openjdk/6444769-windowwithwarningtest.patch \
patches/openjdk/6656651-windows_lcd_glyphs.patch \
+ patches/openjdk/6791502-invalid_icc_profile.patch \
+ patches/openjdk/6793818-jpegimagereader_too_greedy.patch \
+ patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \
+ patches/openjdk/4893408-jpegreader_byte_gray.patch \
+ patches/openjdk/6888215-jpeg_memory_leak.patch \
+ patches/openjdk/6989774-imageio_compiler_warnings.patch \
+ patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \
+ patches/openjdk/6989760-native_warnings.patch \
+ patches/openjdk/7013519-integer_overflows.patch \
+ patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch \
patches/notice-safepoints.patch \
patches/parisc-opt.patch \
patches/lucene-crash.patch \
@@ -740,7 +750,9 @@
patches/alternative_krb5_cache.patch \
patches/alternative_krb5_cache_fixup.patch \
patches/openjdk/8014469-tzdata2013c.patch \
- patches/openjdk/8020054-tzdata2013d.patch
+ patches/openjdk/8020054-tzdata2013d.patch \
+ patches/imageiojpeg_sync.patch \
+ patches/openjdk/8005194-scale_memory_leak.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 7eeaaf0ac806 -r de0023a3d26d NEWS
--- a/NEWS Fri Aug 30 14:41:42 2013 +0100
+++ b/NEWS Sat Aug 31 17:42:12 2013 +0100
@@ -21,6 +21,17 @@
- S8009641: OpenJDK 6 build broken via 8007675 fix
- OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
- S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)
+ - S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
+ - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
+ - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
+ - S6793818: JpegImageReader is too greedy creating color profiles
+ - S6888215: memory leak in jpeg plugin
+ - S6989760: cmm native compiler warnings
+ - S6989774: imageio compiler warnings in native code
+ - S7013519: [parfait] Integer overflows in 2D code
+ - S7018912: [parfait] potential buffer overruns in imageio jpeg
+ - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
+ - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
* Bug fixes
- PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
- PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
diff -r 7eeaaf0ac806 -r de0023a3d26d patches/imageiojpeg_sync.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/imageiojpeg_sync.patch Sat Aug 31 17:42:12 2013 +0100
@@ -0,0 +1,217 @@
+diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:50:38.238272213 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:57:43.240892673 +0100
+@@ -447,9 +447,6 @@
+ pixelBuffer pixelBuf; // Buffer for pixels
+
+ jboolean abortFlag; // Passed down from Java abort method
+-
+- UINT8 scale[MAX_BANDS][NUM_INPUT_VALUES];
+- int bandSizes[MAX_BANDS]; // For scaling to-from non-8-bit images
+ } imageIOData, *imageIODataPtr;
+
+ /*
+@@ -487,12 +484,6 @@
+
+ data->abortFlag = JNI_FALSE;
+
+- for (i = 0; i < MAX_BANDS; i ++) {
+- data->bandSizes[i] = 0;
+- for (j = 0; j < NUM_INPUT_VALUES; j++) {
+- data->scale[i][j] = 0;
+- }
+- }
+ return data;
+ }
+
+@@ -1978,34 +1969,6 @@
+
+ (*env)->ReleaseIntArrayElements(env, srcBands, body, JNI_ABORT);
+
+- bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
+-
+- for (i = 0; i < numBands; i++) {
+- if (bandSize[i] != JPEG_BAND_SIZE) {
+- mustScale = TRUE;
+- break;
+- }
+- }
+-
+- if (mustScale) {
+- // Build any scale tables that aren't already OK
+- for (i = 0; i < numBands; i++) {
+- if (data->bandSizes[i] != bandSize[i]) {
+- data->bandSizes[i] = bandSize[i];
+- maxBandValue = (1 << bandSize[i]) - 1;
+- halfMaxBandValue = maxBandValue >> 1;
+- for (j = 0; j <= maxBandValue; j++) {
+- data->scale[i][j] =
+- (UINT8)((j*MAX_JPEG_BAND_VALUE
+- + halfMaxBandValue)/maxBandValue);
+- }
+- }
+- }
+- }
+-
+- (*env)->ReleaseIntArrayElements(env, bandSizes,
+- bandSize, JNI_ABORT);
+-
+ #ifdef DEBUG_IIO_JPEG
+ printf("---- in reader.read ----\n");
+ printf("numBands is %d\n", numBands);
+@@ -2028,15 +1991,6 @@
+ return data->abortFlag; // We already threw an out of memory exception
+ }
+
+- // Allocate a 1-scanline buffer
+- if (cinfo->num_components <= 0 ||
+- cinfo->image_width > (UINT_MAX / (unsigned int)cinfo->num_components))
+- {
+- RELEASE_ARRAYS(env, data, src->next_input_byte);
+- JNU_ThrowByName(env, "javax/imageio/IIOException",
+- "Invalid number of color components");
+- return data->abortFlag;
+- }
+ /* Establish the setjmp return context for sun_jpeg_error_exit to use. */
+ jerr = (sun_jpeg_error_ptr) cinfo->err;
+
+@@ -2154,15 +2108,8 @@
+
+ // Now mangle it into our buffer
+ out = data->pixelBuf.buf.bp;
+- if (mustScale) {
+- for (in = scanLinePtr+sourceXStart*cinfo->num_components;
+- in < pixelLimit;
+- in += pixelStride) {
+- for (i = 0; i < numBands; i++) {
+- *out++ = data->scale[i][*(in+bands[i])];
+- }
+- }
+- } else if (orderedBands && (pixelStride == numBands)) {
++
++ if (orderedBands && (pixelStride == numBands)) {
+ // Optimization: The component bands are ordered sequentially,
+ // so we can simply use memcpy() to copy the intermediate
+ // scanline buffer into the raster.
+@@ -2177,7 +2124,7 @@
+ } else {
+ numBytes = numBands;
+ for (in = scanLinePtr+sourceXStart*cinfo->output_components;
+- in < pixelLimit &&
++ in < pixelLimit &&
+ numBytes <= data->pixelBuf.byteBufferLength;
+ in += pixelStride) {
+ for (i = 0; i < numBands; i++) {
+@@ -2914,9 +2861,10 @@
+ jint *scanData;
+ jint *bandSize;
+ int maxBandValue, halfMaxBandValue;
+- boolean mustScale = FALSE;
+ imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
+ j_compress_ptr cinfo;
++ UINT8** scale = NULL;
++
+
+ /* verify the inputs */
+
+@@ -2963,24 +2911,32 @@
+
+ for (i = 0; i < numBands; i++) {
+ if (bandSize[i] != JPEG_BAND_SIZE) {
+- mustScale = TRUE;
+- break;
+- }
+- }
++ if (scale == NULL) {
++ scale = (UINT8**) calloc(numBands, sizeof(UINT8*));
+
+- if (mustScale) {
+- // Build any scale tables that aren't already OK
+- for (i = 0; i < numBands; i++) {
+- if (data->bandSizes[i] != bandSize[i]) {
+- data->bandSizes[i] = bandSize[i];
+- maxBandValue = (1 << bandSize[i]) - 1;
+- halfMaxBandValue = maxBandValue >> 1;
+- for (j = 0; j <= maxBandValue; j++) {
+- data->scale[i][j] =
+- (UINT8)((j*MAX_JPEG_BAND_VALUE
+- + halfMaxBandValue)/maxBandValue);
++ if (scale == NULL) {
++ JNU_ThrowByName( env, "java/lang/OutOfMemoryError",
++ "Writing JPEG Stream");
++ return JNI_FALSE;
+ }
+ }
++
++ maxBandValue = (1 << bandSize[i]) - 1;
++
++ scale[i] = (UINT8*) malloc((maxBandValue + 1) * sizeof(UINT8));
++
++ if (scale[i] == NULL) {
++ JNU_ThrowByName( env, "java/lang/OutOfMemoryError",
++ "Writing JPEG Stream");
++ return JNI_FALSE;
++ }
++
++ halfMaxBandValue = maxBandValue >> 1;
++
++ for (j = 0; j <= maxBandValue; j++) {
++ scale[i][j] = (UINT8)
++ ((j*MAX_JPEG_BAND_VALUE + halfMaxBandValue)/maxBandValue);
++ }
+ }
+ }
+
+@@ -3189,28 +3145,25 @@
+ out = scanLinePtr;
+ pixelLimit = in + ((pixelBufferSize > data->pixelBuf.byteBufferLength) ?
+ data->pixelBuf.byteBufferLength : pixelBufferSize);
+- if (mustScale) {
+- for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) {
+- for (i = 0; i < numBands; i++) {
+- *out++ = data->scale[i][*(in+i)];
++ for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) {
++ for (i = 0; i < numBands; i++) {
++ if (scale !=NULL && scale[i] != NULL) {
++ *out++ = scale[i][*(in+i)];
+ #ifdef DEBUG_IIO_JPEG
+ if (in == data->pixelBuf.buf.bp){ // Just the first pixel
+ printf("in %d -> out %d, ", *(in+i), *(out-i-1));
+ }
+ #endif
+- }
++
+ #ifdef DEBUG_IIO_JPEG
+ if (in == data->pixelBuf.buf.bp){ // Just the first pixel
+ printf("\n");
+ }
+ #endif
+- }
+- } else {
+- for (; (in < pixelLimit) && (out < scanLineLimit); in += pixelStride) {
+- for (i = 0; i < numBands; i++) {
++ } else {
+ *out++ = *(in+i);
+ }
+- }
++ }
+ }
+ // write it out
+ jpegwritescanlines(cinfo, (JSAMPARRAY)&scanLinePtr, 1);
+@@ -3226,6 +3179,16 @@
+ } else {
+ jpegabort((j_common_ptr)cinfo);
+ }
++
++ if (scale != NULL) {
++ for (i = 0; i < numBands; i++) {
++ if (scale[i] != NULL) {
++ free(scale[i]);
++ }
++ }
++ free(scale);
++ }
++
+ free(scanLinePtr);
+ RELEASE_ARRAYS(env, data, NULL);
+ return data->abortFlag;
diff -r 7eeaaf0ac806 -r de0023a3d26d patches/libraries.patch
--- a/patches/libraries.patch Fri Aug 30 14:41:42 2013 +0100
+++ b/patches/libraries.patch Sat Aug 31 17:42:12 2013 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-07-22 19:51:20.762208023 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-08-30 16:53:14.788401039 +0100
@@ -64,23 +64,21 @@
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
@@ -55,7 +55,7 @@
endif #PLATFORM
diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
--- openjdk.orig/jdk/make/common/Program.gmk 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/common/Program.gmk 2013-08-30 16:53:14.788401039 +0100
@@ -85,7 +85,7 @@
endif
endif
@@ -75,7 +75,7 @@
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
--- openjdk.orig/jdk/make/java/jli/Makefile 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/java/jli/Makefile 2013-08-30 16:53:14.788401039 +0100
@@ -44,8 +44,6 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -127,7 +127,7 @@
diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
@@ -30,15 +30,4 @@
Inflater.c \
ZipFile.c \
@@ -146,7 +146,7 @@
zip_util.c
diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
--- openjdk.orig/jdk/make/java/zip/Makefile 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/java/zip/Makefile 2013-08-30 16:53:14.788401039 +0100
@@ -30,8 +30,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -176,7 +176,7 @@
+OTHER_LDLIBS = $(JVMLIB) -lz
diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
@@ -25,51 +25,7 @@
FILES_c = \
@@ -231,9 +231,9 @@
ifndef OPENJDK
FILES_c += \
diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-07-22 19:51:20.774208212 +0100
-@@ -68,6 +68,8 @@
+--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2013-08-30 16:44:07.551631313 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-08-30 16:53:14.788401039 +0100
+@@ -81,6 +81,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -244,7 +244,7 @@
#
diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2012-10-26 19:25:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
@@ -30,81 +30,5 @@
splashscreen_impl.c \
splashscreen_jpeg.c \
@@ -330,7 +330,7 @@
diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2012-10-26 19:25:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-08-30 16:53:14.788401039 +0100
@@ -59,12 +59,12 @@
# C Flags
#
@@ -362,8 +362,8 @@
ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 64)
diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:49:54.900852754 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:51:20.774208212 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:43:56.687449694 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:53:14.788401039 +0100
@@ -89,11 +89,7 @@
// bytes and byte arrays
@@ -378,7 +378,7 @@
typedef DWORDLONG julong;
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c
--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-08-30 16:53:14.788401039 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -390,7 +390,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c
--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-08-30 16:53:14.788401039 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -402,7 +402,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c
--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-08-30 16:53:14.788401039 +0100
@@ -32,7 +32,7 @@
#include "jlong.h"
#include "jni.h"
@@ -414,7 +414,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c
--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-07-22 19:51:20.774208212 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-08-30 16:53:14.788401039 +0100
@@ -35,7 +35,7 @@
#include "jni.h"
#include "jvm.h"
@@ -425,8 +425,8 @@
#define ThrowDataFormatException(env, msg) \
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:49:56.968885397 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:51:20.778208275 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:44:05.355594646 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:53:14.788401039 +0100
@@ -44,7 +44,8 @@
#include "io_util.h"
#include "io_util_md.h"
@@ -438,8 +438,8 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:49:56.160872642 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:51:20.778208275 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:44:07.599632116 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:55:38.374649561 +0100
@@ -52,7 +52,9 @@
/* headers from the JPEG library */
@@ -514,7 +514,7 @@
/*
* Defined in jpegdecoder.c. Copy code from there if and
* when that disappears. */
-@@ -619,7 +677,7 @@
+@@ -627,7 +685,7 @@
return;
}
@@ -523,7 +523,7 @@
}
-@@ -644,7 +702,7 @@
+@@ -652,7 +710,7 @@
return;
}
@@ -532,7 +532,7 @@
}
-@@ -662,7 +720,7 @@
+@@ -670,7 +728,7 @@
free(cinfo->dest);
cinfo->dest = NULL;
}
@@ -541,7 +541,7 @@
free(info);
}
}
-@@ -702,14 +760,14 @@
+@@ -710,14 +768,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->quant_tbl_ptrs[i] == NULL) {
decomp->quant_tbl_ptrs[i] =
@@ -558,7 +558,7 @@
}
quant_ptr = comp->quant_tbl_ptrs[i];
}
-@@ -800,14 +858,14 @@
More information about the distro-pkg-dev
mailing list