remove deprecated v1 style function j2k_add_mhmarker; rename j2k_add_mhmarker_v2...

[openjpeg.git] / libopenjpeg / cidx_manager.c

diff --git a/libopenjpeg/cidx_manager.c b/libopenjpeg/cidx_manager.c
old mode 100755 (executable)
new mode 100644 (file)
index c197d54..f3b251f
--- a/libopenjpeg/cidx_manager.c
+++ b/libopenjpeg/cidx_manager.c
@@ -29,11 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "cidx_manager.h"
-#include "indexbox_manager.h"
-#include "cio.h"
+#include "opj_includes.h"
 
 
 /* 
@@ -75,8 +71,10 @@ int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_i
   opj_jp2_box_t *box;
   int num_box = 0;
   opj_bool  EPHused;
+  (void)image; /* unused ? */
 
-  box = (opj_jp2_box_t *)calloc( 32, sizeof(opj_jp2_box_t));
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
 
   for (i=0;i<2;i++){
   
@@ -120,7 +118,7 @@ int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_i
     cio_seek( cio, lenp+len);
   }
 
-  free( box);
+  opj_free( box);
   
   return len;
 }