defined new type "opj_bool", and new constants OPJ_FALSE and OPJ_TRUE, to avoid havin...

[openjpeg.git] / libopenjpeg / cio.c

diff --git a/libopenjpeg/cio.c b/libopenjpeg/cio.c
index 0725b3810cbd11245f42b00d687948fe50ebe974..3b0f816f254b8f827e31c9127f8f86b1bdb2842c 100644 (file)
--- a/libopenjpeg/cio.c
+++ b/libopenjpeg/cio.c
@@ -58,9 +58,10 @@ opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer
                                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 */
+               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;
                }
@@ -125,13 +126,13 @@ unsigned char *cio_getbp(opj_cio_t *cio) {
 /*
  * Write a byte.
  */
-bool cio_byteout(opj_cio_t *cio, unsigned char v) {
+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 false;
+               return OPJ_FALSE;
        }
        *cio->bp++ = v;
-       return true;
+       return OPJ_TRUE;
 }
 
 /*