Update openjpeg

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.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 553 matching lines @@
         opj_tcd_resolution_t* tr = tilec->resolutions;
 
         OPJ_UINT32 rw = (OPJ_UINT32)(tr->x1 - tr->x0);  /* width of the resolution level computed */
         OPJ_UINT32 rh = (OPJ_UINT32)(tr->y1 - tr->y0);  /* height of the resolution level computed */
 
         OPJ_UINT32 w = (OPJ_UINT32)(tilec->x1 - tilec->x0);
 
         h.mem = (OPJ_INT32*)
         opj_aligned_malloc(opj_dwt_max_resolution(tr, numres) * sizeof(OPJ_INT32));
         if (! h.mem){
+                /* FIXME event manager error callback */
                 return OPJ_FALSE;
         }
 
         v.mem = h.mem;
 
         while( --numres) {
                 OPJ_INT32 * restrict tiledp = tilec->data;
                 OPJ_UINT32 j;
 
                 ++tr;
@@ skipping 217 matching lines @@
                 }
                 a = 0;
                 b = 1;
         }else{
                 if(!((dwt->sn > 0) || (dwt->dn > 1))) {
                         return;
                 }
                 a = 1;
                 b = 0;
         }
-
 #ifdef __SSE__
         opj_v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(opj_K));
         opj_v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(opj_c13318));
         opj_v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, opj_int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(opj_dwt_delta));
         opj_v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, opj_int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(opj_dwt_gamma));
         opj_v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, opj_int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(opj_dwt_beta));
         opj_v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, opj_int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(opj_dwt_alpha));
 #else
         opj_v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, opj_K);
         opj_v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, opj_c13318);
@@ skipping 14 matching lines @@
         opj_v4dwt_t v;
 
         opj_tcd_resolution_t* res = tilec->resolutions;
 
         OPJ_UINT32 rw = (OPJ_UINT32)(res->x1 - res->x0);        /* width of the resolution level computed */
         OPJ_UINT32 rh = (OPJ_UINT32)(res->y1 - res->y0);        /* height of the resolution level computed */
 
         OPJ_UINT32 w = (OPJ_UINT32)(tilec->x1 - tilec->x0);
 
         h.wavelet = (opj_v4_t*) opj_aligned_malloc((opj_dwt_max_resolution(res, numres)+5) * sizeof(opj_v4_t));
+        if (!h.wavelet) {
+                /* FIXME event manager error callback */
+                return OPJ_FALSE;
+        }
         v.wavelet = h.wavelet;
 
         while( --numres) {
                 OPJ_FLOAT32 * restrict aj = (OPJ_FLOAT32*) tilec->data;
                 OPJ_UINT32 bufsize = (OPJ_UINT32)((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0));
                 OPJ_INT32 j;
 
                 h.sn = (OPJ_INT32)rw;
                 v.sn = (OPJ_INT32)rh;
 
@@ skipping 61 matching lines @@
 
                         for(k = 0; k < rh; ++k){
                                 memcpy(&aj[k*w], &v.wavelet[k], (size_t)j * sizeof(OPJ_FLOAT32));
                         }
                 }
         }
 
         opj_aligned_free(h.wavelet);
         return OPJ_TRUE;
 }