Merge pull request #558 from kmilos/patch-1

Use tifdiff tool name consistently. Looks great, thank you!

Author: mm2

ChangeLog

@@ -14,7 +14,7 @@ Added unneeded checks as a try to get rid of spam reports about "vulnerabilities
 Utility program names generated by Visual Studio 2026 are now same as all other platforms.
 Creating an output profile by cmsTransform2DeviceLink does not propagate correctly the colorant table. Fixed.
 Added some profile class definitions from iccMAX
-Deprecated uint16 and uint32 types removed from tiffdiff
+Deprecated uint16 and uint32 types removed from tifdiff
 
 -----------------------
 2.18 Maintenance release

Projects/VC2026/tiffdiff/tiffdiff.vcxproj

@@ -139,6 +139,24 @@
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>tifdiff</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -299,4 +317,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

cmake/Lcms2Options.cmake

@@ -9,7 +9,7 @@ function(lcms2_setup_options)
   # Tool-specific toggles (only meaningful when LCMS2_BUILD_TOOLS=ON).
   option(LCMS2_BUILD_JPGICC "Build jpgicc tool (requires JPEG)" ON)
   option(LCMS2_BUILD_TIFICC "Build tificc tool (requires TIFF, optionally ZLIB)" ON)
-  option(LCMS2_BUILD_TIFFDIFF "Build tiffdiff tool (requires TIFF)" ON)
+  option(LCMS2_BUILD_TIFDIFF "Build tifdiff tool (requires TIFF)" ON)
 
   # Dependency toggles (only consulted when the dependent tool is enabled).
   option(LCMS2_WITH_JPEG "Enable JPEG support for tools (find_package only when needed)" ON)

cmake/Lcms2Tools.cmake

@@ -141,27 +141,27 @@ function(lcms2_add_tools)
     endif()
   endif()
 
-  # Optional tiffdiff (requires TIFF).
-  if(LCMS2_BUILD_TIFFDIFF)
+  # Optional tifdiff (requires TIFF).
+  if(LCMS2_BUILD_TIFDIFF)
     if(LCMS2_WITH_TIFF)
       find_package(TIFF)
     endif()
 
     if(TIFF_FOUND)
-      _lcms2_add_tool(tiffdiff
+      _lcms2_add_tool(tifdiff
         SOURCES
           "${PROJECT_SOURCE_DIR}/utils/tificc/tifdiff.c"
           ${_common_sources}
       )
       if(TARGET TIFF::TIFF)
-        target_link_libraries(tiffdiff PRIVATE TIFF::TIFF)
+        target_link_libraries(tifdiff PRIVATE TIFF::TIFF)
       else()
         # Do not quote list variables: they may contain debug/optimized keywords.
-        target_include_directories(tiffdiff PRIVATE ${TIFF_INCLUDE_DIR})
-        target_link_libraries(tiffdiff PRIVATE ${TIFF_LIBRARIES})
+        target_include_directories(tifdiff PRIVATE ${TIFF_INCLUDE_DIR})
+        target_link_libraries(tifdiff PRIVATE ${TIFF_LIBRARIES})
       endif()
     else()
-      message(STATUS "TIFF not found or disabled; skipping tiffdiff")
+      message(STATUS "TIFF not found or disabled; skipping tifdiff")
     endif()
   endif()
 

utils/tificc/meson.build

@@ -15,13 +15,13 @@ tificc_man = files(
 
 install_man(tificc_man)
 
-tiffdiff_sources = files(
+tifdiff_sources = files(
   'tifdiff.c',
 )
 
-tiffdiff_exe = executable(
-  'tiffdiff',
-  tiffdiff_sources,
+tifdiff_exe = executable(
+  'tifdiff',
+  tifdiff_sources,
   dependencies: [liblcms2_dep, common_dep, tiff_dep],
   install: true,
 )