X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp2%2Ft1.c;h=0d6c2f606a37558d9d6f0bef1f01d8d43c3d0e24;hb=d19a4ab6768c48b542c0add922eba0dcddae9ffe;hp=1030729467cef653159769475e2b051de373fb94;hpb=ec0fe091380c2de75584fdfc3d914eee5b89e731;p=openjpeg.git diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c index 10307294..0d6c2f60 100644 --- a/src/lib/openjp2/t1.c +++ b/src/lib/openjp2/t1.c @@ -1,9 +1,15 @@ /* - * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2007, Professor Benoit Macq + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third + * party and contributor rights, including patent rights, and no such rights + * are granted under this license. + * + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2007, Callum Lerwick * All rights reserved. @@ -62,6 +68,7 @@ static void opj_t1_enc_sigpass_step(opj_t1_t *t1, /** Decode significant pass */ +#if 0 static void opj_t1_dec_sigpass_step(opj_t1_t *t1, opj_flag_t *flagsp, OPJ_INT32 *datap, @@ -69,27 +76,28 @@ static void opj_t1_dec_sigpass_step(opj_t1_t *t1, OPJ_INT32 oneplushalf, OPJ_BYTE type, OPJ_UINT32 vsc); +#endif static INLINE void opj_t1_dec_sigpass_step_raw( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int vsc); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 vsc); static INLINE void opj_t1_dec_sigpass_step_mqc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf); static INLINE void opj_t1_dec_sigpass_step_mqc_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int vsc); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 vsc); /** @@ -107,17 +115,17 @@ Decode significant pass */ static void opj_t1_dec_sigpass_raw( opj_t1_t *t1, - int bpno, - int orient, - int cblksty); + OPJ_INT32 bpno, + OPJ_INT32 orient, + OPJ_INT32 cblksty); static void opj_t1_dec_sigpass_mqc( opj_t1_t *t1, - int bpno, - int orient); + OPJ_INT32 bpno, + OPJ_INT32 orient); static void opj_t1_dec_sigpass_mqc_vsc( opj_t1_t *t1, - int bpno, - int orient); + OPJ_INT32 bpno, + OPJ_INT32 orient); @@ -148,19 +156,20 @@ Decode refinement pass */ static void opj_t1_dec_refpass_raw( opj_t1_t *t1, - int bpno, - int cblksty); + OPJ_INT32 bpno, + OPJ_INT32 cblksty); static void opj_t1_dec_refpass_mqc( opj_t1_t *t1, - int bpno); + OPJ_INT32 bpno); static void opj_t1_dec_refpass_mqc_vsc( opj_t1_t *t1, - int bpno); + OPJ_INT32 bpno); /** Decode refinement pass */ +#if 0 static void opj_t1_dec_refpass_step(opj_t1_t *t1, opj_flag_t *flagsp, OPJ_INT32 *datap, @@ -168,27 +177,28 @@ static void opj_t1_dec_refpass_step(opj_t1_t *t1, OPJ_INT32 neghalf, OPJ_BYTE type, OPJ_UINT32 vsc); +#endif static INLINE void opj_t1_dec_refpass_step_raw( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf, - int vsc); + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf, + OPJ_INT32 vsc); static INLINE void opj_t1_dec_refpass_step_mqc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf); + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf); static INLINE void opj_t1_dec_refpass_step_mqc_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf, - int vsc); + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf, + OPJ_INT32 vsc); @@ -211,23 +221,23 @@ Decode clean-up pass static void opj_t1_dec_clnpass_step_partial( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf); static void opj_t1_dec_clnpass_step( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf); static void opj_t1_dec_clnpass_step_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int partial, - int vsc); + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 partial, + OPJ_INT32 vsc); /** Encode clean-up pass */ @@ -242,9 +252,9 @@ Decode clean-up pass */ static void opj_t1_dec_clnpass( opj_t1_t *t1, - int bpno, - int orient, - int cblksty); + OPJ_INT32 bpno, + OPJ_INT32 orient, + OPJ_INT32 cblksty); static OPJ_FLOAT64 opj_t1_getwmsedec( OPJ_INT32 nmsedec, @@ -367,25 +377,25 @@ void opj_t1_enc_sigpass_step( opj_t1_t *t1, opj_mqc_t *mqc = t1->mqc; /* MQC component */ - flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); + flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (OPJ_UINT32)(*flagsp); if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { v = opj_int_abs(*datap) & one ? 1 : 0; opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); /* ESSAI */ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */ - opj_mqc_bypass_enc(mqc, v); + opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v); } else { - opj_mqc_encode(mqc, v); + opj_mqc_encode(mqc, (OPJ_UINT32)v); } if (v) { v = *datap < 0 ? 1 : 0; - *nmsedec += opj_t1_getnmsedec_sig(opj_int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS); + *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS)); opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); /* ESSAI */ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */ - opj_mqc_bypass_enc(mqc, v); + opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v); } else { - opj_mqc_encode(mqc, v ^ opj_t1_getspb(flag)); + opj_mqc_encode(mqc, (OPJ_UINT32)(v ^ opj_t1_getspb((OPJ_UINT32)flag))); } - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } *flagsp |= T1_VISIT; } @@ -395,21 +405,21 @@ void opj_t1_enc_sigpass_step( opj_t1_t *t1, static INLINE void opj_t1_dec_sigpass_step_raw( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int vsc) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 vsc) { - int v, flag; + OPJ_INT32 v, flag; opj_raw_t *raw = t1->raw; /* RAW component */ OPJ_ARG_NOT_USED(orient); flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { if (opj_raw_decode(raw)) { - v = opj_raw_decode(raw); /* ESSAI */ + v = (OPJ_INT32)opj_raw_decode(raw); /* ESSAI */ *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } *flagsp |= T1_VISIT; } @@ -418,22 +428,22 @@ static INLINE void opj_t1_dec_sigpass_step_raw( INLINE void opj_t1_dec_sigpass_step_mqc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf) { - int v, flag; + OPJ_INT32 v, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ flag = *flagsp; if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc((OPJ_UINT32)flag, (OPJ_UINT32)orient)); if (opj_mqc_decode(mqc)) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); - v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc((OPJ_UINT32)flag)); + v = opj_mqc_decode(mqc) ^ opj_t1_getspb((OPJ_UINT32)flag); *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } *flagsp |= T1_VISIT; } @@ -442,23 +452,23 @@ INLINE void opj_t1_dec_sigpass_step_mqc( INLINE void opj_t1_dec_sigpass_step_mqc_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int vsc) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 vsc) { - int v, flag; + OPJ_INT32 v, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc((OPJ_UINT32)flag, (OPJ_UINT32)orient)); if (opj_mqc_decode(mqc)) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); - v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc((OPJ_UINT32)flag)); + v = opj_mqc_decode(mqc) ^ opj_t1_getspb((OPJ_UINT32)flag); *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } *flagsp |= T1_VISIT; } @@ -500,11 +510,11 @@ void opj_t1_enc_sigpass(opj_t1_t *t1, void opj_t1_dec_sigpass_raw( opj_t1_t *t1, - int bpno, - int orient, - int cblksty) + OPJ_INT32 bpno, + OPJ_INT32 orient, + OPJ_INT32 cblksty) { - int one, half, oneplushalf, vsc; + OPJ_INT32 one, half, oneplushalf, vsc; OPJ_UINT32 i, j, k; one = 1 << bpno; half = one >> 1; @@ -527,19 +537,19 @@ void opj_t1_dec_sigpass_raw( void opj_t1_dec_sigpass_mqc( opj_t1_t *t1, - int bpno, - int orient) + OPJ_INT32 bpno, + OPJ_INT32 orient) { - int one, half, oneplushalf; + OPJ_INT32 one, half, oneplushalf; OPJ_UINT32 i, j, k; - int *data1 = t1->data; + OPJ_INT32 *data1 = t1->data; opj_flag_t *flags1 = &t1->flags[1]; one = 1 << bpno; half = one >> 1; oneplushalf = one | half; - for (k = 0; k < (t1->h & ~3); k += 4) { + for (k = 0; k < (t1->h & ~3u); k += 4) { for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; flags2 += t1->flags_stride; opj_t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf); @@ -558,7 +568,7 @@ void opj_t1_dec_sigpass_mqc( flags1 += t1->flags_stride << 2; } for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; for (j = k; j < t1->h; ++j) { flags2 += t1->flags_stride; @@ -570,10 +580,10 @@ void opj_t1_dec_sigpass_mqc( void opj_t1_dec_sigpass_mqc_vsc( opj_t1_t *t1, - int bpno, - int orient) + OPJ_INT32 bpno, + OPJ_INT32 orient) { - int one, half, oneplushalf, vsc; + OPJ_INT32 one, half, oneplushalf, vsc; OPJ_UINT32 i, j, k; one = 1 << bpno; half = one >> 1; @@ -610,15 +620,15 @@ void opj_t1_enc_refpass_step( opj_t1_t *t1, opj_mqc_t *mqc = t1->mqc; /* MQC component */ - flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); + flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (OPJ_UINT32)(*flagsp); if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) { - *nmsedec += opj_t1_getnmsedec_ref(opj_int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS); + *nmsedec += opj_t1_getnmsedec_ref((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS)); v = opj_int_abs(*datap) & one ? 1 : 0; opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */ if (type == T1_TYPE_RAW) { /* BYPASS/LAZY MODE */ - opj_mqc_bypass_enc(mqc, v); + opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v); } else { - opj_mqc_encode(mqc, v); + opj_mqc_encode(mqc, (OPJ_UINT32)v); } *flagsp |= T1_REFINE; } @@ -627,18 +637,18 @@ void opj_t1_enc_refpass_step( opj_t1_t *t1, INLINE void opj_t1_dec_refpass_step_raw( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf, - int vsc) + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf, + OPJ_INT32 vsc) { - int v, t, flag; + OPJ_INT32 v, t, flag; opj_raw_t *raw = t1->raw; /* RAW component */ flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) { - v = opj_raw_decode(raw); + v = (OPJ_INT32)opj_raw_decode(raw); t = v ? poshalf : neghalf; *datap += *datap < 0 ? -t : t; *flagsp |= T1_REFINE; @@ -648,17 +658,17 @@ INLINE void opj_t1_dec_refpass_step_raw( INLINE void opj_t1_dec_refpass_step_mqc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf) + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf) { - int v, t, flag; + OPJ_INT32 v, t, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ flag = *flagsp; if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */ + opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag((OPJ_UINT32)flag)); /* ESSAI */ v = opj_mqc_decode(mqc); t = v ? poshalf : neghalf; *datap += *datap < 0 ? -t : t; @@ -669,18 +679,18 @@ INLINE void opj_t1_dec_refpass_step_mqc( INLINE void opj_t1_dec_refpass_step_mqc_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int poshalf, - int neghalf, - int vsc) + OPJ_INT32 *datap, + OPJ_INT32 poshalf, + OPJ_INT32 neghalf, + OPJ_INT32 vsc) { - int v, t, flag; + OPJ_INT32 v, t, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag)); /* ESSAI */ + opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag((OPJ_UINT32)flag)); /* ESSAI */ v = opj_mqc_decode(mqc); t = v ? poshalf : neghalf; *datap += *datap < 0 ? -t : t; @@ -721,12 +731,12 @@ void opj_t1_enc_refpass( void opj_t1_dec_refpass_raw( opj_t1_t *t1, - int bpno, - int cblksty) + OPJ_INT32 bpno, + OPJ_INT32 cblksty) { - int one, poshalf, neghalf; + OPJ_INT32 one, poshalf, neghalf; OPJ_UINT32 i, j, k; - int vsc; + OPJ_INT32 vsc; one = 1 << bpno; poshalf = one >> 1; neghalf = bpno > 0 ? -poshalf : -1; @@ -748,18 +758,18 @@ void opj_t1_dec_refpass_raw( void opj_t1_dec_refpass_mqc( opj_t1_t *t1, - int bpno) + OPJ_INT32 bpno) { - int one, poshalf, neghalf; + OPJ_INT32 one, poshalf, neghalf; OPJ_UINT32 i, j, k; - int *data1 = t1->data; + OPJ_INT32 *data1 = t1->data; opj_flag_t *flags1 = &t1->flags[1]; one = 1 << bpno; poshalf = one >> 1; neghalf = bpno > 0 ? -poshalf : -1; - for (k = 0; k < (t1->h & ~3); k += 4) { + for (k = 0; k < (t1->h & ~3u); k += 4) { for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; flags2 += t1->flags_stride; opj_t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf); @@ -778,7 +788,7 @@ void opj_t1_dec_refpass_mqc( flags1 += t1->flags_stride << 2; } for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; for (j = k; j < t1->h; ++j) { flags2 += t1->flags_stride; @@ -790,11 +800,11 @@ void opj_t1_dec_refpass_mqc( void opj_t1_dec_refpass_mqc_vsc( opj_t1_t *t1, - int bpno) + OPJ_INT32 bpno) { - int one, poshalf, neghalf; + OPJ_INT32 one, poshalf, neghalf; OPJ_UINT32 i, j, k; - int vsc; + OPJ_INT32 vsc; one = 1 << bpno; poshalf = one >> 1; neghalf = bpno > 0 ? -poshalf : -1; @@ -831,21 +841,21 @@ void opj_t1_enc_clnpass_step( opj_mqc_t *mqc = t1->mqc; /* MQC component */ - flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); + flag = vsc ? (OPJ_UINT32)((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (OPJ_UINT32)(*flagsp); if (partial) { goto LABEL_PARTIAL; } if (!(*flagsp & (T1_SIG | T1_VISIT))) { opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); v = opj_int_abs(*datap) & one ? 1 : 0; - opj_mqc_encode(mqc, v); + opj_mqc_encode(mqc, (OPJ_UINT32)v); if (v) { LABEL_PARTIAL: - *nmsedec += opj_t1_getnmsedec_sig(opj_int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS); + *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS)); opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); v = *datap < 0 ? 1 : 0; - opj_mqc_encode(mqc, v ^ opj_t1_getspb(flag)); - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_mqc_encode(mqc, (OPJ_UINT32)(v ^ opj_t1_getspb((OPJ_UINT32)flag))); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } } *flagsp &= ~T1_VISIT; @@ -854,42 +864,42 @@ LABEL_PARTIAL: static void opj_t1_dec_clnpass_step_partial( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf) { - int v, flag; + OPJ_INT32 v, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ OPJ_ARG_NOT_USED(orient); flag = *flagsp; - opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); - v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc((OPJ_UINT32)flag)); + v = opj_mqc_decode(mqc) ^ opj_t1_getspb((OPJ_UINT32)flag); *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); *flagsp &= ~T1_VISIT; } /* VSC and BYPASS by Antonin */ static void opj_t1_dec_clnpass_step( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf) { - int v, flag; + OPJ_INT32 v, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ flag = *flagsp; if (!(flag & (T1_SIG | T1_VISIT))) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc((OPJ_UINT32)flag, (OPJ_UINT32)orient)); if (opj_mqc_decode(mqc)) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); - v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc((OPJ_UINT32)flag)); + v = opj_mqc_decode(mqc) ^ opj_t1_getspb((OPJ_UINT32)flag); *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } } *flagsp &= ~T1_VISIT; @@ -898,13 +908,13 @@ static void opj_t1_dec_clnpass_step( static void opj_t1_dec_clnpass_step_vsc( opj_t1_t *t1, opj_flag_t *flagsp, - int *datap, - int orient, - int oneplushalf, - int partial, - int vsc) + OPJ_INT32 *datap, + OPJ_INT32 orient, + OPJ_INT32 oneplushalf, + OPJ_INT32 partial, + OPJ_INT32 vsc) { - int v, flag; + OPJ_INT32 v, flag; opj_mqc_t *mqc = t1->mqc; /* MQC component */ @@ -913,13 +923,13 @@ static void opj_t1_dec_clnpass_step_vsc( goto LABEL_PARTIAL; } if (!(flag & (T1_SIG | T1_VISIT))) { - opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient)); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc((OPJ_UINT32)flag, (OPJ_UINT32)orient)); if (opj_mqc_decode(mqc)) { LABEL_PARTIAL: - opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag)); - v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag); + opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc((OPJ_UINT32)flag)); + v = opj_mqc_decode(mqc) ^ opj_t1_getspb((OPJ_UINT32)flag); *datap = v ? -oneplushalf : oneplushalf; - opj_t1_updateflags(flagsp, v, t1->flags_stride); + opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride); } } *flagsp &= ~T1_VISIT; @@ -993,13 +1003,13 @@ void opj_t1_enc_clnpass( static void opj_t1_dec_clnpass( opj_t1_t *t1, - int bpno, - int orient, - int cblksty) + OPJ_INT32 bpno, + OPJ_INT32 orient, + OPJ_INT32 cblksty) { - int one, half, oneplushalf, agg, runlen, vsc; + OPJ_INT32 one, half, oneplushalf, agg, runlen, vsc; OPJ_UINT32 i, j, k; - int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM; + OPJ_INT32 segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM; opj_mqc_t *mqc = t1->mqc; /* MQC component */ @@ -1029,7 +1039,7 @@ static void opj_t1_dec_clnpass( } else { runlen = 0; } - for (j = k + runlen; j < k + 4 && j < t1->h; ++j) { + for (j = k + (OPJ_UINT32)runlen; j < k + 4 && j < t1->h; ++j) { vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0; opj_t1_dec_clnpass_step_vsc( t1, @@ -1037,17 +1047,17 @@ static void opj_t1_dec_clnpass( &t1->data[(j * t1->w) + i], orient, oneplushalf, - agg && (j == k + runlen), + agg && (j == k + (OPJ_UINT32)runlen), vsc); } } } } else { - int *data1 = t1->data; + OPJ_INT32 *data1 = t1->data; opj_flag_t *flags1 = &t1->flags[1]; - for (k = 0; k < (t1->h & ~3); k += 4) { + for (k = 0; k < (t1->h & ~3u); k += 4) { for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH) || MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH) @@ -1061,11 +1071,11 @@ static void opj_t1_dec_clnpass( opj_mqc_setcurctx(mqc, T1_CTXNO_UNI); runlen = opj_mqc_decode(mqc); runlen = (runlen << 1) | opj_mqc_decode(mqc); - flags2 += runlen * t1->flags_stride; - data2 += runlen * t1->w; - for (j = k + runlen; j < k + 4 && j < t1->h; ++j) { + flags2 += (OPJ_UINT32)runlen * t1->flags_stride; + data2 += (OPJ_UINT32)runlen * t1->w; + for (j = k + (OPJ_UINT32)runlen; j < k + 4 && j < t1->h; ++j) { flags2 += t1->flags_stride; - if (agg && (j == k + runlen)) { + if (agg && (j == k + (OPJ_UINT32)runlen)) { opj_t1_dec_clnpass_step_partial(t1, flags2, data2, orient, oneplushalf); } else { opj_t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf); @@ -1091,7 +1101,7 @@ static void opj_t1_dec_clnpass( flags1 += t1->flags_stride << 2; } for (i = 0; i < t1->w; ++i) { - int *data2 = data1 + i; + OPJ_INT32 *data2 = data1 + i; opj_flag_t *flags2 = flags1 + i; for (j = k; j < t1->h; ++j) { flags2 += t1->flags_stride; @@ -1102,7 +1112,7 @@ static void opj_t1_dec_clnpass( } if (segsym) { - int v = 0; + OPJ_INT32 v = 0; opj_mqc_setcurctx(mqc, T1_CTXNO_UNI); v = opj_mqc_decode(mqc); v = (v << 1) | opj_mqc_decode(mqc); @@ -1256,7 +1266,7 @@ OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1, ) { OPJ_UINT32 resno, bandno, precno, cblkno; - OPJ_UINT32 tile_w = tilec->x1 - tilec->x0; + OPJ_UINT32 tile_w = (OPJ_UINT32)(tilec->x1 - tilec->x0); for (resno = 0; resno < tilec->minimum_num_resolutions; ++resno) { opj_tcd_resolution_t* res = &tilec->resolutions[resno]; @@ -1279,7 +1289,7 @@ OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1, t1, cblk, band->bandno, - tccp->roishift, + (OPJ_UINT32)tccp->roishift, tccp->cblksty)) { return OPJ_FALSE; } @@ -1315,7 +1325,7 @@ OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1, /*tiledp=(void*)&tilec->data[(y * tile_w) + x];*/ if (tccp->qmfbid == 1) { - int* restrict tiledp = &tilec->data[(y * tile_w) + x]; + OPJ_INT32* restrict tiledp = &tilec->data[(OPJ_UINT32)y * tile_w + (OPJ_UINT32)x]; for (j = 0; j < cblk_h; ++j) { for (i = 0; i < cblk_w; ++i) { OPJ_INT32 tmp = datap[(j * cblk_w) + i]; @@ -1323,11 +1333,11 @@ OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1, } } } else { /* if (tccp->qmfbid == 0) */ - float* restrict tiledp = (float*) &tilec->data[(y * tile_w) + x]; + OPJ_FLOAT32* restrict tiledp = (OPJ_FLOAT32*) &tilec->data[(OPJ_UINT32)y * tile_w + (OPJ_UINT32)x]; for (j = 0; j < cblk_h; ++j) { - float* restrict tiledp2 = tiledp; + OPJ_FLOAT32* restrict tiledp2 = tiledp; for (i = 0; i < cblk_w; ++i) { - float tmp = *datap * band->stepsize; + OPJ_FLOAT32 tmp = (OPJ_FLOAT32)*datap * band->stepsize; *tiledp2 = tmp; datap++; tiledp2++; @@ -1366,13 +1376,13 @@ OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1, if(!opj_t1_allocate_buffers( t1, - cblk->x1 - cblk->x0, - cblk->y1 - cblk->y0)) + (OPJ_UINT32)(cblk->x1 - cblk->x0), + (OPJ_UINT32)(cblk->y1 - cblk->y0))) { return OPJ_FALSE; } - bpno = roishift + cblk->numbps - 1; + bpno = (OPJ_INT32)(roishift + cblk->numbps - 1); passtype = 2; opj_mqc_resetstates(mqc); @@ -1401,18 +1411,18 @@ OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1, switch (passtype) { case 0: if (type == T1_TYPE_RAW) { - opj_t1_dec_sigpass_raw(t1, bpno+1, orient, cblksty); + opj_t1_dec_sigpass_raw(t1, bpno+1, (OPJ_INT32)orient, (OPJ_INT32)cblksty); } else { if (cblksty & J2K_CCP_CBLKSTY_VSC) { - opj_t1_dec_sigpass_mqc_vsc(t1, bpno+1, orient); + opj_t1_dec_sigpass_mqc_vsc(t1, bpno+1, (OPJ_INT32)orient); } else { - opj_t1_dec_sigpass_mqc(t1, bpno+1, orient); + opj_t1_dec_sigpass_mqc(t1, bpno+1, (OPJ_INT32)orient); } } break; case 1: if (type == T1_TYPE_RAW) { - opj_t1_dec_refpass_raw(t1, bpno+1, cblksty); + opj_t1_dec_refpass_raw(t1, bpno+1, (OPJ_INT32)cblksty); } else { if (cblksty & J2K_CCP_CBLKSTY_VSC) { opj_t1_dec_refpass_mqc_vsc(t1, bpno+1); @@ -1422,7 +1432,7 @@ OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1, } break; case 2: - opj_t1_dec_clnpass(t1, bpno+1, orient, cblksty); + opj_t1_dec_clnpass(t1, bpno+1, (OPJ_INT32)orient, (OPJ_INT32)cblksty); break; } @@ -1457,7 +1467,7 @@ OPJ_BOOL opj_t1_encode_cblks( opj_t1_t *t1, for (compno = 0; compno < tile->numcomps; ++compno) { opj_tcd_tilecomp_t* tilec = &tile->comps[compno]; opj_tccp_t* tccp = &tcp->tccps[compno]; - OPJ_UINT32 tile_w = tilec->x1 - tilec->x0; + OPJ_UINT32 tile_w = (OPJ_UINT32)(tilec->x1 - tilec->x0); for (resno = 0; resno < tilec->numresolutions; ++resno) { opj_tcd_resolution_t *res = &tilec->resolutions[resno]; @@ -1490,8 +1500,8 @@ OPJ_BOOL opj_t1_encode_cblks( opj_t1_t *t1, if(!opj_t1_allocate_buffers( t1, - cblk->x1 - cblk->x0, - cblk->y1 - cblk->y0)) + (OPJ_UINT32)(cblk->x1 - cblk->x0), + (OPJ_UINT32)(cblk->y1 - cblk->y0))) { return OPJ_FALSE; } @@ -1500,7 +1510,7 @@ OPJ_BOOL opj_t1_encode_cblks( opj_t1_t *t1, cblk_w = t1->w; cblk_h = t1->h; - tiledp=&tilec->data[(y * tile_w) + x]; + tiledp=&tilec->data[(OPJ_UINT32)y * tile_w + (OPJ_UINT32)x]; if (tccp->qmfbid == 1) { for (j = 0; j < cblk_h; ++j) { for (i = 0; i < cblk_w; ++i) { @@ -1573,9 +1583,9 @@ void opj_t1_encode_cblk(opj_t1_t *t1, max = opj_int_max(max, tmp); } - cblk->numbps = max ? (opj_int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0; + cblk->numbps = max ? (OPJ_UINT32)((opj_int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS) : 0; - bpno = cblk->numbps - 1; + bpno = (OPJ_INT32)(cblk->numbps - 1); passtype = 2; opj_mqc_resetstates(mqc); @@ -1678,6 +1688,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1, } } +#if 0 void opj_t1_dec_refpass_step( opj_t1_t *t1, opj_flag_t *flagsp, OPJ_INT32 *datap, @@ -1705,9 +1716,11 @@ void opj_t1_dec_refpass_step( opj_t1_t *t1, *flagsp |= T1_REFINE; } } /* VSC and BYPASS by Antonin */ +#endif +#if 0 void opj_t1_dec_sigpass_step( opj_t1_t *t1, opj_flag_t *flagsp, OPJ_INT32 *datap, @@ -1741,4 +1754,4 @@ void opj_t1_dec_sigpass_step( opj_t1_t *t1, *flagsp |= T1_VISIT; } } /* VSC and BYPASS by Antonin */ - +#endif