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

[b2.x.x] backport into 2.x.x the rev 2251 of trunk

This commit is contained in:
Mickael Savinaud 2013-02-02 17:59:03 +00:00
parent 06be854c32
commit 1c35a9ec95
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lib/openjp2/jp2.c
View File

@ -682,13 +682,15 @@ OPJ_BYTE * opj_jp2_write_colr( opj_jp2_t *jp2,
/* preconditions */ /* preconditions */
assert(jp2 != 00); assert(jp2 != 00);
assert(p_nb_bytes_written != 00); assert(p_nb_bytes_written != 00);
assert(jp2->meth == 1 || jp2->meth == 2);
switch (jp2->meth) { switch (jp2->meth) {
case 1 : case 1 :
l_colr_size += 4; l_colr_size += 4; /* EnumCS */
break; break;
case 2 : case 2 :
++l_colr_size; assert(jp2->color.icc_profile_len); /* ICC profile */
l_colr_size += jp2->color.icc_profile_len;
break; break;
default : default :
return 00; return 00;
@ -717,11 +719,16 @@ OPJ_BYTE * opj_jp2_write_colr( opj_jp2_t *jp2,
opj_write_bytes(l_current_colr_ptr, jp2->approx,1); /* APPROX */ opj_write_bytes(l_current_colr_ptr, jp2->approx,1); /* APPROX */
++l_current_colr_ptr; ++l_current_colr_ptr;
if (jp2->meth == 1) { if (jp2->meth == 1) { /* Meth value is restricted to 1 or 2 (Table I.9 of part 1) */
opj_write_bytes(l_current_colr_ptr, jp2->enumcs,4); /* EnumCS */ opj_write_bytes(l_current_colr_ptr, jp2->enumcs,4); } /* EnumCS */
} else {
else { if (jp2->meth == 2) { /* ICC profile */
opj_write_bytes(l_current_colr_ptr, 0, 1); /* PROFILE (??) */ OPJ_UINT32 i;
for(i = 0; i < jp2->color.icc_profile_len; ++i) {
opj_write_bytes(l_current_colr_ptr, jp2->color.icc_profile_buf[i], 1);
++l_current_colr_ptr;
}
}
} }
*p_nb_bytes_written = l_colr_size; *p_nb_bytes_written = l_colr_size;
@ -1472,21 +1479,21 @@ void opj_jp2_setup_encoder( opj_jp2_t *jp2,
} }
/* Colour Specification box */ /* Colour Specification box */
if ((image->numcomps == 1 || image->numcomps == 3) && (jp2->bpc != 255)) { if(image->icc_profile_len) {
jp2->meth = 1; /* METH: Enumerated colourspace */ jp2->meth = 2;
} else { jp2->enumcs = 0;
jp2->meth = 2; /* METH: Restricted ICC profile */ }
} else {
if (jp2->meth == 1) { jp2->meth = 1;
if (image->color_space == 1) if (image->color_space == 1)
jp2->enumcs = 16; /* sRGB as defined by IEC 61966-2-1 */ jp2->enumcs = 16; /* sRGB as defined by IEC 61966-2-1 */
else if (image->color_space == 2) else if (image->color_space == 2)
jp2->enumcs = 17; /* greyscale */ jp2->enumcs = 17; /* greyscale */
else if (image->color_space == 3) else if (image->color_space == 3)
jp2->enumcs = 18; /* YUV */ jp2->enumcs = 18; /* YUV */
} else { }
jp2->enumcs = 0; /* PROFILE (??) */
}
jp2->precedence = 0; /* PRECEDENCE */ jp2->precedence = 0; /* PRECEDENCE */
jp2->approx = 0; /* APPROX */ jp2->approx = 0; /* APPROX */