From 24966ffbda1ef1ebb47a6a1056fa20ee3f8ed0c1 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 10 Mar 2014 09:36:14 +0000 Subject: [PATCH] [trunk] Fix compilation when TIFF lib is neither found nor compiled --- tests/compare_images.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/compare_images.c b/tests/compare_images.c index 5dfd69d1..01ccd8e5 100644 --- a/tests/compare_images.c +++ b/tests/compare_images.c @@ -242,8 +242,10 @@ static opj_image_t* readImageFromFileTIF(const char* filename, int nbFilenamePGX * TIFFOpen: /.../data/baseline/nonregression/opj_jp2_1.tif: Cannot open. * On Win32 this open a message box by default, so remove it from the test suite: */ +#ifdef OPJ_HAVE_LIBTIFF TIFFSetWarningHandler(NULL); TIFFSetErrorHandler(NULL); +#endif /* If separator is empty => nb file to read is equal to one*/ if ( strlen(separator) == 0 ) @@ -271,11 +273,13 @@ static opj_image_t* readImageFromFileTIF(const char* filename, int nbFilenamePGX filenameComponentPGX = createMultiComponentsFilename(filename, it_file, separator); /* Read the tif file corresponding to the component */ +#ifdef OPJ_HAVE_LIBTIFF image_read = tiftoimage(filenameComponentPGX, ¶meters); +#endif if (!image_read) { int it_free_data; - fprintf(stderr, "Unable to load pgx file\n"); + fprintf(stderr, "Unable to load TIF file\n"); free(param_image_read);