jdk-sandbox: comparison jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c

equal deleted inserted replaced

-:3189b5e18f80
+:6b58fe58e767
 typedef struct streamBufferStruct {
 jobject stream;            // ImageInputStream or ImageOutputStream
 jbyteArray hstreamBuffer;  // Handle to a Java buffer for the stream
 JOCTET *buf;               // Pinned buffer pointer */
-int bufferOffset;          // holds offset between unpin and the next pin
+size_t bufferOffset;          // holds offset between unpin and the next pin
-int bufferLength;          // Allocated, nut just used
+size_t bufferLength;          // Allocated, nut just used
 int suspendable;           // Set to true to suspend input
 long remaining_skip;       // Used only on input
 } streamBuffer, *streamBufferPtr;
 /*
 /*
 * Used to signal that no data need be restored from an unpin to a pin.
 * I.e. the buffer is empty.
 */
-#define NO_DATA -1
+#define NO_DATA ((size_t)-1)
 // Forward reference
 static void resetStreamBuffer(JNIEnv *env, streamBufferPtr sb);
 /*
 * on success, NULL on failure.
 */
 static imageIODataPtr initImageioData (JNIEnv *env,
 j_common_ptr cinfo,
 jobject obj) {
-int i, j;
 imageIODataPtr data = (imageIODataPtr) malloc (sizeof(imageIOData));
 if (data == NULL) {
 return NULL;
 }
 struct jpeg_source_mgr *src = cinfo->src;
 imageIODataPtr data = (imageIODataPtr) cinfo->client_data;
 streamBufferPtr sb = &data->streamBuf;
 JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
 jint ret;
-int offset, buflen;
+size_t offset, buflen;
 /*
 * The original (jpegdecoder.c) had code here that called
 * InputStream.available and just returned if the number of bytes
 * available was less than any remaining skip.  Presumably this was
 "java/lang/OutOfMemoryError",
 "Initializing Reader");
 imageio_dispose((j_common_ptr)cinfo);
 return 0;
 }
-return (jlong) ret;
+return ptr_to_jlong(ret);
 }
 /*
 * When we set a source from Java, we set up the stream in the streamBuf
 * object.  If there was an old one, it is released first.
 (JNIEnv *env,
 jobject this,
 jlong ptr,
 jobject source) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_common_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 int ret;
 int h_samp0, h_samp1, h_samp2;
 int v_samp0, v_samp1, v_samp2;
 jboolean retval = JNI_FALSE;
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_decompress_ptr cinfo;
 struct jpeg_source_mgr *src;
 sun_jpeg_error_ptr jerr;
 jbyteArray profileData = NULL;
 (JNIEnv *env,
 jobject this,
 jlong ptr,
 jint code) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_decompress_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 struct jpeg_source_mgr *src;
 JSAMPROW scanLinePtr = NULL;
 jint bands[MAX_BANDS];
-int i, j;
+int i;
 jint *body;
 int scanlineLimit;
 int pixelStride;
 unsigned char *in, *out, *pixelLimit;
 int targetLine;
 int skipLines, linesLeft;
 pixelBufferPtr pb;
 sun_jpeg_error_ptr jerr;
 boolean done;
-jint *bandSize;
-int maxBandValue, halfMaxBandValue;
 boolean mustScale = FALSE;
 boolean progressive = FALSE;
 boolean orderedBands = TRUE;
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_decompress_ptr cinfo;
-unsigned int numBytes;
+size_t numBytes;
 /* verify the inputs */
 if (data == NULL) {
 JNU_ThrowByName(env,
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid argument to native readImage");
 return JNI_FALSE;
 }
-if (stepX > cinfo->image_width) {
+if (stepX > (jint)cinfo->image_width) {
 stepX = cinfo->image_width;
 }
-if (stepY > cinfo->image_height) {
+if (stepY > (jint)cinfo->image_height) {
 stepY = cinfo->image_height;
 }
 /*
 * First get the source bands array and copy it to our local array
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_abortRead
 (JNIEnv *env,
 jobject this,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 "Attempting to use reader after dispose()");
 JNIEXPORT void JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetLibraryState
 (JNIEnv *env,
 jobject this,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_decompress_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetReader
 (JNIEnv *env,
 jobject this,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_decompress_ptr cinfo;
 sun_jpeg_error_ptr jerr;
 if (data == NULL) {
 JNU_ThrowByName(env,
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_disposeReader
 (JNIEnv *env,
 jclass reader,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_common_ptr info = destroyImageioData(env, data);
 imageio_dispose(info);
 }
 imageIODataPtr data = (imageIODataPtr) cinfo->client_data;
 streamBufferPtr sb = &data->streamBuf;
 JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
 /* find out how much needs to be written */
-jint datacount = sb->bufferLength - dest->free_in_buffer;
+/* this conversion from size_t to jint is safe, because the lenght of the buffer is limited by jint */
+jint datacount = (jint)(sb->bufferLength - dest->free_in_buffer);
 if (datacount != 0) {
 RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
 (*env)->CallVoidMethod(env,
 sb->stream,
 "java/lang/OutOfMemoryError",
 "Initializing Writer");
 imageio_dispose((j_common_ptr)cinfo);
 return 0;
 }
-return (jlong) ret;
+return ptr_to_jlong(ret);
 }
 JNIEXPORT void JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_setDest
 (JNIEnv *env,
 jobject this,
 jlong ptr,
 jobject destination) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_compress_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 jobjectArray DCHuffmanTables,
 jobjectArray ACHuffmanTables) {
 struct jpeg_destination_mgr *dest;
 sun_jpeg_error_ptr jerr;
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_compress_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 jsize qlen, hlen;
 int *scanptr;
 jint *scanData;
 jint *bandSize;
 int maxBandValue, halfMaxBandValue;
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_compress_ptr cinfo;
 UINT8** scale = NULL;
 /* verify the inputs */
 if (data == NULL) {
 JNU_ThrowByName(env,
 char buffer[JMSG_LENGTH_MAX];
 (*cinfo->err->format_message) ((j_common_ptr) cinfo,
 buffer);
 JNU_ThrowByName(env, "javax/imageio/IIOException", buffer);
 }
+if (scale != NULL) {
+for (i = 0; i < numBands; i++) {
+if (scale[i] != NULL) {
+free(scale[i]);
+}
+}
+free(scale);
+}
 free(scanLinePtr);
 return data->abortFlag;
 }
 // set up parameters
 Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_abortWrite
 (JNIEnv *env,
 jobject this,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 "Attempting to use writer after dispose()");
 JNIEXPORT void JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_resetWriter
 (JNIEnv *env,
 jobject this,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_compress_ptr cinfo;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_disposeWriter
 (JNIEnv *env,
 jclass writer,
 jlong ptr) {
-imageIODataPtr data = (imageIODataPtr) ptr;
+imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr);
 j_common_ptr info = destroyImageioData(env, data);
 imageio_dispose(info);
 }

changeset 8355	6b58fe58e767
parent 7668	d4a77089c587
child 8358	39c22ace748d