[trunk]rename pi_update_encoding_parameters to opj_pi_update_encoding_parameters

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index c76bcba5a9027b4912493085724e1fdeda2eff18..f706e828aa1686bce2fc527225fdfd249669e9c5 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -1629,7 +1629,7 @@ opj_bool opj_j2k_calculate_tp(  opj_j2k_v2_t *p_j2k,
                 for (tileno = 0; tileno < l_nb_tiles; ++tileno) {
                         OPJ_UINT32 cur_totnum_tp = 0;
 
-                        pi_update_encoding_parameters(image,cp,tileno);
+                        opj_pi_update_encoding_parameters(image,cp,tileno);
 
                         for (pino = 0; pino <= tcp->numpocs; ++pino)
                         {
@@ -1659,7 +1659,7 @@ opj_bool opj_j2k_calculate_tp(  opj_j2k_v2_t *p_j2k,
                 for (tileno = 0; tileno < l_nb_tiles; ++tileno) {
                         OPJ_UINT32 cur_totnum_tp = 0;
 
-                        pi_update_encoding_parameters(image,cp,tileno);
+                        opj_pi_update_encoding_parameters(image,cp,tileno);
 
                         for (pino = 0; pino <= tcp->numpocs; ++pino) {
                                 OPJ_UINT32 tp_num = opj_j2k_get_num_tp(cp,pino,tileno);

diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
index e59571b63792d9877917b124ae6ffcfc05c6892a..f36e258fbd640f13748124b44dfe4417c5d14abe 100644 (file)
--- a/src/lib/openjp2/pi.c
+++ b/src/lib/openjp2/pi.c
@@ -1424,9 +1424,9 @@ opj_bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int p
        return OPJ_FALSE;
 }
 
-void pi_update_encoding_parameters(    const opj_image_t *p_image,
-                                                                       opj_cp_v2_t *p_cp,
-                                                                       OPJ_UINT32 p_tile_no )
+void opj_pi_update_encoding_parameters(        const opj_image_t *p_image,
+                                        opj_cp_v2_t *p_cp,
+                                        OPJ_UINT32 p_tile_no )
 {
        /* encoding parameters to set */
        OPJ_UINT32 l_max_res;

diff --git a/src/lib/openjp2/pi.h b/src/lib/openjp2/pi.h
index 061e3e2022e5f68e2a41e26b7fc72dca2f0c4b3a..35e534c5d2dd1282b6e357ce0f8a21444aa61eb0 100644 (file)
--- a/src/lib/openjp2/pi.h
+++ b/src/lib/openjp2/pi.h
@@ -133,9 +133,9 @@ opj_pi_iterator_t *pi_initialise_encode_v2( const struct opj_image *image,
  * @param      p_cp            the coding parameters.
  * @param      p_tile_no       index of the tile being encoded.
 */
-void pi_update_encoding_parameters(    const struct opj_image *p_image,
-                                                                       struct opj_cp_v2 *p_cp,
-                                                                       OPJ_UINT32 p_tile_no );
+void opj_pi_update_encoding_parameters(        const opj_image_t *p_image,
+                                        opj_cp_v2_t *p_cp,
+                                        OPJ_UINT32 p_tile_no );
 
 /**
 Modify the packet iterator for enabling tile part generation