[trunk] clean jp2_read_ihdr_v2 interface

[openjpeg.git] / libopenjpeg / image.c

diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c
index 28795ef310bee37bcb222b1b735ed0555e7ea355..baebc2a2397eaf8e17f41ed6d75b345eaad180ee 100644 (file)
--- a/libopenjpeg/image.c
+++ b/libopenjpeg/image.c
@@ -31,7 +31,7 @@ opj_image_t* opj_image_create0(void) {
        return image;
 }
 
-opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
+opj_image_t* OPJ_CALLCONV opj_image_create(OPJ_UINT32 numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
        int compno;
        opj_image_t *image = NULL;
 
@@ -126,3 +126,110 @@ void opj_image_comp_header_update(opj_image_t * p_image_header, const struct opj
                ++l_img_comp;
        }
 }
+
+
+/**
+ * Copy only header of image and its component header (no data are copied)
+ * if dest image have data, they will be freed
+ *
+ * @param      p_image_src             the src image
+ * @param      p_image_dest    the dest image
+ *
+ */
+void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest)
+{
+       OPJ_UINT32 compno;
+
+       /* preconditions */
+       assert(p_image_src != 00);
+       assert(p_image_dest != 00);
+
+       p_image_dest->x0 = p_image_src->x0;
+       p_image_dest->y0 = p_image_src->y0;
+       p_image_dest->x1 = p_image_src->x1;
+       p_image_dest->y1 = p_image_src->y1;
+
+       if (p_image_dest->comps){
+               for(compno = 0; compno < p_image_dest->numcomps; compno++) {
+                       opj_image_comp_t *image_comp = &(p_image_dest->comps[compno]);
+                       if(image_comp->data) {
+                               opj_free(image_comp->data);
+                       }
+               }
+               opj_free(p_image_dest->comps);
+               p_image_dest->comps = NULL;
+       }
+
+       p_image_dest->numcomps = p_image_src->numcomps;
+
+       p_image_dest->comps = (opj_image_comp_t*) opj_malloc(p_image_dest->numcomps * sizeof(opj_image_comp_t));
+       if (!p_image_dest->comps){
+               p_image_dest->comps = NULL;
+               p_image_dest->numcomps = 0;
+               return;
+       }
+
+       for (compno=0; compno < p_image_dest->numcomps; compno++){
+               memcpy( &(p_image_dest->comps[compno]),
+                               &(p_image_src->comps[compno]),
+                               sizeof(opj_image_comp_t));
+               p_image_dest->comps[compno].data = NULL;
+       }
+
+       p_image_dest->color_space = p_image_src->color_space;
+       p_image_dest->icc_profile_len = p_image_src->icc_profile_len;
+
+       if (p_image_dest->icc_profile_len) {
+               p_image_dest->icc_profile_buf = (OPJ_BYTE*)opj_malloc(p_image_dest->icc_profile_len);
+               if (!p_image_dest->icc_profile_buf){
+                       p_image_dest->icc_profile_buf = NULL;
+                       p_image_dest->icc_profile_len = 0;
+                       return;
+               }
+               memcpy( p_image_dest->icc_profile_buf,
+                               p_image_src->icc_profile_buf,
+                               p_image_src->icc_profile_len);
+               }
+               else
+                       p_image_dest->icc_profile_buf = NULL;
+
+       return;
+}
+
+opj_image_t* OPJ_CALLCONV opj_image_tile_create(OPJ_UINT32 numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
+       OPJ_UINT32 compno;
+       opj_image_t *image = 00;
+
+       image = (opj_image_t*) opj_malloc(sizeof(opj_image_t));
+       if (image)
+       {
+               memset(image,0,sizeof(opj_image_t));
+               
+               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 00;
+               }
+               memset(image->comps,0,image->numcomps * sizeof(opj_image_comp_t));
+               
+               /* 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->sgnd = cmptparms[compno].sgnd;
+                       comp->data = 0;
+               }
+       }
+
+       return image;
+}