Move most TIFF tools to archive and keep some as unsupported (see #580).

CMakeLists.txt

@@ -54,6 +54,7 @@ else()
 endif()
 
 option(tiff-tools "build TIFF tools" ON)
+option(tiff-tools-unsupported "build unsupported TIFF tools" OFF)
 option(tiff-tests "build TIFF tests" ON)
 option(tiff-contrib "build TIFF contrib" ON)
 option(tiff-docs "build TIFF documentation" ON)
@@ -127,9 +128,6 @@ include(WebPCodec)
 # Option for C++ libtiffxx library
 include(CXXLibrary)
 
-# Checks for OpenGL support
-include(OpenGLChecks)
-
 # Windows support
 include(WindowsSupport)
 
@@ -149,6 +147,9 @@ add_subdirectory(libtiff)
 if(tiff-tools)
   add_subdirectory(tools)
 endif()
+if(tiff-tools-unsupported)
+  add_subdirectory(tools/unsupported)
+endif()
 if(tiff-tests)
   add_subdirectory(test)
 endif()
@@ -172,6 +173,7 @@ message(STATUS "  C compiler:                         ${CMAKE_C_COMPILER}")
 message(STATUS "  C++ compiler:                       ${CMAKE_CXX_COMPILER}")
 message(STATUS "  Build shared libraries:             ${BUILD_SHARED_LIBS}")
 message(STATUS "  Build tools:                        ${tiff-tools}")
+message(STATUS "  Build tools-unsupported:            ${tiff-tools-unsupported}")
 message(STATUS "  Build tests:                        ${tiff-tests}")
 message(STATUS "  Build contrib:                      ${tiff-contrib}")
 message(STATUS "  Build docs:                         ${tiff-docs}")
@@ -222,7 +224,5 @@ message(STATUS "  ZSTD support:                       Requested:${zstd} Availabi
 message(STATUS "  WEBP support:                       Requested:${webp} Availability:${WebP_FOUND} Support:${WEBP_SUPPORT}")
 message(STATUS "")
 message(STATUS "  C++ support:                        ${cxx} (requested) ${CXX_SUPPORT} (availability)")
-message(STATUS "")
 # message(STATUS "  X Athena Widgets support:           ${HAVE_XAW}")
-message(STATUS "  OpenGL support:                     Requested:${tiff-opengl} Availability:${HAVE_OPENGL} Support:${OPENGL_SUPPORT}")
 message(STATUS "")

Makefile.am

@@ -60,7 +60,7 @@ distcheck-hook:
 	rm -rf $(distdir)/_build/cmake
 	rm -rf $(distdir)/_inst/cmake
 
-SUBDIRS = port libtiff tools build contrib test doc
+SUBDIRS = port libtiff tools build contrib test doc tools/unsupported
 
 release:
 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)

archive/test/tiffcp-g3-1d-fill.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G3 compression, 1 dimensional
+# encoding, and zero-filled boundaries.
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g3:1d:fill" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-1d-fill.tiff"

archive/test/tiffcp-g3-1d.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G3 compression and 1 dimensional encoding.
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-1d.tiff"

archive/test/tiffcp-g3-2d-fill.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G3 compression, 2 dimensional
+# encoding, and zero-filled boundaries.
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g3:2d:fill" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-2d-fill.tiff"

archive/test/tiffcp-g3-2d.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G3 compression and 2 dimensional encoding.
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g3:2d" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-2d.tiff"

archive/test/tiffcp-g3.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G3 compression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g3" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3.tiff"

archive/test/tiffcp-g4.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with G4 compression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c g4" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g4.tiff"

archive/test/tiffcp-logluv.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with logluv compression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c none" "${srcdir}/images/logluv-3c-16b.tiff" "o-tiffcp-logluv-raw.tiff"
+f_test_convert "${TIFFCP} -c sgilog" "o-tiffcp-logluv-raw.tiff" "o-tiffcp-logluv-sgilog.tiff"

archive/test/tiffcp-lzw-compat.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with LZW Old-LZW decompression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c none" "${IMG_QUAD_LZW_COMPAT}" "o-tiffcp-lzw-compat.tiff"

archive/test/tiffcp-lzw-scanline-decode.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with LZW decompression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c none -r 1" "${IMG_LZW_SINGLE_STROP}" "o-tiffcp-lzw-scanline-decode.tiff"

archive/test/tiffcp-split-join.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp + tiffsplit + tiffcp
+#
+# First we use tiffcp to join our test files into a multi-frame TIFF
+# then we use tiffsplit to split them out again, and then we use
+# tiffcp to recombine again.
+
+. ${srcdir:-.}/common.sh
+conjoined=o-tiffcp-split-join-conjoined.tif
+reconjoined=o-tiffcp-split-join-reconjoined.tif
+splitfile=o-tiffcp-split-join-split-
+
+f_test_convert "${TIFFCP}" "${IMG_UNCOMPRESSED}" "${conjoined}"
+f_test_convert "${TIFFSPLIT}" "${conjoined}" "${splitfile}"
+f_test_convert "${TIFFCP}" "${splitfile}*" "${reconjoined}"

archive/test/tiffcp-split.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp + tiffsplit
+#
+# First we use tiffcp to join our test files into a multi-frame TIFF
+# and then we use tiffsplit to split them out again.
+#
+. ${srcdir:-.}/common.sh
+conjoined=o-tiffcp-split-conjoined.tif
+splitfile=o-tiffcp-split-split-
+
+f_test_convert "${TIFFCP}" "${IMG_UNCOMPRESSED}" "${conjoined}"
+f_test_convert "${TIFFSPLIT}" "${conjoined}" "${splitfile}"