diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-06-17 14:09:31 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-06-17 14:09:31 +0200 |
| commit | cc07aec6c7b50090c3f471ca2c68d0ffa8aa4ff1 (patch) | |
| tree | 61c062f6c62a59c4e5ef8ac033e7c10397614872 /src/lib | |
| parent | 36dd87cea80ad56e0e3178221aa579a28f02a549 (diff) | |
Fix warnings with recent GCC versions
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/dwt.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/t1.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/openjp2/dwt.c b/src/lib/openjp2/dwt.c index a2841282..03ba5034 100644 --- a/src/lib/openjp2/dwt.c +++ b/src/lib/openjp2/dwt.c @@ -1182,8 +1182,10 @@ OPJ_BOOL opj_dwt_decode_real(opj_tcd_tilecomp_t* OPJ_RESTRICT tilec, switch (j) { case 3: aj[k + (OPJ_INT32)w * 2] = h.wavelet[k].f[2]; + /* FALLTHRU */ case 2: aj[k + (OPJ_INT32)w ] = h.wavelet[k].f[1]; + /* FALLTHRU */ case 1: aj[k ] = h.wavelet[k].f[0]; } diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c index ce0fb7d1..33913bb2 100644 --- a/src/lib/openjp2/t1.c +++ b/src/lib/openjp2/t1.c @@ -345,7 +345,7 @@ static INLINE void opj_t1_enc_sigpass_step(opj_t1_t *t1, flagsp[-1], flagsp[1], ci); 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), (OPJ_UINT32)bpno); #ifdef DEBUG_ENC_SIG @@ -1077,7 +1077,7 @@ LABEL_PARTIAL: #endif opj_mqc_setcurctx(mqc, ctxt2); - v = *datap < 0 ? 1 : 0; + v = *datap < 0 ? 1U : 0U; spb = opj_t1_getspb(lu); #ifdef DEBUG_ENC_CLN printf(" spb=%d\n", spb); @@ -1256,21 +1256,21 @@ static void opj_t1_enc_clnpass( l_w, 0, mqc, curctx, \ v, a, c, ct, oneplushalf, vsc); \ partial = OPJ_FALSE; \ - /* falltrough */ \ + /* FALLTHRU */ \ case 1: \ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ flags, flagsp, flags_stride, data, \ l_w, 1, mqc, curctx, \ v, a, c, ct, oneplushalf, OPJ_FALSE); \ partial = OPJ_FALSE; \ - /* falltrough */ \ + /* FALLTHRU */ \ case 2: \ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ flags, flagsp, flags_stride, data, \ l_w, 2, mqc, curctx, \ v, a, c, ct, oneplushalf, OPJ_FALSE); \ partial = OPJ_FALSE; \ - /* falltrough */ \ + /* FALLTHRU */ \ case 3: \ opj_t1_dec_clnpass_step_macro(OPJ_FALSE, partial,\ flags, flagsp, flags_stride, data, \ |