[1.5] Check the number of tiles

[openjpeg.git] / libopenjpeg / image.c

diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c
index 6159b6399c9163b021f6f941cbba6610850a1f1b..579fd73d71824f0f8e6127e2ea205de5e62e294e 100644 (file)
--- a/libopenjpeg/image.c
+++ b/libopenjpeg/image.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,22 +26,23 @@
 
 #include "opj_includes.h"
 
-opj_image_t* opj_image_create0() {
-       opj_image_t *image = (opj_image_t*)opj_malloc(sizeof(opj_image_t));
+opj_image_t* opj_image_create0(void) {
+       opj_image_t *image = (opj_image_t*)opj_calloc(1, sizeof(opj_image_t));
        return image;
 }
 
-opj_image_t *opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
+opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
        int compno;
        opj_image_t *image = NULL;
 
-       image = (opj_image_t*)opj_malloc(sizeof(opj_image_t));
+       image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
        if(image) {
                image->color_space = clrspc;
                image->numcomps = numcmpts;
                /* allocate memory for the per-component information */
-               image->comps = (opj_image_comp_t*)opj_malloc(image->numcomps * sizeof(opj_image_comp_t));
+               image->comps = (opj_image_comp_t*)opj_calloc(1,image->numcomps * sizeof(opj_image_comp_t));
                if(!image->comps) {
+                       fprintf(stderr,"Unable to allocate memory for image.\n");
                        opj_image_destroy(image);
                        return NULL;
                }
@@ -57,8 +58,9 @@ opj_image_t *opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ
                        comp->prec = cmptparms[compno].prec;
                        comp->bpp = cmptparms[compno].bpp;
                        comp->sgnd = cmptparms[compno].sgnd;
-                       comp->data = (int*)opj_malloc(comp->w * comp->h * sizeof(int));
+                       comp->data = (int*) opj_calloc(comp->w * comp->h, sizeof(int));
                        if(!comp->data) {
+                               fprintf(stderr,"Unable to allocate memory for image.\n");
                                opj_image_destroy(image);
                                return NULL;
                        }
@@ -68,7 +70,7 @@ opj_image_t *opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ
        return image;
 }
 
-void opj_image_destroy(opj_image_t *image) {
+void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
        int i;
        if(image) {
                if(image->comps) {