Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/t1.c

 /*
  * 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
@@ skipping 277 matching lines @@
 @param orient
 @param roishift Region of interest shifting value
 @param cblksty Code-block style
 */
 static OPJ_BOOL opj_t1_decode_cblk( opj_t1_t *t1,
                                     opj_tcd_cblk_dec_t* cblk,
                                     OPJ_UINT32 orient,
                                     OPJ_UINT32 roishift,
                                     OPJ_UINT32 cblksty);
 
-OPJ_BOOL opj_t1_allocate_buffers(   opj_t1_t *t1,
+static OPJ_BOOL opj_t1_allocate_buffers(   opj_t1_t *t1,
                                     OPJ_UINT32 w,
                                     OPJ_UINT32 h);
 
 /*@}*/
 
 /*@}*/
 
 /* ----------------------------------------------------------------------- */
 
-OPJ_BYTE opj_t1_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient) {
+static OPJ_BYTE opj_t1_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient) {
         return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
 }
 
-OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f) {
+static OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f) {
         return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
 }
 
-OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f) {
+static OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f) {
         OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
         OPJ_UINT32 tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
         return (tmp2);
 }
 
-OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f) {
+static OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f) {
         return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
 }
 
-OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
-        if (bitpos > T1_NMSEDEC_FRACBITS) {
-                return lut_nmsedec_sig[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+static OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
+        if (bitpos > 0) {
+                return lut_nmsedec_sig[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)];
         }
         
         return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
-OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
-        if (bitpos > T1_NMSEDEC_FRACBITS) {
-                return lut_nmsedec_ref[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+static OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
+        if (bitpos > 0) {
+                return lut_nmsedec_ref[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)];
         }
 
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
-void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s, OPJ_UINT32 stride) {
+static void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s, OPJ_UINT32 stride) {
         opj_flag_t *np = flagsp - stride;
         opj_flag_t *sp = flagsp + stride;
 
         static const opj_flag_t mod[] = {
                 T1_SIG_S, T1_SIG_S|T1_SGN_S,
                 T1_SIG_E, T1_SIG_E|T1_SGN_E,
                 T1_SIG_W, T1_SIG_W|T1_SGN_W,
                 T1_SIG_N, T1_SIG_N|T1_SGN_N
         };
 
         np[-1] |= T1_SIG_SE;
         np[0]  |= mod[s];
         np[1]  |= T1_SIG_SW;
 
         flagsp[-1] |= mod[s+2];
         flagsp[0]  |= T1_SIG;
         flagsp[1]  |= mod[s+4];
 
         sp[-1] |= T1_SIG_NE;
         sp[0]  |= mod[s+6];
         sp[1]  |= T1_SIG_NW;
 }
 
-void opj_t1_enc_sigpass_step(   opj_t1_t *t1,
+static void opj_t1_enc_sigpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
                                 OPJ_UINT32 orient,
                                 OPJ_INT32 bpno,
                                 OPJ_INT32 one,
                                 OPJ_INT32 *nmsedec,
                                 OPJ_BYTE type,
                                 OPJ_UINT32 vsc
                                 )
 {
         OPJ_INT32 v;
     OPJ_UINT32 flag;
         
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
         
         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, (OPJ_UINT32)v);
                 } else {
                         opj_mqc_encode(mqc, (OPJ_UINT32)v);
                 }
                 if (v) {
                         v = *datap < 0 ? 1 : 0;
-                        *nmsedec +=     opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS));
+                        *nmsedec +=     opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno));
                         opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));       /* ESSAI */
                         if (type == T1_TYPE_RAW) {      /* BYPASS/LAZY MODE */
                                 opj_mqc_bypass_enc(mqc, (OPJ_UINT32)v);
                         } else {
                                 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;
         }
@@ skipping 16 matching lines @@
         if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
                         if (opj_raw_decode(raw)) {
                                 v = (OPJ_INT32)opj_raw_decode(raw);    /* ESSAI */
                                 *datap = v ? -oneplushalf : oneplushalf;
                                 opj_t1_updateflags(flagsp, (OPJ_UINT32)v, t1->flags_stride);
                         }
                 *flagsp |= T1_VISIT;
         }
 }      
 
-INLINE void opj_t1_dec_sigpass_step_mqc(
+static INLINE void opj_t1_dec_sigpass_step_mqc(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_INT32 orient,
                 OPJ_INT32 oneplushalf)
 {
         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((OPJ_UINT32)flag, (OPJ_UINT32)orient));
                         if (opj_mqc_decode(mqc)) {
                                 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, (OPJ_UINT32)v, t1->flags_stride);
                         }
                 *flagsp |= T1_VISIT;
         }
 }                               /* VSC and  BYPASS by Antonin */
 
-INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
+static INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_INT32 orient,
                 OPJ_INT32 oneplushalf,
                 OPJ_INT32 vsc)
 {
         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((OPJ_UINT32)flag, (OPJ_UINT32)orient));
                 if (opj_mqc_decode(mqc)) {
                         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, (OPJ_UINT32)v, t1->flags_stride);
                 }
                 *flagsp |= T1_VISIT;
         }
 }                               /* VSC and  BYPASS by Antonin */
 
 
 
-void opj_t1_enc_sigpass(opj_t1_t *t1,
+static void opj_t1_enc_sigpass(opj_t1_t *t1,
                         OPJ_INT32 bpno,
                         OPJ_UINT32 orient,
                         OPJ_INT32 *nmsedec,
                         OPJ_BYTE type,
                         OPJ_UINT32 cblksty
                         )
 {
         OPJ_UINT32 i, j, k, vsc; 
     OPJ_INT32 one;
 
@@ skipping 11 matching lines @@
                                                 bpno,
                                                 one,
                                                 nmsedec,
                                                 type,
                                                 vsc);
                         }
                 }
         }
 }
 
-void opj_t1_dec_sigpass_raw(
+static void opj_t1_dec_sigpass_raw(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_INT32 orient,
                 OPJ_INT32 cblksty)
 {
         OPJ_INT32 one, half, oneplushalf, vsc;
         OPJ_UINT32 i, j, k; 
         one = 1 << bpno;
         half = one >> 1;
         oneplushalf = one | half;
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_dec_sigpass_step_raw(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
                                                 &t1->data[(j * t1->w) + i],
                                                 orient,
                                                 oneplushalf,
                                                 vsc);
                         }
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
-void opj_t1_dec_sigpass_mqc(
+static void opj_t1_dec_sigpass_mqc(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_INT32 orient)
 {
         OPJ_INT32 one, half, oneplushalf;
         OPJ_UINT32 i, j, k;
         OPJ_INT32 *data1 = t1->data;
         opj_flag_t *flags1 = &t1->flags[1];
         one = 1 << bpno;
         half = one >> 1;
@@ skipping 22 matching lines @@
                 OPJ_INT32 *data2 = data1 + i;
                 opj_flag_t *flags2 = flags1 + i;
                 for (j = k; j < t1->h; ++j) {
                         flags2 += t1->flags_stride;
                         opj_t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
                         data2 += t1->w;
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
-void opj_t1_dec_sigpass_mqc_vsc(
+static void opj_t1_dec_sigpass_mqc_vsc(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_INT32 orient)
 {
         OPJ_INT32 one, half, oneplushalf, vsc;
         OPJ_UINT32 i, j, k;
         one = 1 << bpno;
         half = one >> 1;
         oneplushalf = one | half;
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
                                 opj_t1_dec_sigpass_step_mqc_vsc(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
                                                 &t1->data[(j * t1->w) + i],
                                                 orient,
                                                 oneplushalf,
                                                 vsc);
                         }
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
 
 
-void opj_t1_enc_refpass_step(   opj_t1_t *t1,
+static void opj_t1_enc_refpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
                                 OPJ_INT32 bpno,
                                 OPJ_INT32 one,
                                 OPJ_INT32 *nmsedec,
                                 OPJ_BYTE type,
                                 OPJ_UINT32 vsc)
 {
         OPJ_INT32 v;
         OPJ_UINT32 flag;
         
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
         
         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_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS));
+                *nmsedec += opj_t1_getnmsedec_ref((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno));
                 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, (OPJ_UINT32)v);
                 } else {
                         opj_mqc_encode(mqc, (OPJ_UINT32)v);
                 }
                 *flagsp |= T1_REFINE;
         }
 }
 
-INLINE void opj_t1_dec_refpass_step_raw(
+static INLINE void opj_t1_dec_refpass_step_raw(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_INT32 poshalf,
                 OPJ_INT32 neghalf,
                 OPJ_INT32 vsc)
 {
         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_INT32)opj_raw_decode(raw);
                 t = v ? poshalf : neghalf;
                 *datap += *datap < 0 ? -t : t;
                 *flagsp |= T1_REFINE;
         }
 }                               /* VSC and  BYPASS by Antonin  */
 
-INLINE void opj_t1_dec_refpass_step_mqc(
+static INLINE void opj_t1_dec_refpass_step_mqc(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_INT32 poshalf,
                 OPJ_INT32 neghalf)
 {
         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((OPJ_UINT32)flag));      /* ESSAI */
                         v = opj_mqc_decode(mqc);
                 t = v ? poshalf : neghalf;
                 *datap += *datap < 0 ? -t : t;
                 *flagsp |= T1_REFINE;
                 }
 }                               /* VSC and  BYPASS by Antonin  */
 
-INLINE void opj_t1_dec_refpass_step_mqc_vsc(
+static INLINE void opj_t1_dec_refpass_step_mqc_vsc(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_INT32 poshalf,
                 OPJ_INT32 neghalf,
                 OPJ_INT32 vsc)
 {
         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((OPJ_UINT32)flag));      /* ESSAI */
                 v = opj_mqc_decode(mqc);
                 t = v ? poshalf : neghalf;
                 *datap += *datap < 0 ? -t : t;
                 *flagsp |= T1_REFINE;
         }
 }                               /* VSC and  BYPASS by Antonin  */
 
 
-void opj_t1_enc_refpass(
+static void opj_t1_enc_refpass(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_INT32 *nmsedec,
                 OPJ_BYTE type,
                 OPJ_UINT32 cblksty)
 {
         OPJ_UINT32 i, j, k, vsc;
     OPJ_INT32 one;
 
         *nmsedec = 0;
         one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_enc_refpass_step(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
                                                 &t1->data[(j * t1->data_stride) + i],
                                                 bpno,
                                                 one,
                                                 nmsedec,
                                                 type,
                                                 vsc);
                         }
                 }
         }
 }
 
-void opj_t1_dec_refpass_raw(
+static void opj_t1_dec_refpass_raw(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_INT32 cblksty)
 {
         OPJ_INT32 one, poshalf, neghalf;
         OPJ_UINT32 i, j, k;
         OPJ_INT32 vsc;
         one = 1 << bpno;
         poshalf = one >> 1;
         neghalf = bpno > 0 ? -poshalf : -1;
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_dec_refpass_step_raw(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
                                                 &t1->data[(j * t1->w) + i],
                                                 poshalf,
                                                 neghalf,
                                                 vsc);
                         }
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
-void opj_t1_dec_refpass_mqc(
+static void opj_t1_dec_refpass_mqc(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno)
 {
         OPJ_INT32 one, poshalf, neghalf;
         OPJ_UINT32 i, j, k;
         OPJ_INT32 *data1 = t1->data;
         opj_flag_t *flags1 = &t1->flags[1];
         one = 1 << bpno;
         poshalf = one >> 1;
         neghalf = bpno > 0 ? -poshalf : -1;
@@ skipping 21 matching lines @@
                 OPJ_INT32 *data2 = data1 + i;
                 opj_flag_t *flags2 = flags1 + i;
                 for (j = k; j < t1->h; ++j) {
                         flags2 += t1->flags_stride;
                         opj_t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
                         data2 += t1->w;
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
-void opj_t1_dec_refpass_mqc_vsc(
+static void opj_t1_dec_refpass_mqc_vsc(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno)
 {
         OPJ_INT32 one, poshalf, neghalf;
         OPJ_UINT32 i, j, k;
         OPJ_INT32 vsc;
         one = 1 << bpno;
         poshalf = one >> 1;
         neghalf = bpno > 0 ? -poshalf : -1;
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         for (j = k; j < k + 4 && j < t1->h; ++j) {
                                 vsc = ((j == k + 3 || j == t1->h - 1)) ? 1 : 0;
                                 opj_t1_dec_refpass_step_mqc_vsc(
                                                 t1,
                                                 &t1->flags[((j+1) * t1->flags_stride) + i + 1],
                                                 &t1->data[(j * t1->w) + i],
                                                 poshalf,
                                                 neghalf,
                                                 vsc);
                         }
                 }
         }
 }                               /* VSC and  BYPASS by Antonin */
 
 
-void opj_t1_enc_clnpass_step(
+static void opj_t1_enc_clnpass_step(
                 opj_t1_t *t1,
                 opj_flag_t *flagsp,
                 OPJ_INT32 *datap,
                 OPJ_UINT32 orient,
                 OPJ_INT32 bpno,
                 OPJ_INT32 one,
                 OPJ_INT32 *nmsedec,
                 OPJ_UINT32 partial,
                 OPJ_UINT32 vsc)
 {
         OPJ_INT32 v;
         OPJ_UINT32 flag;
         
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
         
         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, (OPJ_UINT32)v);
                 if (v) {
 LABEL_PARTIAL:
-                        *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno + T1_NMSEDEC_FRACBITS));
+                        *nmsedec += opj_t1_getnmsedec_sig((OPJ_UINT32)opj_int_abs(*datap), (OPJ_UINT32)(bpno));
                         opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
                         v = *datap < 0 ? 1 : 0;
                         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;
 }
 
 static void opj_t1_dec_clnpass_step_partial(
@@ skipping 63 matching lines @@
 LABEL_PARTIAL:
                         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, (OPJ_UINT32)v, t1->flags_stride);
                 }
         }
         *flagsp &= ~T1_VISIT;
 }
 
-void opj_t1_enc_clnpass(
+static void opj_t1_enc_clnpass(
                 opj_t1_t *t1,
                 OPJ_INT32 bpno,
                 OPJ_UINT32 orient,
                 OPJ_INT32 *nmsedec,
                 OPJ_UINT32 cblksty)
 {
         OPJ_UINT32 i, j, k;
         OPJ_INT32 one;
         OPJ_UINT32 agg, runlen, vsc;
         
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
         
         *nmsedec = 0;
         one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
         for (k = 0; k < t1->h; k += 4) {
                 for (i = 0; i < t1->w; ++i) {
                         if (k + 3 < t1->h) {
                                 if (cblksty & J2K_CCP_CBLKSTY_VSC) {
                                         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)
                                                 || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
                                                 || (MACRO_t1_flags(1 + k + 3,1 + i) 
                                                 & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
                                 } else {
-                                        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)
-                                                || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-                                                || MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                                        agg = !((MACRO_t1_flags(1 + k,1 + i) | 
+                                                    MACRO_t1_flags(1 + k + 1,1 + i) |
+                                                    MACRO_t1_flags(1 + k + 2,1 + i) | 
+                                                     MACRO_t1_flags(1 + k + 3,1 + i)) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
                                 }
                         } else {
                                 agg = 0;
                         }
                         if (agg) {
                                 for (runlen = 0; runlen < 4; ++runlen) {
                                         if (opj_int_abs(t1->data[((k + runlen)*t1->data_stride) + i]) & one)
                                                 break;
                                 }
                                 opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
@@ skipping 75 matching lines @@
                         }
                 }
         }
         } else {
                 OPJ_INT32 *data1 = t1->data;
                 opj_flag_t *flags1 = &t1->flags[1];
                 for (k = 0; k < (t1->h & ~3u); k += 4) {
                         for (i = 0; i < t1->w; ++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)
-                                        || MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-                                        || MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+                                agg = !((MACRO_t1_flags(1 + k, 1 + i) |
+                                                        MACRO_t1_flags(1 + k + 1, 1 + i) |
+                                                        MACRO_t1_flags(1 + k + 2, 1 + i) |
+                                                        MACRO_t1_flags(1 + k + 3, 1 + i)) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
                                 if (agg) {
                                         opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
                                         if (!opj_mqc_decode(mqc)) {
                                                 continue;
                                         }
                                         opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
                                         runlen = opj_mqc_decode(mqc);
                                         runlen = (runlen << 1) | opj_mqc_decode(mqc);
                                         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) {
+                                        for (j = (OPJ_UINT32)runlen; j < 4 && j < t1->h; ++j) {
                                                 flags2 += t1->flags_stride;
-                                                if (agg && (j == k + (OPJ_UINT32)runlen)) {
+                                                if (agg && (j == (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);
                                                 }
                                                 data2 += t1->w;
                                         }
                                 } else {
                                         flags2 += t1->flags_stride;
                                         opj_t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
                                         data2 += t1->w;
@@ skipping 63 matching lines @@
         } else {        /* if (qmfbid == 0) */
                 w2 = opj_dwt_getnorm_real(level, orient);
         }
 
         wmsedec = w1 * w2 * stepsize * (1 << bpno);
         wmsedec *= wmsedec * nmsedec / 8192.0;
 
         return wmsedec;
 }
 
-OPJ_BOOL opj_t1_allocate_buffers(
+static OPJ_BOOL opj_t1_allocate_buffers(
                 opj_t1_t *t1,
                 OPJ_UINT32 w,
                 OPJ_UINT32 h)
 {
         OPJ_UINT32 datasize=w * h;
         OPJ_UINT32 flagssize;
 
         /* encoder uses tile buffer, so no need to allocate */
         if (!t1->encoder) {
                 if(datasize > t1->datasize){
@@ skipping 106 matching lines @@
 
                 for (bandno = 0; bandno < res->numbands; ++bandno) {
                         opj_tcd_band_t* restrict band = &res->bands[bandno];
 
                         for (precno = 0; precno < res->pw * res->ph; ++precno) {
                                 opj_tcd_precinct_t* precinct = &band->precincts[precno];
 
                                 for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
                                         opj_tcd_cblk_dec_t* cblk = &precinct->cblks.dec[cblkno];
                                         OPJ_INT32* restrict datap;
-                                        /*void* restrict tiledp;*/
                                         OPJ_UINT32 cblk_w, cblk_h;
                                         OPJ_INT32 x, y;
                                         OPJ_UINT32 i, j;
 
                     if (OPJ_FALSE == opj_t1_decode_cblk(
                                             t1,
                                             cblk,
                                             band->bandno,
                                             (OPJ_UINT32)tccp->roishift,
                                             tccp->cblksty)) {
@@ skipping 21 matching lines @@
                                                         for (i = 0; i < cblk_w; ++i) {
                                                                 OPJ_INT32 val = datap[(j * cblk_w) + i];
                                                                 OPJ_INT32 mag = abs(val);
                                                                 if (mag >= thresh) {
                                                                         mag >>= tccp->roishift;
                                                                         datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
                                                                 }
                                                         }
                                                 }
                                         }
-
-                                        /*tiledp=(void*)&tilec->data[(y * tile_w) + x];*/
                                         if (tccp->qmfbid == 1) {
                         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];
-                                                                ((OPJ_INT32*)tiledp)[(j * tile_w) + i] = tmp / 2;
+                                                                ((OPJ_INT32*)tiledp)[(j * tile_w) + i] = tmp/2;
                                                         }
                                                 }
                                         } else {                /* if (tccp->qmfbid == 0) */
                         OPJ_FLOAT32* restrict tiledp = (OPJ_FLOAT32*) &tilec->data[(OPJ_UINT32)y * tile_w + (OPJ_UINT32)x];
                                                 for (j = 0; j < cblk_h; ++j) {
                             OPJ_FLOAT32* restrict tiledp2 = tiledp;
                                                         for (i = 0; i < cblk_w; ++i) {
                                 OPJ_FLOAT32 tmp = (OPJ_FLOAT32)*datap * band->stepsize;
                                 *tiledp2 = tmp;
                                 datap++;
                                 tiledp2++;
-                                                                /*float tmp = datap[(j * cblk_w) + i] * band->stepsize;
-                                                                ((float*)tiledp)[(j * tile_w) + i] = tmp;*/
-
                                                         }
                             tiledp += tile_w;
                                                 }
                                         }
-                    /*opj_free(cblk->data);
-                                        opj_free(cblk->segs);*/
-                                        /*cblk->segs = 00;*/
                                 } /* cblkno */
-                /*opj_free(precinct->cblks.dec);*/
                         } /* precno */
                 } /* bandno */
         } /* resno */
         return OPJ_TRUE;
 }
 
 
-OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
+static OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
                             opj_tcd_cblk_dec_t* cblk,
                             OPJ_UINT32 orient,
                             OPJ_UINT32 roishift,
                             OPJ_UINT32 cblksty)
 {
         opj_raw_t *raw = t1->raw;       /* RAW component */
         opj_mqc_t *mqc = t1->mqc;       /* MQC component */
 
-        OPJ_INT32 bpno;
+        OPJ_INT32 bpno_plus_one;
         OPJ_UINT32 passtype;
         OPJ_UINT32 segno, passno;
         OPJ_BYTE type = T1_TYPE_MQ; /* BYPASS mode */
 
         if(!opj_t1_allocate_buffers(
                                 t1,
                                 (OPJ_UINT32)(cblk->x1 - cblk->x0),
                                 (OPJ_UINT32)(cblk->y1 - cblk->y0)))
         {
                 return OPJ_FALSE;
         }
 
-        bpno = (OPJ_INT32)(roishift + cblk->numbps - 1);
+        bpno_plus_one = (OPJ_INT32)(roishift + cblk->numbps);
         passtype = 2;
 
         opj_mqc_resetstates(mqc);
         opj_mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
         opj_mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
         opj_mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 
         for (segno = 0; segno < cblk->real_num_segs; ++segno) {
                 opj_tcd_seg_t *seg = &cblk->segs[segno];
 
                 /* BYPASS mode */
-                type = ((bpno <= ((OPJ_INT32) (cblk->numbps) - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+                type = ((bpno_plus_one <= ((OPJ_INT32) (cblk->numbps)) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
                 /* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
                 if(seg->data == 00){
                         continue;
                 }
                 if (type == T1_TYPE_RAW) {
                         opj_raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
                 } else {
             if (OPJ_FALSE == opj_mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len)) {
                     return OPJ_FALSE;
             }
                 }
 
                 for (passno = 0; passno < seg->real_num_passes; ++passno) {
             switch (passtype) {
                 case 0:
                     if (type == T1_TYPE_RAW) {
-                        opj_t1_dec_sigpass_raw(t1, bpno+1, (OPJ_INT32)orient, (OPJ_INT32)cblksty);
+                        opj_t1_dec_sigpass_raw(t1, bpno_plus_one, (OPJ_INT32)orient, (OPJ_INT32)cblksty);
                     } else {
                         if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-                            opj_t1_dec_sigpass_mqc_vsc(t1, bpno+1, (OPJ_INT32)orient);
+                            opj_t1_dec_sigpass_mqc_vsc(t1, bpno_plus_one, (OPJ_INT32)orient);
                         } else {
-                            opj_t1_dec_sigpass_mqc(t1, bpno+1, (OPJ_INT32)orient);
+                            opj_t1_dec_sigpass_mqc(t1, bpno_plus_one, (OPJ_INT32)orient);
                         }
                     }
                     break;
                 case 1:
                     if (type == T1_TYPE_RAW) {
-                            opj_t1_dec_refpass_raw(t1, bpno+1, (OPJ_INT32)cblksty);
+                            opj_t1_dec_refpass_raw(t1, bpno_plus_one, (OPJ_INT32)cblksty);
                     } else {
                         if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-                            opj_t1_dec_refpass_mqc_vsc(t1, bpno+1);
+                            opj_t1_dec_refpass_mqc_vsc(t1, bpno_plus_one);
                         } else {
-                            opj_t1_dec_refpass_mqc(t1, bpno+1);
+                            opj_t1_dec_refpass_mqc(t1, bpno_plus_one);
                         }
                     }
                     break;
                 case 2:
-                    opj_t1_dec_clnpass(t1, bpno+1, (OPJ_INT32)orient, (OPJ_INT32)cblksty);
+                    opj_t1_dec_clnpass(t1, bpno_plus_one, (OPJ_INT32)orient, (OPJ_INT32)cblksty);
                     break;
             }
 
                         if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
                                 opj_mqc_resetstates(mqc);
                                 opj_mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
                                 opj_mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
                                 opj_mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
                         }
                         if (++passtype == 3) {
                                 passtype = 0;
-                                bpno--;
+                                bpno_plus_one--;
                         }
                 }
         }
-        return OPJ_TRUE;
+    return OPJ_TRUE;
 }
 
 
 
 
 OPJ_BOOL opj_t1_encode_cblks(   opj_t1_t *t1,
                                 opj_tcd_tile_t *tile,
                                 opj_tcp_t *tcp,
                                 const OPJ_FLOAT64 * mct_norms,
                                 OPJ_UINT32 mct_numcomps
@@ skipping 89 matching lines @@
 
                                         } /* cblkno */
                                 } /* precno */
                         } /* bandno */
                 } /* resno  */
         } /* compno  */
         return OPJ_TRUE;
 }
 
 /** mod fixed_quality */
-void opj_t1_encode_cblk(opj_t1_t *t1,
+static void opj_t1_encode_cblk(opj_t1_t *t1,
                         opj_tcd_cblk_enc_t* cblk,
                         OPJ_UINT32 orient,
                         OPJ_UINT32 compno,
                         OPJ_UINT32 level,
                         OPJ_UINT32 qmfbid,
                         OPJ_FLOAT64 stepsize,
                         OPJ_UINT32 cblksty,
                         OPJ_UINT32 numcomps,
                         opj_tcd_tile_t * tile,
                         const OPJ_FLOAT64 * mct_norms,
@@ skipping 119 matching lines @@
                         pass->rate = opj_mqc_numbytes(mqc);
                 /*Preventing generation of FF as last data byte of a pass*/
                 if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
                         pass->rate--;
                 }
                 pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);
         }
 }
 
 #if 0
-void opj_t1_dec_refpass_step(   opj_t1_t *t1,
+static void opj_t1_dec_refpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
                                 OPJ_INT32 poshalf,
                                 OPJ_INT32 neghalf,
                                 OPJ_BYTE type,
                                 OPJ_UINT32 vsc)
 {
         OPJ_INT32  t;
         OPJ_UINT32 v,flag;
 
@@ skipping 11 matching lines @@
                 t = v ? poshalf : neghalf;
                 *datap += *datap < 0 ? -t : t;
                 *flagsp |= T1_REFINE;
         }
 }                               /* VSC and  BYPASS by Antonin  */
 #endif
 
 
 
 #if 0
-void opj_t1_dec_sigpass_step(   opj_t1_t *t1,
+static void opj_t1_dec_sigpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
                                 OPJ_UINT32 orient,
                                 OPJ_INT32 oneplushalf,
                                 OPJ_BYTE type,
                                 OPJ_UINT32 vsc)
 {
         OPJ_UINT32 v, flag;
 
         opj_raw_t *raw = t1->raw;       /* RAW component */
@@ skipping 13 matching lines @@
                                 opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
                                 v = opj_mqc_decode(mqc) ^ opj_t1_getspb(flag);
                                 *datap = v ? -oneplushalf : oneplushalf;
                                 opj_t1_updateflags(flagsp, v, t1->flags_stride);
                         }
                 }
                 *flagsp |= T1_VISIT;
         }
 }                               /* VSC and  BYPASS by Antonin */
 #endif