Merge remote-tracking branch 'dclamage/remove-tiff'

Author: LocalIdentity

SimpleGraphic.vcxproj

@@ -144,7 +144,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

SimpleGraphic.vcxproj.filters

@@ -3,7 +3,7 @@
   <ItemGroup>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;png;wav;mfcribbon-ms</Extensions>
     </Filter>
     <Filter Include="UI">
       <UniqueIdentifier>{a5dff788-b233-499b-9e81-9fd39c493de0}</UniqueIdentifier>

engine/core/core_image.cpp

@@ -9,7 +9,6 @@
 #include "core_image.h"
 
 #include <jpeglib.h>
-#include <tiffio.h>
 #include <png.h>
 #include <gif_lib.h>
 
@@ -19,7 +18,7 @@
 
 #define BLP2_MAGIC	0x32504C42	// "BLP2"
 
-// Generic client data structure, used by JPEG, TIFF and PNG
+// Generic client data structure, used by JPEG and PNG
 struct clientData_s {
 	IConsole* con;
 	const char* fileName;
@@ -89,9 +88,6 @@ image_c* image_c::LoaderForFile(IConsole* conHnd, const char* fileName)
 	if (dat[0] == 0xFF && dat[1] == 0xD8) {
 		// JPEG Start Of Image marker
 		return new jpeg_c(conHnd);
-	} else if (*(dword*)dat == 0x002A4949 || *(dword*)dat == 0x2A004D4D) {
-		// Little-endian / Big-endian marker + version
-		return new tiff_c(conHnd);
 	} else if (*(dword*)dat == 0x474E5089) {
 		// 0x89 P N G
 		return new png_c(conHnd);
@@ -624,163 +620,6 @@ bool jpeg_c::ImageInfo(const char* fileName, imageInfo_s* info)
 	return (comp != 1 && comp != 3);
 }
 
-// ==========
-// TIFF Image
-// ==========
-
-static void ITIFF_ErrorProc(thandle_t clientData, const char* module, const char* fmt, va_list va)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	char text[1024];
-	vsprintf(text, fmt, va);
-	cd->con->Warning("TIFF '%s': Error in '%.20s%s': %s", cd->fileName, module, strlen(module)>20?"...":"", text);
-}
-
-static void ITIFF_WarningProc(thandle_t clientData, const char* module, const char* fmt, va_list va)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	char text[1024];
-	vsprintf(text, fmt, va);
-	cd->con->Warning("TIFF '%s': Warning in '%.20s%s': %s", cd->fileName, module, strlen(module)>20?"...":"", text);
-}
-
-static tsize_t ITIFF_ReadProc(thandle_t clientData, tdata_t data, tsize_t len)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	return cd->io->Read(data, len)? 0 : len;
-}
-
-static tsize_t ITIFF_WriteProc(thandle_t clientData, tdata_t data, tsize_t len)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	return cd->io->Write(data, len)? 0 : len;
-}
-
-static toff_t ITIFF_SeekProc(thandle_t clientData, toff_t pos, int mode)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	cd->io->Seek((size_t)pos, mode);
-	return cd->io->GetPos();
-}
-
-static int ITIFF_CloseProc(thandle_t clientData)
-{
-	return 0;
-}
-
-static toff_t ITIFF_SizeProc(thandle_t clientData)
-{
-	clientData_s* cd = (clientData_s*)clientData;
-	return cd->io->GetLen();
-}
-
-bool tiff_c::Load(const char* fileName)
-{
-	Free();
-
-	// Open the file
-	fileInputStream_c in;
-	if (in.FileOpen(fileName, true)) {
-		return true;
-	}
-
-	// Initialise TIFF
-	TIFFSetErrorHandler(NULL);
-	TIFFSetErrorHandlerExt(ITIFF_ErrorProc);
-	TIFFSetWarningHandler(NULL);
-	TIFFSetWarningHandlerExt(ITIFF_WarningProc);
-	clientData_s cd;
-	cd.con = con;
-	cd.fileName = fileName;
-	cd.io = &in;
-	TIFF* t = TIFFClientOpen(fileName, "r", &cd, ITIFF_ReadProc, ITIFF_WriteProc, ITIFF_SeekProc, ITIFF_CloseProc, ITIFF_SizeProc, NULL, NULL);
-	if ( !t ) {
-		return true;
-	}
-
-	// Get image info and read image
-	TIFFGetField(t, TIFFTAG_IMAGEWIDTH, &width);
-	TIFFGetField(t, TIFFTAG_IMAGELENGTH, &height);
-	dat = new byte[width * height * 4];
-	comp = 4;
-	type = IMGTYPE_RGBA;
-	bool ret = !TIFFReadRGBAImageOriented(t, width, height, (dword*)dat, ORIENTATION_TOPLEFT, 0);
-	TIFFClose(t);
-	return ret;
-}
-
-bool tiff_c::Save(const char* fileName)
-{
-	// Only save RGB or RGBA
-	if (type != IMGTYPE_RGB && type != IMGTYPE_RGBA) {
-		return true;
-	}
-
-	// Open the file
-	fileOutputStream_c out;
-	if (out.FileOpen(fileName, true)) {
-		return true;
-	}
-
-	// Initialise TIFF
-	TIFFSetErrorHandler(NULL);
-	TIFFSetErrorHandlerExt(ITIFF_ErrorProc);
-	TIFFSetWarningHandler(NULL);
-	TIFFSetWarningHandlerExt(ITIFF_WarningProc);
-	clientData_s cd;
-	cd.con = con;
-	cd.fileName = fileName;
-	cd.io = &out;
-	TIFF* t = TIFFClientOpen(fileName, "w", &cd, ITIFF_ReadProc, ITIFF_WriteProc, ITIFF_SeekProc, ITIFF_CloseProc, ITIFF_SizeProc, NULL, NULL);
-	if ( !t ) {
-		return true;
-	}
-
-	// Save image
-	TIFFSetField(t, TIFFTAG_IMAGEWIDTH, width);
-	TIFFSetField(t, TIFFTAG_BITSPERSAMPLE, 8);
-	TIFFSetField(t, TIFFTAG_SAMPLESPERPIXEL, comp);
-	TIFFSetField(t, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
-	TIFFSetField(t, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
-	TIFFSetField(t, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-	for (dword r = 0; r < height; r++) {
-		TIFFWriteScanline(t, dat + r*width*comp, r);
-	}
-	TIFFClose(t);
-	return false;
-}
-
-bool tiff_c::ImageInfo(const char* fileName, imageInfo_s* info)
-{
-	// Open the file
-	fileInputStream_c in;
-	if (in.FileOpen(fileName, true)) {
-		return true;
-	}
-
-	// Initialise TIFF
-	TIFFSetErrorHandler(NULL);
-	TIFFSetErrorHandlerExt(ITIFF_ErrorProc);
-	TIFFSetWarningHandler(NULL);
-	TIFFSetWarningHandlerExt(ITIFF_WarningProc);
-	clientData_s cd;
-	cd.con = con;
-	cd.fileName = fileName;
-	cd.io = &in;
-	TIFF* t = TIFFClientOpen(fileName, "r", &cd, ITIFF_ReadProc, ITIFF_WriteProc, ITIFF_SeekProc, ITIFF_CloseProc, ITIFF_SizeProc, NULL, NULL);
-	if ( !t ) {
-		return true;
-	}
-
-	// Get image info
-	TIFFGetField(t, TIFFTAG_IMAGEWIDTH, &info->width);
-	TIFFGetField(t, TIFFTAG_IMAGELENGTH, &info->height);
-	TIFFGetField(t, TIFFTAG_SAMPLESPERPIXEL, &info->comp);
-	info->alpha = info->comp == 4;
-	TIFFClose(t);
-	return false;
-}
-
 // =========
 // PNG Image
 // =========

engine/core/core_image.h

@@ -74,15 +74,6 @@ class jpeg_c: public image_c {
 	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
 };
 
-// TIFF Image
-class tiff_c: public image_c {
-public:
-	tiff_c(IConsole* conHnd): image_c(conHnd) { }
-	bool	Load(const char* fileName) override;
-	bool	Save(const char* fileName) override;
-	bool	ImageInfo(const char* fileName, imageInfo_s* info) override;
-};
-
 // PNG Image
 class png_c: public image_c {
 public:

engine/render/r_main.cpp

@@ -14,7 +14,6 @@ enum r_takeScreenshot_e {
 	R_SSNONE,
 	R_SSTGA,
 	R_SSJPEG,
-	R_SSTIFF,
 	R_SSPNG
 };
 
@@ -447,13 +446,6 @@ void r_renderer_c::EndFrame()
 			DoScreenshot(&i, "jpg");
 		}
 		break;
-	case R_SSTIFF:
-		{
-			tiff_c i(sys->con);
-			i.type = IMGTYPE_RGB;
-			DoScreenshot(&i, "tiff");
-		}
-		break;
 	case R_SSPNG:
 		{
 			png_c i(sys->con);
@@ -721,10 +713,8 @@ void r_renderer_c::C_Screenshot(IConsole* conHnd, args_c &args)
 		takeScreenshot = R_SSJPEG;
 	} else if ( !_stricmp(fmtName, "png") ) {
 		takeScreenshot = R_SSPNG;
-	} else if ( !_stricmp(fmtName, "tiff") ) {
-		takeScreenshot = R_SSTIFF;
 	} else {
-		conHnd->Warning("Unknown screenshot format '%s', valid formats: jpg, tga, png, tiff", fmtName);
+		conHnd->Warning("Unknown screenshot format '%s', valid formats: jpg, tga, png", fmtName);
 	}
 }
 

vcpkg.txt

@@ -3,5 +3,4 @@ libjpeg-turbo:x86-windows-static
 liblzma:x86-windows-static
 libpng:x86-windows-static
 luajit:x86-windows-static
-tiff:x86-windows-static
 zlib:x86-windows-static

win/entry.cpp

@@ -17,25 +17,21 @@
 #if defined(_WIN64) && defined(_DEBUG)
 #pragma comment(lib, "_lib\\zlib64MT_D")
 #pragma comment(lib, "_lib\\jpeg64MT_D")
-#pragma comment(lib, "_lib\\tiff64MT_D")
 #pragma comment(lib, "_lib\\png64MT_D")
 #pragma comment(lib, "_lib\\gif64MT_D")
 #elif defined(_WIN64)
 #pragma comment(lib, "_lib\\zlib64MT")
 #pragma comment(lib, "_lib\\jpeg64MT")
-#pragma comment(lib, "_lib\\tiff64MT")
 #pragma comment(lib, "_lib\\png64MT")
 #pragma comment(lib, "_lib\\gif64MT")
 #elif defined(_DEBUG)
 #pragma comment(lib, "_lib\\zlib32MT_D")
 #pragma comment(lib, "_lib\\jpeg32MT_D")
-#pragma comment(lib, "_lib\\tiff32MT_D")
 #pragma comment(lib, "_lib\\png32MT_D")
 #pragma comment(lib, "_lib\\gif32MT_D")
 #else
 #pragma comment(lib, "_lib\\zlib32MT")
 #pragma comment(lib, "_lib\\jpeg32MT")
-#pragma comment(lib, "_lib\\tiff32MT")
 #pragma comment(lib, "_lib\\png32MT")
 #pragma comment(lib, "_lib\\gif32MT")
 #endif