diff options
Diffstat (limited to 'Build/source/libs/gd/libgd-src/tests/tiff')
4 files changed, 26 insertions, 18 deletions
diff --git a/Build/source/libs/gd/libgd-src/tests/tiff/CMakeLists.txt b/Build/source/libs/gd/libgd-src/tests/tiff/CMakeLists.txt index 8e542e690c4..b1ce8a81627 100644 --- a/Build/source/libs/gd/libgd-src/tests/tiff/CMakeLists.txt +++ b/Build/source/libs/gd/libgd-src/tests/tiff/CMakeLists.txt @@ -4,8 +4,13 @@ LIST(APPEND TESTS_FILES tiff_invalid_read tiff_null tiff_dpi +) + +IF(PNG_FOUND) +LIST(APPEND TESTS_FILES tiff_read_bw ) +ENDIF(PNG_FOUND) ENDIF(TIFF_FOUND) ADD_GD_TESTS() diff --git a/Build/source/libs/gd/libgd-src/tests/tiff/Makemodule.am b/Build/source/libs/gd/libgd-src/tests/tiff/Makemodule.am index 2a88d68df3c..a1364399080 100644 --- a/Build/source/libs/gd/libgd-src/tests/tiff/Makemodule.am +++ b/Build/source/libs/gd/libgd-src/tests/tiff/Makemodule.am @@ -3,9 +3,13 @@ libgd_test_programs += \ tiff/tiff_dpi \ tiff/tiff_im2im \ tiff/tiff_invalid_read \ - tiff/tiff_null \ + tiff/tiff_null + +if HAVE_LIBPNG +libgd_test_programs += \ tiff/tiff_read_bw endif +endif EXTRA_DIST += \ tiff/CMakeLists.txt \ diff --git a/Build/source/libs/gd/libgd-src/tests/tiff/tiff_dpi.c b/Build/source/libs/gd/libgd-src/tests/tiff/tiff_dpi.c index 7b607a25fa1..73626466dc1 100644 --- a/Build/source/libs/gd/libgd-src/tests/tiff/tiff_dpi.c +++ b/Build/source/libs/gd/libgd-src/tests/tiff/tiff_dpi.c @@ -1,4 +1,4 @@ -/* +/* * Test that reading and writing image resolution values to/from TIFF files * works correctly. Set the image resolution, write the file, read the file * back and test that the image resolution comes back correct. @@ -23,7 +23,7 @@ int main() r = gdImageColorAllocate(src, 0xFF, 0, 0); gdImageFilledRectangle(src, 0, 0, 99, 99, r); - // gd default DPI is 96; libtiff default is 72. + // gd default DPI is 96; libtiff default is 72. // Use something else so we know the value has been // written / read correctly. res_x = 100; diff --git a/Build/source/libs/gd/libgd-src/tests/tiff/tiff_read_bw.c b/Build/source/libs/gd/libgd-src/tests/tiff/tiff_read_bw.c index c302c63aa86..93b646dfd97 100644 --- a/Build/source/libs/gd/libgd-src/tests/tiff/tiff_read_bw.c +++ b/Build/source/libs/gd/libgd-src/tests/tiff/tiff_read_bw.c @@ -1,26 +1,25 @@ #include "gd.h" #include "gdtest.h" - int main() { - gdImagePtr im; - FILE *fp; - char *path; + gdImagePtr im; + FILE *fp; + char *path; - fp = gdTestFileOpen2("tiff", "tiff_read_bw.tiff"); - gdTestAssert(fp != NULL); - im = gdImageCreateFromTiff(fp); - fclose(fp); + fp = gdTestFileOpen2("tiff", "tiff_read_bw.tiff"); + gdTestAssert(fp != NULL); + im = gdImageCreateFromTiff(fp); + fclose(fp); - gdTestAssert(im != NULL); - gdTestAssert(!gdImageTrueColor(im)); + gdTestAssert(im != NULL); + gdTestAssert(!gdImageTrueColor(im)); - path = gdTestFilePath2("tiff", "tiff_read_bw_exp.png"); - gdAssertImageEqualsToFile(path, im); - gdFree(path); + path = gdTestFilePath2("tiff", "tiff_read_bw_exp.png"); + gdAssertImageEqualsToFile(path, im); + gdFree(path); - gdImageDestroy(im); + gdImageDestroy(im); - return gdNumFailures(); + return gdNumFailures(); } |