remove old v1 style functions from jp2.c

1 files changed, 0 insertions, 99 deletions

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index f39ec6cf..f24eee80 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -260,33 +260,6 @@ static opj_bool opj_jp2_read_colr(  opj_jp2_v2_t *jp2,
                                     OPJ_UINT32 p_colr_header_size,
                                     opj_event_mgr_t * p_manager );
 
-/**
-Write file Index (superbox)
-@param[in] offset_jp2c offset of jp2c box
-@param[in] length_jp2c length of jp2c box
-@param[in] offset_idx  offset of cidx box
-@param[in] length_idx  length of cidx box
-@param[in] cio         file output handle
-@return                length of fidx box
-*/
-static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio);
-/**
-Write index Finder box
-@param[in] offset offset of fidx box
-@param[in] length length of fidx box
-@param[in] cio         file output handle
-*/
-static void write_iptr( int offset, int length, opj_cio_t *cio);
-/**
-
-Write proxy box
-@param[in] offset_jp2c offset of jp2c box
-@param[in] length_jp2c length of jp2c box
-@param[in] offset_idx  offset of cidx box
-@param[in] length_idx  length of cidx box
-@param[in] cio         file output handle
-*/
-static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio);
 /*@}*/
 
 /*@}*/
@@ -812,19 +785,6 @@ void opj_jp2_free_pclr(opj_jp2_color_t *color)
     opj_free(color->jp2_pclr); color->jp2_pclr = NULL;
 }
 
-static void free_color_data(opj_jp2_color_t *color)
-{
-	if(color->jp2_pclr)
-   {
-	jp2_free_pclr(color);
-   }
-	if(color->jp2_cdef) 
-   {
-	if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
-	opj_free(color->jp2_cdef);
-   }
-	if(color->icc_profile_buf) opj_free(color->icc_profile_buf);
-}
 
 
 void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
@@ -1516,65 +1476,6 @@ opj_bool opj_jp2_write_jp(	opj_jp2_v2_t *jp2,
 	return OPJ_TRUE;
 }
 
-static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio)
-{  
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_FIDX, 4);  /* IPTR           */
-  
-  write_prxy( offset_jp2c, length_jp2c, offset_idx, length_idx, cio);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);  
-
-  return len;
-}
-
-static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio)
-{
-  int len, lenp;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_PRXY, 4);  /* IPTR           */
-  
-  cio_write( cio, offset_jp2c, 8); /* OOFF           */
-  cio_write( cio, length_jp2c, 4); /* OBH part 1     */
-  cio_write( cio, JP2_JP2C, 4);        /* OBH part 2     */
-  
-  cio_write( cio, 1,1);           /* NI             */
-
-  cio_write( cio, offset_idx, 8);  /* IOFF           */
-  cio_write( cio, length_idx, 4);  /* IBH part 1     */
-  cio_write( cio, JPIP_CIDX, 4);   /* IBH part 2     */
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-}
-
-static void write_iptr( int offset, int length, opj_cio_t *cio)
-{
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_IPTR, 4);  /* IPTR           */
-  
-  cio_write( cio, offset, 8);
-  cio_write( cio, length, 8);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L             */
-  cio_seek( cio, lenp+len);
-}
-
 
 /* ----------------------------------------------------------------------- */
 /* JP2 decoder interface                                             */