- Miscellaneous warning fixes under Windows

5 files changed, 10 insertions, 10 deletions

diff --git a/DevIL/src-IL/msvc/resource.h b/DevIL/src-IL/msvc/resource.h
index 5cbdc7c7..7fd5016e 100644
--- a/DevIL/src-IL/msvc/resource.h
+++ b/DevIL/src-IL/msvc/resource.h
@@ -540,7 +540,7 @@
 #define VK_MENU                         0x12
 #define WM_QUIT                         0x0012
 #define HTBORDER                        18
-#define CF_MAX                          18
+//#define CF_MAX                          18
 #define LANG_KOREAN                     0x12
 #define SUBLANG_ENGLISH_SINGAPORE       0x12
 #define SUBLANG_SPANISH_HONDURAS        0x12
@@ -1478,7 +1478,7 @@
 #define LVS_TYPESTYLEMASK               0xfc00
 #define SPVERSION_MASK                  0x0000FF00
 #define UNICODE_NOCHAR                  0xFFFF
-#define HTTRANSPARENT                   -1
+//#define HTTRANSPARENT                   -1
 
 // Next default values for new objects
 // 
diff --git a/DevIL/src-IL/src/il_dds-save.cpp b/DevIL/src-IL/src/il_dds-save.cpp
index a771f5a8..aa18e93a 100644
--- a/DevIL/src-IL/src/il_dds-save.cpp
+++ b/DevIL/src-IL/src/il_dds-save.cpp
@@ -629,11 +629,11 @@ void CompressToRXGB(ILimage *Image, ILushort** xgb, ILubyte** r)
 ILuint Compress(ILimage *Image, ILenum DXTCFormat)
 {
 	ILushort	*Data, Block[16], ex0, ex1, *Runner16, t0, t1;
-	ILuint		x, y, z, i, BitMask, DXTCSize;//, Rms1, Rms2;
+	ILuint		x, y, z, i, BitMask;//, DXTCSize;//, Rms1, Rms2;
 	ILubyte		*Alpha, AlphaBlock[16], AlphaBitMask[6], /*AlphaOut[16],*/ a0, a1;
 	ILboolean	HasAlpha;
 	ILuint		Count = 0;
-	ILubyte		*Data3Dc, *Runner8, *ByteData, *BlockData;
+	ILubyte		*Data3Dc, *Runner8;//, *ByteData, *BlockData;
 
 	if (DXTCFormat == IL_3DC) {
 		Data3Dc = CompressTo88(Image);
diff --git a/DevIL/src-IL/src/il_ktx.cpp b/DevIL/src-IL/src/il_ktx.cpp
index 407ebb16..94c21e5a 100644
--- a/DevIL/src-IL/src/il_ktx.cpp
+++ b/DevIL/src-IL/src/il_ktx.cpp
@@ -171,7 +171,7 @@ ILboolean iLoadKtxInternal()
 	ILuint		imageSize;
 	ILenum		Format;
 	ILubyte		Bpp;
-	ILubyte		FileIdentifier[12] = {
+	char		FileIdentifier[12] = {
 		//0xAB, 0x4B, 0x54, 0x58, 0x20, 0x31, 0x31, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A
 		'«', 'K', 'T', 'X', ' ', '1', '1', '»', '\r', '\n', '\x1A', '\n'
 	};
diff --git a/DevIL/src-IL/src/il_rle.cpp b/DevIL/src-IL/src/il_rle.cpp
index 5644f8e3..80e71690 100644
--- a/DevIL/src-IL/src/il_rle.cpp
+++ b/DevIL/src-IL/src/il_rle.cpp
@@ -17,7 +17,7 @@ ILboolean ilRleCompressLine(ILubyte *p, ILuint n, ILubyte bpp,
 	ILint		SameCount;		// number of identical adjacent pixels
 	ILint		RLEBufSize = 0; // count of number of bytes encoded
 	ILint		MaxRun;
-	const ILint bmp_pad_to_even = 1 - ((ILint)q - *DestWidth) % 2;
+	const ILint bmp_pad_to_even = (ILint)(1 - ((ILint)q - *DestWidth) % 2);
 
 	switch( CompressMode ) {
 		case IL_TGACOMP:
diff --git a/DevIL/src-IL/src/il_tiff.cpp b/DevIL/src-IL/src/il_tiff.cpp
index 3f2bb68b..e49786a5 100644
--- a/DevIL/src-IL/src/il_tiff.cpp
+++ b/DevIL/src-IL/src/il_tiff.cpp
@@ -762,7 +762,7 @@ _tiffFileSeekProc(thandle_t fd, toff_t tOff, int whence)
 	if (tOff == 0xFFFFFFFF)
 		return 0xFFFFFFFF;
 
-	iseek(tOff, whence);
+	iseek((ILint)tOff, whence);
 	return itell();
 	//return tOff;
 }
@@ -776,7 +776,7 @@ _tiffFileSeekProcW(thandle_t fd, toff_t tOff, int whence)
 	if (tOff == 0xFFFFFFFF)
 		return 0xFFFFFFFF;
 
-	iseekw(tOff, whence);
+	iseekw((ILint)tOff, whence);
 	return itellw();
 	//return tOff;
 }
@@ -982,7 +982,7 @@ ILboolean iSaveTiffInternal(/*ILconst_string Filename*/)
 		return IL_FALSE;
 	}
 
-	sprintf(Description, "Tiff generated by %s", ilGetString(IL_VERSION_NUM));
+	sprintf(Description, "Tiff generated by %Ls", ilGetString(IL_VERSION_NUM));
 
 	TIFFSetField(File, TIFFTAG_IMAGEWIDTH, TempImage->Width);
 	TIFFSetField(File, TIFFTAG_IMAGELENGTH, TempImage->Height);
@@ -994,7 +994,7 @@ ILboolean iSaveTiffInternal(/*ILconst_string Filename*/)
 		TIFFSetField(File, TIFFTAG_MATTEING, 1);
 	TIFFSetField(File, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 	TIFFSetField(File, TIFFTAG_ROWSPERSTRIP, 1);
-	TIFFSetField(File, TIFFTAG_SOFTWARE, ilGetString(IL_VERSION_NUM));
+	TIFFSetField(File, TIFFTAG_SOFTWARE, ilGetString(IL_VERSION_NUM));  //@TODO: Will probably not work properly under Windows if Unicode
 	/*TIFFSetField(File, TIFFTAG_DOCUMENTNAME,
 		iGetString(IL_TIF_DOCUMENTNAME_STRING) ?
 		iGetString(IL_TIF_DOCUMENTNAME_STRING) : FileName);