Update openjpeg

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/jp2.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 841 matching lines @@
 
         channel_size = color->jp2_pclr->channel_size;
         channel_sign = color->jp2_pclr->channel_sign;
         entries = color->jp2_pclr->entries;
         cmap = color->jp2_pclr->cmap;
         nr_channels = color->jp2_pclr->nr_channels;
 
         old_comps = image->comps;
         new_comps = (opj_image_comp_t*)
                         opj_malloc(nr_channels * sizeof(opj_image_comp_t));
-
+        if (!new_comps) {
+                /* FIXME no error code for opj_jp2_apply_pclr */
+                /* FIXME event manager error callback */
+                return;
+        }
         for(i = 0; i < nr_channels; ++i) {
                 pcol = cmap[i].pcol; cmp = cmap[i].cmp;
 
                 /* Direct use */
     if(cmap[i].mtyp == 0){
       assert( pcol == 0 );
       new_comps[i] = old_comps[cmp];
     } else {
       assert( i == pcol );
       new_comps[pcol] = old_comps[cmp];
     }
 
                 /* Palette mapping: */
                 new_comps[i].data = (OPJ_INT32*)
                                 opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(OPJ_INT32));
+                if (!new_comps[i].data) {
+                        opj_free(new_comps);
+                        new_comps = NULL;
+                        /* FIXME no error code for opj_jp2_apply_pclr */
+                        /* FIXME event manager error callback */
+                        return;
+                }
                 new_comps[i].prec = channel_size[i];
                 new_comps[i].sgnd = channel_sign[i];
         }
 
         top_k = color->jp2_pclr->nr_entries - 1;
 
         for(i = 0; i < nr_channels; ++i) {
                 /* Palette mapping: */
                 cmp = cmap[i].cmp; pcol = cmap[i].pcol;
                 src = old_comps[cmp].data;
@@ skipping 711 matching lines @@
 
         /* further JP2 initializations go here */
         jp2->color.jp2_has_colr = 0;
     jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
 }
 
 /* ----------------------------------------------------------------------- */
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-void opj_jp2_setup_encoder(     opj_jp2_t *jp2,
+OPJ_BOOL opj_jp2_setup_encoder( opj_jp2_t *jp2,
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
                             opj_event_mgr_t * p_manager)
 {
     OPJ_UINT32 i;
         OPJ_UINT32 depth_0;
   OPJ_UINT32 sign;
 
         if(!jp2 || !parameters || !image)
-                return;
+                return OPJ_FALSE;
 
         /* setup the J2K codec */
         /* ------------------- */
 
         /* Check if number of components respects standard */
         if (image->numcomps < 1 || image->numcomps > 16384) {
                 opj_event_msg(p_manager, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
-                return;
+                return OPJ_FALSE;
         }
 
-        opj_j2k_setup_encoder(jp2->j2k, parameters, image, p_manager );
+        if (opj_j2k_setup_encoder(jp2->j2k, parameters, image, p_manager ) == OPJ_FALSE) {
+                return OPJ_FALSE;
+        }
 
         /* setup the JP2 codec */
         /* ------------------- */
         
         /* Profile box */
 
         jp2->brand = JP2_JP2;   /* BR */
         jp2->minversion = 0;    /* MinV */
         jp2->numcl = 1;
         jp2->cl = (OPJ_UINT32*) opj_malloc(jp2->numcl * sizeof(OPJ_UINT32));
-    if (!jp2->cl){
-        jp2->cl = NULL;
-        opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
-        return;
-    }
+        if (!jp2->cl){
+                jp2->cl = NULL;
+                opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
+                return OPJ_FALSE;
+        }
         jp2->cl[0] = JP2_JP2;   /* CL0 : JP2 */
 
         /* Image Header box */
 
         jp2->numcomps = image->numcomps;        /* NC */
         jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
-    if (!jp2->comps) {
-        jp2->comps = NULL;
-        opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
-        return;
-    }
+        if (!jp2->comps) {
+                jp2->comps = NULL;
+                opj_event_msg(p_manager, EVT_ERROR, "Not enough memory when setup the JP2 encoder\n");
+                /* Memory of jp2->cl will be freed by opj_jp2_destroy */
+                return OPJ_FALSE;
+        }
 
         jp2->h = image->y1 - image->y0;         /* HEIGHT */
         jp2->w = image->x1 - image->x0;         /* WIDTH */
         /* BPC */
         depth_0 = image->comps[0].prec - 1;
         sign = image->comps[0].sgnd;
         jp2->bpc = depth_0 + (sign << 7);
         for (i = 1; i < image->numcomps; i++) {
                 OPJ_UINT32 depth = image->comps[i].prec - 1;
                 sign = image->comps[i].sgnd;
@@ skipping 22 matching lines @@
             jp2->enumcs = 17;   /* greyscale */
         else if (image->color_space == 3)
             jp2->enumcs = 18;   /* YUV */
     }
 
 
         jp2->precedence = 0;    /* PRECEDENCE */
         jp2->approx = 0;                /* APPROX */
 
         jp2->jpip_on = parameters->jpip_on;
+
+        return OPJ_TRUE;
 }
 
 OPJ_BOOL opj_jp2_encode(opj_jp2_t *jp2,
                                                 opj_stream_private_t *stream,
                                                 opj_event_mgr_t * p_manager)
 {
         return opj_j2k_encode(jp2->j2k, stream, p_manager);
 }
 
 OPJ_BOOL opj_jp2_end_decompress(opj_jp2_t *jp2,
@@ skipping 1107 matching lines @@
   len = opj_stream_tell(cio)-lenp;
   opj_stream_skip(cio, lenp, p_manager);
   opj_write_bytes(l_data_header,len,4);/* L              */
   opj_stream_write_data(cio,l_data_header,4,p_manager);
   opj_stream_seek(cio, lenp+len,p_manager);
 
   return len;
 }
 #endif
 #endif /* USE_JPIP */