Merge branch 'typetests' into 'master'

Add test to check that libtiff types have the correct size

See merge request libtiff/libtiff!57

6 files changed, 77 insertions, 19 deletions

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/CMakeLists.txt b/CMakeLists.txt
index 22cf520c..721ebb30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,29 +338,21 @@ endif()
 if(SIZEOF_UNSIGNED_INT EQUAL SIZEOF_SIZE_T)
   set(TIFF_SIZE_T "unsigned int")
   set(TIFF_SIZE_FORMAT "%u")
+  set(TIFF_SSIZE_T "signed int")
+  set(TIFF_SSIZE_FORMAT "%d")
 elseif(SIZEOF_UNSIGNED_LONG EQUAL SIZEOF_SIZE_T)
   set(TIFF_SIZE_T "unsigned long")
   set(TIFF_SIZE_FORMAT "%lu")
-elseif(SIZEOF_UNSIGNED_LONG_LONG EQUAL SIZEOF_SIZE_T)
-  set(TIFF_SIZE_T "unsigned long long")
-  if (MINGW)
-    set(TIFF_SIZE_FORMAT "%I64u")
-  else()
-    set(TIFF_SIZE_FORMAT "%llu")
-  endif()
-endif()
-
-if(SIZEOF_SIGNED_INT EQUAL SIZEOF_UNSIGNED_CHAR_P)
-  set(TIFF_SSIZE_T "signed int")
-  set(TIFF_SSIZE_FORMAT "%d")
-elseif(SIZEOF_SIGNED_LONG EQUAL SIZEOF_UNSIGNED_CHAR_P)
   set(TIFF_SSIZE_T "signed long")
   set(TIFF_SSIZE_FORMAT "%ld")
-elseif(SIZEOF_SIGNED_LONG_LONG EQUAL SIZEOF_UNSIGNED_CHAR_P)
+elseif(SIZEOF_UNSIGNED_LONG_LONG EQUAL SIZEOF_SIZE_T)
+  set(TIFF_SIZE_T "unsigned long long")
   set(TIFF_SSIZE_T "signed long long")
   if (MINGW)
+    set(TIFF_SIZE_FORMAT "%I64u")
     set(TIFF_SSIZE_FORMAT "%I64d")
   else()
+    set(TIFF_SIZE_FORMAT "%llu")
     set(TIFF_SSIZE_FORMAT "%lld")
   endif()
 endif()
diff --git a/configure.ac b/configure.ac
index 54915e05..09f959f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,15 +365,15 @@ AC_DEFINE_UNQUOTED([TIFF_SIZE_FORMAT],[$SIZE_FORMAT],[Size type formatter])
 AC_MSG_CHECKING(for signed size type)
 SSIZE_T='unknown'
 SSIZE_FORMAT='unknown'
-if test $ac_cv_sizeof_signed_int -eq $ac_cv_sizeof_unsigned_char_p
+if test $ac_cv_sizeof_signed_int -eq $ac_cv_sizeof_size_t
 then
   SSIZE_T='signed int'
   SSIZE_FORMAT='"%d"'
-elif test $ac_cv_sizeof_signed_long -eq $ac_cv_sizeof_unsigned_char_p
+elif test $ac_cv_sizeof_signed_long -eq $ac_cv_sizeof_size_t
 then
   SSIZE_T='signed long'
   SSIZE_FORMAT='"%ld"'
-elif test $ac_cv_sizeof_signed_long_long -eq $ac_cv_sizeof_unsigned_char_p
+elif test $ac_cv_sizeof_signed_long_long -eq $ac_cv_sizeof_size_t
 then
   SSIZE_T='signed long long'
   case "${host_os}" in
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..a36d21e5
--- /dev/null
+++ b/test/testtypes.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019, Thomas Bernard  <miniupnp@free.fr>
+ *
+ * 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 <stdio.h>
+
+#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(size_t))
+	return 0;
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */