[trunk] Revert r2453 since it breaks conformance test ETS-C1P1-p1_06.j2k-decode

[openjpeg.git] / src / lib / openjp2 / function_list.c

diff --git a/src/lib/openjp2/function_list.c b/src/lib/openjp2/function_list.c
index 1f84a429f057594c03464c276d3dbf01b8a9e8ea..bf8c0bb60de6d1aa5c0f3e7f326d643298584629 100644 (file)
--- a/src/lib/openjp2/function_list.c
+++ b/src/lib/openjp2/function_list.c
@@ -67,7 +67,7 @@ void  opj_procedure_list_destroy(opj_procedure_list_t * p_list)
         opj_free(p_list);
 }
 
-opj_bool  opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure)
+OPJ_BOOL opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure)
 {
         if (p_validation_list->m_nb_max_procedures == p_validation_list->m_nb_procedures)
         {
@@ -82,7 +82,7 @@ opj_bool  opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_
                         opj_free(p_validation_list->m_procedures);
                         p_validation_list->m_nb_max_procedures = 0;
                         p_validation_list->m_nb_procedures = 0;
-                        /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to add a new validation procedure\n"); */
+                        /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to add a new validation procedure\n"); */
                         fprintf(stderr, "Not enough memory to add a new validation procedure\n");
                         
                         return OPJ_FALSE;
@@ -108,7 +108,7 @@ opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_
         return p_validation_list->m_procedures;
 }
 
-void  opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
+void opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
 {
         p_validation_list->m_nb_procedures = 0;
 }