diff options
| author | Antonin Descampe <antonin@gmail.com> | 2005-12-08 09:38:47 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2005-12-08 09:38:47 +0000 |
| commit | 95bc884365deb41c357583874c23d82eac7cad2d (patch) | |
| tree | cbeb4c538d1bf2f253bc5d3aa21da2871032b670 /libopenjpeg/image.c | |
| parent | e45e87cfb7c7a131fcd7412e3fb228b61f3c999e (diff) | |
OpenJPEG version 1.1
Diffstat (limited to 'libopenjpeg/image.c')
| -rw-r--r-- | libopenjpeg/image.c | 97 |
1 files changed, 48 insertions, 49 deletions
diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c index 0bdaa223..6159b639 100644 --- a/libopenjpeg/image.c +++ b/libopenjpeg/image.c @@ -24,65 +24,64 @@ * 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 *image = (opj_image_t*)opj_malloc(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; + 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_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; + } + } + } - 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); - } + 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); + } } |
