From 69ce2652ef2feae25a4569eb57b837dde0a1bd71 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Tue, 29 Jan 2019 18:06:36 +0100 Subject: [PATCH] Add test to check that libtiff types have the correct size in configure/CMakeList.txt : - TIFF_INT8_T/TIFF_UINT8_T is signed/unsigned char sizeof(char)==1 in C standard - TIFF_INT16_T/TIFF_UINT16_T is signed/unsigned short sizeof(short)>=2 in C standard - TIFF_INT32_T/TIFF_UINT32_T is defined so its sizeof() is 4 - TIFF_INT64_T/TIFF_UINT64_T is defined so its sizeof() is 8 - TIFF_SIZE_T is defined so it has same sizeof() than size_t - TIFF_SSIZE_T is defined so it has same sizeof() than unsigned char * --- .gitignore | 1 + test/CMakeLists.txt | 7 ++++++ test/Makefile.am | 4 ++-- test/testtypes.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 test/testtypes.c diff --git a/.gitignore b/.gitignore index 55e450cc..0283dc5c 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ test/short_tag test/strip_rw test/defer_strile_loading test/defer_strile_writing +test/testtypes test/*.log test/*.trs test/o-* diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6e863e78..a4216d56 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -194,6 +194,9 @@ target_link_libraries(defer_strile_loading tiff port) add_executable(defer_strile_writing defer_strile_writing.c) target_link_libraries(defer_strile_writing tiff port) +add_executable(testtypes testtypes.c) +target_link_libraries(testtypes tiff port) + set(TEST_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/output") file(MAKE_DIRECTORY "${TEST_OUTPUT}") @@ -391,3 +394,7 @@ add_convert_tests(tiffcrop doubleflip "-F both" TIFFIMAGES TRU add_convert_tests(tiffcrop extract "-U px -E top -X 60 -Y 60" TIFFIMAGES TRUE) # Test extracting the first and fourth quarters from the left side. add_convert_tests(tiffcrop extractz14 "-E left -Z1:4,2:4" TIFFIMAGES TRUE) + +# test types +add_test(NAME "testtypes" + COMMAND "testtypes") diff --git a/test/Makefile.am b/test/Makefile.am index 1e88c103..90c2f3d1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -63,8 +63,8 @@ endif # Executable programs which need to be built in order to support tests check_PROGRAMS = \ - ascii_tag long_tag short_tag strip_rw rewrite custom_dir defer_strile_loading \ - defer_strile_writing \ + ascii_tag long_tag short_tag strip_rw rewrite custom_dir \ + defer_strile_loading defer_strile_writing testtypes \ $(JPEG_DEPENDENT_CHECK_PROG) # Test scripts to execute diff --git a/test/testtypes.c b/test/testtypes.c new file mode 100644 index 00000000..100b7766 --- /dev/null +++ b/test/testtypes.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2019, Thomas Bernard + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that (i) the above copyright notices and this permission notice appear in + * all copies of the software and related documentation, and (ii) the names of + * Sam Leffler and Silicon Graphics may not be used in any advertising or + * publicity relating to the software without the specific, prior written + * permission of Sam Leffler and Silicon Graphics. + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * + * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR + * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +/* + * TIFF Library + * + * Module to test ASCII tags read/write functions. + */ + +#include "tif_config.h" + +#include + +#include "tiffio.h" + +#define CHECK_TYPE(t, s) \ + if (sizeof(t) != s) { \ + fprintf(stderr, "sizeof(" # t ")=%d, it should be %d\n", (int)sizeof(t), (int)s); \ + return 1; \ + } + +int +main() +{ + CHECK_TYPE(TIFF_INT8_T, 1) + CHECK_TYPE(TIFF_INT16_T, 2) + CHECK_TYPE(TIFF_INT32_T, 4) + CHECK_TYPE(TIFF_INT64_T, 8) + CHECK_TYPE(TIFF_UINT8_T, 1) + CHECK_TYPE(TIFF_UINT16_T, 2) + CHECK_TYPE(TIFF_UINT32_T, 4) + CHECK_TYPE(TIFF_UINT64_T, 8) + CHECK_TYPE(TIFF_SIZE_T, sizeof(size_t)) + CHECK_TYPE(TIFF_SSIZE_T, sizeof(unsigned char *)) + return 0; +} + +/* vim: set ts=8 sts=8 sw=8 noet: */