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

This reverts commit eab89a6.

# Conflicts:
#	tools/unsupported/CMakeLists.txt
#	tools/unsupported/tif_tools-unsupported_versioninfo.rc

Author: SuLaus

CMakeLists.txt

@@ -51,7 +51,6 @@ 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)
@@ -125,6 +124,9 @@ include(WebPCodec)
 # Option for C++ libtiffxx library
 include(CXXLibrary)
 
+# Checks for OpenGL support
+include(OpenGLChecks)
+
 # Windows support
 include(WindowsSupport)
 
@@ -144,9 +146,6 @@ 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()
@@ -177,7 +176,6 @@ 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}")
@@ -228,5 +226,7 @@ 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 tools/unsupported
+SUBDIRS = port libtiff tools build contrib test doc
 
 
 NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d")

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

@@ -1,55 +1,50 @@
-# Tag Image File Format (TIFF) Software
+# Checks for OpenGL and GLUT support
 #
-# Copyright (C) 2004, Andrey Kiselev <[email protected]>
+# Copyright © 2015 Open Microscopy Environment / University of Dundee
+# Copyright © 2021 Roger Leigh <[email protected]>
+# Written by Roger Leigh <[email protected]>
 #
-# Permission to use, copy, modify, distribute, and sell this software and 
+# 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.  
-# 
+#
+# 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 
+# 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.
 
-# Process this file with automake to produce Makefile.in.
-
-LIBPORT = $(top_builddir)/port/libport.la
-LIBTIFF = $(top_builddir)/libtiff/libtiff.la
-
-EXTRA_DIST = \
-	CMakeLists.txt
-
-(echo tifftoolsunsupported: $(TIFF_TOOLS_UNSUPPORTED))
-if TIFF_TOOLS_UNSUPPORTED
-bin_PROGRAMS = \
-	tiff2pdf \
-	tiff2ps
-endif
-
-EXTRA_PROGRAMS = 
+# OpenGL and GLUT
+set(OpenGL_GL_PREFERENCE LEGACY)
 
-if HAVE_RPATH
-AM_LDFLAGS = $(LIBDIR)
-endif
+find_package(OpenGL COMPONENTS OpenGL)
+find_package(GLUT)
 
-tiff2pdf_SOURCES = tiff2pdf.c
-tiff2pdf_LDADD = $(LIBTIFF) $(LIBPORT)
+set(OPENGL_SUPPORT FALSE)
+set(HAVE_OPENGL FALSE)
+if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
+    set(HAVE_OPENGL TRUE)
+endif()
 
-tiff2ps_SOURCES = tiff2ps.c
-tiff2ps_LDADD = $(LIBTIFF) $(LIBPORT)
+# Purely to satisfy the generated headers:
+check_include_file(GL/gl.h HAVE_GL_GL_H)
+check_include_file(GL/glu.h HAVE_GL_GLU_H)
+check_include_file(GL/glut.h HAVE_GL_GLUT_H)
+check_include_file(GLUT/glut.h HAVE_GLUT_GLUT_H)
+check_include_file(OpenGL/gl.h HAVE_OPENGL_GL_H)
+check_include_file(OpenGL/glu.h HAVE_OPENGL_GLU_H)
 
-AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port
+option(tiff-opengl "use OpenGL (required for tiffgt viewer)" ${HAVE_OPENGL})
 
-echo:
-	(echo $(CFLAGS))
-	(echo tifftoolsunsupported: $(TIFF_TOOLS_UNSUPPORTED))
+if (tiff-opengl AND HAVE_OPENGL)
+    set(OPENGL_SUPPORT TRUE)
+endif()

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

@@ -320,12 +320,6 @@ AC_ARG_ENABLE(tools,
                              [TIFF_TOOLS=$enableval], [TIFF_TOOLS=yes])
 AM_CONDITIONAL(TIFF_TOOLS, test "$TIFF_TOOLS" = "yes")
 
-AC_ARG_ENABLE(tools-unsupported,
-              AS_HELP_STRING([--enable-tools-unsupported],
-                             [Enable building of unsupported tools]),
-                             [TIFF_TOOLS_UNSUPPORTED=$enableval], [TIFF_TOOLS_UNSUPPORTED=no])
-AM_CONDITIONAL(TIFF_TOOLS_UNSUPPORTED, test "$TIFF_TOOLS_UNSUPPORTED" = "yes")
-
 AC_ARG_ENABLE(tests,
               AS_HELP_STRING([--disable-tests],
                              [Disable building of tests]),
@@ -966,6 +960,38 @@ fi
 
 AM_CONDITIONAL(HAVE_CXX, test "$HAVE_CXX" = "yes")
 
+dnl ---------------------------------------------------------------------------
+dnl Check for OpenGL and GLUT.
+dnl ---------------------------------------------------------------------------
+
+HAVE_OPENGL=no
+
+AC_ARG_ENABLE(opengl,
+	      AS_HELP_STRING([--disable-opengl],
+			     [disable OpenGL usage (required by tiffgt, enabled by default)]),,)
+
+if test "x$enable_opengl" != "xno" ; then
+
+  AC_PATH_XTRA
+
+  dnl AX_CHECK_GL sets GL_CFLAGS & GL_LIBS.  Also PTHREAD_LIBS,
+  dnl PTHREAD_CFLAGS, & PTHREAD_CC as a side-effect
+  AX_CHECK_GL
+
+  dnl AX_CHECK_GLU sets GLU_CFLAGS & GLU_LIBS
+  AX_CHECK_GLU
+
+  dnl AX_CHECK_GLUT sets GLUT_CFLAGS & GLUT_LIBS
+  AX_CHECK_GLUT
+
+  if test "$no_x" != "yes" -a "$no_gl" != "yes" \
+      -a "$no_glu" != "yes" -a "$no_glut" != "yes" ; then
+    HAVE_OPENGL=yes
+  fi
+fi
+
+AM_CONDITIONAL(HAVE_OPENGL, test "$HAVE_OPENGL" = "yes")
+
 dnl ---------------------------------------------------------------------------
 dnl Check for Win32 IO: make sure we have windows.h but not cygwin
 dnl ---------------------------------------------------------------------------
@@ -1187,8 +1213,7 @@ AC_CONFIG_FILES([Makefile \
 		 libtiff/tiffvers.h \
 		 port/Makefile \
 		 test/Makefile \
-		 tools/Makefile \
-		 tools/unsupported/Makefile])
+		 tools/Makefile])
 AC_OUTPUT
 
 dnl ---------------------------------------------------------------------------
@@ -1207,7 +1232,6 @@ LOC_MSG([  Documentation directory:            ${LIBTIFF_DOCDIR}])
 LOC_MSG([  C compiler:                         ${CC} ${CFLAGS}])
 LOC_MSG([  C++ compiler:                       ${CXX} ${CXXFLAGS}])
 LOC_MSG([  Build tools:                        ${TIFF_TOOLS}])
-LOC_MSG([  Build tools-unsupported:            ${TIFF_TOOLS_UNSUPPORTED}])
 LOC_MSG([  Build tests:                        ${TIFF_TESTS}])
 LOC_MSG([  Build contrib:                      ${TIFF_CONTRIB}])
 LOC_MSG([  Build docs:                         ${TIFF_DOCS}])
@@ -1245,5 +1269,6 @@ LOC_MSG()
 LOC_MSG([  C++ support:                        ${HAVE_CXX}])
 LOC_MSG()
 dnl LOC_MSG([  X Athena Widgets support:           ${HAVE_XAW}])
+LOC_MSG([  OpenGL support:                     ${HAVE_OPENGL}])
 LOC_MSG()
 

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

@@ -103,10 +103,26 @@ rst_sources = \
 	index.rst \
 	build.rst \
 	internals.rst \
+	tools/tiffgt.rst \
+	tools/tiffdither.rst \
+	tools/tiff2pdf.rst \
+	tools/tiff2ps.rst \
+	tools/ppm2tiff.rst \
+	tools/raw2tiff.rst \
+	tools/fax2tiff.rst \
+	tools/tiffcrop.rst \
+	tools/tiff2bw.rst \
+	tools/fax2ps.rst \
+	tools/thumbnail.rst \
+	tools/tiffcmp.rst \
 	tools/tiffdump.rst \
+	tools/tiff2rgba.rst \
 	tools/tiffinfo.rst \
+	tools/rgb2ycbcr.rst \
 	tools/tiffset.rst \
 	tools/tiffsplit.rst \
+	tools/tiffmedian.rst \
+	tools/pal2rgb.rst \
 	tools/tiffcp.rst \
 	project/license.rst \
 	project/index.rst \

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

@@ -617,16 +617,20 @@ necessary to manually do this work on a non-UNIX system.
 Testing the software
 --------------------
 
-You can try
+Assuming you have working versions of :doc:`/tools/tiffgt`, you can now use
+it to view any of the sample images available for testing, or try
 :doc:`/tools/tiffinfo` to display the file metadata.  See the
-:doc:`images` section on obtaining the test images.
-Otherwise, you can do a cursory check of the library
-with the :doc:`/tools/tiffcp` program. For example,
+:doc:`images` section on obtaining the test images.  Otherwise, you can
+do a cursory check of the library with the :doc:`/tools/tiffcp` and
+:doc:`/tools/tiffcmp` programs. For example,
 
 .. code-block:: shell
 
     tiffcp -lzw cramps.tif x.tif
+    tiffcmp cramps.tif x.tif
 
+(:program:`tiffcmp` should be silent if the files compare
+correctly).
 
 
 LibTIFF source files