[trunk] WIP: add a read CBD marker function (JPEG2000 part 2)

[openjpeg.git] / libopenjpeg / image.c

diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c
index 84664e9a86f03ce9dd700c56fa38d47e99df5051..21a0f503d52f05b51a57dfc2cd1bf7bf6fc1b3d6 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,8 +26,8 @@
 
 #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;
 }
 
@@ -35,13 +35,14 @@ opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *c
        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));
                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_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *c
                        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;
                        }
@@ -69,19 +71,56 @@ opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *c
 }
 
 void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
-       int i;
        if(image) {
                if(image->comps) {
+                       OPJ_UINT32 compno;
                        /* image components */
-                       for(i = 0; i < image->numcomps; i++) {
-                               opj_image_comp_t *image_comp = &image->comps[i];
+                       for(compno = 0; compno < image->numcomps; compno++) {
+                               opj_image_comp_t *image_comp = &(image->comps[compno]);
                                if(image_comp->data) {
                                        opj_free(image_comp->data);
                                }
                        }
                        opj_free(image->comps);
                }
-               opj_free(image);
+
+               if(image->icc_profile_buf) {
+                       opj_free(image->icc_profile_buf);
+               }
+               //FIXME opj_free(image);
        }
 }
 
+/**
+ * Updates the components characteristics of the image from the coding parameters.
+ *
+ * @param p_image_header       the image header to update.
+ * @param p_cp                         the coding parameters from which to update the image.
+ */
+void opj_image_comp_header_update(opj_image_t * p_image_header, const struct opj_cp_v2 * p_cp)
+{
+       OPJ_UINT32 i, l_width, l_height;
+       OPJ_INT32 l_x0, l_y0, l_x1, l_y1;
+       OPJ_INT32 l_comp_x0, l_comp_y0, l_comp_x1, l_comp_y1;
+       opj_image_comp_t* l_img_comp = NULL;
+
+       l_x0 = int_max(p_cp->tx0 , p_image_header->x0);
+       l_y0 = int_max(p_cp->ty0 , p_image_header->y0);
+       l_x1 = int_min(p_cp->tx0 + p_cp->tw * p_cp->tdx, p_image_header->x1);
+       l_y1 = int_min(p_cp->ty0 + p_cp->th * p_cp->tdy, p_image_header->y1);
+
+       l_img_comp = p_image_header->comps;
+       for     (i = 0; i < p_image_header->numcomps; ++i) {
+               l_comp_x0 = int_ceildiv(l_x0, l_img_comp->dx);
+               l_comp_y0 = int_ceildiv(l_y0, l_img_comp->dy);
+               l_comp_x1 = int_ceildiv(l_x1, l_img_comp->dx);
+               l_comp_y1 = int_ceildiv(l_y1, l_img_comp->dy);
+               l_width = int_ceildivpow2(l_comp_x1 - l_comp_x0, l_img_comp->factor);
+               l_height = int_ceildivpow2(l_comp_y1 - l_comp_y0, l_img_comp->factor);
+               l_img_comp->w = l_width;
+               l_img_comp->h = l_height;
+               l_img_comp->x0 = l_comp_x0/*l_x0*/;
+               l_img_comp->y0 = l_comp_y0/*l_y0*/;
+               ++l_img_comp;
+       }
+}