[1.5] Check the number of tiles

[openjpeg.git] / libopenjpeg / image.c

diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c
index 0bdaa2230d17ae6f35c152b716a64e5dfc7d4623..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
@@ -24,65 +24,66 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "opj_includes.h"
 
-opj_image_t* opj_image_create0() {
-  opj_image_t *image = (opj_image_t*)opj_malloc(sizeof(opj_image_t));
-  return image;
+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) {
-  int compno;
-  opj_image_t *image = NULL;
+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));
-  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));
-    if(!image->comps) {
-      opj_image_destroy(image);
-      return NULL;
-    }
-    /* create the individual image components */
-    for(compno = 0; compno < numcmpts; compno++) {
-      opj_image_comp_t *comp = &image->comps[compno];
-      comp->dx = cmptparms[compno].dx;
-      comp->dy = cmptparms[compno].dy;
-      comp->w = cmptparms[compno].w;
-      comp->h = cmptparms[compno].h;
-      comp->x0 = cmptparms[compno].x0;
-      comp->y0 = cmptparms[compno].y0;
-      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));
-      if(!comp->data) {
-        opj_image_destroy(image);
-        return NULL;
-      }
-    }
-  }
+       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_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;
+               }
+               /* create the individual image components */
+               for(compno = 0; compno < numcmpts; compno++) {
+                       opj_image_comp_t *comp = &image->comps[compno];
+                       comp->dx = cmptparms[compno].dx;
+                       comp->dy = cmptparms[compno].dy;
+                       comp->w = cmptparms[compno].w;
+                       comp->h = cmptparms[compno].h;
+                       comp->x0 = cmptparms[compno].x0;
+                       comp->y0 = cmptparms[compno].y0;
+                       comp->prec = cmptparms[compno].prec;
+                       comp->bpp = cmptparms[compno].bpp;
+                       comp->sgnd = cmptparms[compno].sgnd;
+                       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;
+                       }
+               }
+       }
 
-  return image;
+       return image;
 }
 
-void opj_image_destroy(opj_image_t *image) {
-  int i;
-  if(image) {
-    if(image->comps) {
-      /* image components */
-      for(i = 0; i < image->numcomps; i++) {
-        opj_image_comp_t *image_comp = &image->comps[i];
-        if(image_comp->data) {
-          opj_free(image_comp->data);
-        }
-      }
-      opj_free(image->comps);
-    }
-    opj_free(image);
-  }
+void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
+       int i;
+       if(image) {
+               if(image->comps) {
+                       /* image components */
+                       for(i = 0; i < image->numcomps; i++) {
+                               opj_image_comp_t *image_comp = &image->comps[i];
+                               if(image_comp->data) {
+                                       opj_free(image_comp->data);
+                               }
+                       }
+                       opj_free(image->comps);
+               }
+               opj_free(image);
+       }
 }