generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[trunk] Fix compilation when TIFF lib is neither found nor compiled

Browse Source
This commit is contained in:
Mathieu Malaterre 2014-03-10 09:36:14 +00:00
parent 666ef53fd2
commit 24966ffbda
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/compare_images.c
View File

@ -242,8 +242,10 @@ static opj_image_t* readImageFromFileTIF(const char* filename, int nbFilenamePGX
* TIFFOpen: /.../data/baseline/nonregression/opj_jp2_1.tif: Cannot open. * 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: * On Win32 this open a message box by default, so remove it from the test suite:
*/ */
#ifdef OPJ_HAVE_LIBTIFF
TIFFSetWarningHandler(NULL); TIFFSetWarningHandler(NULL);
TIFFSetErrorHandler(NULL); TIFFSetErrorHandler(NULL);
#endif
/* If separator is empty => nb file to read is equal to one*/ /* If separator is empty => nb file to read is equal to one*/
if ( strlen(separator) == 0 ) if ( strlen(separator) == 0 )
@ -271,11 +273,13 @@ static opj_image_t* readImageFromFileTIF(const char* filename, int nbFilenamePGX
filenameComponentPGX = createMultiComponentsFilename(filename, it_file, separator); filenameComponentPGX = createMultiComponentsFilename(filename, it_file, separator);
/* Read the tif file corresponding to the component */ /* Read the tif file corresponding to the component */
#ifdef OPJ_HAVE_LIBTIFF
image_read = tiftoimage(filenameComponentPGX, &parameters); image_read = tiftoimage(filenameComponentPGX, &parameters);
#endif
if (!image_read) if (!image_read)
{ {
int it_free_data; int it_free_data;
fprintf(stderr, "Unable to load pgx file\n"); fprintf(stderr, "Unable to load TIF file\n");
free(param_image_read); free(param_image_read);