l_new_image->comps[2].resno_decoded = original->comps[0].resno_decoded;
memcpy(l_new_image->comps[0].data, original->comps[0].data,
- original->comps[0].w * original->comps[0].h * sizeof(OPJ_INT32));
+ sizeof(OPJ_INT32) * original->comps[0].w * original->comps[0].h);
memcpy(l_new_image->comps[1].data, original->comps[0].data,
- original->comps[0].w * original->comps[0].h * sizeof(OPJ_INT32));
+ sizeof(OPJ_INT32) * original->comps[0].w * original->comps[0].h);
memcpy(l_new_image->comps[2].data, original->comps[0].data,
- original->comps[0].w * original->comps[0].h * sizeof(OPJ_INT32));
+ sizeof(OPJ_INT32) * original->comps[0].w * original->comps[0].h);
for (compno = 1U; compno < original->numcomps; ++compno) {
l_new_image->comps[compno + 2U].factor = original->comps[compno].factor;
l_new_image->comps[compno + 2U].resno_decoded =
original->comps[compno].resno_decoded;
memcpy(l_new_image->comps[compno + 2U].data, original->comps[compno].data,
- original->comps[compno].w * original->comps[compno].h * sizeof(OPJ_INT32));
+ sizeof(OPJ_INT32) * original->comps[compno].w * original->comps[compno].h);
}
opj_image_destroy(original);
return l_new_image;
}
} else {
memcpy(l_new_cmp->data, l_org_cmp->data,
- l_org_cmp->w * l_org_cmp->h * sizeof(OPJ_INT32));
+ sizeof(OPJ_INT32) * l_org_cmp->w * l_org_cmp->h);
}
}
opj_image_destroy(original);
int main(int argc, char **argv)
{
opj_decompress_parameters parameters; /* decompression parameters */
- opj_image_t* image = NULL;
- opj_stream_t *l_stream = NULL; /* Stream */
- opj_codec_t* l_codec = NULL; /* Handle to a decompressor */
- opj_codestream_index_t* cstr_index = NULL;
OPJ_INT32 num_images, imageno;
img_fol_t img_fol;
destroy_parameters(¶meters);
return EXIT_FAILURE;
}
- dirptr->filename_buf = (char*)malloc((size_t)num_images * OPJ_PATH_LEN * sizeof(
- char)); /* Stores at max 10 image file names*/
+ /* Stores at max 10 image file names */
+ dirptr->filename_buf = (char*)malloc(sizeof(char) *
+ (size_t)num_images * OPJ_PATH_LEN);
if (!dirptr->filename_buf) {
failed = 1;
goto fin;
/*Decoding image one by one*/
for (imageno = 0; imageno < num_images ; imageno++) {
+ opj_image_t* image = NULL;
+ opj_stream_t *l_stream = NULL; /* Stream */
+ opj_codec_t* l_codec = NULL; /* Handle to a decompressor */
+ opj_codestream_index_t* cstr_index = NULL;
if (!parameters.quiet) {
fprintf(stderr, "\n");
}
}
- /* FIXME? Shouldn't that situation be considered as an error of */
- /* opj_decode() / opj_get_decoded_tile() ? */
- if (image->comps[0].data == NULL) {
- fprintf(stderr, "ERROR -> opj_decompress: no image data!\n");
- opj_destroy_codec(l_codec);
- opj_stream_destroy(l_stream);
- opj_image_destroy(image);
- failed = 1;
- goto fin;
- }
-
tCumulative += opj_clock() - t;
numDecompressedImages++;