Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/image.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) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 29 matching lines @@
         OPJ_UINT32 compno;
         opj_image_t *image = NULL;
 
         image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
         if(image) {
                 image->color_space = clrspc;
                 image->numcomps = numcmpts;
                 /* allocate memory for the per-component information */
                 image->comps = (opj_image_comp_t*)opj_calloc(1,image->numcomps * sizeof(opj_image_comp_t));
                 if(!image->comps) {
-                        fprintf(stderr,"Unable to allocate memory for image.\n");
+                        /* TODO replace with event manager, breaks API */
+                        /* fprintf(stderr,"Unable to allocate memory for image.\n"); */
                         opj_image_destroy(image);
                         return NULL;
                 }
                 /* create the individual image components */
                 for(compno = 0; compno < numcmpts; compno++) {
                         opj_image_comp_t *comp = &image->comps[compno];
                         comp->dx = cmptparms[compno].dx;
                         comp->dy = cmptparms[compno].dy;
                         comp->w = cmptparms[compno].w;
                         comp->h = cmptparms[compno].h;
                         comp->x0 = cmptparms[compno].x0;
                         comp->y0 = cmptparms[compno].y0;
                         comp->prec = cmptparms[compno].prec;
                         comp->bpp = cmptparms[compno].bpp;
                         comp->sgnd = cmptparms[compno].sgnd;
                         comp->data = (OPJ_INT32*) opj_calloc(comp->w * comp->h, sizeof(OPJ_INT32));
                         if(!comp->data) {
-                                fprintf(stderr,"Unable to allocate memory for image.\n");
+                                /* TODO replace with event manager, breaks API */
+                                /* fprintf(stderr,"Unable to allocate memory for image.\n"); */
                                 opj_image_destroy(image);
                                 return NULL;
                         }
                 }
         }
 
         return image;
 }
 
 void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
@@ skipping 21 matching lines @@
 
 /**
  * Updates the components characteristics of the image from the coding parameters.
  *
  * @param p_image_header        the image header to update.
  * @param p_cp                          the coding parameters from which to update the image.
  */
 void opj_image_comp_header_update(opj_image_t * p_image_header, const struct opj_cp * p_cp)
 {
         OPJ_UINT32 i, l_width, l_height;
-        OPJ_INT32 l_x0, l_y0, l_x1, l_y1;
-        OPJ_INT32 l_comp_x0, l_comp_y0, l_comp_x1, l_comp_y1;
+        OPJ_UINT32 l_x0, l_y0, l_x1, l_y1;
+        OPJ_UINT32 l_comp_x0, l_comp_y0, l_comp_x1, l_comp_y1;
         opj_image_comp_t* l_img_comp = NULL;
 
-        l_x0 = opj_int_max((OPJ_INT32)p_cp->tx0 , (OPJ_INT32)p_image_header->x0);
-        l_y0 = opj_int_max((OPJ_INT32)p_cp->ty0 , (OPJ_INT32)p_image_header->y0);
-        l_x1 = opj_int_min((OPJ_INT32)(p_cp->tx0 + p_cp->tw * p_cp->tdx), (OPJ_INT32)p_image_header->x1);
-        l_y1 = opj_int_min((OPJ_INT32)(p_cp->ty0 + p_cp->th * p_cp->tdy), (OPJ_INT32)p_image_header->y1);
+        l_x0 = opj_uint_max(p_cp->tx0 , p_image_header->x0);
+        l_y0 = opj_uint_max(p_cp->ty0 , p_image_header->y0);
+        l_x1 = p_cp->tx0 + (p_cp->tw - 1U) * p_cp->tdx; /* validity of p_cp members used here checked in opj_j2k_read_siz. Can't overflow. */
+        l_y1 = p_cp->ty0 + (p_cp->th - 1U) * p_cp->tdy; /* can't overflow */
+        l_x1 = opj_uint_min(opj_uint_adds(l_x1, p_cp->tdx), p_image_header->x1); /* use add saturated to prevent overflow */
+        l_y1 = opj_uint_min(opj_uint_adds(l_y1, p_cp->tdy), p_image_header->y1); /* use add saturated to prevent overflow */
 
         l_img_comp = p_image_header->comps;
         for     (i = 0; i < p_image_header->numcomps; ++i) {
-                l_comp_x0 = opj_int_ceildiv(l_x0, (OPJ_INT32)l_img_comp->dx);
-                l_comp_y0 = opj_int_ceildiv(l_y0, (OPJ_INT32)l_img_comp->dy);
-                l_comp_x1 = opj_int_ceildiv(l_x1, (OPJ_INT32)l_img_comp->dx);
-                l_comp_y1 = opj_int_ceildiv(l_y1, (OPJ_INT32)l_img_comp->dy);
-                l_width = (OPJ_UINT32)opj_int_ceildivpow2(l_comp_x1 - l_comp_x0, (OPJ_INT32)l_img_comp->factor);
-                l_height = (OPJ_UINT32)opj_int_ceildivpow2(l_comp_y1 - l_comp_y0, (OPJ_INT32)l_img_comp->factor);
+                l_comp_x0 = opj_uint_ceildiv(l_x0, l_img_comp->dx);
+                l_comp_y0 = opj_uint_ceildiv(l_y0, l_img_comp->dy);
+                l_comp_x1 = opj_uint_ceildiv(l_x1, l_img_comp->dx);
+                l_comp_y1 = opj_uint_ceildiv(l_y1, l_img_comp->dy);
+                l_width   = opj_uint_ceildivpow2(l_comp_x1 - l_comp_x0, l_img_comp->factor);
+                l_height  = opj_uint_ceildivpow2(l_comp_y1 - l_comp_y0, l_img_comp->factor);
                 l_img_comp->w = l_width;
                 l_img_comp->h = l_height;
-                l_img_comp->x0 = (OPJ_UINT32)l_comp_x0/*l_x0*/;
-                l_img_comp->y0 = (OPJ_UINT32)l_comp_y0/*l_y0*/;
+                l_img_comp->x0 = l_comp_x0;
+                l_img_comp->y0 = l_comp_y0;
                 ++l_img_comp;
         }
 }
 
 
 /**
  * Copy only header of image and its component header (no data are copied)
  * if dest image have data, they will be freed
  *
  * @param       p_image_src             the src image
@@ skipping 88 matching lines @@
                         comp->x0 = cmptparms[compno].x0;
                         comp->y0 = cmptparms[compno].y0;
                         comp->prec = cmptparms[compno].prec;
                         comp->sgnd = cmptparms[compno].sgnd;
                         comp->data = 0;
                 }
         }
 
         return image;
 }