rename jp2_write_colr_v2 to opj_jp2_write_colr

[openjpeg.git] / libopenjpeg / function_list.c

diff --git a/libopenjpeg/function_list.c b/libopenjpeg/function_list.c
index 206458ae08396734bcae399c4a95b4e9c9a35528..0be913c443e5a5450910df7f0295eca9b13cb058 100644 (file)
--- a/libopenjpeg/function_list.c
+++ b/libopenjpeg/function_list.c
@@ -24,10 +24,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-//#include "function_list.h"
-//#include "opj_includes.h"
-//#include "opj_malloc.h"
-
 #include "opj_includes.h"
 
 /**
@@ -52,7 +48,7 @@ opj_procedure_list_t *  opj_procedure_list_create()
        /* initialization */
        memset(l_validation,0,sizeof(opj_procedure_list_t));
        l_validation->m_nb_max_procedures = OPJ_VALIDATION_SIZE;
-       l_validation->m_procedures = (void**)opj_malloc(
+       l_validation->m_procedures = (opj_procedure*)opj_malloc(
                OPJ_VALIDATION_SIZE * sizeof(opj_procedure));
        if
                (! l_validation->m_procedures)
@@ -98,16 +94,23 @@ opj_bool  opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_
        if
                (p_validation_list->m_nb_max_procedures == p_validation_list->m_nb_procedures)
        {
+         opj_procedure * new_procedures;
+
                p_validation_list->m_nb_max_procedures += OPJ_VALIDATION_SIZE;
-               p_validation_list->m_procedures = (void**)opj_realloc(
+                new_procedures = (opj_procedure*)opj_realloc(
                p_validation_list->m_procedures,p_validation_list->m_nb_max_procedures * sizeof(opj_procedure));
                if
-                       (! p_validation_list->m_procedures)
+                       (! new_procedures)
                {
+                       opj_free(p_validation_list->m_procedures);
                        p_validation_list->m_nb_max_procedures = 0;
                        p_validation_list->m_nb_procedures = 0;
                        return OPJ_FALSE;
                }
+                else
+                {
+                       p_validation_list->m_procedures = new_procedures;
+                }
        }
        p_validation_list->m_procedures[p_validation_list->m_nb_procedures] = p_procedure;
        ++p_validation_list->m_nb_procedures;