From e30818ce39fecd0f9e800b77652f570d7dbbea40 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Wed, 10 Oct 2012 13:26:29 +0000 Subject: [PATCH] [trunk] Fix advanced (and experimental) Java binding. As reported on the mailing list. --- wrapping/java/openjp2/CMakeLists.txt | 3 +- wrapping/java/openjp2/JavaOpenJPEG.c | 70 ++++++++++----------- wrapping/java/openjp2/JavaOpenJPEGDecoder.c | 48 +++++++------- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt index c0566eab..8f53cb76 100644 --- a/wrapping/java/openjp2/CMakeLists.txt +++ b/wrapping/java/openjp2/CMakeLists.txt @@ -13,7 +13,8 @@ include_directories(${JNI_INCLUDE_DIRS}) # required header file: include_directories( ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h - ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 + #${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2 ${OPENJPEG_SOURCE_DIR}/src/bin/common ${OPENJPEG_SOURCE_DIR}/src/bin/jp2 ) diff --git a/wrapping/java/openjp2/JavaOpenJPEG.c b/wrapping/java/openjp2/JavaOpenJPEG.c index 3f8e2ee7..9f306b58 100644 --- a/wrapping/java/openjp2/JavaOpenJPEG.c +++ b/wrapping/java/openjp2/JavaOpenJPEG.c @@ -57,7 +57,7 @@ extern int get_file_format(char *filename); extern void error_callback(const char *msg, void *client_data); -extern warning_callback(const char *msg, void *client_data); +extern void warning_callback(const char *msg, void *client_data); extern void info_callback(const char *msg, void *client_data); typedef struct callback_variables { @@ -350,9 +350,9 @@ OPJ_PROG_ORDER give_progression(char progression[4]) { } -/// -/// Get logarithm of an integer and round downwards. -/// +/** + Get logarithm of an integer and round downwards. + */ int int_floorlog2(int a) { int l; for (l=0; a>1; l++) { @@ -1352,7 +1352,7 @@ char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer } } - // Compute the size of the index buffer, in number of bytes*/ + /* Compute the size of the index buffer, in number of bytes*/ *buffer_size = 1 /* version */ + (10 /* image_w until decomposition */ @@ -1361,18 +1361,18 @@ char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer + cstr_info->tw * cstr_info->th * 4 /* tile info, without distorsion info */ + cstr_info->tw*cstr_info->th * cstr_info->numlayers * (cstr_info->numdecompos[0] + 1) * cstr_info->numcomps * prec_max *8 ) * sizeof(int); - //printf("C: index buffer size = %d bytes\n", *buffer_size); + /*printf("C: index buffer size = %d bytes\n", *buffer_size);*/ buffer = (char*) malloc(*buffer_size); if (!buffer) { - //opj_event_msg(j2k->cinfo, EVT_ERROR, "failed to allocate index buffer for writing %d int\n", *buffer_size); + /*opj_event_msg(j2k->cinfo, EVT_ERROR, "failed to allocate index buffer for writing %d int\n", *buffer_size);*/ fprintf(stderr, "failed to allocate index buffer for writing %d int\n", *buffer_size); return 0; } - buffer[0] = 1; // Version stored on a byte + buffer[0] = 1; /* Version stored on a byte*/ buffer++; - // Remaining informations are stored on a int. + /* Remaining informations are stored on a int.*/ ((int*)buffer)[buffer_pos++] = cstr_info->image_w; ((int*)buffer)[buffer_pos++] = cstr_info->image_h; ((int*)buffer)[buffer_pos++] = cstr_info->prog; @@ -1597,7 +1597,7 @@ char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer } /* tileno */ if (buffer_pos > *buffer_size) { - //opj_event_msg(j2k->cinfo, EVT_ERROR, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size); + /*opj_event_msg(j2k->cinfo, EVT_ERROR, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size);*/ fprintf(stderr, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size); return 0; } @@ -1630,7 +1630,7 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, jint *jiBody; jboolean isCopy; - // Image width, height and depth + /* Image width, height and depth*/ fid = (*env)->GetFieldID(env, cls,"width", "I"); ji = (*env)->GetIntField(env, obj, fid); w = ji; @@ -1643,7 +1643,7 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, ji = (*env)->GetIntField(env, obj, fid); depth = ji; - // Read the image + /* Read the image*/ if (depth <=16) { numcomps = 1; color_space = CLRSPC_GRAY; @@ -1658,8 +1658,8 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, cmptparm[0].y0 = parameters->image_offset_y0; cmptparm[0].w = !cmptparm[0].x0 ? (w - 1) * parameters->subsampling_dx + 1 : cmptparm[0].x0 + (w - 1) * parameters->subsampling_dx + 1; cmptparm[0].h = !cmptparm[0].y0 ? (h - 1) * parameters->subsampling_dy + 1 : cmptparm[0].y0 + (h - 1) * parameters->subsampling_dy + 1; - // Java types are always signed but we use them as unsigned types (shift of the negative part of - // the pixels of the images in Telemis before entering the encoder). + /* Java types are always signed but we use them as unsigned types (shift of the negative part of + the pixels of the images in Telemis before entering the encoder).*/ cmptparm[0].sgnd = 0; if (depth<=16) cmptparm[0].prec=depth; @@ -1705,12 +1705,12 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, comp = &image->comps[compno]; max = -100000; if (depth == 8) { - fid = (*env)->GetFieldID(env, cls,"image8", "[B"); // byteArray [] + fid = (*env)->GetFieldID(env, cls,"image8", "[B"); /* byteArray []*/ jba = (*env)->GetObjectField(env, obj, fid); len = (*env)->GetArrayLength(env, jba); jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, &isCopy); - //printf("C: before transfering 8 bpp image\n"); + /*printf("C: before transfering 8 bpp image\n");*/ if (comp->sgnd) { for(i=0; i< len;i++) { comp->data[i] = (char) jbBody[i]; @@ -1724,13 +1724,13 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, } (*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0); } else if(depth == 16) { - fid = (*env)->GetFieldID(env, cls,"image16", "[S"); // shortArray [] + fid = (*env)->GetFieldID(env, cls,"image16", "[S"); /* shortArray []*/ jsa = (*env)->GetObjectField(env, obj, fid); len = (*env)->GetArrayLength(env, jsa); jsBody = (*env)->GetPrimitiveArrayCritical(env, jsa, &isCopy); - //printf("C: before transfering 16 bpp image\n"); - if (comp->sgnd) { // Special behaviour to deal with signed elements ?? + /*printf("C: before transfering 16 bpp image\n");*/ + if (comp->sgnd) { /* Special behaviour to deal with signed elements ??*/ comp->data[i] = (short) jsBody[i]; for(i=0; i< len;i++) { if (comp->data[i] > max) max = comp->data[i]; @@ -1743,14 +1743,14 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, } (*env)->ReleasePrimitiveArrayCritical(env, jsa, jsBody, 0); } else if (depth == 24) { - fid = (*env)->GetFieldID(env, cls,"image24", "[I"); // intArray [] + fid = (*env)->GetFieldID(env, cls,"image24", "[I"); /* intArray []*/ jia = (*env)->GetObjectField(env, obj, fid); len = (*env)->GetArrayLength(env, jia); shift = compno*8; jiBody = (*env)->GetPrimitiveArrayCritical(env, jia, &isCopy); - //printf("C: before transfering 24 bpp image (component %d, signed = %d)\n", compno, comp->sgnd); - if (comp->sgnd) { // Special behaviour to deal with signed elements ?? XXXXX + /*printf("C: before transfering 24 bpp image (component %d, signed = %d)\n", compno, comp->sgnd);*/ + if (comp->sgnd) { /* Special behaviour to deal with signed elements ?? XXXXX*/ for(i=0; i< len;i++) { comp->data[i] = ( ((int) jiBody[i]) & (0xFF << shift) ) >> shift; if (comp->data[i] > max) max = comp->data[i]; @@ -1765,7 +1765,7 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, } comp->bpp = int_floorlog2(max)+1; comp->prec = comp->bpp; - //printf("C: component %d: max %d, real bpp = %d\n", compno, max, comp->bpp); + /*printf("C: component %d: max %d, real bpp = %d\n", compno, max, comp->bpp);*/ } return image; } @@ -1786,9 +1786,9 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag opj_codestream_info_t cstr_info; /* Codestream information structure */ char indexfilename[OPJ_PATH_LEN]; /* index file name */ - int* compressed_index = NULL; + char* compressed_index = NULL; int compressed_index_size=-1; - // ==> Access variables to the Java member variables + /* ==> Access variables to the Java member variables*/ jsize arraySize; jclass cls; jobject object; @@ -1797,18 +1797,18 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag jbyteArray jba; jbyte *jbBody; callback_variables_t msgErrorCallback_vars; - // <== access variable to the Java member variables. + /* <== access variable to the Java member variables.*/ - // For the encoding and storage into the file + /* For the encoding and storage into the file*/ opj_cinfo_t* cinfo; int codestream_length; opj_cio_t *cio = NULL; FILE *f = NULL; - // JNI reference to the calling class + /* JNI reference to the calling class*/ cls = (*env)->GetObjectClass(env, obj); - // Pointers to be able to call a Java method for all the info and error messages + /* Pointers to be able to call a Java method for all the info and error messages*/ msgErrorCallback_vars.env = env; msgErrorCallback_vars.jobj = &obj; msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V"); @@ -1817,11 +1817,11 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag arraySize = (*env)->GetArrayLength(env, javaParameters); argc = (int) arraySize +1; argv = malloc(argc*sizeof(char*)); - argv[0] = "ProgramName.exe"; // The program name: useless + argv[0] = "ProgramName.exe"; /* The program name: useless*/ j=0; for (i=1; iGetObjectArrayElement(env, javaParameters, i-1); - argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy); + argv[i] = (char*)(*env)->GetStringUTFChars(env, object, &isCopy); } /*printf("C: "); @@ -1841,7 +1841,7 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag /* set encoding parameters to default values */ opj_set_default_encoder_parameters(¶meters); parameters.cod_format = J2K_CFMT; - //parameters.index_on = 1; + /*parameters.index_on = 1;*/ /* Initialize indexfilename and img_fol */ *indexfilename = 0; @@ -1849,13 +1849,13 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag /* parse input and get user encoding parameters */ if (parse_cmdline_encoder(argc, argv, ¶meters,&img_fol, indexfilename) == 1) { - // Release the Java arguments array + /* Release the Java arguments array*/ for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); return -1; } - // Release the Java arguments array + /* Release the Java arguments array*/ for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); @@ -1891,7 +1891,7 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag fprintf(stderr,"\n"); image = loadImage(¶meters, env, obj, cls); - //printf("C: after load image: image = %d\n", image); + /*printf("C: after load image: image = %d\n", image);*/ if (!image) { fprintf(stderr, "Unable to load image\n"); return -1; diff --git a/wrapping/java/openjp2/JavaOpenJPEGDecoder.c b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c index a273028c..c60f154d 100644 --- a/wrapping/java/openjp2/JavaOpenJPEGDecoder.c +++ b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c @@ -508,7 +508,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto int w,h; long min_value, max_value; short tempS; unsigned char tempUC, tempUC1, tempUC2; - // ==> Access variables to the Java member variables + /* ==> Access variables to the Java member variables*/ jsize arraySize; jclass cls; jobject object; @@ -521,8 +521,8 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto jshort *jsBody, *ptrSBody; jint *jiBody, *ptrIBody; callback_variables_t msgErrorCallback_vars; - // <=== access variable to Java member variables */ - int *ptr, *ptr1, *ptr2; // <== To transfer the decoded image to Java + /* <=== access variable to Java member variables */ + int *ptr, *ptr1, *ptr2; /* <== To transfer the decoded image to Java*/ /* configure the event callbacks */ memset(&event_mgr, 0, sizeof(opj_event_mgr_t)); @@ -530,24 +530,24 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto event_mgr.warning_handler = warning_callback; event_mgr.info_handler = info_callback; - // JNI reference to the calling class + /* JNI reference to the calling class*/ cls = (*env)->GetObjectClass(env, obj); - // Pointers to be able to call a Java method for all the info and error messages + /* Pointers to be able to call a Java method for all the info and error messages*/ msgErrorCallback_vars.env = env; msgErrorCallback_vars.jobj = &obj; msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V"); msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V"); - // Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments. + /* Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments.*/ arraySize = (*env)->GetArrayLength(env, javaParameters); argc = (int) arraySize +1; argv = malloc(argc*sizeof(char*)); - argv[0] = "ProgramName.exe"; // The program name: useless + argv[0] = "ProgramName.exe"; /* The program name: useless*/ j=0; for (i=1; iGetObjectArrayElement(env, javaParameters, i-1); - argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy); + argv[i] = (char*)(*env)->GetStringUTFChars(env, object, &isCopy); } /*printf("C: decoder params = "); @@ -562,18 +562,18 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto /* parse input and get user encoding parameters */ if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol) == 1) { - // Release the Java arguments array + /* Release the Java arguments array*/ for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); return -1; } - // Release the Java arguments array + /* Release the Java arguments array*/ for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); num_images=1; - // Get additional information from the Java object variables + /* Get additional information from the Java object variables*/ fid = (*env)->GetFieldID(env, cls,"skippedResolutions", "I"); parameters.cp_reduce = (short) (*env)->GetIntField(env, obj, fid); @@ -587,7 +587,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto Implemented for debug purpose. */ /* -------------------------------------------------------------- */ if (parameters.infile && parameters.infile[0]!='\0') { - //printf("C: opening [%s]\n", parameters.infile); + /*printf("C: opening [%s]\n", parameters.infile);*/ fsrc = fopen(parameters.infile, "rb"); if (!fsrc) { fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile); @@ -599,10 +599,10 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto src = (unsigned char *) malloc(file_length); fread(src, 1, file_length, fsrc); fclose(fsrc); - //printf("C: %d bytes read from file\n",file_length); + /*printf("C: %d bytes read from file\n",file_length);*/ } else { - // Preparing the transfer of the codestream from Java to C - //printf("C: before transfering codestream\n"); + /* Preparing the transfer of the codestream from Java to C*/ + /*printf("C: before transfering codestream\n");*/ fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B"); jba = (*env)->GetObjectField(env, obj, fid); file_length = (*env)->GetArrayLength(env, jba); @@ -752,17 +752,17 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto } - // ========= Return the image to the Java structure =============== + /* ========= Return the image to the Java structure ===============*/ #ifdef CHECK_THRESHOLDS printf("C: checking thresholds\n"); #endif - // First compute the real with and height, in function of the resolutions decoded. - //wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor; - //hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor; + /* First compute the real with and height, in function of the resolutions decoded.*/ + /*wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/ + /*hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/ w = image->comps[0].w; h = image->comps[0].h; - if (image->numcomps==3) { // 3 components color image + if (image->numcomps==3) { /* 3 components color image*/ ptr = image->comps[0].data; ptr1 = image->comps[1].data; ptr2 = image->comps[2].data; @@ -775,7 +775,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto max_value = 255; } #endif - // Get the pointer to the Java structure where the data must be copied + /* Get the pointer to the Java structure where the data must be copied*/ fid = (*env)->GetFieldID(env, cls,"image24", "[I"); jia = (*env)->GetObjectField(env, obj, fid); jiBody = (*env)->GetIntArrayElements(env, jia, 0); @@ -804,7 +804,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto } (*env)->ReleaseIntArrayElements(env, jia, jiBody, 0); - } else { // 1 component 8 or 16 bpp image + } else { /* 1 component 8 or 16 bpp image*/ ptr = image->comps[0].data; printf("C: before transfering a %d bpp image to java (length = %d)\n",image->comps[0].prec ,w*h); if (image->comps[0].prec<=8) { @@ -821,7 +821,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto max_value = 255; } #endif - //printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody); + /*printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody);*/ for (i=0; i