walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

JavaOpenJpegDecoder.c : fixed a signed/unsigned behaviour when returning form C to JAVA

This commit is contained in:
Antonin Descampe 2009-08-31 13:18:20 +00:00
parent a695c8eb51
commit 83abf56736
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
August 31, 2009
* [antonin] JavaOpenJpegDecoder.c : fixed a signed/unsigned behaviour when returning form C to JAVA
August 21, 2008 August 21, 2008
* [antonin] found a bug in tcd.c that was preventing to find the correct threshold in tcd_rateallocate.c for high-precision images. Applied a temporary patch but a better solution should be found. * [antonin] found a bug in tcd.c that was preventing to find the correct threshold in tcd_rateallocate.c for high-precision images. Applied a temporary patch but a better solution should be found.

22
JavaOpenJPEG/JavaOpenJPEGDecoder.c
View File

@ -782,13 +782,13 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
ptr2 = image->comps[2].data; ptr2 = image->comps[2].data;
#ifdef CHECK_THRESHOLDS #ifdef CHECK_THRESHOLDS
if (image->comps[0].sgnd) { if (image->comps[0].sgnd) {
min_value = 0;
max_value = 255;
} else {
min_value = -128; min_value = -128;
max_value = 127; max_value = 127;
} else {
min_value = 0;
max_value = 255;
} }
#endif #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"); fid = (*env)->GetFieldID(env, cls,"image24", "[I");
jia = (*env)->GetObjectField(env, obj, fid); jia = (*env)->GetObjectField(env, obj, fid);
@ -828,13 +828,13 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
ptrBBody = jbBody; ptrBBody = jbBody;
#ifdef CHECK_THRESHOLDS #ifdef CHECK_THRESHOLDS
if (image->comps[0].sgnd) { if (image->comps[0].sgnd) {
min_value = 0;
max_value = 255;
} else {
min_value = -128; min_value = -128;
max_value = 127; max_value = 127;
} else {
min_value = 0;
max_value = 255;
} }
#endif #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<w*h; i++) { for (i=0; i<w*h; i++) {
tempUC = (unsigned char) (ptr[i]); tempUC = (unsigned char) (ptr[i]);
@ -855,11 +855,11 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
ptrSBody = jsBody; ptrSBody = jsBody;
#ifdef CHECK_THRESHOLDS #ifdef CHECK_THRESHOLDS
if (image->comps[0].sgnd) { if (image->comps[0].sgnd) {
min_value = 0;
max_value = 65535;
} else {
min_value = -32768; min_value = -32768;
max_value = 32767; max_value = 32767;
} else {
min_value = 0;
max_value = 65535;
} }
printf("C: minValue = %d, maxValue = %d\n", min_value, max_value); printf("C: minValue = %d, maxValue = %d\n", min_value, max_value);
#endif #endif