diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-06-04 13:23:26 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-06-04 13:23:26 +0000 |
| commit | ea9335ff48f106556e04a249d88246dba493a62a (patch) | |
| tree | 405b1f1960745fa1c4645b0abedab9e7cb8da1a6 /codec/convert.c | |
| parent | adc1aacb600419d6ce8427d652da4f53efc5e408 (diff) | |
Bugs corrected in decoding of command line (getopt.c), in the handling of 16 bit files (t1.c and tcd.c) and the calculation of elapsed time for multiple tiles parts (tcd.c and tdc.h).
Diffstat (limited to 'codec/convert.c')
| -rw-r--r-- | codec/convert.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/codec/convert.c b/codec/convert.c index 936d5a48..4aafaae8 100644 --- a/codec/convert.c +++ b/codec/convert.c @@ -1278,7 +1278,7 @@ opj_image_t* tiftoimage(char *filename, opj_cparameters_t *parameters) /* initialize image components*/ memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t)); for(j = 0; j < numcomps; j++) { - if ((parameters->cp_cinema) & (Info.tiBps== 16)){ + if (parameters->cp_cinema) { cmptparm[j].prec = 12; cmptparm[j].bpp = 12; }else{ @@ -1335,7 +1335,7 @@ opj_image_t* tiftoimage(char *filename, opj_cparameters_t *parameters) image->comps[0].data[index] = (image->comps[0].data[index] + 0x08) >> 4 ; image->comps[1].data[index] = (image->comps[1].data[index] + 0x08) >> 4 ; image->comps[2].data[index] = (image->comps[2].data[index] + 0x08) >> 4 ; - } + } index++; } } @@ -1344,6 +1344,11 @@ opj_image_t* tiftoimage(char *filename, opj_cparameters_t *parameters) image->comps[0].data[index] = dat8[i+0]; // R image->comps[1].data[index] = dat8[i+1]; // G image->comps[2].data[index] = dat8[i+2]; // B + if(parameters->cp_cinema){/* Rounding to 12 bits*/ + image->comps[0].data[index] = image->comps[0].data[index] << 4 ; + image->comps[1].data[index] = image->comps[1].data[index] << 4 ; + image->comps[2].data[index] = image->comps[2].data[index] << 4 ; + } index++; } } |