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

Modified the way raw images with more that 8bpp are read and written

This commit is contained in:
Francois-Olivier Devaux 2008-08-08 13:15:36 +00:00
parent f4bbad8615
commit 4da178b0d8
2 changed files with 29 additions and 7 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 8, 2008
! [FOD] Modified the way raw images with more that 8bpp are read and written
July 9, 2008 July 9, 2008
+ [Parvatha] Added the default lossless parameter to opj_set_default_encoder_parameters in openjpeg.c. + [Parvatha] Added the default lossless parameter to opj_set_default_encoder_parameters in openjpeg.c.

29
codec/convert.c
View File

@ -2013,19 +2013,30 @@ opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw
} }
} }
} }
else else if(raw_cp->rawBitDepth <= 16)
{ {
unsigned short value = 0; unsigned short value;
for(compno = 0; compno < numcomps; compno++) { for(compno = 0; compno < numcomps; compno++) {
for (i = 0; i < w * h; i++) { for (i = 0; i < w * h; i++) {
if (!fread(&value, 2, 1, f)) { unsigned char temp;
if (!fread(&temp, 1, 1, f)) {
fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); fprintf(stderr,"Error reading raw file. End of file probably reached.\n");
return NULL; return NULL;
} }
value = temp << 8;
if (!fread(&temp, 1, 1, f)) {
fprintf(stderr,"Error reading raw file. End of file probably reached.\n");
return NULL;
}
value += temp;
image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value; image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value;
} }
} }
} }
else {
fprintf(stderr,"OpenJPEG cannot encode raw components with bit depth higher than 16 bits.\n");
return NULL;
}
if (fread(&ch, 1, 1, f)) { if (fread(&ch, 1, 1, f)) {
fprintf(stderr,"Warning. End of raw file not reached... processing anyway\n"); fprintf(stderr,"Warning. End of raw file not reached... processing anyway\n");
@ -2103,8 +2114,12 @@ int imagetoraw(opj_image_t * image, const char *outfile)
ptr = image->comps[compno].data; ptr = image->comps[compno].data;
for (line = 0; line < h; line++) { for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) { for(row = 0; row < w; row++) {
unsigned char temp;
curr = (signed short int) (*ptr & mask); curr = (signed short int) (*ptr & mask);
fwrite(&curr, sizeof(signed short int), 1, rawFile); temp = curr >> 8;
fwrite(&temp, 1, 1, rawFile);
temp = curr;
fwrite(&temp, 1, 1, rawFile);
ptr++; ptr++;
} }
} }
@ -2116,8 +2131,12 @@ int imagetoraw(opj_image_t * image, const char *outfile)
ptr = image->comps[compno].data; ptr = image->comps[compno].data;
for (line = 0; line < h; line++) { for (line = 0; line < h; line++) {
for(row = 0; row < w; row++) { for(row = 0; row < w; row++) {
unsigned char temp;
curr = (unsigned short int) (*ptr & mask); curr = (unsigned short int) (*ptr & mask);
fwrite(&curr, sizeof(unsigned short int), 1, rawFile); temp = curr >> 8;
fwrite(&temp, 1, 1, rawFile);
temp = curr;
fwrite(&temp, 1, 1, rawFile);
ptr++; ptr++;
} }
} }