upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/pi.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 197 matching lines @@
  * FIXME DOC
  */
 static void opj_pi_update_decode_poc (  opj_pi_iterator_t * p_pi,
                                         opj_tcp_t * p_tcp,
                                         OPJ_UINT32 p_max_precision,
                                         OPJ_UINT32 p_max_res);
 
 /**
  * FIXME DOC
  */
-OPJ_BOOL opj_pi_check_next_level(       OPJ_INT32 pos,
+static OPJ_BOOL opj_pi_check_next_level(        OPJ_INT32 pos,
                                                                 opj_cp_t *cp,
                                                                 OPJ_UINT32 tileno,
                                                                 OPJ_UINT32 pino,
                                                                 const OPJ_CHAR *prog);
 
 /*@}*/
 
 /*@}*/
 
 /*
 ==========================================================
    local functions
 ==========================================================
 */
 
-OPJ_BOOL opj_pi_next_lrcp(opj_pi_iterator_t * pi) {
+static OPJ_BOOL opj_pi_next_lrcp(opj_pi_iterator_t * pi) {
         opj_pi_comp_t *comp = NULL;
         opj_pi_resolution_t *res = NULL;
         OPJ_UINT32 index = 0;
         
         if (!pi->first) {
                 comp = &pi->comps[pi->compno];
                 res = &comp->resolutions[pi->resno];
                 goto LABEL_SKIP;
         } else {
                 pi->first = 0;
@@ skipping 19 matching lines @@
                                         }
 LABEL_SKIP:;
                                 }
                         }
                 }
         }
         
         return OPJ_FALSE;
 }
 
-OPJ_BOOL opj_pi_next_rlcp(opj_pi_iterator_t * pi) {
+static OPJ_BOOL opj_pi_next_rlcp(opj_pi_iterator_t * pi) {
         opj_pi_comp_t *comp = NULL;
         opj_pi_resolution_t *res = NULL;
         OPJ_UINT32 index = 0;
 
         if (!pi->first) {
                 comp = &pi->comps[pi->compno];
                 res = &comp->resolutions[pi->resno];
                 goto LABEL_SKIP;
         } else {
                 pi->first = 0;
@@ skipping 18 matching lines @@
                                         }
 LABEL_SKIP:;
                                 }
                         }
                 }
         }
         
         return OPJ_FALSE;
 }
 
-OPJ_BOOL opj_pi_next_rpcl(opj_pi_iterator_t * pi) {
+static OPJ_BOOL opj_pi_next_rpcl(opj_pi_iterator_t * pi) {
         opj_pi_comp_t *comp = NULL;
         opj_pi_resolution_t *res = NULL;
         OPJ_UINT32 index = 0;
 
         if (!pi->first) {
                 goto LABEL_SKIP;
         } else {
                 OPJ_UINT32 compno, resno;
                 pi->first = 0;
                 pi->dx = 0;
@@ skipping 62 matching lines @@
 LABEL_SKIP:;
                                         }
                                 }
                         }
                 }
         }
         
         return OPJ_FALSE;
 }
 
-OPJ_BOOL opj_pi_next_pcrl(opj_pi_iterator_t * pi) {
+static OPJ_BOOL opj_pi_next_pcrl(opj_pi_iterator_t * pi) {
         opj_pi_comp_t *comp = NULL;
         opj_pi_resolution_t *res = NULL;
         OPJ_UINT32 index = 0;
 
         if (!pi->first) {
                 comp = &pi->comps[pi->compno];
                 goto LABEL_SKIP;
         } else {
                 OPJ_UINT32 compno, resno;
                 pi->first = 0;
@@ skipping 60 matching lines @@
 LABEL_SKIP:;
                                         }
                                 }
                         }
                 }
         }
         
         return OPJ_FALSE;
 }
 
-OPJ_BOOL opj_pi_next_cprl(opj_pi_iterator_t * pi) {
+static OPJ_BOOL opj_pi_next_cprl(opj_pi_iterator_t * pi) {
         opj_pi_comp_t *comp = NULL;
         opj_pi_resolution_t *res = NULL;
         OPJ_UINT32 index = 0;
 
         if (!pi->first) {
                 comp = &pi->comps[pi->compno];
                 goto LABEL_SKIP;
         } else {
                 pi->first = 0;
         }
@@ skipping 58 matching lines @@
 LABEL_SKIP:;
                                         }
                                 }
                         }
                 }
         }
         
         return OPJ_FALSE;
 }
 
-void opj_get_encoding_parameters(       const opj_image_t *p_image,
+static void opj_get_encoding_parameters(        const opj_image_t *p_image,
                                     const opj_cp_t *p_cp,
                                     OPJ_UINT32 p_tileno,
                                     OPJ_INT32 * p_tx0,
                                     OPJ_INT32  * p_tx1,
                                     OPJ_INT32  * p_ty0,
                                     OPJ_INT32  * p_ty1,
                                     OPJ_UINT32 * p_dx_min,
                                     OPJ_UINT32 * p_dy_min,
                                     OPJ_UINT32 * p_max_prec,
                                     OPJ_UINT32 * p_max_res )
@@ skipping 93 matching lines @@
                         if (l_product > *p_max_prec) {
                                 *p_max_prec = l_product;
                         }
                 }
                 ++l_img_comp;
                 ++l_tccp;
         }
 }
 
 
-void opj_get_all_encoding_parameters(   const opj_image_t *p_image,
+static void opj_get_all_encoding_parameters(   const opj_image_t *p_image,
                                         const opj_cp_t *p_cp,
                                         OPJ_UINT32 tileno,
                                         OPJ_INT32 * p_tx0,
                                         OPJ_INT32 * p_tx1,
                                         OPJ_INT32 * p_ty0,
                                         OPJ_INT32 * p_ty1,
                                         OPJ_UINT32 * p_dx_min,
                                         OPJ_UINT32 * p_dy_min,
                                         OPJ_UINT32 * p_max_prec,
                                         OPJ_UINT32 * p_max_res,
@@ skipping 102 matching lines @@
                                 *p_max_prec = l_product;
                         }
 
                         --l_level_no;
                 }
                 ++l_tccp;
                 ++l_img_comp;
         }
 }
 
-opj_pi_iterator_t * opj_pi_create(      const opj_image_t *image,
+static opj_pi_iterator_t * opj_pi_create(       const opj_image_t *image,
                                     const opj_cp_t *cp,
                                     OPJ_UINT32 tileno )
 {
         /* loop*/
         OPJ_UINT32 pino, compno;
         /* number of poc in the p_pi*/
         OPJ_UINT32 l_poc_bound;
 
         /* pointers to tile coding parameters and components.*/
         opj_pi_iterator_t *l_pi = 00;
@@ skipping 40 matching lines @@
                                 return 00;
                         }
 
                         comp->numresolutions = tccp->numresolutions;
                 }
                 ++l_current_pi;
         }
         return l_pi;
 }
 
-void opj_pi_update_encode_poc_and_final (   opj_cp_t *p_cp,
+static void opj_pi_update_encode_poc_and_final (   opj_cp_t *p_cp,
                                             OPJ_UINT32 p_tileno,
                                             OPJ_INT32 p_tx0,
                                             OPJ_INT32 p_tx1,
                                             OPJ_INT32 p_ty0,
                                             OPJ_INT32 p_ty1,
                                             OPJ_UINT32 p_max_prec,
                                             OPJ_UINT32 p_max_res,
                                             OPJ_UINT32 p_dx_min,
                                             OPJ_UINT32 p_dy_min)
 {
@@ skipping 57 matching lines @@
                 l_current_poc->txS = (OPJ_UINT32)p_tx0;
                 l_current_poc->txE = (OPJ_UINT32)p_tx1;
                 l_current_poc->tyS = (OPJ_UINT32)p_ty0;
                 l_current_poc->tyE = (OPJ_UINT32)p_ty1;
                 l_current_poc->dx = p_dx_min;
                 l_current_poc->dy = p_dy_min;
                 ++ l_current_poc;
         }
 }
 
-void opj_pi_update_encode_not_poc (     opj_cp_t *p_cp,
+static void opj_pi_update_encode_not_poc (      opj_cp_t *p_cp,
                                     OPJ_UINT32 p_num_comps,
                                     OPJ_UINT32 p_tileno,
                                     OPJ_INT32 p_tx0,
                                     OPJ_INT32 p_tx1,
                                     OPJ_INT32 p_ty0,
                                     OPJ_INT32 p_ty1,
                                     OPJ_UINT32 p_max_prec,
                                     OPJ_UINT32 p_max_res,
                                     OPJ_UINT32 p_dx_min,
                                     OPJ_UINT32 p_dy_min)
@@ skipping 34 matching lines @@
                 l_current_poc->txS = (OPJ_UINT32)p_tx0;
                 l_current_poc->txE = (OPJ_UINT32)p_tx1;
                 l_current_poc->tyS = (OPJ_UINT32)p_ty0;
                 l_current_poc->tyE = (OPJ_UINT32)p_ty1;
                 l_current_poc->dx = p_dx_min;
                 l_current_poc->dy = p_dy_min;
                 ++ l_current_poc;
         }
 }
 
-void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi,
+static void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi,
                                opj_tcp_t * p_tcp,
                                OPJ_UINT32 p_max_precision,
                                OPJ_UINT32 p_max_res)
 {
         /* loop*/
         OPJ_UINT32 pino;
 
         /* encoding prameters to set*/
         OPJ_UINT32 l_bound;
 
@@ skipping 21 matching lines @@
                 l_current_pi->poc.precno0 = 0;
                 l_current_pi->poc.resno1 = l_current_poc->resno1; /* Resolution Level Index #0 (End) */
                 l_current_pi->poc.compno1 = l_current_poc->compno1; /* Component Index #0 (End) */
                 l_current_pi->poc.layno1 = l_current_poc->layno1; /* Layer Index #0 (End) */
                 l_current_pi->poc.precno1 = p_max_precision;
                 ++l_current_pi;
                 ++l_current_poc;
         }
 }
 
-void opj_pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,
+static void opj_pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,
                                    opj_tcp_t * p_tcp,
                                    OPJ_UINT32 p_max_precision,
                                    OPJ_UINT32 p_max_res)
 {
         /* loop*/
         OPJ_UINT32 pino;
 
         /* encoding prameters to set*/
         OPJ_UINT32 l_bound;
 
@@ skipping 16 matching lines @@
                 l_current_pi->poc.resno1 = p_max_res;
                 l_current_pi->poc.compno1 = l_current_pi->numcomps;
                 l_current_pi->poc.layno1 = p_tcp->numlayers;
                 l_current_pi->poc.precno1 = p_max_precision;
                 ++l_current_pi;
         }
 }
 
 
 
-OPJ_BOOL opj_pi_check_next_level(       OPJ_INT32 pos,
+static OPJ_BOOL opj_pi_check_next_level(        OPJ_INT32 pos,
                                                                 opj_cp_t *cp,
                                                                 OPJ_UINT32 tileno,
                                                                 OPJ_UINT32 pino,
                                                                 const OPJ_CHAR *prog)
 {
         OPJ_INT32 i;
         opj_tcp_t *tcps =&cp->tcps[tileno];
         opj_poc_t *tcp = &tcps->pocs[pino];
 
         if(pos>=0){
@@ skipping 157 matching lines @@
         l_step_l = l_max_res * l_step_r;
 
         /* set values for first packet iterator */
         l_current_pi = l_pi;
 
         /* memory allocation for include */
         l_current_pi->include = 00;
         if
                 (l_step_l && l_tcp->numlayers < UINT_MAX / l_step_l - 1)
         {
-                l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers + 1) * l_step_l, sizeof(OPJ_INT16));
+                l_current_pi->include = (OPJ_INT16*)opj_calloc((l_tcp->numlayers + 1) * l_step_l, sizeof(OPJ_INT16));
         }
 
         if
                 (!l_current_pi->include)
         {
                 opj_free(l_tmp_data);
                 opj_free(l_tmp_ptr);
                 opj_pi_destroy(l_pi, l_bound);
                 return 00;
         }
@@ skipping 175 matching lines @@
         /* get encoding parameters*/
         opj_get_all_encoding_parameters(p_image,p_cp,p_tile_no,&l_tx0,&l_tx1,&l_ty0,&l_ty1,&l_dx_min,&l_dy_min,&l_max_prec,&l_max_res,l_tmp_ptr);
 
         /* step calculations*/
         l_step_p = 1;
         l_step_c = l_max_prec * l_step_p;
         l_step_r = p_image->numcomps * l_step_c;
         l_step_l = l_max_res * l_step_r;
 
         /* set values for first packet iterator*/
-        l_pi->tp_on = p_cp->m_specific_param.m_enc.m_tp_on;
+        l_pi->tp_on = (OPJ_BYTE)p_cp->m_specific_param.m_enc.m_tp_on;
         l_current_pi = l_pi;
 
         /* memory allocation for include*/
         l_current_pi->include = (OPJ_INT16*) opj_calloc(l_tcp->numlayers * l_step_l, sizeof(OPJ_INT16));
         if (!l_current_pi->include) {
                 opj_free(l_tmp_data);
                 opj_free(l_tmp_ptr);
                 opj_pi_destroy(l_pi, l_bound);
                 return 00;
         }
@@ skipping 424 matching lines @@
                 case OPJ_PCRL:
                         return opj_pi_next_pcrl(pi);
                 case OPJ_CPRL:
                         return opj_pi_next_cprl(pi);
                 case OPJ_PROG_UNKNOWN:
                         return OPJ_FALSE;
         }
         
         return OPJ_FALSE;
 }