Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/function_list.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) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 51 matching lines @@
                 return;
         }
         /* initialization */
         if (p_list->m_procedures)
         {
                 opj_free(p_list->m_procedures);
         }
         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, opj_event_mgr_t* p_manager )
 {
+        
+        assert(p_manager != NULL);
+        
         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;
                 new_procedures = (opj_procedure*)opj_realloc(
                         p_validation_list->m_procedures,
                         p_validation_list->m_nb_max_procedures * sizeof(opj_procedure));
                 if (! new_procedures)
                 {
                         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(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");
-                        
+                        opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to add a new validation procedure\n");
                         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;
 
         return OPJ_TRUE;
 }
 
 OPJ_UINT32 opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list)
 {
         return p_validation_list->m_nb_procedures;
 }
 
 opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list)
 {
         return p_validation_list->m_procedures;
 }
 
 void opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
 {
         p_validation_list->m_nb_procedures = 0;
 }