[trunk] Remove deprecated functions.

Update issue 268

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 92a3726aa8ded0e455ef4f67ac92549c41969a11..7aa38f04d53c201f2459bcc92936a89bbfff0ddc 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -2712,6 +2712,7 @@ static OPJ_BOOL opj_jpip_write_cidx(opj_jp2_t *jp2,
   return OPJ_TRUE;
 }
 
+#if 0
 static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
   opj_event_mgr_t * p_manager )
 {
@@ -2744,8 +2745,10 @@ static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int le
   opj_stream_write_data(cio,l_data_header,4,p_manager);
   opj_stream_seek(cio, lenp+len,p_manager);
 }
+#endif
 
 
+#if 0
 static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
   opj_event_mgr_t * p_manager )
 {
@@ -2767,4 +2770,5 @@ static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int len
 
   return len;
 }
+#endif
 #endif /* USE_JPIP */

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index 6e2b557f4ebc2ee804ec64ec6ef0338a141e17b1..240126c9e83fbe84699047c3acba9e1d7e468729 100644 (file)
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -62,6 +62,7 @@ static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
 /**
 Decode significant pass
 */
+#if 0
 static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
                                     opj_flag_t *flagsp,
                                     OPJ_INT32 *datap,
@@ -69,6 +70,7 @@ static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
                                     OPJ_INT32 oneplushalf,
                                     OPJ_BYTE type,
                                     OPJ_UINT32 vsc);
+#endif
 
 static INLINE void opj_t1_dec_sigpass_step_raw(
                 opj_t1_t *t1,
@@ -161,6 +163,7 @@ static void opj_t1_dec_refpass_mqc_vsc(
 /**
 Decode refinement pass
 */
+#if 0
 static void opj_t1_dec_refpass_step(opj_t1_t *t1,
                                     opj_flag_t *flagsp,
                                     OPJ_INT32 *datap,
@@ -168,6 +171,7 @@ static void opj_t1_dec_refpass_step(opj_t1_t *t1,
                                     OPJ_INT32 neghalf,
                                     OPJ_BYTE type,
                                     OPJ_UINT32 vsc);
+#endif
 
 static INLINE void  opj_t1_dec_refpass_step_raw(
                 opj_t1_t *t1,
@@ -1678,6 +1682,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
        }
 }
 
+#if 0
 void opj_t1_dec_refpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
@@ -1705,9 +1710,11 @@ void opj_t1_dec_refpass_step(   opj_t1_t *t1,
                *flagsp |= T1_REFINE;
        }
 }                              /* VSC and  BYPASS by Antonin  */
+#endif
 
 
 
+#if 0
 void opj_t1_dec_sigpass_step(   opj_t1_t *t1,
                                 opj_flag_t *flagsp,
                                 OPJ_INT32 *datap,
@@ -1741,4 +1748,4 @@ void opj_t1_dec_sigpass_step(   opj_t1_t *t1,
                *flagsp |= T1_VISIT;
        }
 }                              /* VSC and  BYPASS by Antonin */
-
+#endif