rename j2k_read_com_v2 to opj_j2k_read_com

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index c71edf569f2624b82941399a54b0d17e1e482b0b..6fde81bba548a60fdac3a967311d55c57fb25e78 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -460,12 +460,10 @@ static opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the COM marker.
  * @param      p_manager               the user event manager.
 */
-static opj_bool j2k_read_com_v2 (
-                                       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_com (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager );
 /**
 Write the value concerning the specified component in the marker COD and COC
 @param j2k J2K handle
@@ -1366,7 +1364,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt},
   {J2K_MS_SOP, 0, 0},
   {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg},
-  {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2},
+  {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_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
@@ -2580,12 +2578,11 @@ opj_bool j2k_write_com_v2(      opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the COM marker.
  * @param      p_manager               the user event manager.
 */
-opj_bool j2k_read_com_v2 (
-                                       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_com (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager 
+                                    )
 {
        /* preconditions */
        assert(p_j2k != 00);