[OMPT-svn-commit] SF.net SVN: modplug:[1879] trunk/OpenMPT

[<man...@us...>]

Revision: 1879
          http://sourceforge.net/p/modplug/code/1879
Author:   manxorist
Date:     2013-04-14 19:41:22 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
[Var] Silence some compiler warnings.

Modified Paths:
--------------
    trunk/OpenMPT/common/serialization_utils.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/common/serialization_utils.cpp
===================================================================
--- trunk/OpenMPT/common/serialization_utils.cpp	2013-04-14 17:30:46 UTC (rev 1878)
+++ trunk/OpenMPT/common/serialization_utils.cpp	2013-04-14 19:41:22 UTC (rev 1879)
@@ -727,7 +727,7 @@
 	if (GetFlag(RwfRwHasMap))
 	{
 		ReadAdaptive1248(iStrm, tempU64);
-		if(tempU64 > std::numeric_limits<Offtype>::max())
+		if(tempU64 > static_cast<uint64>(std::numeric_limits<Offtype>::max()))
 			{ AddReadNote(SNR_INSUFFICIENT_STREAM_OFFTYPE); return; }
 	}
 
@@ -787,7 +787,7 @@
 			{
 				uint64 tempU64;
 				ReadAdaptive1248(iStrm, tempU64);
-				if(tempU64 > std::numeric_limits<Offtype>::max())
+				if(tempU64 > static_cast<uint64>(std::numeric_limits<Offtype>::max()))
 					{ AddReadNote(SNR_INSUFFICIENT_STREAM_OFFTYPE); return; }
 				mapData[i].rposStart = static_cast<RposType>(tempU64);
 			}
@@ -799,7 +799,7 @@
 			{
 				uint64 tempU64;
 				ReadAdaptive1248(iStrm, tempU64);
-				if(tempU64 > std::numeric_limits<Offtype>::max())
+				if(tempU64 > static_cast<uint64>(std::numeric_limits<Offtype>::max()))
 					{ AddReadNote(SNR_INSUFFICIENT_STREAM_OFFTYPE); return; }
 				mapData[i].nSize = static_cast<DataSize>(tempU64);
 			}

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-04-14 17:30:46 UTC (rev 1878)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-04-14 19:41:22 UTC (rev 1879)
@@ -373,9 +373,9 @@
 		if (m_sndFile.GetNumInstruments())
 		{
 			INSTRUMENTINDEX k = m_parent.GetInstrumentChange();
-			if (!m_modDoc.IsChildSample(k, lParam))
+			if (!m_modDoc.IsChildSample(k, (SAMPLEINDEX)lParam))
 			{
-				INSTRUMENTINDEX nins = m_modDoc.FindSampleParent(lParam);
+				INSTRUMENTINDEX nins = m_modDoc.FindSampleParent((SAMPLEINDEX)lParam);
 				if(nins != INSTRUMENTINDEX_INVALID)
 				{
 					m_parent.InstrumentChanged(nins);

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-14 17:30:46 UTC (rev 1878)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-14 19:41:22 UTC (rev 1879)
@@ -502,7 +502,7 @@
 				} else
 				if (((param & 0xF0) == 0xF0) && (param & 0x0F))
 				{
-					if (memory.chnSettings[nChn].chnVol > (param & 0x0F)) param = memory.chnSettings[nChn].chnVol - (param & 0x0F);
+					if (memory.chnSettings[nChn].chnVol > (UINT)(param & 0x0F)) param = memory.chnSettings[nChn].chnVol - (param & 0x0F);
 					else param = 0;
 				} else
 				if (param & 0x0F)

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