From addf8d97982918732b15ad9da19be689a2432b76 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Fri, 4 Jan 2019 21:00:56 +0100
Subject: [PATCH] Win32/msvc: build with libtiff

---
 project/msvc/grafx2-win32.vcxproj         | 13 +++++++------
 project/msvc/grafx2-win32.vcxproj.filters |  3 +++
 project/msvc/grafx2.vcxproj               |  5 +++--
 project/msvc/grafx2.vcxproj.filters       |  3 +++
 project/msvc/libraries.props              |  2 ++
 src/tifformat.c                           | 22 +++++++++++++++++++++-
 6 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/project/msvc/grafx2-win32.vcxproj b/project/msvc/grafx2-win32.vcxproj
index fd4d3604..6fc3310b 100644
--- a/project/msvc/grafx2-win32.vcxproj
+++ b/project/msvc/grafx2-win32.vcxproj
@@ -53,13 +53,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4244</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(TIFFIncDir);$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(PNGLibDirDebug);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libtiff.lib;lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(TIFFLibDir);$(PNGLibDirDebug);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -70,15 +70,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4244</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(TIFFIncDir);$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(PNGLibDirRelease);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libtiff.lib;lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(TIFFLibDir);$(PNGLibDirRelease);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -133,6 +133,7 @@
     <ClCompile Include="..\..\src\shade.c" />
     <ClCompile Include="..\..\src\special.c" />
     <ClCompile Include="..\..\src\text.c" />
+    <ClCompile Include="..\..\src\tifformat.c" />
     <ClCompile Include="..\..\src\tiles.c" />
     <ClCompile Include="..\..\src\transform.c" />
     <ClCompile Include="..\..\src\unicode.c" />
diff --git a/project/msvc/grafx2-win32.vcxproj.filters b/project/msvc/grafx2-win32.vcxproj.filters
index 8c013acb..678145fb 100644
--- a/project/msvc/grafx2-win32.vcxproj.filters
+++ b/project/msvc/grafx2-win32.vcxproj.filters
@@ -186,6 +186,9 @@
     <ClCompile Include="..\..\src\gfx2log.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\tifformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\brush.h">
diff --git a/project/msvc/grafx2.vcxproj b/project/msvc/grafx2.vcxproj
index 1b580d42..9bf5abc2 100644
--- a/project/msvc/grafx2.vcxproj
+++ b/project/msvc/grafx2.vcxproj
@@ -56,7 +56,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -75,7 +75,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -204,6 +204,7 @@
     <ClCompile Include="..\..\src\shade.c" />
     <ClCompile Include="..\..\src\special.c" />
     <ClCompile Include="..\..\src\text.c" />
+    <ClCompile Include="..\..\src\tifformat.c" />
     <ClCompile Include="..\..\src\tiles.c" />
     <ClCompile Include="..\..\src\transform.c" />
     <ClCompile Include="..\..\src\unicode.c" />
diff --git a/project/msvc/grafx2.vcxproj.filters b/project/msvc/grafx2.vcxproj.filters
index 0fe3804d..235e2e2d 100644
--- a/project/msvc/grafx2.vcxproj.filters
+++ b/project/msvc/grafx2.vcxproj.filters
@@ -367,5 +367,8 @@
     <ClCompile Include="..\..\src\gfx2log.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\tifformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/project/msvc/libraries.props b/project/msvc/libraries.props
index f8ac9b5f..edb6632f 100644
--- a/project/msvc/libraries.props
+++ b/project/msvc/libraries.props
@@ -11,5 +11,7 @@
     <PNGIncDir>..\..\..\..\lpng1634</PNGIncDir>
     <PNGLibDirDebug>..\..\..\..\lpng1634\projects\vstudio\Debug Library</PNGLibDirDebug>
     <PNGLibDirRelease>..\..\..\..\lpng1634\projects\vstudio\Release Library</PNGLibDirRelease>
+    <TIFFIncDir>..\..\..\..\tiff-4.0.10\libtiff</TIFFIncDir>
+    <TIFFLibDir>..\..\..\..\tiff-4.0.10\libtiff</TIFFLibDir>
   </PropertyGroup>
 </Project>
diff --git a/src/tifformat.c b/src/tifformat.c
index 8a800243..ac4655f7 100644
--- a/src/tifformat.c
+++ b/src/tifformat.c
@@ -27,6 +27,13 @@
 
 #ifndef __no_tifflib__
 
+#ifdef _MSC_VER
+#include <stdio.h>
+#if _MSC_VER < 1900
+#define snprintf _snprintf
+#define fileno _fileno
+#endif
+#endif
 #include <tiffio.h>
 #include "global.h"
 #include "io.h"
@@ -350,8 +357,9 @@ void Load_TIFF_Sub(T_IO_Context * context, TIFF * tif, unsigned long file_size)
 /// Load TIFF from file
 void Load_TIFF(T_IO_Context * context)
 {
-  FILE * file;
   TIFF * tif;
+#if !defined(WIN32)
+  FILE * file;
 
   File_error = 1;
 
@@ -366,6 +374,18 @@ void Load_TIFF(T_IO_Context * context)
     }
     fclose(file);
   }
+#else
+  char filename[MAX_PATH_CHARACTERS]; // filename with full path
+
+  File_error = 1;
+  Get_full_filename(filename, context->File_name, context->File_directory);
+  tif = TIFFOpen(filename, "r");
+  if (tif != NULL)
+  {
+    Load_TIFF_Sub(context, tif, File_length(filename));
+    TIFFClose(tif);
+  }
+#endif
 }