From d38e32c036d85a394871c103ab44a20033818b51 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Wed, 12 Mar 2014 11:32:44 +0000 Subject: [PATCH] [trunk] TIFF files in test suite can have 1 or 3 components --- tests/compare_images.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/compare_images.c b/tests/compare_images.c index 12a0809f..b6cc2be4 100644 --- a/tests/compare_images.c +++ b/tests/compare_images.c @@ -278,7 +278,7 @@ static opj_image_t* readImageFromFileTIF(const char* filename, int nbFilenamePGX } /* \postconditions */ - assert( image_read->numcomps == 3 ); + assert( image_read->numcomps == 1 || image_read->numcomps == 3 ); return image_read; } @@ -875,10 +875,10 @@ int main(int argc, char **argv) { char *filenamePNGbase_it_comp, *filenamePNGtest_it_comp, *filenamePNGdiff_it_comp; - filenamePNGbase_it_comp = (char*) malloc((size_t)memsizebasefilename); + filenamePNGbase_it_comp = (char*) malloc(memsizebasefilename); strcpy(filenamePNGbase_it_comp,filenamePNGbase); - filenamePNGtest_it_comp = (char*) malloc((size_t)memsizetestfilename); + filenamePNGtest_it_comp = (char*) malloc(memsizetestfilename); strcpy(filenamePNGtest_it_comp,filenamePNGtest); filenamePNGdiff_it_comp = (char*) malloc(memsizedifffilename);