X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fjp2.c;h=7f6988d33a1ad8e3933e0d57c848f32a3aefe968;hb=20f7cba5b9d4012e8f038e47588c4de3962d147c;hp=796d015c1196d911d919074eb58e5103e5b34cad;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/jp2.c b/src/gdcmopenjpeg/libopenjpeg/jp2.c
index 796d015c..7f6988d3 100644
--- a/src/gdcmopenjpeg/libopenjpeg/jp2.c
+++ b/src/gdcmopenjpeg/libopenjpeg/jp2.c
@@ -1,528 +1,704 @@
 /*
-* Copyright (c) 2003-2004, Yannick Verschueren
-* Copyright (c) 2003-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2004, Yannick Verschueren
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Read box headers
+@param cinfo Codec context info
+@param cio Input stream
+@param box
+@return Returns true if successful, returns false otherwise
 */
+static bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box);
+/*static void jp2_write_url(opj_cio_t *cio, char *Idx_file);*/
+/**
+Read the IHDR box - Image Header box
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
+static bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio);
+static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Write the JP2H box - JP2 Header box
+@param jp2 JP2 handle
+@param cio Output buffer stream
+*/
+static void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Read the JP2H box - JP2 Header box
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Write the FTYP box - File type box
+@param jp2 JP2 handle
+@param cio Output buffer stream
+*/
+static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Read the FTYP box - File type box
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
+static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index);
+static bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset);
+static void jp2_write_jp(opj_cio_t *cio);
+/**
+Read the JP box - JPEG 2000 signature
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Decode the structure of a JP2 file
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio);
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "j2k.h"
-#include "jp2.h"
-#include "cio.h"
-
-#define JPIP_JPIP 0x6a706970
+/*@}*/
 
-#define JP2_JP   0x6a502020
-#define JP2_FTYP 0x66747970
-#define JP2_JP2H 0x6a703268
-#define JP2_IHDR 0x69686472
-#define JP2_COLR 0x636f6c72
-#define JP2_JP2C 0x6a703263
-#define JP2_URL  0x75726c20
-#define JP2_DBTL 0x6474626c
-#define JP2_BPCC 0x62706363
-#define JP2_JP2  0x6a703220
+/*@}*/
 
-/*
-* 
-* Read box headers
-*
-*/
+/* ----------------------------------------------------------------------- */
 
-int jp2_read_boxhdr(jp2_box_t * box)
-{
-  box->init_pos = cio_tell();
-  box->length = cio_read(4);
-  box->type = cio_read(4);
+static bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box) {
+  box->init_pos = cio_tell(cio);
+  box->length = cio_read(cio, 4);
+  box->type = cio_read(cio, 4);
   if (box->length == 1) {
-    if (cio_read(4) != 0) {
-      fprintf(stderr, "Error: Cannot handle box sizes higher than 2^32\n");
-      return 1;
+    if (cio_read(cio, 4) != 0) {
+      opj_event_msg(cinfo, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
+      return false;
     }
-    box->length = cio_read(4);
-    if (box->length == 0)
-      box->length = cio_numbytesleft() + 12;
-  } else if (box->length == 0) {
-    box->length = cio_numbytesleft() + 8;
+    box->length = cio_read(cio, 4);
+    if (box->length == 0) 
+      box->length = cio_numbytesleft(cio) + 12;
   }
-  return 0;
-}
-
-/*
-* 
-* Initialisation of a Standard JP2 structure
-*/
-
-int jp2_init_stdjp2(jp2_struct_t * jp2_struct)
-{
-
-  jp2_struct->comps =
-    (jp2_comps_t *) malloc(jp2_struct->numcomps * sizeof(jp2_comps_t));
-
-  jp2_struct->precedence = 0;   // PRECEDENCE
-  jp2_struct->approx = 0;   // APPROX
-
-  jp2_struct->brand = JP2_JP2;   /* BR         */
-  jp2_struct->minversion = 0;   /* MinV       */
-  jp2_struct->numcl = 1;
-  jp2_struct->cl = (int *) malloc(jp2_struct->numcl * sizeof(int));
-  jp2_struct->cl[0] = JP2_JP2;   /* CL0 : JP2  */
-
-  jp2_struct->C = 7;      // C : Always 7
-  jp2_struct->UnkC = 0;      // UnkC, colorspace specified in colr box
-  jp2_struct->IPR = 0;      // IPR, no intellectual property
-
-  return 0;
+  else if (box->length == 0) {
+    box->length = cio_numbytesleft(cio) + 8;
+  }
+  
+  return true;
 }
 
-
-void jp2_write_url(char *Idx_file)
-{
+#if 0
+static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
   unsigned int i;
-  char str[256];
-  jp2_box_t box;
-
-  sprintf(str, "%s", Idx_file);
+  opj_jp2_box_t box;
 
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_URL, 4);  /* DBTL */
+  cio_write(cio, 0, 1);    /* VERS */
+  cio_write(cio, 0, 3);    /* FLAG */
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_URL, 4);   // DBTL
-  cio_write(0, 1);      // VERS
-  cio_write(0, 3);      // FLAG
-
-  for (i = 0; i < strlen(str); i++) {
-    cio_write(str[i], 1);
+  if(Idx_file) {
+    for (i = 0; i < strlen(Idx_file); i++) {
+      cio_write(cio, Idx_file[i], 1);
+    }
   }
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
+#endif
 
-/*
-* Read the IHDR box
-*
-* Image Header box
-*
-*/
-int jp2_read_ihdr(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
+
+  opj_common_ptr cinfo = jp2->cinfo;
 
-  jp2_read_boxhdr(&box);
+  jp2_read_boxhdr(cinfo, cio, &box);
   if (JP2_IHDR != box.type) {
-    fprintf(stderr, "Error: Expected IHDR Marker\n");
-    return 1;
+    opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
+    return false;
   }
 
-  jp2_struct->h = cio_read(4);   // HEIGHT
-  jp2_struct->w = cio_read(4);   // WIDTH
-  jp2_struct->numcomps = cio_read(2);   // NC
+  jp2->h = cio_read(cio, 4);      /* HEIGHT */
+  jp2->w = cio_read(cio, 4);      /* WIDTH */
+  jp2->numcomps = cio_read(cio, 2);  /* NC */
+  jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
 
-  jp2_struct->bpc = cio_read(1);   // BPC
+  jp2->bpc = cio_read(cio, 1);    /* BPC */
 
-  jp2_struct->C = cio_read(1);   // C 
-  jp2_struct->UnkC = cio_read(1);   // UnkC
-  jp2_struct->IPR = cio_read(1);   // IPR
+  jp2->C = cio_read(cio, 1);      /* C */
+  jp2->UnkC = cio_read(cio, 1);    /* UnkC */
+  jp2->IPR = cio_read(cio, 1);    /* IPR */
 
-  if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with IHDR Box\n");
-    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with IHDR Box\n");
+    return false;
   }
-  return 0;
+
+  return true;
 }
 
-void jp2_write_ihdr(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_IHDR, 4);   // IHDR
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_IHDR, 4);    /* IHDR */
 
-  cio_write(jp2_struct->h, 4);   // HEIGHT
-  cio_write(jp2_struct->w, 4);   // WIDTH
-  cio_write(jp2_struct->numcomps, 2);   // NC
+  cio_write(cio, jp2->h, 4);      /* HEIGHT */
+  cio_write(cio, jp2->w, 4);      /* WIDTH */
+  cio_write(cio, jp2->numcomps, 2);  /* NC */
 
-  cio_write(jp2_struct->bpc, 1);   // BPC  
+  cio_write(cio, jp2->bpc, 1);    /* BPC */
 
-  cio_write(jp2_struct->C, 1);   // C : Always 7
-  cio_write(jp2_struct->UnkC, 1);   // UnkC, colorspace unknow
-  cio_write(jp2_struct->IPR, 1);   // IPR, no intellectual property
+  cio_write(cio, jp2->C, 1);      /* C : Always 7 */
+  cio_write(cio, jp2->UnkC, 1);    /* UnkC, colorspace unknown */
+  cio_write(cio, jp2->IPR, 1);    /* IPR, no intellectual property */
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
-
-void jp2_write_bpcc(jp2_struct_t * jp2_struct)
-{
+static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
   unsigned int i;
-  jp2_box_t box;
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_BPCC, 4);   // BPCC
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_BPCC, 4);  /* BPCC */
 
-  for (i = 0; i < jp2_struct->numcomps; i++)
-    cio_write(jp2_struct->comps[i].bpcc, 1);
+  for (i = 0; i < jp2->numcomps; i++) {
+    cio_write(cio, jp2->comps[i].bpcc, 1);
+  }
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
 
-int jp2_read_bpcc(jp2_struct_t * jp2_struct)
-{
+static bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
   unsigned int i;
-  jp2_box_t box;
+  opj_jp2_box_t box;
+
+  opj_common_ptr cinfo = jp2->cinfo;
 
-  jp2_read_boxhdr(&box);
+  jp2_read_boxhdr(cinfo, cio, &box);
   if (JP2_BPCC != box.type) {
-    fprintf(stderr, "Error: Expected BPCC Marker\n");
-    return 1;
+    opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
+    return false;
   }
 
-  for (i = 0; i < jp2_struct->numcomps; i++)
-    jp2_struct->comps[i].bpcc = cio_read(1);
+  for (i = 0; i < jp2->numcomps; i++) {
+    jp2->comps[i].bpcc = cio_read(cio, 1);
+  }
 
-  if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with BPCC Box\n");
-    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
+    return false;
   }
-  return 0;
+
+  return true;
 }
 
-void jp2_write_colr(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_COLR, 4);   // COLR
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_COLR, 4);    /* COLR */
 
-  cio_write(jp2_struct->meth, 1);   // METH
-  cio_write(jp2_struct->precedence, 1);   // PRECEDENCE
-  cio_write(jp2_struct->approx, 1);   // APPROX
+  cio_write(cio, jp2->meth, 1);    /* METH */
+  cio_write(cio, jp2->precedence, 1);  /* PRECEDENCE */
+  cio_write(cio, jp2->approx, 1);    /* APPROX */
 
-  if (jp2_struct->meth == 1)
-    cio_write(jp2_struct->enumcs, 4);   // EnumCS
-  else
-    cio_write(0, 1);      // PROFILE (??)
+  if (jp2->meth == 1) {
+    cio_write(cio, jp2->enumcs, 4);  /* EnumCS */
+  } else {
+    cio_write(cio, 0, 1);      /* PROFILE (??) */
+  }
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
-int jp2_read_colr(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
   int skip_len;
 
-  jp2_read_boxhdr(&box);
+  opj_common_ptr cinfo = jp2->cinfo;
+
+  jp2_read_boxhdr(cinfo, cio, &box);
   do {
     if (JP2_COLR != box.type) {
-      cio_skip(box.length - 8);
-      jp2_read_boxhdr(&box);
+      cio_skip(cio, box.length - 8);
+      jp2_read_boxhdr(cinfo, cio, &box);
     }
-  } while (JP2_COLR != box.type);
+  } while(JP2_COLR != box.type);
 
-  jp2_struct->meth = cio_read(1);   // METH
-  jp2_struct->precedence = cio_read(1);   // PRECEDENCE
-  jp2_struct->approx = cio_read(1);   // APPROX
+  jp2->meth = cio_read(cio, 1);    /* METH */
+  jp2->precedence = cio_read(cio, 1);  /* PRECEDENCE */
+  jp2->approx = cio_read(cio, 1);    /* APPROX */
 
-  if (jp2_struct->meth == 1)
-    jp2_struct->enumcs = cio_read(4);   // EnumCS
-  else {
-    // SKIP PROFILE     
-    skip_len = box.init_pos + box.length - cio_tell();
+  if (jp2->meth == 1) {
+    jp2->enumcs = cio_read(cio, 4);  /* EnumCS */
+  } else {
+    /* skip PROFILE */
+    skip_len = box.init_pos + box.length - cio_tell(cio);
     if (skip_len < 0) {
-      fprintf(stderr, "Error with JP2H box size\n");
-      return 1;
+      opj_event_msg(cinfo, EVT_ERROR, "Error with JP2H box size\n");
+      return false;
     }
-    cio_skip(box.init_pos + box.length - cio_tell());
+    cio_skip(cio, box.init_pos + box.length - cio_tell(cio));
   }
 
-  if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with BPCC Box\n");
-    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
+    return false;
   }
-  return 0;
+  return true;
 }
 
-/*
-* Write the JP2H box
-*
-* JP2 Header box
-*
-*/
-void jp2_write_jp2h(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);;
-  cio_write(JP2_JP2H, 4);   /* JP2H */
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_JP2H, 4);  /* JP2H */
 
-  jp2_write_ihdr(jp2_struct);
+  jp2_write_ihdr(jp2, cio);
 
-  if (jp2_struct->bpc == 255)
-    jp2_write_bpcc(jp2_struct);
-  jp2_write_colr(jp2_struct);
+  if (jp2->bpc == 255) {
+    jp2_write_bpcc(jp2, cio);
+  }
+  jp2_write_colr(jp2, cio);
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
-
-/*
-* Read the JP2H box
-*
-* JP2 Header box
-*
-*/
-int jp2_read_jp2h(jp2_struct_t * jp2_struct)
-{
-  jp2_box_t box;
+static bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
   int skip_len;
 
-  jp2_read_boxhdr(&box);
+  opj_common_ptr cinfo = jp2->cinfo;
+
+  jp2_read_boxhdr(cinfo, cio, &box);
   do {
     if (JP2_JP2H != box.type) {
       if (box.type == JP2_JP2C) {
-   fprintf(stderr, "Error: Expected JP2H Marker\n");
-   return 1;
+        opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
+        return false;
       }
-      cio_skip(box.length - 8);
-      jp2_read_boxhdr(&box);
+      cio_skip(cio, box.length - 8);
+      jp2_read_boxhdr(cinfo, cio, &box);
     }
-  } while (JP2_JP2H != box.type);
+  } while(JP2_JP2H != box.type);
 
-  if (jp2_read_ihdr(jp2_struct))
-    return 1;
+  if (!jp2_read_ihdr(jp2, cio))
+    return false;
 
-  if (jp2_struct->bpc == 255) {
-    if (jp2_read_bpcc(jp2_struct))
-      return 1;
+  if (jp2->bpc == 255) {
+    if (!jp2_read_bpcc(jp2, cio))
+      return false;
   }
+  if (!jp2_read_colr(jp2, cio))
+    return false;
 
-  if (jp2_read_colr(jp2_struct))
-    return 1;
-
-  skip_len = box.init_pos + box.length - cio_tell();
+  skip_len = box.init_pos + box.length - cio_tell(cio);
   if (skip_len < 0) {
-    fprintf(stderr, "Error with JP2H box size\n");
-    return 1;
+    opj_event_msg(cinfo, EVT_ERROR, "Error with JP2H Box\n");
+    return false;
   }
-  cio_skip(box.init_pos + box.length - cio_tell());
+  cio_skip(cio, box.init_pos + box.length - cio_tell(cio));
 
-  return 0;
+  return true;
 }
 
-/*
-* Write the FTYP box
-*
-* File type box
-*
-*/
-void jp2_write_ftyp(jp2_struct_t * jp2_struct)
-{
+static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
   unsigned int i;
-  jp2_box_t box;
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_FTYP, 4);   /* FTYP       */
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_FTYP, 4);    /* FTYP */
 
-  cio_write(jp2_struct->brand, 4);   /* BR         */
-  cio_write(jp2_struct->minversion, 4);   /* MinV       */
+  cio_write(cio, jp2->brand, 4);    /* BR */
+  cio_write(cio, jp2->minversion, 4);  /* MinV */
 
-  for (i = 0; i < jp2_struct->numcl; i++)
-    cio_write(jp2_struct->cl[i], 4);   /* CL           */
+  for (i = 0; i < jp2->numcl; i++) {
+    cio_write(cio, jp2->cl[i], 4);  /* CL */
+  }
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
-/*
-* Read the FTYP box
-*
-* File type box
-*
-*/
-int jp2_read_ftyp(jp2_struct_t * jp2_struct)
-{
+static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
   int i;
-  jp2_box_t box;
+  opj_jp2_box_t box;
+
+  opj_common_ptr cinfo = jp2->cinfo;
 
-  jp2_read_boxhdr(&box);
+  jp2_read_boxhdr(cinfo, cio, &box);
 
   if (JP2_FTYP != box.type) {
-    fprintf(stderr, "Error: Excpected FTYP Marker\n");
-    return 1;
+    opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
+    return false;
   }
 
-  jp2_struct->brand = cio_read(4);   /* BR              */
-  jp2_struct->minversion = cio_read(4);   /* MinV            */
-  jp2_struct->numcl = (box.length - 16) / 4;
-  jp2_struct->cl =
-    (unsigned int *) malloc(jp2_struct->numcl * sizeof(unsigned int));
+  jp2->brand = cio_read(cio, 4);    /* BR */
+  jp2->minversion = cio_read(cio, 4);  /* MinV */
+  jp2->numcl = (box.length - 16) / 4;
+  jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
 
-  for (i = 0; i < (int) jp2_struct->numcl; i++)
-    jp2_struct->cl[i] = cio_read(4);   /* CLi */
+  for (i = 0; i < (int)jp2->numcl; i++) {
+    jp2->cl[i] = cio_read(cio, 4);  /* CLi */
+  }
 
-  if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with FTYP Box\n");
-    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with FTYP Box\n");
+    return false;
   }
-  return 0;
+
+  return true;
 }
 
-int jp2_write_jp2c(int j2k_codestream_len, int *j2k_codestream_offset,
-         char *j2k_codestream)
-{
-  jp2_box_t box;
+static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index) {
+  unsigned int j2k_codestream_offset, j2k_codestream_length;
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_JP2C, 4);   // JP2C
+  opj_j2k_t *j2k = jp2->j2k;
 
-  *j2k_codestream_offset = cio_tell();
-  memcpy(cio_getbp(), j2k_codestream, j2k_codestream_len);
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_JP2C, 4);  /* JP2C */
 
-  box.length = 8 + j2k_codestream_len;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  /* J2K encoding */
+  j2k_codestream_offset = cio_tell(cio);
+  if(!j2k_encode(j2k, cio, image, index)) {
+    opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
+    return 0;
+  }
+  j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
+
+  jp2->j2k_codestream_offset = j2k_codestream_offset;
+  jp2->j2k_codestream_length = j2k_codestream_length;
+
+  box.length = 8 + jp2->j2k_codestream_length;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 
   return box.length;
 }
 
+static bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset) {
+  opj_jp2_box_t box;
 
-int jp2_read_jp2c(unsigned int *j2k_codestream_len,
-        unsigned int *j2k_codestream_offset)
-{
-  jp2_box_t box;
+  opj_common_ptr cinfo = jp2->cinfo;
 
-  jp2_read_boxhdr(&box);
+  jp2_read_boxhdr(cinfo, cio, &box);
   do {
-    if (JP2_JP2C != box.type) {
-      cio_skip(box.length - 8);
-      jp2_read_boxhdr(&box);
+    if(JP2_JP2C != box.type) {
+      cio_skip(cio, box.length - 8);
+      jp2_read_boxhdr(cinfo, cio, &box);
     }
-  } while (JP2_JP2C != box.type);
+  } while(JP2_JP2C != box.type);
 
-  *j2k_codestream_offset = cio_tell();
-  *j2k_codestream_len = box.length - 8;
+  *j2k_codestream_offset = cio_tell(cio);
+  *j2k_codestream_length = box.length - 8;
 
-  return 0;
+  return true;
 }
 
-void jp2_write_jp()
-{
-  jp2_box_t box;
+static void jp2_write_jp(opj_cio_t *cio) {
+  opj_jp2_box_t box;
 
-  box.init_pos = cio_tell();
-  cio_skip(4);
-  cio_write(JP2_JP, 4);      // JP
-  cio_write(0x0d0a870a, 4);
+  box.init_pos = cio_tell(cio);
+  cio_skip(cio, 4);
+  cio_write(cio, JP2_JP, 4);    /* JP2 signature */
+  cio_write(cio, 0x0d0a870a, 4);
 
-  box.length = cio_tell() - box.init_pos;
-  cio_seek(box.init_pos);
-  cio_write(box.length, 4);   /*    L       */
-  cio_seek(box.init_pos + box.length);
+  box.length = cio_tell(cio) - box.init_pos;
+  cio_seek(cio, box.init_pos);
+  cio_write(cio, box.length, 4);  /* L */
+  cio_seek(cio, box.init_pos + box.length);
 }
 
-/*
-* Read the JP box
-*
-* JPEG 2000 signature
-*
-* return 1 if error else 0
-*/
-int jp2_read_jp()
-{
-  jp2_box_t box;
+static bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_jp2_box_t box;
 
-  jp2_read_boxhdr(&box);
+  opj_common_ptr cinfo = jp2->cinfo;
+
+  jp2_read_boxhdr(cinfo, cio, &box);
   if (JP2_JP != box.type) {
-    fprintf(stderr, "Error: Expected JP Marker\n");
-    return 1;
+    opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
+    return false;
   }
-  if (0x0d0a870a != cio_read(4)) {
-    fprintf(stderr, "Error with JP Marker\n");
-    return 1;
+  if (0x0d0a870a != cio_read(cio, 4)) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with JP Marker\n");
+    return false;
   }
-  if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with JP Box size\n");
-    return 1;
+  if (cio_tell(cio) - box.init_pos != box.length) {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with JP Box size\n");
+    return false;
   }
-  return 0;
 
+  return true;
 }
 
 
-int jp2_read_struct(unsigned char *src, jp2_struct_t * jp2_struct, int len)
-{
-  cio_init(src, len);
-
-  if (jp2_read_jp())
-    return 1;
-  if (jp2_read_ftyp(jp2_struct))
-    return 1;
-  if (jp2_read_jp2h(jp2_struct))
-    return 1;
-  if (jp2_read_jp2c
-      (&jp2_struct->j2k_codestream_len,
-       &jp2_struct->j2k_codestream_offset))
-    return 1;
-  return 0;
+static bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio) {
+  if (!jp2_read_jp(jp2, cio))
+    return false;
+  if (!jp2_read_ftyp(jp2, cio))
+    return false;
+  if (!jp2_read_jp2h(jp2, cio))
+    return false;
+  if (!jp2_read_jp2c(jp2, cio, &jp2->j2k_codestream_length, &jp2->j2k_codestream_offset))
+    return false;
+  
+  return true;
+}
+
+/* ----------------------------------------------------------------------- */
+/* JP2 decoder interface                                             */
+/* ----------------------------------------------------------------------- */
+
+opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
+  opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
+  if(jp2) {
+    jp2->cinfo = cinfo;
+    /* create the J2K codec */
+    jp2->j2k = j2k_create_decompress(cinfo);
+    if(jp2->j2k == NULL) {
+      jp2_destroy_decompress(jp2);
+      return NULL;
+    }
+  }
+  return jp2;
 }
 
-int jp2_wrap_j2k(jp2_struct_t * jp2_struct, char *j2k_codestream,
-       char *output)
-{
-  jp2_write_jp();
-  jp2_write_ftyp(jp2_struct);
-  jp2_write_jp2h(jp2_struct);
+void jp2_destroy_decompress(opj_jp2_t *jp2) {
+  if(jp2) {
+    /* destroy the J2K codec */
+    j2k_destroy_decompress(jp2->j2k);
 
-  jp2_write_jp2c(jp2_struct->j2k_codestream_len,
-       &jp2_struct->j2k_codestream_offset, j2k_codestream);
+    if(jp2->comps) {
+      opj_free(jp2->comps);
+    }
+    if(jp2->cl) {
+      opj_free(jp2->cl);
+    }
+    opj_free(jp2);
+  }
+}
 
-  return cio_tell();
+void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
+  /* setup the J2K codec */
+  j2k_setup_decoder(jp2->j2k, parameters);
+  /* further JP2 initializations go here */
+}
+
+opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio) {
+  opj_common_ptr cinfo;
+  opj_image_t *image = NULL;
+
+  if(!jp2 || !cio) {
+    return NULL;
+  }
+
+  cinfo = jp2->cinfo;
+
+  /* JP2 decoding */
+  if(!jp2_read_struct(jp2, cio)) {
+    opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
+    return NULL;
+  }
+
+  /* J2K decoding */
+  image = j2k_decode(jp2->j2k, cio);
+  if(!image) {
+    opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
+  }
+
+  return image;
+}
+
+/* ----------------------------------------------------------------------- */
+/* JP2 encoder interface                                             */
+/* ----------------------------------------------------------------------- */
+
+opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo) {
+  opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
+  if(jp2) {
+    jp2->cinfo = cinfo;
+    /* create the J2K codec */
+    jp2->j2k = j2k_create_compress(cinfo);
+    if(jp2->j2k == NULL) {
+      jp2_destroy_compress(jp2);
+      return NULL;
+    }
+  }
+  return jp2;
 }
+
+void jp2_destroy_compress(opj_jp2_t *jp2) {
+  if(jp2) {
+    /* destroy the J2K codec */
+    j2k_destroy_compress(jp2->j2k);
+
+    if(jp2->comps) {
+      opj_free(jp2->comps);
+    }
+    if(jp2->cl) {
+      opj_free(jp2->cl);
+    }
+    opj_free(jp2);
+  }
+}
+
+void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image) {
+  int i;
+  int depth_0, sign;
+
+  if(!jp2 || !parameters || !image)
+    return;
+
+  /* setup the J2K codec */
+  /* ------------------- */
+
+  j2k_setup_encoder(jp2->j2k, parameters, image);
+
+  /* setup the JP2 codec */
+  /* ------------------- */
+  
+  /* Profile box */
+
+  jp2->brand = JP2_JP2;  /* BR */
+  jp2->minversion = 0;  /* MinV */
+  jp2->numcl = 1;
+  jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
+  jp2->cl[0] = JP2_JP2;  /* CL0 : JP2 */
+
+  /* Image Header box */
+
+  jp2->numcomps = image->numcomps;  /* NC */
+  jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+  jp2->h = image->y1 - image->y0;    /* HEIGHT */
+  jp2->w = image->x1 - image->x0;    /* WIDTH */
+  /* BPC */
+  depth_0 = image->comps[0].prec - 1;
+  sign = image->comps[0].sgnd;
+  jp2->bpc = depth_0 + (sign << 7);
+  for (i = 1; i < image->numcomps; i++) {
+    int depth = image->comps[i].prec - 1;
+    sign = image->comps[i].sgnd;
+    if (depth_0 != depth)
+      jp2->bpc = 255;
+  }
+  jp2->C = 7;      /* C : Always 7 */
+  jp2->UnkC = 0;    /* UnkC, colorspace specified in colr box */
+  jp2->IPR = 0;    /* IPR, no intellectual property */
+  
+  /* BitsPerComponent box */
+
+  for (i = 0; i < image->numcomps; i++) {
+    jp2->comps[i].bpcc = image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
+  }
+
+  /* Colour Specification box */
+
+  if ((image->numcomps == 1 || image->numcomps == 3) && (jp2->bpc != 255)) {
+    jp2->meth = 1;  /* METH: Enumerated colourspace */
+  } else {
+    jp2->meth = 2;  /* METH: Restricted ICC profile */
+  }
+  if (jp2->meth == 1) {
+    if (image->color_space == 1)
+      jp2->enumcs = 16;  /* sRGB as defined by IEC 61966–2–1 */
+    else if (image->color_space == 2)
+      jp2->enumcs = 17;  /* greyscale */
+    else if (image->color_space == 3)
+      jp2->enumcs = 18;  /* YUV */
+  } else {
+    jp2->enumcs = 0;    /* PROFILE (??) */
+  }
+  jp2->precedence = 0;  /* PRECEDENCE */
+  jp2->approx = 0;    /* APPROX */
+
+}
+
+bool jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, char *index) {
+
+  /* JP2 encoding */
+
+  /* JPEG 2000 Signature box */
+  jp2_write_jp(cio);
+  /* File Type box */
+  jp2_write_ftyp(jp2, cio);
+  /* JP2 Header box */
+  jp2_write_jp2h(jp2, cio);
+
+  /* J2K encoding */
+
+  if(!jp2_write_jp2c(jp2, cio, image, index)) {
+    opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
+    return false;
+  }
+
+  return true;
+}
+
+