rename j2k_read_rgn_v2 to opj_j2k_read_rgn

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index c4ee74a0b0e7f56fc12c80871e2177d8b8b8478b..d4ec8a877ede7881407b2ebea2b21b1b282024f8 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1001,12 +1001,10 @@ static opj_bool j2k_write_rgn_v2(       opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the POC marker.
  * @param      p_manager               the user event manager.
 */
-static opj_bool j2k_read_rgn_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_rgn (opj_j2k_v2_t *p_j2k,
+                                  OPJ_BYTE * p_header_data,
+                                  OPJ_UINT32 p_header_size,
+                                  opj_event_mgr_t * p_manager );
 
 /**
  * Writes the EOC marker (End of Codestream)
@@ -1429,7 +1427,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, opj_j2k_read_sot},
   {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_cod},
   {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_coc},
-  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn_v2},
+  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_rgn},
   {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2},
   {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2},
   {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2},
@@ -5524,12 +5522,11 @@ opj_bool j2k_write_eoc_v2(      opj_j2k_v2_t *p_j2k,
  * @param      p_header_size   the size of the data contained in the POC marker.
  * @param      p_manager               the user event manager.
 */
-opj_bool j2k_read_rgn_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_rgn (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;
        opj_image_t * l_image = 00;