diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:38:35 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:38:35 +0000 |
| commit | e212154d8d43ec583cb6dc8f963b97988a54c11d (patch) | |
| tree | 074b1b8b459ce72933177247b3d9a891fa00e5c2 /src/bin/common | |
| parent | ec0fe091380c2de75584fdfc3d914eee5b89e731 (diff) | |
[trunk]extend last commits to apps
Diffstat (limited to 'src/bin/common')
| -rw-r--r-- | src/bin/common/color.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 21b02156..13b1337e 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -217,7 +217,7 @@ void color_sycc_to_rgb(opj_image_t *img) { if(img->numcomps < 3) { - img->color_space = CLRSPC_GRAY; + img->color_space = OPJ_CLRSPC_GRAY; return; } @@ -256,7 +256,7 @@ void color_sycc_to_rgb(opj_image_t *img) __FILE__,__LINE__); return; } - img->color_space = CLRSPC_SRGB; + img->color_space = OPJ_CLRSPC_SRGB; }/* color_sycc_to_rgb() */ @@ -306,7 +306,7 @@ void color_apply_icc_profile(opj_image_t *image) in_type = TYPE_RGB_16; out_type = TYPE_RGB_16; out_prof = cmsCreate_sRGBProfile(); - image->color_space = CLRSPC_SRGB; + image->color_space = OPJ_CLRSPC_SRGB; } else if(out_space == cmsSigGrayData) /* enumCS 17 */ @@ -314,7 +314,7 @@ void color_apply_icc_profile(opj_image_t *image) in_type = TYPE_GRAY_8; out_type = TYPE_RGB_8; out_prof = cmsCreate_sRGBProfile(); - image->color_space = CLRSPC_SRGB; + image->color_space = OPJ_CLRSPC_SRGB; } else if(out_space == cmsSigYCbCrData) /* enumCS 18 */ @@ -322,7 +322,7 @@ void color_apply_icc_profile(opj_image_t *image) in_type = TYPE_YCbCr_16; out_type = TYPE_RGB_16; out_prof = cmsCreate_sRGBProfile(); - image->color_space = CLRSPC_SRGB; + image->color_space = OPJ_CLRSPC_SRGB; } else { |