remove deprecated v1 style function j2k_read_cod
[openjpeg.git] / libopenjpeg / cio.c
index bc5adc6076594c7e9dba6f6c4e949202e2e12c4f..1e9cdebd30f365a97cb00382c05bf1f3a3f9cc99 100644 (file)
@@ -1,5 +1,10 @@
 /*
- * Copyright (c) 2001-2002, David Janssens
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cio.h"
-#include <setjmp.h>
+#include "opj_includes.h"
 
-static unsigned char *cio_start, *cio_end, *cio_bp;
+/* ----------------------------------------------------------------------- */
 
-extern jmp_buf j2k_error;
+opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
+       opj_cp_t *cp = NULL;
+       opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
+       if(!cio) return NULL;
+       cio->cinfo = cinfo;
+       if(buffer && length) {
+               /* wrap a user buffer containing the encoded image */
+               cio->openmode = OPJ_STREAM_READ;
+               cio->buffer = buffer;
+               cio->length = length;
+       }
+       else if(!buffer && !length && cinfo) {
+               /* allocate a buffer for the encoded image */
+               cio->openmode = OPJ_STREAM_WRITE;
+               switch(cinfo->codec_format) {
+                       case CODEC_J2K:
+                               cp = ((opj_j2k_t*)cinfo->j2k_handle)->cp;
+                               break;
+                       case CODEC_JP2:
+                               cp = ((opj_jp2_t*)cinfo->jp2_handle)->j2k->cp;
+                               break;
+                       default:
+                               opj_free(cio);
+                               return NULL;
+               }
+               cio->length = (int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
+               assert(cio->length >= 0);
+               cio->buffer = (unsigned char *)opj_malloc((OPJ_SIZE_T)cio->length);
+               if(!cio->buffer) {
+                       opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
+                       opj_free(cio);
+                       return NULL;
+               }
+       }
+       else {
+               opj_free(cio);
+               return NULL;
+       }
+
+       /* Initialize byte IO */
+       cio->start = cio->buffer;
+       cio->end = cio->buffer + cio->length;
+       cio->bp = cio->buffer;
+
+       return cio;
+}
+
+void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
+       if(cio) {
+               if(cio->openmode == OPJ_STREAM_WRITE) {
+                       /* destroy the allocated buffer */
+                       opj_free(cio->buffer);
+               }
+               /* destroy the cio */
+               opj_free(cio);
+       }
+}
+
+
+/* ----------------------------------------------------------------------- */
+
+/*
+ * Get position in byte stream.
+ */
+OPJ_OFF_T OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
+       return cio->bp - cio->start;
+}
+
+/*
+ * Set position in byte stream.
+ *
+ * pos : position, in number of bytes, from the beginning of the stream
+ */
+void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
+       cio->bp = cio->start + pos;
+}
+
+/*
+ * Number of bytes left before the end of the stream.
+ */
+OPJ_SIZE_T cio_numbytesleft(opj_cio_t *cio) {
+       const ptrdiff_t diff = cio->end - cio->bp;
+  assert( diff >= 0 );
+  return (OPJ_SIZE_T)diff;
+}
+
+/*
+ * Get pointer to the current position in the stream.
+ */
+unsigned char *cio_getbp(opj_cio_t *cio) {
+       return cio->bp;
+}
+
+/*
+ * Write a byte.
+ */
+opj_bool cio_byteout(opj_cio_t *cio, unsigned char v) {
+       if (cio->bp >= cio->end) {
+               opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
+               return OPJ_FALSE;
+       }
+       *cio->bp++ = v;
+       return OPJ_TRUE;
+}
 
-/* <summary> */
-/* Number of bytes written. */
-/* </summary> */
-int cio_numbytes()
+/*
+ * Read a byte.
+ */
+unsigned char cio_bytein(opj_cio_t *cio) {
+       if (cio->bp >= cio->end) {
+               opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
+               return 0;
+       }
+       return *cio->bp++;
+}
+
+/*
+ * Write some bytes.
+ *
+ * v : value to write
+ * n : number of bytes to write
+ */
+unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
+       int i;
+       for (i = n - 1; i >= 0; i--) {
+               if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
+                       return 0;
+       }
+  assert( n >= 0 );
+       return (unsigned int)n;
+}
+
+/*
+ * Read some bytes.
+ *
+ * n : number of bytes to read
+ *
+ * return : value of the n bytes read
+ */
+unsigned int cio_read(opj_cio_t *cio, int n) {
+       int i;
+       unsigned int v = 0;
+       for (i = n - 1; i >= 0; i--) {
+    const unsigned int c = cio_bytein(cio);
+               v += c << (i << 3);
+       }
+       return v;
+}
+
+/* 
+ * Skip some bytes.
+ *
+ * n : number of bytes to skip
+ */
+void cio_skip(opj_cio_t *cio, int n) {
+       cio->bp += n;
+}
+
+
+/* ----------------------------------------------------------------------- */
+
+
+/**
+ * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ * @param p_nb_bytes   the number of bytes to write
+*/
+void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
-       return cio_bp - cio_start;
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes;
+
+       assert(p_nb_bytes > 0 && p_nb_bytes <=  sizeof(OPJ_UINT32));
+
+       memcpy(p_buffer,l_data_ptr,p_nb_bytes);
 }
 
-/* <summary> */
-/* Get position in byte stream. */
-/* </summary> */
-int cio_tell()
+/**
+ * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ * @param p_nb_bytes   the number of bytes to write
+ * @return                             the number of bytes written or -1 if an error occured
+*/
+void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
-       return cio_bp - cio_start;
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes - 1;
+       OPJ_UINT32 i;
+
+       assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
+
+       for     (i=0;i<p_nb_bytes;++i) {
+               *(p_buffer++) = *(l_data_ptr--);
+       }
 }
 
-/* <summary> */
-/* Set position in byte stream. */
-/* </summary> */
-void cio_seek(int pos)
+/**
+ * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ * @param p_nb_bytes   the nb bytes to read.
+ * @return                             the number of bytes read or -1 if an error occured.
+ */
+void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
-       cio_bp = cio_start + pos;
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
+
+       assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
+
+       *p_value = 0;
+       memcpy(l_data_ptr+4-p_nb_bytes,p_buffer,p_nb_bytes);
 }
 
-/* <summary> */
-/* Number of bytes left before the end of the stream. */
-/* </summary> */
-int cio_numbytesleft()
+/**
+ * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ * @param p_nb_bytes   the nb bytes to read.
+ * @return                             the number of bytes read or -1 if an error occured.
+ */
+void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
-       return cio_end - cio_bp;
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + p_nb_bytes-1;
+       OPJ_UINT32 i;
+
+       assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
+
+       *p_value = 0;
+       for (i=0;i<p_nb_bytes;++i) {
+               *(l_data_ptr--) = *(p_buffer++);
+       }
 }
 
-/* <summary> */
-/* Get pointer to the current position in the stream. */
-/* </summary> */
-unsigned char *cio_getbp()
+/**
+ * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ * @return                             the number of bytes written or -1 if an error occured
+ */
+void opj_write_double_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
 {
-       return cio_bp;
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value);
+       memcpy(p_buffer,l_data_ptr,sizeof(OPJ_FLOAT64));
 }
 
-/* <summary> */
-/* Initialize byte IO. */
-/* </summary> */
-void cio_init(unsigned char *bp, int len)
+/**
+ * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ */
+void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
 {
-       cio_start = bp;
-       cio_end = bp + len;
-       cio_bp = bp;
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + sizeof(OPJ_FLOAT64) - 1;
+       OPJ_UINT32 i;
+       for     (i=0;i<sizeof(OPJ_FLOAT64);++i) {
+               *(p_buffer++) = *(l_data_ptr--);
+       }
 }
 
-/* <summary> */
-/* Write a byte. */
-/* </summary> */
-void cio_byteout(unsigned char v)
+/**
+ * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ */
+void opj_read_double_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value)
 {
-       if (cio_bp >= cio_end)
-               longjmp(j2k_error, 1);
-       *cio_bp++ = v;
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
+       memcpy(l_data_ptr,p_buffer,sizeof(OPJ_FLOAT64));
+}
+
 
+/**
+ * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ */
+void opj_read_double_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value)
+{
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT64)-1;
+       OPJ_UINT32 i;
+       for (i=0;i<sizeof(OPJ_FLOAT64);++i) {
+               *(l_data_ptr--) = *(p_buffer++);
+       }
 }
 
-/* <summary> */
-/* Read a byte. */
-/* </summary> */
-unsigned char cio_bytein()
+/**
+ * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ * @return                             the number of bytes written or -1 if an error occured
+ */
+void opj_write_float_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value)
 {
-       if (cio_bp >= cio_end)
-               longjmp(j2k_error, 1);
-       return *cio_bp++;
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value);
+       memcpy(p_buffer,l_data_ptr,sizeof(OPJ_FLOAT32));
 }
 
-/* <summary> */
-/* Write a byte. */
-/* </summary> */
-void cio_write(unsigned int v, int n)
+/**
+ * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to write data to.
+ * @param p_value              the value to write
+ */
+void opj_write_float_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value)
 {
-       int i;
-       for (i = n - 1; i >= 0; i--) {
-               cio_byteout((unsigned char) ((v >> (i << 3)) & 0xff));
+       const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + sizeof(OPJ_FLOAT32) - 1;
+       OPJ_UINT32 i;
+       for     (i=0;i<sizeof(OPJ_FLOAT32);++i) {
+               *(p_buffer++) = *(l_data_ptr--);
        }
 }
 
-/* <summary> */
-/* Read some bytes. */
-/* </summary> */
-unsigned int cio_read(int n)
+/**
+ * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ */
+void opj_read_float_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
 {
-       int i;
-       unsigned int v;
-       v = 0;
-       for (i = n - 1; i >= 0; i--) {
-               v += cio_bytein() << (i << 3);
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
+       memcpy(l_data_ptr,p_buffer,sizeof(OPJ_FLOAT32));
+}
+
+
+/**
+ * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
+ * @param p_buffer             pointer the data buffer to read data from.
+ * @param p_value              pointer to the value that will store the data.
+ */
+void opj_read_float_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
+{
+       OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT32)-1;
+       OPJ_UINT32 i;
+       for     (i=0;i<sizeof(OPJ_FLOAT32);++i) {
+               *(l_data_ptr--) = *(p_buffer++);
        }
-       return v;
 }
 
-/* <summary> */
-/* Write some bytes. */
-/* </summary> */
-void cio_skip(int n)
+
+/**
+ * Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
+ * @return a stream object.
+*/
+opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,opj_bool l_is_input)
+{
+       opj_stream_private_t * l_stream = 00;
+       l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_t));
+       if (! l_stream) {
+               return 00;
+       }
+
+       memset(l_stream,0,sizeof(opj_stream_private_t));
+       l_stream->m_buffer_size = p_buffer_size;
+       l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size);
+       if (! l_stream->m_stored_data) {
+               opj_free(l_stream);
+               return 00;
+       }
+
+       l_stream->m_current_data = l_stream->m_stored_data;
+
+       if (l_is_input) {
+               l_stream->m_status |= opj_stream_e_input;
+               l_stream->m_opj_skip = opj_stream_read_skip;
+               l_stream->m_opj_seek = opj_stream_read_seek;
+       }
+       else {
+               l_stream->m_status |= opj_stream_e_output;
+               l_stream->m_opj_skip = opj_stream_write_skip;
+               l_stream->m_opj_seek = opj_stream_write_seek;
+       }
+
+       l_stream->m_read_fn = opj_stream_default_read;
+       l_stream->m_write_fn = opj_stream_default_write;
+       l_stream->m_skip_fn = opj_stream_default_skip;
+       l_stream->m_seek_fn = opj_stream_default_seek;
+
+       return (opj_stream_t *) l_stream;
+}
+
+/**
+ * Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
+ * @return a stream object.
+*/
+opj_stream_t* OPJ_CALLCONV opj_stream_default_create(opj_bool l_is_input)
+{
+       return opj_stream_create(J2K_STREAM_CHUNK_SIZE,l_is_input);
+}
+
+/**
+ * Destroys a stream created by opj_create_stream. This function does NOT close the abstract stream. If needed the user must
+ * close its own implementation of the stream.
+ */
+OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       
+       if (l_stream) {
+               opj_free(l_stream->m_stored_data);
+               l_stream->m_stored_data = 00;
+               opj_free(l_stream);
+       }
+}
+
+/**
+ * Sets the given function to be used as a read function.
+ * @param              p_stream        the stream to modify
+ * @param              p_function      the function to use a read function.
+*/
+OPJ_API void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+
+       if ((!l_stream) || (! (l_stream->m_status & opj_stream_e_input))) {
+               return;
+       }
+
+       l_stream->m_read_fn = p_function;
+}
+
+OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, opj_stream_seek_fn p_function)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       
+       if (!l_stream) {
+               return;
+       }
+       l_stream->m_seek_fn = p_function;
+}
+
+/**
+ * Sets the given function to be used as a write function.
+ * @param              p_stream        the stream to modify
+ * @param              p_function      the function to use a write function.
+*/
+OPJ_API void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream, opj_stream_write_fn p_function)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       
+       if ((!l_stream )|| (! (l_stream->m_status & opj_stream_e_output))) {
+               return;
+       }
+
+       l_stream->m_write_fn = p_function;
+}
+
+/**
+ * Sets the given function to be used as a skip function.
+ * @param              p_stream        the stream to modify
+ * @param              p_function      the function to use a skip function.
+*/
+OPJ_API void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_stream_skip_fn p_function)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       
+       if (! l_stream) {
+               return;
+       }
+
+       l_stream->m_skip_fn = p_function;
+}
+
+/**
+ * Sets the given data to be used as a user data for the stream.
+ * @param              p_stream        the stream to modify
+ * @param              p_data          the data to set.
+*/
+OPJ_API void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       l_stream->m_user_data = p_data;
+}
+
+/**
+ * Sets the given data to be used as a user data for the stream.
+ * @param              p_stream        the stream to modify
+ * @param              p_data          the data to set.
+*/
+OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
+{
+       opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
+       l_stream->m_user_data_length = data_length;
+}
+
+/**
+ * Reads some bytes from the stream.
+ * @param              p_stream        the stream to read data from.
+ * @param              p_buffer        pointer to the data buffer that will receive the data.
+ * @param              p_size          number of bytes to read.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes read, or -1 if an error occured or if the stream is at the end.
+ */
+OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       OPJ_SIZE_T l_read_nb_bytes = 0;
+       if (p_stream->m_bytes_in_buffer >= p_size) {
+               memcpy(p_buffer,p_stream->m_current_data,p_size);
+               p_stream->m_current_data += p_size;
+               p_stream->m_bytes_in_buffer -= p_size;
+               l_read_nb_bytes += p_size;
+               p_stream->m_byte_offset += (OPJ_OFF_T)p_size;
+               return l_read_nb_bytes;
+       }
+
+       /* we are now in the case when the remaining data if not sufficient */
+       if (p_stream->m_status & opj_stream_e_end) {
+               l_read_nb_bytes += p_stream->m_bytes_in_buffer;
+               memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
+               p_stream->m_current_data += p_stream->m_bytes_in_buffer;
+               p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+               p_stream->m_bytes_in_buffer = 0;
+               return l_read_nb_bytes ? l_read_nb_bytes : (OPJ_SIZE_T)-1;
+       }
+
+       /* the flag is not set, we copy data and then do an actual read on the stream */
+       if (p_stream->m_bytes_in_buffer) {
+               l_read_nb_bytes += p_stream->m_bytes_in_buffer;
+               memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
+               p_stream->m_current_data = p_stream->m_stored_data;
+               p_buffer += p_stream->m_bytes_in_buffer;
+               p_size -= p_stream->m_bytes_in_buffer;
+               p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+               p_stream->m_bytes_in_buffer = 0;
+       }
+       else {
+    /* case where we are already at the end of the buffer
+       so reset the m_current_data to point to the start of the
+       stored buffer to get ready to read from disk*/
+               p_stream->m_current_data = p_stream->m_stored_data;
+       }
+
+
+       while(1){
+               /* we should read less than a chunk -> read a chunk */
+               if (p_size < p_stream->m_buffer_size) {
+                       /* we should do an actual read on the media */
+                       p_stream->m_bytes_in_buffer = p_stream->m_read_fn(p_stream->m_stored_data,p_stream->m_buffer_size,p_stream->m_user_data);
+
+                       if (p_stream->m_bytes_in_buffer == (OPJ_SIZE_T)-1) {
+                               /* end of stream */
+                               opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
+
+                               p_stream->m_bytes_in_buffer = 0;
+                               p_stream->m_status |= opj_stream_e_end;
+                               /* end of stream */
+                               return l_read_nb_bytes ? l_read_nb_bytes : (OPJ_SIZE_T)-1;
+                       }
+                       else if (p_stream->m_bytes_in_buffer < p_size) {
+                               /* not enough data */
+                               l_read_nb_bytes += p_stream->m_bytes_in_buffer;
+                               memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
+                               p_stream->m_current_data = p_stream->m_stored_data;
+                               p_buffer += p_stream->m_bytes_in_buffer;
+                               p_size -= p_stream->m_bytes_in_buffer;
+                               p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+                               p_stream->m_bytes_in_buffer = 0;
+                       }
+                       else {
+                               l_read_nb_bytes += p_size;
+                               memcpy(p_buffer,p_stream->m_current_data,p_size);
+                               p_stream->m_current_data += p_size;
+                               p_stream->m_bytes_in_buffer -= p_size;
+                               p_stream->m_byte_offset += (OPJ_OFF_T)p_size;
+                               return l_read_nb_bytes;
+                       }
+               }
+               else {
+                       /* direct read on the dest buffer */
+                       p_stream->m_bytes_in_buffer = p_stream->m_read_fn(p_buffer,p_size,p_stream->m_user_data);
+
+                       if (p_stream->m_bytes_in_buffer == (OPJ_SIZE_T)-1) {
+                               /*  end of stream */
+                               opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
+
+                               p_stream->m_bytes_in_buffer = 0;
+                               p_stream->m_status |= opj_stream_e_end;
+                               /* end of stream */
+                               return l_read_nb_bytes ? l_read_nb_bytes : (OPJ_SIZE_T)-1;
+                       }
+                       else if (p_stream->m_bytes_in_buffer < p_size) {
+                               /* not enough data */
+                               l_read_nb_bytes += p_stream->m_bytes_in_buffer;
+                               p_stream->m_current_data = p_stream->m_stored_data;
+                               p_buffer += p_stream->m_bytes_in_buffer;
+                               p_size -= p_stream->m_bytes_in_buffer;
+                               p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+                               p_stream->m_bytes_in_buffer = 0;
+                       }
+                       else {
+                               /* we have read the exact size */
+                               l_read_nb_bytes += p_stream->m_bytes_in_buffer;
+                               p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+                               p_stream->m_current_data = p_stream->m_stored_data;
+                               p_stream->m_bytes_in_buffer = 0;
+                               return l_read_nb_bytes;
+                       }
+               }
+       }
+}
+
+/**
+ * Writes some bytes from the stream.
+ * @param              p_stream        the stream to write data to.
+ * @param              p_buffer        pointer to the data buffer holds the data to be writtent.
+ * @param              p_size          number of bytes to write.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes writtent, or -1 if an error occured.
+ */
+OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,
+                                                                 const OPJ_BYTE * p_buffer,
+                                                                 OPJ_SIZE_T p_size, 
+                                                                 opj_event_mgr_t * p_event_mgr)
+{
+       OPJ_SIZE_T l_remaining_bytes = 0;
+       OPJ_SIZE_T l_write_nb_bytes = 0;
+
+       if (p_stream->m_status & opj_stream_e_error) {
+               return (OPJ_SIZE_T)-1;
+       }
+
+       while(1) {
+               l_remaining_bytes = p_stream->m_buffer_size - p_stream->m_bytes_in_buffer;
+               
+               /* we have more memory than required */
+               if (l_remaining_bytes >= p_size) {
+                       memcpy(p_stream->m_current_data, p_buffer, p_size);
+                       
+                       p_stream->m_current_data += p_size;
+                       p_stream->m_bytes_in_buffer += p_size;
+                       l_write_nb_bytes += p_size;
+                       p_stream->m_byte_offset += (OPJ_OFF_T)p_size;
+                       
+                       return l_write_nb_bytes;
+               }
+
+               /* we copy data and then do an actual read on the stream */
+               if (l_remaining_bytes) {
+                       l_write_nb_bytes += l_remaining_bytes;
+                       
+                       memcpy(p_stream->m_current_data,p_buffer,l_remaining_bytes);
+                       
+                       p_stream->m_current_data = p_stream->m_stored_data;
+                       
+                       p_buffer += l_remaining_bytes;
+                       p_size -= l_remaining_bytes;
+                       p_stream->m_bytes_in_buffer += l_remaining_bytes;
+                       p_stream->m_byte_offset += (OPJ_OFF_T)l_remaining_bytes;
+               }
+
+               if (! opj_stream_flush(p_stream, p_event_mgr)) {
+                       return (OPJ_SIZE_T)-1;
+               }
+       }
+
+}
+
+/**
+ * Writes the content of the stream buffer to the stream.
+ * @param              p_stream        the stream to write data to.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes written, or -1 if an error occured.
+ */
+opj_bool opj_stream_flush (opj_stream_private_t * p_stream, opj_event_mgr_t * p_event_mgr)
+{
+       /* the number of bytes written on the media. */
+       OPJ_SIZE_T l_current_write_nb_bytes = 0;
+
+       p_stream->m_current_data = p_stream->m_stored_data;
+
+       while (p_stream->m_bytes_in_buffer) {
+               /* we should do an actual write on the media */
+               l_current_write_nb_bytes = p_stream->m_write_fn(p_stream->m_current_data,
+                                                                                                               p_stream->m_bytes_in_buffer,
+                                                                                                               p_stream->m_user_data);
+               
+               if (l_current_write_nb_bytes == (OPJ_SIZE_T)-1) {
+                       p_stream->m_status |= opj_stream_e_error;
+                       opj_event_msg_v2(p_event_mgr, EVT_INFO, "Error on writting stream!\n");
+
+                       return OPJ_FALSE;
+               }
+
+               p_stream->m_current_data += l_current_write_nb_bytes;
+               p_stream->m_bytes_in_buffer -= l_current_write_nb_bytes;
+       }
+
+       p_stream->m_current_data = p_stream->m_stored_data;
+       
+       return OPJ_TRUE;
+}
+
+/**
+ * Skips a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes skipped, or -1 if an error occured.
+ */
+OPJ_OFF_T opj_stream_read_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       OPJ_OFF_T l_skip_nb_bytes = 0;
+       OPJ_OFF_T l_current_skip_nb_bytes = 0;
+       
+       assert( p_size >= 0 );
+       
+       if (p_stream->m_bytes_in_buffer >= (OPJ_SIZE_T)p_size) {
+               p_stream->m_current_data += p_size;
+               /* it is safe to cast p_size to OPJ_SIZE_T since it is <= m_bytes_in_buffer
+               which is of type OPJ_SIZE_T */
+               p_stream->m_bytes_in_buffer -= (OPJ_SIZE_T)p_size;
+               l_skip_nb_bytes += p_size;
+               p_stream->m_byte_offset += l_skip_nb_bytes;
+               return l_skip_nb_bytes;
+       }
+
+       /* we are now in the case when the remaining data if not sufficient */
+       if (p_stream->m_status & opj_stream_e_end) {
+               l_skip_nb_bytes += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+               p_stream->m_current_data += p_stream->m_bytes_in_buffer;
+               p_stream->m_bytes_in_buffer = 0;
+               p_stream->m_byte_offset += l_skip_nb_bytes;
+               return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T) -1;
+       }
+
+       /* the flag is not set, we copy data and then do an actual skip on the stream */
+       if (p_stream->m_bytes_in_buffer) {
+               l_skip_nb_bytes += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+               p_stream->m_current_data = p_stream->m_stored_data;
+               p_size -= (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
+               p_stream->m_bytes_in_buffer = 0;
+       }
+
+       while (p_size > 0) {
+               /* we should do an actual skip on the media */
+               l_current_skip_nb_bytes = p_stream->m_skip_fn(p_size, p_stream->m_user_data);
+               if (l_current_skip_nb_bytes == (OPJ_OFF_T) -1) {
+                       opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
+
+                       p_stream->m_status |= opj_stream_e_end;
+                       p_stream->m_byte_offset += l_skip_nb_bytes;
+                       /* end if stream */
+                       return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T) -1;
+               }
+               p_size -= l_current_skip_nb_bytes;
+               l_skip_nb_bytes += l_current_skip_nb_bytes;
+       }
+
+       p_stream->m_byte_offset += l_skip_nb_bytes;
+       
+       return l_skip_nb_bytes;
+}
+
+/**
+ * Skips a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes skipped, or -1 if an error occured.
+ */
+OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       opj_bool l_is_written = 0;
+       OPJ_OFF_T l_current_skip_nb_bytes = 0;
+       OPJ_OFF_T l_skip_nb_bytes = 0;
+
+       if (p_stream->m_status & opj_stream_e_error) {
+               return (OPJ_OFF_T) -1;
+       }
+
+       /* we should flush data */
+       l_is_written = opj_stream_flush (p_stream, p_event_mgr);
+       if (! l_is_written) {
+               p_stream->m_status |= opj_stream_e_error;
+               p_stream->m_bytes_in_buffer = 0;
+               p_stream->m_current_data = p_stream->m_current_data;
+               return (OPJ_OFF_T) -1;
+       }
+       /* then skip */
+
+       while (p_size > 0) {
+               /* we should do an actual skip on the media */
+               l_current_skip_nb_bytes = p_stream->m_skip_fn(p_size, p_stream->m_user_data);
+               
+               if (l_current_skip_nb_bytes == (OPJ_OFF_T)-1) {
+                       opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream error!\n");
+
+                       p_stream->m_status |= opj_stream_e_error;
+                       p_stream->m_byte_offset += l_skip_nb_bytes;
+                       /* end if stream */
+                       return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T)-1;
+               }
+               p_size -= l_current_skip_nb_bytes;
+               l_skip_nb_bytes += l_current_skip_nb_bytes;
+       }
+
+       p_stream->m_byte_offset += l_skip_nb_bytes;
+       
+       return l_skip_nb_bytes;
+}
+
+/**
+ * Tells the byte offset on the stream (similar to ftell).
+ *
+ * @param              p_stream        the stream to get the information from.
+ *
+ * @return             the current position of the stream.
+ */
+OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream)
+{
+       return p_stream->m_byte_offset;
+}
+
+
+/**
+ * Get the number of bytes left before the end of the stream (similar to cio_numbytesleft).
+ *
+ * @param              p_stream        the stream to get the information from.
+ *
+ * @return             Number of bytes left before the end of the stream.
+ */
+OPJ_OFF_T opj_stream_get_number_byte_left (const opj_stream_private_t * p_stream)
+{
+  assert( p_stream->m_byte_offset >= 0 );
+  assert( p_stream->m_user_data_length >= (OPJ_UINT64)p_stream->m_byte_offset);
+  return p_stream->m_user_data_length ?
+                               (OPJ_OFF_T)(p_stream->m_user_data_length) - p_stream->m_byte_offset :
+                               0;
+}
+
+/**
+ * Skips a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes skipped, or -1 if an error occured.
+ */
+OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       assert(p_size >= 0);
+       return p_stream->m_opj_skip(p_stream,p_size,p_event_mgr);
+}
+
+
+/**
+ * Skips a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes skipped, or -1 if an error occured.
+ */
+opj_bool opj_stream_read_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       OPJ_ARG_NOT_USED(p_event_mgr);
+       p_stream->m_current_data = p_stream->m_stored_data;
+       p_stream->m_bytes_in_buffer = 0;
+
+       if( !(p_stream->m_seek_fn(p_size,p_stream->m_user_data)) ) {
+               p_stream->m_status |= opj_stream_e_end;
+               return OPJ_FALSE;
+       }
+       else {
+               /* reset stream status */
+               p_stream->m_status &= (~opj_stream_e_end);
+               p_stream->m_byte_offset = p_size;
+
+       }
+
+       return OPJ_TRUE;
+}
+
+/**
+ * Skips a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             the number of bytes skipped, or -1 if an error occured.
+ */
+opj_bool opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+{
+       if (! opj_stream_flush(p_stream,p_event_mgr)) {
+               p_stream->m_status |= opj_stream_e_error;
+               return OPJ_FALSE;
+       }
+
+       p_stream->m_current_data = p_stream->m_stored_data;
+       p_stream->m_bytes_in_buffer = 0;
+
+       if (! p_stream->m_seek_fn(p_size,p_stream->m_user_data)) {
+               p_stream->m_status |= opj_stream_e_error;
+               return OPJ_FALSE;
+       }
+       else {
+               p_stream->m_byte_offset = p_size;
+       }
+
+       return OPJ_TRUE;
+}
+
+
+/**
+ * Seeks a number of bytes from the stream.
+ * @param              p_stream        the stream to skip data from.
+ * @param              p_size          the number of bytes to skip.
+ * @param              p_event_mgr     the user event manager to be notified of special events.
+ * @return             true if the stream is seekable.
+ */
+opj_bool opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr)
+{
+       assert(p_size >= 0);
+       return p_stream->m_opj_seek(p_stream,p_size,p_event_mgr);
+}
+
+/**
+ * Tells if the given stream is seekable.
+ */
+opj_bool opj_stream_has_seek (const opj_stream_private_t * p_stream)
+{
+       return p_stream->m_seek_fn != opj_stream_default_seek;
+}
+
+OPJ_SIZE_T opj_stream_default_read (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
+{
+       OPJ_ARG_NOT_USED(p_buffer);
+       OPJ_ARG_NOT_USED(p_nb_bytes);
+       OPJ_ARG_NOT_USED(p_user_data);
+       return (OPJ_SIZE_T) -1;
+}
+
+OPJ_SIZE_T opj_stream_default_write (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
+{
+       OPJ_ARG_NOT_USED(p_buffer);
+       OPJ_ARG_NOT_USED(p_nb_bytes);
+       OPJ_ARG_NOT_USED(p_user_data);
+       return (OPJ_SIZE_T) -1;
+}
+
+OPJ_OFF_T opj_stream_default_skip (OPJ_OFF_T p_nb_bytes, void * p_user_data)
+{
+       OPJ_ARG_NOT_USED(p_nb_bytes);
+       OPJ_ARG_NOT_USED(p_user_data);
+       return (OPJ_OFF_T) -1;
+}
+
+opj_bool opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data)
 {
-       cio_bp += n;
+       OPJ_ARG_NOT_USED(p_nb_bytes);
+       OPJ_ARG_NOT_USED(p_user_data);
+       return OPJ_FALSE;
 }