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 | |
| parent | 3259fe2ff86637d956715e1f6e7f18b1acf4a30f (diff) | |
| parent | 6721f8a53fec2ad30d15b142968ab9c8e2e6ba1c (diff) | |
Merge branch 'master' into coc-qcc
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/common/color.c | 16 | ||||
| -rw-r--r-- | src/lib/openjp2/dwt.c | 4 | ||||
| -rw-r--r-- | src/lib/openjp3d/jp3d.c | 1 | ||||
| -rw-r--r-- | src/lib/openjpwl/jpwl.c | 2 |
4 files changed, 12 insertions, 11 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() */ diff --git a/src/lib/openjp2/dwt.c b/src/lib/openjp2/dwt.c index 4ad99ed9..eead5865 100644 --- a/src/lib/openjp2/dwt.c +++ b/src/lib/openjp2/dwt.c @@ -741,8 +741,8 @@ static void opj_v4dwt_decode_step1(opj_v4_t* w, OPJ_INT32 count, const OPJ_FLOAT static void opj_v4dwt_decode_step2(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, OPJ_FLOAT32 c) { - OPJ_FLOAT32* restrict fl = (OPJ_FLOAT32*) l; - OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w; + OPJ_FLOAT32* fl = (OPJ_FLOAT32*) l; + OPJ_FLOAT32* fw = (OPJ_FLOAT32*) w; OPJ_INT32 i; for(i = 0; i < m; ++i){ OPJ_FLOAT32 tmp1_1 = fl[0]; diff --git a/src/lib/openjp3d/jp3d.c b/src/lib/openjp3d/jp3d.c index f445fb36..9e060df7 100644 --- a/src/lib/openjp3d/jp3d.c +++ b/src/lib/openjp3d/jp3d.c @@ -1008,6 +1008,7 @@ static void j3d_write_qcx(opj_j3d_t *j3d, int compno) { cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1); /* Sqcx : Table A28 de 15444-1*/ + numbands = 0; // compiler warning if (j3d->cinfo->codec_format == CODEC_J2K) numbands = tccp->qntsty == J3D_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolution[0] * 3 - 2; else if (j3d->cinfo->codec_format == CODEC_J3D) { diff --git a/src/lib/openjpwl/jpwl.c b/src/lib/openjpwl/jpwl.c index 79d0e04c..99a34990 100644 --- a/src/lib/openjpwl/jpwl.c +++ b/src/lib/openjpwl/jpwl.c @@ -1296,7 +1296,7 @@ opj_bool jpwl_check_tile(opj_j2k_t *j2k, opj_tcd_t *tcd, int tileno) { opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR, "JPWL: wrong x-cord of block origin %d => x-prec is (%d, %d)\n", block->x0, prec->x0, prec->x1); - if (!JPWL_ASSUME || JPWL_ASSUME) + if (!JPWL_ASSUME) return OPJ_FALSE; }; } |