Update openjpeg

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/cio.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 133 matching lines @@
         OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT32)-1;
         OPJ_UINT32 i;
         for     (i=0;i<sizeof(OPJ_FLOAT32);++i) {
                 *(l_data_ptr--) = *(p_buffer++);
         }
 }
 
 opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,OPJ_BOOL l_is_input)
 {
         opj_stream_private_t * l_stream = 00;
-        l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_t));
+        l_stream = (opj_stream_private_t*) opj_calloc(1,sizeof(opj_stream_private_t));
         if (! l_stream) {
                 return 00;
         }
 
-        memset(l_stream,0,sizeof(opj_stream_private_t));
         l_stream->m_buffer_size = p_buffer_size;
         l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size);
         if (! l_stream->m_stored_data) {
                 opj_free(l_stream);
                 return 00;
         }
 
         l_stream->m_current_data = l_stream->m_stored_data;
 
         if (l_is_input) {
@@ skipping 27 matching lines @@
         if (l_stream) {
                 if (l_stream->m_free_user_data_fn) {
                         l_stream->m_free_user_data_fn(l_stream->m_user_data);
                 }
                 opj_free(l_stream->m_stored_data);
                 l_stream->m_stored_data = 00;
                 opj_free(l_stream);
         }
 }
 
-void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream)
-{
-        opj_stream_destroy(p_stream);
-}
-
 void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
 {
         opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
 
         if ((!l_stream) || (! (l_stream->m_status & opj_stream_e_input))) {
                 return;
         }
 
         l_stream->m_read_fn = p_function;
 }
@@ skipping 23 matching lines @@
 {
         opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
         
         if (! l_stream) {
                 return;
         }
 
         l_stream->m_skip_fn = p_function;
 }
 
-void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
+void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function)
 {
         opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
         if (!l_stream)
-                return;
-        l_stream->m_user_data = p_data;
-}
-
-void OPJ_CALLCONV opj_stream_set_user_data_v3(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function)
-{
-        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-        if (!l_stream)
                 return;
         l_stream->m_user_data = p_data;
   l_stream->m_free_user_data_fn = p_function;
 }
 
 void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
 {
         opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
         if (!l_stream)
                 return;
@@ skipping 372 matching lines @@
         OPJ_ARG_NOT_USED(p_user_data);
         return (OPJ_OFF_T) -1;
 }
 
 OPJ_BOOL opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data)
 {
         OPJ_ARG_NOT_USED(p_nb_bytes);
         OPJ_ARG_NOT_USED(p_user_data);
         return OPJ_FALSE;
 }