[trunk] update mqc global functions with opj_ prefix

diff --git a/src/lib/openjp2/mqc.c b/src/lib/openjp2/mqc.c
index 8e641d23d848619f728f437bf6c21a01d2775212..d38395d491731c480201914e37256a93ab2c650c 100644 (file)
--- a/src/lib/openjp2/mqc.c
+++ b/src/lib/openjp2/mqc.c
@@ -353,7 +353,7 @@ static INLINE void opj_mqc_renormd(opj_mqc_t *const mqc) {
 ==========================================================
 */
 
-opj_mqc_t* mqc_create(void) {
+opj_mqc_t* opj_mqc_create(void) {
        opj_mqc_t *mqc = (opj_mqc_t*)opj_malloc(sizeof(opj_mqc_t));
 #ifdef MQC_PERF_OPT
        mqc->buffer = NULL;
@@ -361,7 +361,7 @@ opj_mqc_t* mqc_create(void) {
        return mqc;
 }
 
-void mqc_destroy(opj_mqc_t *mqc) {
+void opj_mqc_destroy(opj_mqc_t *mqc) {
        if(mqc) {
 #ifdef MQC_PERF_OPT
                if (mqc->buffer) { /* TODO: LH: this test is pointless as free() is a no-op on 0 */
@@ -372,13 +372,13 @@ void mqc_destroy(opj_mqc_t *mqc) {
        }
 }
 
-OPJ_UINT32 mqc_numbytes(opj_mqc_t *mqc) {
+OPJ_UINT32 opj_mqc_numbytes(opj_mqc_t *mqc) {
        return mqc->bp - mqc->start;
 }
 
-void mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp) {
+void opj_mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp) {
     /* TODO MSD: need to take a look to the v2 version */
-       mqc_setcurctx(mqc, 0);
+       opj_mqc_setcurctx(mqc, 0);
        mqc->a = 0x8000;
        mqc->c = 0;
        mqc->bp = bp - 1;
@@ -389,7 +389,7 @@ void mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp) {
        mqc->start = bp;
 }
 
-void mqc_encode(opj_mqc_t *mqc, OPJ_UINT32 d) {
+void opj_mqc_encode(opj_mqc_t *mqc, OPJ_UINT32 d) {
        if ((*mqc->curctx)->mps == d) {
                opj_mqc_codemps(mqc);
        } else {
@@ -397,7 +397,7 @@ void mqc_encode(opj_mqc_t *mqc, OPJ_UINT32 d) {
        }
 }
 
-void mqc_flush(opj_mqc_t *mqc) {
+void opj_mqc_flush(opj_mqc_t *mqc) {
        opj_mqc_setbits(mqc);
        mqc->c <<= mqc->ct;
        opj_mqc_byteout(mqc);
@@ -409,7 +409,7 @@ void mqc_flush(opj_mqc_t *mqc) {
        }
 }
 
-void mqc_bypass_init_enc(opj_mqc_t *mqc) {
+void opj_mqc_bypass_init_enc(opj_mqc_t *mqc) {
        mqc->c = 0;
        mqc->ct = 8;
        /*if (*mqc->bp == 0xff) {
@@ -417,7 +417,7 @@ void mqc_bypass_init_enc(opj_mqc_t *mqc) {
      } */
 }
 
-void mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d) {
+void opj_mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d) {
        mqc->ct--;
        mqc->c = mqc->c + (d << mqc->ct);
        if (mqc->ct == 0) {
@@ -431,7 +431,7 @@ void mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d) {
        }
 }
 
-OPJ_UINT32 mqc_bypass_flush_enc(opj_mqc_t *mqc) {
+OPJ_UINT32 opj_mqc_bypass_flush_enc(opj_mqc_t *mqc) {
        OPJ_BYTE bit_padding;
        
        bit_padding = 0;
@@ -451,14 +451,14 @@ OPJ_UINT32 mqc_bypass_flush_enc(opj_mqc_t *mqc) {
        return 1;
 }
 
-void mqc_reset_enc(opj_mqc_t *mqc) {
-       mqc_resetstates(mqc);
-       mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-       mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-       mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+void opj_mqc_reset_enc(opj_mqc_t *mqc) {
+       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);
 }
 
-OPJ_UINT32 mqc_restart_enc(opj_mqc_t *mqc) {
+OPJ_UINT32 opj_mqc_restart_enc(opj_mqc_t *mqc) {
        OPJ_UINT32 correction = 1;
        
        /* <flush part> */
@@ -474,9 +474,9 @@ OPJ_UINT32 mqc_restart_enc(opj_mqc_t *mqc) {
        return correction;
 }
 
-void mqc_restart_init_enc(opj_mqc_t *mqc) {
+void opj_mqc_restart_init_enc(opj_mqc_t *mqc) {
        /* <Re-init part> */
-       mqc_setcurctx(mqc, 0);
+       opj_mqc_setcurctx(mqc, 0);
        mqc->a = 0x8000;
        mqc->c = 0;
        mqc->ct = 12;
@@ -486,7 +486,7 @@ void mqc_restart_init_enc(opj_mqc_t *mqc) {
        }
 }
 
-void mqc_erterm_enc(opj_mqc_t *mqc) {
+void opj_mqc_erterm_enc(opj_mqc_t *mqc) {
        OPJ_INT32 k = 11 - mqc->ct + 1;
        
        while (k > 0) {
@@ -501,17 +501,17 @@ void mqc_erterm_enc(opj_mqc_t *mqc) {
        }
 }
 
-void mqc_segmark_enc(opj_mqc_t *mqc) {
+void opj_mqc_segmark_enc(opj_mqc_t *mqc) {
        OPJ_UINT32 i;
-       mqc_setcurctx(mqc, 18);
+       opj_mqc_setcurctx(mqc, 18);
        
        for (i = 1; i < 5; i++) {
-               mqc_encode(mqc, i % 2);
+               opj_mqc_encode(mqc, i % 2);
        }
 }
 
-opj_bool mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
-       mqc_setcurctx(mqc, 0);
+opj_bool opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
+       opj_mqc_setcurctx(mqc, 0);
        mqc->start = bp;
        mqc->end = bp + len;
        mqc->bp = bp;
@@ -569,7 +569,7 @@ opj_bool mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len) {
         return OPJ_TRUE;
 }
 
-OPJ_INT32 mqc_decode(opj_mqc_t *const mqc) {
+OPJ_INT32 opj_mqc_decode(opj_mqc_t *const mqc) {
        OPJ_INT32 d;
        mqc->a -= (*mqc->curctx)->qeval;
        if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
@@ -588,14 +588,14 @@ OPJ_INT32 mqc_decode(opj_mqc_t *const mqc) {
        return d;
 }
 
-void mqc_resetstates(opj_mqc_t *mqc) {
+void opj_mqc_resetstates(opj_mqc_t *mqc) {
        OPJ_UINT32 i;
        for (i = 0; i < MQC_NUMCTXS; i++) {
                mqc->ctxs[i] = mqc_states;
        }
 }
 
-void mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob) {
+void opj_mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob) {
        mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
 }
 

diff --git a/src/lib/openjp2/mqc.h b/src/lib/openjp2/mqc.h
index 95e4a97d6a0261a6d2ac2c8e9e34580cde9af409..bc4e0055c8578c5c8d4d5465f189948ac139544d 100644 (file)
--- a/src/lib/openjp2/mqc.h
+++ b/src/lib/openjp2/mqc.h
@@ -83,24 +83,24 @@ typedef struct opj_mqc {
 Create a new MQC handle 
 @return Returns a new MQC handle if successful, returns NULL otherwise
 */
-opj_mqc_t* mqc_create(void);
+opj_mqc_t* opj_mqc_create(void);
 /**
 Destroy a previously created MQC handle
 @param mqc MQC handle to destroy
 */
-void mqc_destroy(opj_mqc_t *mqc);
+void opj_mqc_destroy(opj_mqc_t *mqc);
 /**
 Return the number of bytes written/read since initialisation
 @param mqc MQC handle
 @return Returns the number of bytes already encoded
 */
-OPJ_UINT32 mqc_numbytes(opj_mqc_t *mqc);
+OPJ_UINT32 opj_mqc_numbytes(opj_mqc_t *mqc);
 /**
 Reset the states of all the context of the coder/decoder 
 (each context is set to a state where 0 and 1 are more or less equiprobable)
 @param mqc MQC handle
 */
-void mqc_resetstates(opj_mqc_t *mqc);
+void opj_mqc_resetstates(opj_mqc_t *mqc);
 /**
 Set the state of a particular context
 @param mqc MQC handle
@@ -108,37 +108,37 @@ Set the state of a particular context
 @param msb The MSB of the new state of the context
 @param prob Number that identifies the probability of the symbols for the new state of the context
 */
-void mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob);
+void opj_mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob);
 /**
 Initialize the encoder
 @param mqc MQC handle
 @param bp Pointer to the start of the buffer where the bytes will be written
 */
-void mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp);
+void opj_mqc_init_enc(opj_mqc_t *mqc, OPJ_BYTE *bp);
 /**
 Set the current context used for coding/decoding
 @param mqc MQC handle
 @param ctxno Number that identifies the context
 */
-#define mqc_setcurctx(mqc, ctxno)      (mqc)->curctx = &(mqc)->ctxs[(OPJ_UINT32)(ctxno)]
+#define opj_mqc_setcurctx(mqc, ctxno)  (mqc)->curctx = &(mqc)->ctxs[(OPJ_UINT32)(ctxno)]
 /**
 Encode a symbol using the MQ-coder
 @param mqc MQC handle
 @param d The symbol to be encoded (0 or 1)
 */
-void mqc_encode(opj_mqc_t *mqc, OPJ_UINT32 d);
+void opj_mqc_encode(opj_mqc_t *mqc, OPJ_UINT32 d);
 /**
 Flush the encoder, so that all remaining data is written
 @param mqc MQC handle
 */
-void mqc_flush(opj_mqc_t *mqc);
+void opj_mqc_flush(opj_mqc_t *mqc);
 /**
 BYPASS mode switch, initialization operation. 
 JPEG 2000 p 505. 
 <h2>Not fully implemented and tested !!</h2>
 @param mqc MQC handle
 */
-void mqc_bypass_init_enc(opj_mqc_t *mqc);
+void opj_mqc_bypass_init_enc(opj_mqc_t *mqc);
 /**
 BYPASS mode switch, coding operation. 
 JPEG 2000 p 505. 
@@ -146,53 +146,53 @@ JPEG 2000 p 505.
 @param mqc MQC handle
 @param d The symbol to be encoded (0 or 1)
 */
-void mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d);
+void opj_mqc_bypass_enc(opj_mqc_t *mqc, OPJ_UINT32 d);
 /**
 BYPASS mode switch, flush operation
 <h2>Not fully implemented and tested !!</h2>
 @param mqc MQC handle
 @return Returns 1 (always)
 */
-OPJ_UINT32 mqc_bypass_flush_enc(opj_mqc_t *mqc);
+OPJ_UINT32 opj_mqc_bypass_flush_enc(opj_mqc_t *mqc);
 /**
 RESET mode switch
 @param mqc MQC handle
 */
-void mqc_reset_enc(opj_mqc_t *mqc);
+void opj_mqc_reset_enc(opj_mqc_t *mqc);
 /**
 RESTART mode switch (TERMALL)
 @param mqc MQC handle
 @return Returns 1 (always)
 */
-OPJ_UINT32 mqc_restart_enc(opj_mqc_t *mqc);
+OPJ_UINT32 opj_mqc_restart_enc(opj_mqc_t *mqc);
 /**
 RESTART mode switch (TERMALL) reinitialisation
 @param mqc MQC handle
 */
-void mqc_restart_init_enc(opj_mqc_t *mqc);
+void opj_mqc_restart_init_enc(opj_mqc_t *mqc);
 /**
 ERTERM mode switch (PTERM)
 @param mqc MQC handle
 */
-void mqc_erterm_enc(opj_mqc_t *mqc);
+void opj_mqc_erterm_enc(opj_mqc_t *mqc);
 /**
 SEGMARK mode switch (SEGSYM)
 @param mqc MQC handle
 */
-void mqc_segmark_enc(opj_mqc_t *mqc);
+void opj_mqc_segmark_enc(opj_mqc_t *mqc);
 /**
 Initialize the decoder
 @param mqc MQC handle
 @param bp Pointer to the start of the buffer from which the bytes will be read
 @param len Length of the input buffer
 */
-opj_bool mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len);
+opj_bool opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len);
 /**
 Decode a symbol
 @param mqc MQC handle
 @return Returns the decoded symbol (0 or 1)
 */
-OPJ_INT32 mqc_decode(opj_mqc_t * const mqc);
+OPJ_INT32 opj_mqc_decode(opj_mqc_t * const mqc);
 /* ----------------------------------------------------------------------- */
 /*@}*/
 

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index 69c6923556165f3da16e1df2d074912cbfc1bcff..2a8a67323ab7ada15936bfa7c3995ac5922dea3c 100644 (file)
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -319,20 +319,20 @@ void opj_t1_enc_sigpass_step(   opj_t1_t *t1,
        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))) {
                v = int_abs(*datap) & one ? 1 : 0;
-               mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));   /* ESSAI */
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));       /* ESSAI */
                if (type == T1_TYPE_RAW) {      /* BYPASS/LAZY MODE */
-                       mqc_bypass_enc(mqc, v);
+                       opj_mqc_bypass_enc(mqc, v);
                } else {
-                       mqc_encode(mqc, v);
+                       opj_mqc_encode(mqc, v);
                }
                if (v) {
                        v = *datap < 0 ? 1 : 0;
                        *nmsedec +=     opj_t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-                       mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));   /* ESSAI */
+                       opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));       /* ESSAI */
                        if (type == T1_TYPE_RAW) {      /* BYPASS/LAZY MODE */
-                               mqc_bypass_enc(mqc, v);
+                               opj_mqc_bypass_enc(mqc, v);
                        } else {
-                               mqc_encode(mqc, v ^ opj_t1_getspb(flag));
+                               opj_mqc_encode(mqc, v ^ opj_t1_getspb(flag));
                        }
                        opj_t1_updateflags(flagsp, v, t1->flags_stride);
                }
@@ -390,11 +390,11 @@ void opj_t1_enc_refpass_step(   opj_t1_t *t1,
        if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
                *nmsedec += opj_t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
                v = int_abs(*datap) & one ? 1 : 0;
-               mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag));  /* ESSAI */
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag));      /* ESSAI */
                if (type == T1_TYPE_RAW) {      /* BYPASS/LAZY MODE */
-                       mqc_bypass_enc(mqc, v);
+                       opj_mqc_bypass_enc(mqc, v);
                } else {
-                       mqc_encode(mqc, v);
+                       opj_mqc_encode(mqc, v);
                }
                *flagsp |= T1_REFINE;
        }
@@ -453,15 +453,15 @@ void opj_t1_enc_clnpass_step(
                goto LABEL_PARTIAL;
        }
        if (!(*flagsp & (T1_SIG | T1_VISIT))) {
-               mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
                v = int_abs(*datap) & one ? 1 : 0;
-               mqc_encode(mqc, v);
+               opj_mqc_encode(mqc, v);
                if (v) {
 LABEL_PARTIAL:
                        *nmsedec += opj_t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-                       mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
+                       opj_mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
                        v = *datap < 0 ? 1 : 0;
-                       mqc_encode(mqc, v ^ opj_t1_getspb(flag));
+                       opj_mqc_encode(mqc, v ^ opj_t1_getspb(flag));
                        opj_t1_updateflags(flagsp, v, t1->flags_stride);
                }
        }
@@ -481,8 +481,8 @@ static void t1_dec_clnpass_step_partial(
        OPJ_ARG_NOT_USED(orient);
        
        flag = *flagsp;
-       mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
-       v = mqc_decode(mqc) ^ opj_t1_getspb(flag);
+       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;
@@ -501,10 +501,10 @@ static void t1_dec_clnpass_step(
        
        flag = *flagsp;
        if (!(flag & (T1_SIG | T1_VISIT))) {
-               mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
-               if (mqc_decode(mqc)) {
-                       mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
-                       v = mqc_decode(mqc) ^ opj_t1_getspb(flag);
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
+               if (opj_mqc_decode(mqc)) {
+                       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);
                }
@@ -530,11 +530,11 @@ static void t1_dec_clnpass_step_vsc(
                goto LABEL_PARTIAL;
        }
        if (!(flag & (T1_SIG | T1_VISIT))) {
-               mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
-               if (mqc_decode(mqc)) {
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
+               if (opj_mqc_decode(mqc)) {
 LABEL_PARTIAL:
-                       mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
-                       v = mqc_decode(mqc) ^ opj_t1_getspb(flag);
+                       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);
                }
@@ -580,14 +580,14 @@ void opj_t1_enc_clnpass(
                                        if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
                                                break;
                                }
-                               mqc_setcurctx(mqc, T1_CTXNO_AGG);
-                               mqc_encode(mqc, runlen != 4);
+                               opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                               opj_mqc_encode(mqc, runlen != 4);
                                if (runlen == 4) {
                                        continue;
                                }
-                               mqc_setcurctx(mqc, T1_CTXNO_UNI);
-                               mqc_encode(mqc, runlen >> 1);
-                               mqc_encode(mqc, runlen & 1);
+                               opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
+                               opj_mqc_encode(mqc, runlen >> 1);
+                               opj_mqc_encode(mqc, runlen & 1);
                        } else {
                                runlen = 0;
                        }
@@ -635,13 +635,13 @@ static void t1_dec_clnpass(
                                agg = 0;
                        }
                        if (agg) {
-                               mqc_setcurctx(mqc, T1_CTXNO_AGG);
-                               if (!mqc_decode(mqc)) {
+                               opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                               if (!opj_mqc_decode(mqc)) {
                                        continue;
                                }
-                               mqc_setcurctx(mqc, T1_CTXNO_UNI);
-                               runlen = mqc_decode(mqc);
-                               runlen = (runlen << 1) | mqc_decode(mqc);
+                               opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
+                               runlen = opj_mqc_decode(mqc);
+                               runlen = (runlen << 1) | opj_mqc_decode(mqc);
                        } else {
                                runlen = 0;
                        }
@@ -670,13 +670,13 @@ static void t1_dec_clnpass(
                                        || 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));
                                if (agg) {
-                                       mqc_setcurctx(mqc, T1_CTXNO_AGG);
-                                       if (!mqc_decode(mqc)) {
+                                       opj_mqc_setcurctx(mqc, T1_CTXNO_AGG);
+                                       if (!opj_mqc_decode(mqc)) {
                                                continue;
                                        }
-                                       mqc_setcurctx(mqc, T1_CTXNO_UNI);
-                                       runlen = mqc_decode(mqc);
-                                       runlen = (runlen << 1) | mqc_decode(mqc);
+                                       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) {
@@ -719,11 +719,11 @@ static void t1_dec_clnpass(
 
        if (segsym) {
                int v = 0;
-               mqc_setcurctx(mqc, T1_CTXNO_UNI);
-               v = mqc_decode(mqc);
-               v = (v << 1) | mqc_decode(mqc);
-               v = (v << 1) | mqc_decode(mqc);
-               v = (v << 1) | mqc_decode(mqc);
+               opj_mqc_setcurctx(mqc, T1_CTXNO_UNI);
+               v = opj_mqc_decode(mqc);
+               v = (v << 1) | opj_mqc_decode(mqc);
+               v = (v << 1) | opj_mqc_decode(mqc);
+               v = (v << 1) | opj_mqc_decode(mqc);
                /*
                if (v!=0xa) {
                        opj_event_msg(t1->cinfo, EVT_WARNING, "Bad segmentation symbol %x\n", v);
@@ -845,7 +845,7 @@ opj_t1_t* opj_t1_create()
        memset(l_t1,0,sizeof(opj_t1_t));
 
        /* create MQC and RAW handles */
-       l_t1->mqc = mqc_create();
+       l_t1->mqc = opj_mqc_create();
        if (! l_t1->mqc) {
                opj_t1_destroy(l_t1);
                return 00;
@@ -873,7 +873,7 @@ void opj_t1_destroy(opj_t1_t *p_t1)
        }
 
        /* destroy MQC and RAW handles */
-       mqc_destroy(p_t1->mqc);
+       opj_mqc_destroy(p_t1->mqc);
        p_t1->mqc = 00;
        raw_destroy(p_t1->raw);
        p_t1->raw = 00;
@@ -1005,10 +1005,10 @@ opj_bool opj_t1_decode_cblk(opj_t1_t *t1,
        bpno = roishift + cblk->numbps - 1;
        passtype = 2;
 
-       mqc_resetstates(mqc);
-       mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-       mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-       mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+       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];
@@ -1022,7 +1022,7 @@ opj_bool opj_t1_decode_cblk(opj_t1_t *t1,
                if (type == T1_TYPE_RAW) {
                        raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
                } else {
-            if (OPJ_FALSE == mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len)) {
+            if (OPJ_FALSE == opj_mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len)) {
                     return OPJ_FALSE;
             }
                }
@@ -1041,10 +1041,10 @@ opj_bool opj_t1_decode_cblk(opj_t1_t *t1,
                        }
 
                        if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
-                               mqc_resetstates(mqc);
-                               mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-                               mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-                               mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+                               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;
@@ -1189,11 +1189,11 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
        bpno = cblk->numbps - 1;
        passtype = 2;
 
-       mqc_resetstates(mqc);
-       mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-       mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-       mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-       mqc_init_enc(mqc, cblk->data);
+       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);
+       opj_mqc_init_enc(mqc, cblk->data);
 
        for (passno = 0; bpno >= 0; ++passno) {
                opj_tcd_pass_v2_t *pass = &cblk->passes[passno];
@@ -1211,7 +1211,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
                                opj_t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
                                /* code switch SEGMARK (i.e. SEGSYM) */
                                if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
-                                       mqc_segmark_enc(mqc);
+                                       opj_mqc_segmark_enc(mqc);
                                break;
                }
 
@@ -1223,11 +1223,11 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
                /* Code switch "RESTART" (i.e. TERMALL) */
                if ((cblksty & J2K_CCP_CBLKSTY_TERMALL) && !((passtype == 2) && (bpno - 1 < 0))) {
                        if (type == T1_TYPE_RAW) {
-                               mqc_flush(mqc);
+                               opj_mqc_flush(mqc);
                                correction = 1;
                                /* correction = mqc_bypass_flush_enc(); */
                        } else {                        /* correction = mqc_restart_enc(); */
-                               mqc_flush(mqc);
+                               opj_mqc_flush(mqc);
                                correction = 1;
                        }
                        pass->term = 1;
@@ -1235,11 +1235,11 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
                        if (((bpno < ((OPJ_INT32) (cblk->numbps) - 4) && (passtype > 0))
                                || ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
                                if (type == T1_TYPE_RAW) {
-                                       mqc_flush(mqc);
+                                       opj_mqc_flush(mqc);
                                        correction = 1;
                                        /* correction = mqc_bypass_flush_enc(); */
                                } else {                /* correction = mqc_restart_enc(); */
-                                       mqc_flush(mqc);
+                                       opj_mqc_flush(mqc);
                                        correction = 1;
                                }
                                pass->term = 1;
@@ -1256,31 +1256,31 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
                if (pass->term && bpno > 0) {
                        type = ((bpno < ((OPJ_INT32) (cblk->numbps) - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
                        if (type == T1_TYPE_RAW)
-                               mqc_bypass_init_enc(mqc);
+                               opj_mqc_bypass_init_enc(mqc);
                        else
-                               mqc_restart_init_enc(mqc);
+                               opj_mqc_restart_init_enc(mqc);
                }
 
                pass->distortiondec = cumwmsedec;
-               pass->rate = mqc_numbytes(mqc) + correction;    /* FIXME */
+               pass->rate = opj_mqc_numbytes(mqc) + correction;        /* FIXME */
 
                /* Code-switch "RESET" */
                if (cblksty & J2K_CCP_CBLKSTY_RESET)
-                       mqc_reset_enc(mqc);
+                       opj_mqc_reset_enc(mqc);
        }
 
        /* Code switch "ERTERM" (i.e. PTERM) */
        if (cblksty & J2K_CCP_CBLKSTY_PTERM)
-               mqc_erterm_enc(mqc);
+               opj_mqc_erterm_enc(mqc);
        else /* Default coding */ if (!(cblksty & J2K_CCP_CBLKSTY_LAZY))
-               mqc_flush(mqc);
+               opj_mqc_flush(mqc);
 
        cblk->totalpasses = passno;
 
        for (passno = 0; passno<cblk->totalpasses; passno++) {
                opj_tcd_pass_v2_t *pass = &cblk->passes[passno];
-               if (pass->rate > mqc_numbytes(mqc))
-                       pass->rate = mqc_numbytes(mqc);
+               if (pass->rate > opj_mqc_numbytes(mqc))
+                       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--;
@@ -1334,11 +1334,11 @@ void opj_t1_dec_refpass_step(   opj_t1_t *t1,
 
        flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
        if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-               mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag));  /* ESSAI */
+               opj_mqc_setcurctx(mqc, opj_t1_getctxno_mag(flag));      /* ESSAI */
                if (type == T1_TYPE_RAW) {
                        v = raw_decode(raw);
                } else {
-                       v = mqc_decode(mqc);
+                       v = opj_mqc_decode(mqc);
                }
                t = v ? poshalf : neghalf;
                *datap += *datap < 0 ? -t : t;
@@ -1396,10 +1396,10 @@ void opj_t1_dec_sigpass_step(   opj_t1_t *t1,
                                opj_t1_updateflags(flagsp, v, t1->flags_stride);
                        }
                } else {
-                       mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
-                       if (mqc_decode(mqc)) {
-                               mqc_setcurctx(mqc, opj_t1_getctxno_sc(flag));
-                               v = mqc_decode(mqc) ^ opj_t1_getspb(flag);
+                       opj_mqc_setcurctx(mqc, opj_t1_getctxno_zc(flag, orient));
+                       if (opj_mqc_decode(mqc)) {
+                               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);
                        }