[Scummvm-cvs-logs] SF.net SVN: scummvm: [30272] tools/branches/branch-0-11-0

[thebluegr at users.sourceforge.net]

Revision: 30272
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30272&view=rev
Author:   thebluegr
Date:     2008-01-05 15:20:12 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Fixed some MSVC warnings (backport)

Modified Paths:
--------------
    tools/branches/branch-0-11-0/compress_saga.cpp
    tools/branches/branch-0-11-0/descumm-tool.cpp
    tools/branches/branch-0-11-0/util.h

Modified: tools/branches/branch-0-11-0/compress_saga.cpp
===================================================================
--- tools/branches/branch-0-11-0/compress_saga.cpp	2008-01-05 23:05:16 UTC (rev 30271)
+++ tools/branches/branch-0-11-0/compress_saga.cpp	2008-01-05 23:20:12 UTC (rev 30272)
@@ -296,7 +296,7 @@
 
 		copyFile(inputFile, inputSize, TEMP_RAW);
 
-		setRawAudioType( !currentFileDescription->swapEndian, sampleStereo, false, sampleBits);
+		setRawAudioType( !currentFileDescription->swapEndian, sampleStereo != 0, false, sampleBits);
 		encodeAudio(TEMP_RAW, true, sampleRate, tempEncoded, gCompMode);
 		return copyFile(tempEncoded, outputFile) + HEADER_SIZE;
 	}
@@ -333,7 +333,7 @@
 		writeBufferToFile((uint8 *)buffer, sampleSize, TEMP_RAW);
 		free(buffer);
 
-		setRawAudioType( !currentFileDescription->swapEndian, sampleStereo, false, sampleBits);
+		setRawAudioType( !currentFileDescription->swapEndian, sampleStereo != 0, false, sampleBits);
 		encodeAudio(TEMP_RAW, true, sampleRate, tempEncoded, gCompMode);
 		return copyFile(tempEncoded, outputFile) + HEADER_SIZE;
 	}

Modified: tools/branches/branch-0-11-0/descumm-tool.cpp
===================================================================
--- tools/branches/branch-0-11-0/descumm-tool.cpp	2008-01-05 23:05:16 UTC (rev 30271)
+++ tools/branches/branch-0-11-0/descumm-tool.cpp	2008-01-05 23:20:12 UTC (rev 30272)
@@ -266,7 +266,7 @@
 			g_scriptStart += 4;
 		}
 	} else if (g_options.scriptVersion >= 5) {
-		if (g_scriptSize < (g_options.scriptVersion == 5 ? 8 : 9)) {
+		if (g_scriptSize < (uint)(g_options.scriptVersion == 5 ? 8 : 9)) {
 			error("File too small to be a script");
 		}
 	

Modified: tools/branches/branch-0-11-0/util.h
===================================================================
--- tools/branches/branch-0-11-0/util.h	2008-01-05 23:05:16 UTC (rev 30271)
+++ tools/branches/branch-0-11-0/util.h	2008-01-05 23:20:12 UTC (rev 30272)
@@ -76,7 +76,10 @@
 	#define snprintf _snprintf
 
 	#define SCUMM_LITTLE_ENDIAN
-	
+	#pragma once
+	#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
+	#pragma warning( disable : 4996 ) // turn off warnings about unsafe functions
+
 #elif defined(__MINGW32__)
 
 	#define scumm_stricmp stricmp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.