Upgrade openjpeg to revision 2997.

core/src/fxcodec/fx_libopenjpeg/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 675 matching lines @@
         const opj_tcp_t *tcp = 00;
         const opj_tccp_t * l_tccp = 00;
         const opj_image_comp_t * l_img_comp = 00;
 
         /* to store l_dx, l_dy, w and h for each resolution and component.*/
         OPJ_UINT32 * lResolutionPtr;
 
         /* position in x and y of tile*/
         OPJ_UINT32 p, q;
 
+        /* non-corrected (in regard to image offset) tile offset */
+        OPJ_UINT32 l_tx0, l_ty0;
+
         /* preconditions in debug*/
         assert(p_cp != 00);
         assert(p_image != 00);
         assert(tileno < p_cp->tw * p_cp->th);
 
         /* initializations*/
         tcp = &p_cp->tcps [tileno];
         l_tccp = tcp->tccps;
         l_img_comp = p_image->comps;
 
         /* position in x and y of tile*/
         p = tileno % p_cp->tw;
         q = tileno / p_cp->tw;
 
         /* here calculation of tx0, tx1, ty0, ty1, maxprec, l_dx and l_dy */
-        *p_tx0 = opj_int_max((OPJ_INT32)(p_cp->tx0 + p * p_cp->tdx), (OPJ_INT32)p_image->x0);
-        *p_tx1 = opj_int_min((OPJ_INT32)(p_cp->tx0 + (p + 1) * p_cp->tdx), (OPJ_INT32)p_image->x1);
-        *p_ty0 = opj_int_max((OPJ_INT32)(p_cp->ty0 + q * p_cp->tdy), (OPJ_INT32)p_image->y0);
-        *p_ty1 = opj_int_min((OPJ_INT32)(p_cp->ty0 + (q + 1) * p_cp->tdy), (OPJ_INT32)p_image->y1);
+        l_tx0 = p_cp->tx0 + p * p_cp->tdx; /* can't be greater than p_image->x1 so won't overflow */
+        *p_tx0 = (OPJ_INT32)opj_uint_max(l_tx0, p_image->x0);
+        *p_tx1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_tx0, p_cp->tdx), p_image->x1);
+        l_ty0 = p_cp->ty0 + q * p_cp->tdy; /* can't be greater than p_image->y1 so won't overflow */
+        *p_ty0 = (OPJ_INT32)opj_uint_max(l_ty0, p_image->y0);
+        *p_ty1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_ty0, p_cp->tdy), p_image->y1);
 
         /* max precision and resolution is 0 (can only grow)*/
         *p_max_prec = 0;
         *p_max_res = 0;
 
         /* take the largest value for dx_min and dy_min*/
         *p_dx_min = 0x7fffffff;
         *p_dy_min = 0x7fffffff;
 
         for (compno = 0; compno < p_image->numcomps; ++compno) {
@@ skipping 1138 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;
 }