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

Fix warnings with recent GCC versions

This commit is contained in:
Even Rouault 2017-06-17 14:09:31 +02:00
parent 36dd87cea8
commit cc07aec6c7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/openjp2/dwt.c
View File

@ -1182,8 +1182,10 @@ OPJ_BOOL opj_dwt_decode_real(opj_tcd_tilecomp_t* OPJ_RESTRICT tilec,
switch (j) { switch (j) {
case 3: case 3:
aj[k + (OPJ_INT32)w * 2] = h.wavelet[k].f[2]; aj[k + (OPJ_INT32)w * 2] = h.wavelet[k].f[2];
/* FALLTHRU */
case 2: case 2:
aj[k + (OPJ_INT32)w ] = h.wavelet[k].f[1]; aj[k + (OPJ_INT32)w ] = h.wavelet[k].f[1];
/* FALLTHRU */
case 1: case 1:
aj[k ] = h.wavelet[k].f[0]; aj[k ] = h.wavelet[k].f[0];
} }

10
src/lib/openjp2/t1.c
View File

@ -345,7 +345,7 @@ static INLINE void opj_t1_enc_sigpass_step(opj_t1_t *t1,
flagsp[-1], flagsp[1], flagsp[-1], flagsp[1],
ci); ci);
OPJ_UINT32 ctxt2 = opj_t1_getctxno_sc(lu); OPJ_UINT32 ctxt2 = opj_t1_getctxno_sc(lu);
v = *datap < 0 ? 1 : 0; v = *datap < 0 ? 1U : 0U;
*nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap),
(OPJ_UINT32)bpno); (OPJ_UINT32)bpno);
#ifdef DEBUG_ENC_SIG #ifdef DEBUG_ENC_SIG
@ -1077,7 +1077,7 @@ LABEL_PARTIAL:
#endif #endif
opj_mqc_setcurctx(mqc, ctxt2); opj_mqc_setcurctx(mqc, ctxt2);
v = *datap < 0 ? 1 : 0; v = *datap < 0 ? 1U : 0U;
spb = opj_t1_getspb(lu); spb = opj_t1_getspb(lu);
#ifdef DEBUG_ENC_CLN #ifdef DEBUG_ENC_CLN
printf(" spb=%d\n", spb); printf(" spb=%d\n", spb);
@ -1256,21 +1256,21 @@ static void opj_t1_enc_clnpass(
l_w, 0, mqc, curctx, \ l_w, 0, mqc, curctx, \
v, a, c, ct, oneplushalf, vsc); \ v, a, c, ct, oneplushalf, vsc); \
partial = OPJ_FALSE; \ partial = OPJ_FALSE; \
/* falltrough */ \ /* FALLTHRU */ \
case 1: \ case 1: \
opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\
flags, flagsp, flags_stride, data, \ flags, flagsp, flags_stride, data, \
l_w, 1, mqc, curctx, \ l_w, 1, mqc, curctx, \
v, a, c, ct, oneplushalf, OPJ_FALSE); \ v, a, c, ct, oneplushalf, OPJ_FALSE); \
partial = OPJ_FALSE; \ partial = OPJ_FALSE; \
/* falltrough */ \ /* FALLTHRU */ \
case 2: \ case 2: \
opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\
flags, flagsp, flags_stride, data, \ flags, flagsp, flags_stride, data, \
l_w, 2, mqc, curctx, \ l_w, 2, mqc, curctx, \
v, a, c, ct, oneplushalf, OPJ_FALSE); \ v, a, c, ct, oneplushalf, OPJ_FALSE); \
partial = OPJ_FALSE; \ partial = OPJ_FALSE; \
/* falltrough */ \ /* FALLTHRU */ \
case 3: \ case 3: \
opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\
flags, flagsp, flags_stride, data, \ flags, flagsp, flags_stride, data, \