diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-13 21:57:58 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-13 21:57:58 +0200 |
| commit | c8d03fea9b2d1db0f2000718395a9f01c59a1e2f (patch) | |
| tree | 15e23aa0dd63ced748d850be0421600ee014f83e /src/bin | |
| parent | 3259fe2ff86637d956715e1f6e7f18b1acf4a30f (diff) | |
| parent | 6721f8a53fec2ad30d15b142968ab9c8e2e6ba1c (diff) | |
Merge branch 'master' into coc-qcc
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/common/color.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 3b0eb97b..0f2b8dac 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -617,7 +617,7 @@ void color_cielab_to_rgb(opj_image_t *image) default_type = (unsigned int)row[1]; - if(default_type == 0x44454600)// DEF : default + if(default_type == 0x44454600)/* DEF : default */ { rl = 100; ra = 170; rb = 200; ol = 0; @@ -679,9 +679,9 @@ void color_cielab_to_rgb(opj_image_t *image) } fprintf(stderr,"%s:%d:\n\tenumCS %d not handled. Ignoring.\n", __FILE__,__LINE__, enumcs); -}// color_apply_conversion() +}/* color_apply_conversion() */ -#endif // OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 +#endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */ void color_cmyk_to_rgb(opj_image_t *image) { @@ -732,11 +732,11 @@ void color_cmyk_to_rgb(opj_image_t *image) memcpy(&(image->comps[i]), &(image->comps[i+1]), sizeof(image->comps[i])); } -}// color_cmyk_to_rgb() +}/* color_cmyk_to_rgb() */ -// -// This code has been adopted from sjpx_openjpeg.c of ghostscript -// +/* + * This code has been adopted from sjpx_openjpeg.c of ghostscript + */ void color_esycc_to_rgb(opj_image_t *image) { int y, cb, cr, sign1, sign2, val; @@ -785,4 +785,4 @@ void color_esycc_to_rgb(opj_image_t *image) } image->color_space = OPJ_CLRSPC_SRGB; -}// color_esycc_to_rgb() +}/* color_esycc_to_rgb() */ |