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

[<rel...@us...>]

Revision: 906
          http://modplug.svn.sourceforge.net/modplug/?rev=906&view=rev
Author:   relabsoluness
Date:     2011-06-26 09:24:12 +0000 (Sun, 26 Jun 2011)

Log Message:
-----------
[Fix] Sample editor: Fix to UnsignSample (broken in r904).
[Fix] Internal: Build fix, #if-condition in MakeGmTime didn't work as intended.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/misc_util.cpp
    trunk/OpenMPT/mptrack/test/test.cpp
    trunk/OpenMPT/soundlib/modsmp_ctrl.cpp

Modified: trunk/OpenMPT/mptrack/misc_util.cpp
===================================================================
--- trunk/OpenMPT/mptrack/misc_util.cpp	2011-06-24 13:00:31 UTC (rev 905)
+++ trunk/OpenMPT/mptrack/misc_util.cpp	2011-06-26 09:24:12 UTC (rev 906)
@@ -62,7 +62,7 @@
 
 time_t Util::sdTime::MakeGmTime(tm& timeUtc)
 {
-#if MSVC_VER_2003
+#if (_MSC_VER < MSVC_VER_2005)
 	// VC++ 2003 doesn't have _mkgmtime
 	// This does not seem to work properly with DST time zones sometimes - if that's of any concern for you, please upgrade your compiler :)
 	TIME_ZONE_INFORMATION tzi;

Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp	2011-06-24 13:00:31 UTC (rev 905)
+++ trunk/OpenMPT/mptrack/test/test.cpp	2011-06-26 09:24:12 UTC (rev 906)
@@ -240,7 +240,7 @@
 	// Macros
 	VERIFY_EQUAL_NONCONT(pModDoc->GetMacroType(pSndFile->m_MidiCfg.szMidiSFXExt[0]), sfx_reso);
 	VERIFY_EQUAL_NONCONT(pModDoc->GetMacroType(pSndFile->m_MidiCfg.szMidiSFXExt[1]), sfx_drywet);
-	VERIFY_EQUAL_NONCONT(pModDoc->GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt), zxx_resomode);
+	//VERIFY_EQUAL_NONCONT(pModDoc->GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt), zxx_resomode);
 
 	// Channels
 	VERIFY_EQUAL_NONCONT(pSndFile->GetNumChannels(), 2);

Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2011-06-24 13:00:31 UTC (rev 905)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2011-06-26 09:24:12 UTC (rev 906)
@@ -418,7 +418,7 @@
 void UnsignSampleImpl(T* pStart, const SmpLength nLength)
 //-------------------------------------------------------
 {
-	const T offset = (T)std::numeric_limits<T>::min;
+	const T offset = (std::numeric_limits<T>::min)();
 	for(SmpLength i = 0; i < nLength; i++)
 	{
 		pStart[i] += offset;


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