rename j2k_read_ppt_v2 to opj_j2k_read_ppt

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 5003c5b611aede2b2098e234be900b906da8e950..4a7320d12f54fa7331d42819dbf0e3c1e062d5a2 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -810,12 +810,10 @@ static opj_bool j2k_read_ppm_v3 (
  * @param      p_header_size   the size of the data contained in the PPT marker.
  * @param      p_manager               the user event manager.
 */
-static opj_bool j2k_read_ppt_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_ppt (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager );
 /**
 Write the TLM marker (Mainheader)
 @param j2k J2K handle
@@ -1377,7 +1375,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_PLM, J2K_STATE_MH, opj_j2k_read_plm},
   {J2K_MS_PLT, J2K_STATE_TPH, opj_j2k_read_plt},
   {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm_v3},
-  {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt_v2},
+  {J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt},
   {J2K_MS_SOP, 0, 0},
   {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg_v2},
   {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2},
@@ -4261,10 +4259,11 @@ opj_bool j2k_read_ppm_v3 (
  * @param      p_header_size   the size of the data contained in the PPT marker.
  * @param      p_manager               the user event manager.
 */
-opj_bool j2k_read_ppt_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_ppt (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager 
+                                    )
 {
        opj_cp_v2_t *l_cp = 00;
        opj_tcp_v2_t *l_tcp = 00;