Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/mqc.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 184 matching lines @@
         {0x5601, 0, &mqc_states[92], &mqc_states[92]},
         {0x5601, 1, &mqc_states[93], &mqc_states[93]},
 };
 
 /* 
 ==========================================================
    local functions
 ==========================================================
 */
 
-void opj_mqc_byteout(opj_mqc_t *mqc) {
+static void opj_mqc_byteout(opj_mqc_t *mqc) {
         if (*mqc->bp == 0xff) {
                 mqc->bp++;
                 *mqc->bp = (OPJ_BYTE)(mqc->c >> 20);
                 mqc->c &= 0xfffff;
                 mqc->ct = 7;
         } else {
                 if ((mqc->c & 0x8000000) == 0) {        /* ((mqc->c&0x8000000)==0) CHANGE */
                         mqc->bp++;
                         *mqc->bp = (OPJ_BYTE)(mqc->c >> 19);
                         mqc->c &= 0x7ffff;
                         mqc->ct = 8;
                 } else {
                         (*mqc->bp)++;
                         if (*mqc->bp == 0xff) {
                                 mqc->c &= 0x7ffffff;
                                 mqc->bp++;
                                 *mqc->bp = (OPJ_BYTE)(mqc->c >> 20);
                                 mqc->c &= 0xfffff;
                                 mqc->ct = 7;
                         } else {
                                 mqc->bp++;
                                 *mqc->bp = (OPJ_BYTE)(mqc->c >> 19);
                                 mqc->c &= 0x7ffff;
                                 mqc->ct = 8;
                         }
                 }
         }
 }
 
-void opj_mqc_renorme(opj_mqc_t *mqc) {
+static void opj_mqc_renorme(opj_mqc_t *mqc) {
         do {
                 mqc->a <<= 1;
                 mqc->c <<= 1;
                 mqc->ct--;
                 if (mqc->ct == 0) {
                         opj_mqc_byteout(mqc);
                 }
         } while ((mqc->a & 0x8000) == 0);
 }
 
-void opj_mqc_codemps(opj_mqc_t *mqc) {
+static void opj_mqc_codemps(opj_mqc_t *mqc) {
         mqc->a -= (*mqc->curctx)->qeval;
         if ((mqc->a & 0x8000) == 0) {
                 if (mqc->a < (*mqc->curctx)->qeval) {
                         mqc->a = (*mqc->curctx)->qeval;
                 } else {
                         mqc->c += (*mqc->curctx)->qeval;
                 }
                 *mqc->curctx = (*mqc->curctx)->nmps;
                 opj_mqc_renorme(mqc);
         } else {
                 mqc->c += (*mqc->curctx)->qeval;
         }
 }
 
-void opj_mqc_codelps(opj_mqc_t *mqc) {
+static void opj_mqc_codelps(opj_mqc_t *mqc) {
         mqc->a -= (*mqc->curctx)->qeval;
         if (mqc->a < (*mqc->curctx)->qeval) {
                 mqc->c += (*mqc->curctx)->qeval;
         } else {
                 mqc->a = (*mqc->curctx)->qeval;
         }
         *mqc->curctx = (*mqc->curctx)->nlps;
         opj_mqc_renorme(mqc);
 }
 
-void opj_mqc_setbits(opj_mqc_t *mqc) {
+static void opj_mqc_setbits(opj_mqc_t *mqc) {
         OPJ_UINT32 tempc = mqc->c + mqc->a;
         mqc->c |= 0xffff;
         if (mqc->c >= tempc) {
                 mqc->c -= 0x8000;
         }
 }
 
 static INLINE OPJ_INT32 opj_mqc_mpsexchange(opj_mqc_t *const mqc) {
         OPJ_INT32 d;
         if (mqc->a < (*mqc->curctx)->qeval) {
@@ skipping 322 matching lines @@
         for (i = 0; i < MQC_NUMCTXS; i++) {
                 mqc->ctxs[i] = mqc_states;
         }
 }
 
 void opj_mqc_setstate(opj_mqc_t *mqc, OPJ_UINT32 ctxno, OPJ_UINT32 msb, OPJ_INT32 prob) {
         mqc->ctxs[ctxno] = &mqc_states[msb + (OPJ_UINT32)(prob << 1)];
 }