X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2Fcio.c;h=2ac262a1f6b54013165218e2bd1a6e2d6d53f36b;hb=64ed560f4f88cb7215adb011ba53f16f1fd3f54c;hp=3d40cb81159be2fd2c29b3786826a770b5f19e80;hpb=f61cda9b7d83e0202cbaa15bac45d358e9b3652e;p=openjpeg.git

diff --git a/libopenjpeg/cio.c b/libopenjpeg/cio.c
index 3d40cb81..2ac262a1 100644
--- a/libopenjpeg/cio.c
+++ b/libopenjpeg/cio.c
@@ -1,9 +1,10 @@
 /*
+ * 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-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, HervŽ Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * 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
@@ -28,65 +29,65 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "opj_includes.h"
 
 /* ----------------------------------------------------------------------- */
 
-opj_cio_t* 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 = cp->tdx * cp->tdy * cp->tw * cp->th * 2;
-    cio->buffer = (unsigned char *)opj_malloc(cio->length);
-    if(!cio->buffer) {
-      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;
+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 = (unsigned int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
+		cio->buffer = (unsigned char *)opj_malloc(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_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);
-  }
+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);
+	}
 }
 
 
@@ -95,8 +96,8 @@ void opj_cio_close(opj_cio_t *cio) {
 /*
  * Get position in byte stream.
  */
-int cio_tell(opj_cio_t *cio) {
-  return cio->bp - cio->start;
+int OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
+	return cio->bp - cio->start;
 }
 
 /*
@@ -104,45 +105,45 @@ int cio_tell(opj_cio_t *cio) {
  *
  * pos : position, in number of bytes, from the beginning of the stream
  */
-void cio_seek(opj_cio_t *cio, int pos) {
-  cio->bp = cio->start + pos;
+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.
  */
 int cio_numbytesleft(opj_cio_t *cio) {
-  return cio->end - cio->bp;
+	return cio->end - cio->bp;
 }
 
 /*
  * Get pointer to the current position in the stream.
  */
 unsigned char *cio_getbp(opj_cio_t *cio) {
-  return cio->bp;
+	return cio->bp;
 }
 
 /*
  * Write a byte.
  */
 bool cio_byteout(opj_cio_t *cio, unsigned char v) {
-  if (cio->bp >= cio->end) {
-    opg_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
-    return false;
-  }
-  *cio->bp++ = v;
-  return true;
+	if (cio->bp >= cio->end) {
+		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
+		return false;
+	}
+	*cio->bp++ = v;
+	return true;
 }
 
 /*
  * Read a byte.
  */
 unsigned char cio_bytein(opj_cio_t *cio) {
-  if (cio->bp >= cio->end) {
-    opg_event_msg(cio->cinfo, EVT_ERROR, "read error\n");
-    return 0;
-  }
-  return *cio->bp++;
+	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++;
 }
 
 /*
@@ -152,12 +153,12 @@ unsigned char cio_bytein(opj_cio_t *cio) {
  * n : number of bytes to write
  */
 unsigned int cio_write(opj_cio_t *cio, unsigned 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;
-  }
-  return n;
+	int i;
+	for (i = n - 1; i >= 0; i--) {
+		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
+			return 0;
+	}
+	return n;
 }
 
 /*
@@ -168,13 +169,13 @@ unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n) {
  * return : value of the n bytes read
  */
 unsigned int cio_read(opj_cio_t *cio, int n) {
-  int i;
-  unsigned int v;
-  v = 0;
-  for (i = n - 1; i >= 0; i--) {
-    v += cio_bytein(cio) << (i << 3);
-  }
-  return v;
+	int i;
+	unsigned int v;
+	v = 0;
+	for (i = n - 1; i >= 0; i--) {
+		v += cio_bytein(cio) << (i << 3);
+	}
+	return v;
 }
 
 /* 
@@ -183,7 +184,7 @@ unsigned int cio_read(opj_cio_t *cio, int n) {
  * n : number of bytes to skip
  */
 void cio_skip(opj_cio_t *cio, int n) {
-  cio->bp += n;
+	cio->bp += n;
 }