Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/bio.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 60 matching lines @@
 /*@}*/
 
 /*@}*/
 
 /* 
 ==========================================================
    local functions
 ==========================================================
 */
 
-OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) {
+static OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) {
         bio->buf = (bio->buf << 8) & 0xffff;
         bio->ct = bio->buf == 0xff00 ? 7 : 8;
         if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) {
                 return OPJ_FALSE;
         }
         *bio->bp++ = (OPJ_BYTE)(bio->buf >> 8);
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) {
+static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) {
         bio->buf = (bio->buf << 8) & 0xffff;
         bio->ct = bio->buf == 0xff00 ? 7 : 8;
         if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) {
                 return OPJ_FALSE;
         }
         bio->buf |= *bio->bp++;
         return OPJ_TRUE;
 }
 
-void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
+static void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
         if (bio->ct == 0) {
                 opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */
         }
         bio->ct--;
         bio->buf |= b << bio->ct;
 }
 
-OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
+static OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
         if (bio->ct == 0) {
                 opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */
         }
         bio->ct--;
         return (bio->buf >> bio->ct) & 1;
 }
 
 /* 
 ==========================================================
    Bit Input/Output interface
@@ skipping 62 matching lines @@
 
 OPJ_BOOL opj_bio_inalign(opj_bio_t *bio) {
         if ((bio->buf & 0xff) == 0xff) {
                 if (! opj_bio_bytein(bio)) {
                         return OPJ_FALSE;
                 }
         }
         bio->ct = 0;
         return OPJ_TRUE;
 }