changeset in /hg/icedtea: 2008-02-26 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Tue Feb 26 06:07:39 PST 2008
changeset 4b9361cb5ec8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b9361cb5ec8
description:
2008-02-26 Lillian Angel <langel at redhat.com>
* patches/icedtea-libraries.patch: Fixed dlopen calls. No longer
hardcoding paths to libjpeg.so.62.
diffstat:
2 files changed, 469 insertions(+), 295 deletions(-)
ChangeLog | 5
patches/icedtea-libraries.patch | 759 +++++++++++++++++++++++----------------
diffs (truncated from 1016 to 500 lines):
diff -r 705c0535c8a1 -r 4b9361cb5ec8 ChangeLog
--- a/ChangeLog Sat Feb 23 19:52:19 2008 -0500
+++ b/ChangeLog Tue Feb 26 08:57:55 2008 -0500
@@ -1,3 +1,8 @@ 2008-02-23 Thomas Fitzsimmons <fitzsim
+2008-02-26 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-libraries.patch: Fixed dlopen calls. No longer
+ hardcoding paths to libjpeg.so.62.
+
2008-02-23 Thomas Fitzsimmons <fitzsim at redhat.com>
* IcedTeaPlugin.cc: New file.
diff -r 705c0535c8a1 -r 4b9361cb5ec8 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Sat Feb 23 19:52:19 2008 -0500
+++ b/patches/icedtea-libraries.patch Tue Feb 26 08:57:55 2008 -0500
@@ -24741,265 +24741,8 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
endif
endif #LINUX
endif #PLATFORM
---- origopenjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2008-01-04 18:21:02.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2008-01-13 23:54:15.000000000 -0500
-@@ -45,7 +45,9 @@
- #undef boolean
- #undef FAR
- #include <jpeglib.h>
--#include "jerror.h"
-+#include <jerror.h>
-+#include <dlfcn.h>
-+
-
- /* The method IDs we cache. Note that the last two belongs to the
- * java.io.InputStream class.
-@@ -56,6 +58,32 @@
- static jmethodID InputStream_readID;
- static jmethodID InputStream_availableID;
-
-+typedef struct jpeg_error_mgr * (*fn_jpegstderror)(struct jpeg_error_mgr *);
-+typedef void (*fn_jpegcreatedecompress)(j_decompress_ptr, int, size_t);
-+typedef boolean (*fn_jpegresynctorestart)(j_decompress_ptr, int);
-+typedef JDIMENSION (*fn_jpegreadscanlines)(j_decompress_ptr, JSAMPARRAY, JDIMENSION);
-+typedef boolean (*fn_jpegfinishoutput)(j_decompress_ptr);
-+typedef int (*fn_jpegreadheader)(j_decompress_ptr, boolean);
-+typedef boolean (*fn_jpegstartdecompress)(j_decompress_ptr);
-+typedef boolean (*fn_jpeghasmultiplescans)(j_decompress_ptr);
-+typedef void (*fn_jpegdestroydecompress)(j_decompress_ptr);
-+typedef int (*fn_jpegconsumeinput)(j_decompress_ptr);
-+typedef boolean (*fn_jpegfinishdecompress)(j_decompress_ptr);
-+typedef boolean (*fn_jpegstartoutput)(j_decompress_ptr, int);
-+
-+fn_jpegstderror jpegstderror;
-+fn_jpegstartoutput jpegstartoutput;
-+fn_jpegfinishdecompress jpegfinishdecompress;
-+fn_jpegconsumeinput jpegconsumeinput;
-+fn_jpegdestroydecompress jpegdestroydecompress;
-+fn_jpeghasmultiplescans jpeghasmultiplescans;
-+fn_jpegstartdecompress jpegstartdecompress;
-+fn_jpegreadheader jpegreadheader;
-+fn_jpegfinishoutput jpegfinishoutput;
-+fn_jpegreadscanlines jpegreadscanlines;
-+fn_jpegresynctorestart jpegresynctorestart;
-+fn_jpegcreatedecompress jpegcreatedecompress;
-+
- /* Initialize the Java VM instance variable when the library is
- first loaded */
- JavaVM *jvm;
-@@ -462,6 +490,70 @@
- Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
- jclass InputStreamClass)
- {
-+ void *handle = dlopen("/usr/lib/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-+ if (handle == NULL)
-+ handle = dlopen("/usr/lib64/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-+
-+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
-+ if (jpegstderror == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegdestroydecompress = (fn_jpegdestroydecompress)dlsym(handle, "jpeg_destroy_decompress");
-+ if (jpegdestroydecompress == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegcreatedecompress = (fn_jpegcreatedecompress)dlsym(handle, "jpeg_CreateDecompress");
-+ if (jpegcreatedecompress == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegreadheader = (fn_jpegreadheader)dlsym(handle, "jpeg_read_header");
-+ if (jpegreadheader == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpeghasmultiplescans = (fn_jpeghasmultiplescans)dlsym(handle, "jpeg_has_multiple_scans");
-+ if (jpeghasmultiplescans == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegstartdecompress = (fn_jpegstartdecompress)dlsym(handle, "jpeg_start_decompress");
-+ if (jpegstartdecompress == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegconsumeinput = (fn_jpegconsumeinput)dlsym(handle, "jpeg_consume_input");
-+ if (jpegconsumeinput == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegstartoutput = (fn_jpegstartoutput)dlsym(handle, "jpeg_start_output");
-+ if (jpegstartoutput == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegfinishdecompress = (fn_jpegfinishdecompress)dlsym(handle, "jpeg_finish_decompress");
-+ if (jpegfinishdecompress == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegreadscanlines = (fn_jpegreadscanlines)dlsym(handle, "jpeg_read_scanlines");
-+ if (jpegreadscanlines == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegfinishoutput = (fn_jpegfinishoutput)dlsym(handle, "jpeg_finish_output");
-+ if (jpegfinishoutput == NULL) {
-+ dlclose(handle);
-+ }
-+
-+ jpegresynctorestart = (fn_jpegresynctorestart)dlsym(handle, "jpeg_resync_to_restart");
-+ if (jpegresynctorestart == NULL) {
-+ dlclose(handle);
-+ }
-+
- sendHeaderInfoID = (*env)->GetMethodID(env, cls, "sendHeaderInfo",
- "(IIZZZ)Z");
- sendPixelsByteID = (*env)->GetMethodID(env, cls, "sendPixels", "([BI)Z");
-@@ -519,7 +611,7 @@
- /* Step 1: allocate and initialize JPEG decompression object */
-
- /* We set up the normal JPEG error routines, then override error_exit. */
-- cinfo.err = jpeg_std_error(&jerr.pub);
-+ cinfo.err = jpegstderror(&jerr.pub);
- jerr.pub.error_exit = sun_jpeg_error_exit;
-
- /* We need to setup our own print routines */
-@@ -530,7 +622,7 @@
- /* If we get here, the JPEG code has signaled an error.
- * We need to clean up the JPEG object, close the input file, and return.
- */
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
- RELEASE_ARRAYS(env, &jsrc);
- if (!(*env)->ExceptionOccurred(env)) {
- char buffer[JMSG_LENGTH_MAX];
-@@ -541,7 +633,7 @@
- return;
- }
- /* Now we can initialize the JPEG decompression object. */
-- jpeg_create_decompress(&cinfo);
-+ jpegcreatedecompress(&cinfo, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct));
-
- /* Step 2: specify data source (eg, a file) */
-
-@@ -555,17 +647,17 @@
- jsrc.pub.init_source = sun_jpeg_init_source;
- jsrc.pub.fill_input_buffer = sun_jpeg_fill_input_buffer;
- jsrc.pub.skip_input_data = sun_jpeg_skip_input_data;
-- jsrc.pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-+ jsrc.pub.resync_to_restart = jpegresynctorestart; /* use default method */
- jsrc.pub.term_source = sun_jpeg_term_source;
- if (!GET_ARRAYS(env, &jsrc)) {
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
- return;
- }
- /* Step 3: read file parameters with jpeg_read_header() */
-
-- (void) jpeg_read_header(&cinfo, TRUE);
-+ (void) jpegreadheader(&cinfo, TRUE);
- /* select buffered-image mode if it is a progressive JPEG only */
-- buffered_mode = cinfo.buffered_image = jpeg_has_multiple_scans(&cinfo);
-+ buffered_mode = cinfo.buffered_image = jpeghasmultiplescans(&cinfo);
- grayscale = (cinfo.out_color_space == JCS_GRAYSCALE);
- #ifdef YCCALPHA
- hasalpha = (cinfo.out_color_space == JCS_RGBA);
-@@ -584,7 +676,7 @@
- grayscale, hasalpha, buffered_mode);
- if ((*env)->ExceptionOccurred(env) || !ret) {
- /* No more interest in this image... */
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
- return;
- }
- /* Make a one-row-high sample array with enough room to expand to ints */
-@@ -595,7 +687,7 @@
- }
-
- if (jsrc.hOutputBuffer == 0 || !GET_ARRAYS(env, &jsrc)) {
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
- return;
- }
-
-@@ -613,7 +705,7 @@
-
- /* Step 5: Start decompressor */
-
-- jpeg_start_decompress(&cinfo);
-+ jpegstartdecompress(&cinfo);
-
- /* We may need to do some setup of our own at this point before reading
- * the data. After jpeg_start_decompress() we have the correct scaled
-@@ -638,28 +730,28 @@
- do {
- sun_jpeg_fill_suspended_buffer(&cinfo);
- jsrc.suspendable = TRUE;
-- ret = jpeg_consume_input(&cinfo);
-+ ret = jpegconsumeinput(&cinfo);
- jsrc.suspendable = FALSE;
- } while (ret != JPEG_SUSPENDED && ret != JPEG_REACHED_EOI);
- if (ret == JPEG_REACHED_EOI) {
- final_pass = TRUE;
- cinfo.dct_method = JDCT_ISLOW;
- }
-- jpeg_start_output(&cinfo, cinfo.input_scan_number);
-+ jpegstartoutput(&cinfo, cinfo.input_scan_number);
- }
- while (cinfo.output_scanline < cinfo.output_height) {
- if (! final_pass) {
- do {
- sun_jpeg_fill_suspended_buffer(&cinfo);
- jsrc.suspendable = TRUE;
-- ret = jpeg_consume_input(&cinfo);
-+ ret = jpegconsumeinput(&cinfo);
- jsrc.suspendable = FALSE;
- } while (ret != JPEG_SUSPENDED && ret != JPEG_REACHED_EOI);
- if (ret == JPEG_REACHED_EOI) {
- break;
- }
- }
-- (void) jpeg_read_scanlines(&cinfo, (JSAMPARRAY) &(jsrc.outbuf), 1);
-+ (void) jpegreadscanlines(&cinfo, (JSAMPARRAY) &(jsrc.outbuf), 1);
-
- if (grayscale) {
- RELEASE_ARRAYS(env, &jsrc);
-@@ -695,18 +787,18 @@
- if ((*env)->ExceptionOccurred(env) || !ret ||
- !GET_ARRAYS(env, &jsrc)) {
- /* No more interest in this image... */
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
- return;
- }
- }
- if (buffered_mode) {
-- jpeg_finish_output(&cinfo);
-+ jpegfinishoutput(&cinfo);
- }
- } while (! final_pass);
-
- /* Step 7: Finish decompression */
-
-- (void) jpeg_finish_decompress(&cinfo);
-+ (void) jpegfinishdecompress(&cinfo);
- /* We can ignore the return value since suspension is not possible
- * with the stdio data source.
- * (nor with the Java data source)
-@@ -715,7 +807,7 @@
- /* Step 8: Release JPEG decompression object */
-
- /* This is an important step since it will release a good deal of memory. */
-- jpeg_destroy_decompress(&cinfo);
-+ jpegdestroydecompress(&cinfo);
-
- /* After finish_decompress, we can close the input file.
- * Here we postpone it until after no more JPEG errors are possible,
---- origopenjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-01-04 18:21:02.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-01-13 23:53:42.000000000 -0500
+--- openjdkold/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-02-12 04:08:13.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-02-26 08:52:21.000000000 -0500
@@ -51,7 +51,9 @@
/* headers from the JPEG library */
@@ -25074,7 +24817,30 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
/*
* Defined in jpegdecoder.c. Copy code from there if and
* when that disappears. */
-@@ -606,7 +664,7 @@
+@@ -376,9 +434,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;
+
+ /*
+@@ -417,12 +472,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;
+ }
+
+@@ -615,7 +664,7 @@
return;
}
@@ -25083,7 +24849,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
-@@ -631,7 +689,7 @@
+@@ -640,7 +689,7 @@
return;
}
@@ -25092,7 +24858,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
-@@ -649,7 +707,7 @@
+@@ -658,7 +707,7 @@
free(cinfo->dest);
cinfo->dest = NULL;
}
@@ -25101,7 +24867,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
free(info);
}
}
-@@ -685,14 +743,14 @@
+@@ -694,14 +743,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->quant_tbl_ptrs[i] == NULL) {
decomp->quant_tbl_ptrs[i] =
@@ -25118,7 +24884,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
quant_ptr = comp->quant_tbl_ptrs[i];
}
-@@ -768,14 +826,14 @@
+@@ -777,14 +826,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->dc_huff_tbl_ptrs[i] == NULL) {
decomp->dc_huff_tbl_ptrs[i] =
@@ -25135,7 +24901,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
huff_ptr = comp->dc_huff_tbl_ptrs[i];
}
-@@ -789,14 +847,14 @@
+@@ -798,14 +847,14 @@
decomp = (j_decompress_ptr) cinfo;
if (decomp->ac_huff_tbl_ptrs[i] == NULL) {
decomp->ac_huff_tbl_ptrs[i] =
@@ -25152,7 +24918,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
huff_ptr = comp->ac_huff_tbl_ptrs[i];
}
-@@ -1337,6 +1395,8 @@
+@@ -1346,6 +1395,8 @@
jclass ImageInputStreamClass,
jclass qTableClass,
jclass huffClass) {
@@ -25161,7 +24927,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
ImageInputStream_readID = (*env)->GetMethodID(env,
ImageInputStreamClass,
-@@ -1422,7 +1482,7 @@
+@@ -1431,7 +1482,7 @@
}
/* We set up the normal JPEG error routines, then override error_exit. */
@@ -25170,7 +24936,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
jerr->pub.error_exit = sun_jpeg_error_exit;
/* We need to setup our own print routines */
jerr->pub.output_message = sun_jpeg_output_message;
-@@ -1439,11 +1499,11 @@
+@@ -1448,11 +1499,11 @@
}
/* Perform library initialization */
@@ -25184,7 +24950,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
/*
* Now set up our source.
-@@ -1461,7 +1521,7 @@
+@@ -1470,7 +1521,7 @@
cinfo->src->init_source = imageio_init_source;
cinfo->src->fill_input_buffer = imageio_fill_input_buffer;
cinfo->src->skip_input_data = imageio_skip_input_data;
@@ -25193,7 +24959,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
cinfo->src->term_source = imageio_term_source;
/* set up the association to persist for future calls */
-@@ -1579,7 +1639,7 @@
+@@ -1588,7 +1639,7 @@
src->bytes_in_buffer = 0;
}
@@ -25202,7 +24968,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
if (ret == JPEG_HEADER_TABLES_ONLY) {
retval = JNI_TRUE;
-@@ -1700,7 +1760,7 @@
+@@ -1709,7 +1760,7 @@
cinfo->num_components,
read_icc_profile(env, cinfo));
if (reset) {
@@ -25211,7 +24977,42 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
}
-@@ -1896,7 +1956,7 @@
+@@ -1836,34 +1887,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
+ printf("---- in reader.read ----\n");
+ printf("numBands is %d\n", numBands);
+@@ -1933,7 +1956,7 @@
TRUE);
}
@@ -25220,7 +25021,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
if (progressive) {
cinfo->buffered_image = TRUE;
cinfo->input_scan_number = minProgressivePass+1; // Java count from 0
-@@ -1908,7 +1968,7 @@
+@@ -1945,7 +1968,7 @@
data->streamBuf.suspendable = FALSE;
@@ -25229,7 +25030,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
// loop over progressive passes
done = FALSE;
-@@ -1916,7 +1976,7 @@
+@@ -1953,7 +1976,7 @@
if (progressive) {
// initialize the next pass. Note that this skips up to
// the first interesting pass.
@@ -25238,7 +25039,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
if (wantUpdates) {
(*env)->CallVoidMethod(env, this,
JPEGImageReader_passStartedID,
-@@ -1932,7 +1992,7 @@
+@@ -1969,7 +1992,7 @@
// Skip until the first interesting line
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -25247,7 +25048,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
}
scanlineLimit = sourceYStart+sourceHeight;
-@@ -1945,7 +2005,7 @@
+@@ -1982,19 +2005,12 @@
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < scanlineLimit)) {
@@ -25256,7 +25057,21 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
// Now mangle it into our buffer
out = data->pixelBuf.buf.bp;
-@@ -1993,13 +2053,13 @@
+- if (mustScale) {
More information about the distro-pkg-dev
mailing list