rename j2k_read_cbd to opj_j2k_read_cbd

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 286f9e53b9536d57fcb2a8fa6745e0066f5eeb11..b5ce8dd9a543903ace3d3b614793634867e3d63c 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1151,10 +1151,10 @@ static opj_bool j2k_write_cbd(  opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the CBD marker.
  * @param      p_manager               the user event manager.
 */
-static opj_bool j2k_read_cbd ( opj_j2k_v2_t *p_j2k,
-                                                       OPJ_BYTE * p_header_data,
-                                                       OPJ_UINT32 p_header_size,
-                                                       struct opj_event_mgr * p_manager);
+static opj_bool opj_j2k_read_cbd (     opj_j2k_v2_t *p_j2k,
+                                                               OPJ_BYTE * p_header_data,
+                                                               OPJ_UINT32 p_header_size,
+                                                               opj_event_mgr_t * p_manager);
 
 /**
  * Writes the image components.
@@ -1361,7 +1361,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg},
   {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_com},
   {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct},
-  {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
+  {J2K_MS_CBD, J2K_STATE_MH , opj_j2k_read_cbd},
   {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
   {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco},
 #ifdef USE_JPWL
@@ -6526,10 +6526,11 @@ opj_bool j2k_write_cbd( opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the CBD marker.
  * @param      p_manager               the user event manager.
 */
-opj_bool j2k_read_cbd (        opj_j2k_v2_t *p_j2k,
-                                               OPJ_BYTE * p_header_data,
-                                               OPJ_UINT32 p_header_size,
-                                               struct opj_event_mgr * p_manager)
+static opj_bool opj_j2k_read_cbd (     opj_j2k_v2_t *p_j2k,
+                                                               OPJ_BYTE * p_header_data,
+                                                               OPJ_UINT32 p_header_size,
+                                                               opj_event_mgr_t * p_manager
+                                    )
 {
        OPJ_UINT32 l_nb_comp,l_num_comp;
        OPJ_UINT32 l_comp_def;