[OMPT-svn-commit] SF.net SVN: modplug:[856] trunk/OpenMPT/soundlib/Sndfile.cpp

[<sag...@us...>]

Revision: 856
          http://modplug.svn.sourceforge.net/modplug/?rev=856&view=rev
Author:   saga-games
Date:     2011-04-17 12:26:43 +0000 (Sun, 17 Apr 2011)

Log Message:
-----------
[Fix] Whoops, the refactoring broke RemoveSelectedSamples()

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2011-04-14 14:23:39 UTC (rev 855)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2011-04-17 12:26:43 UTC (rev 856)
@@ -2615,8 +2615,12 @@
 SAMPLEINDEX CSoundFile::RemoveSelectedSamples(const vector<bool> &keepSamples)
 //----------------------------------------------------------------------------
 {
+	if(keepSamples.empty())
+	{
+		return 0;
+	}
 	SAMPLEINDEX nRemoved = 0;
-	for (SAMPLEINDEX nSmp = (SAMPLEINDEX)min(MAX_SAMPLES - 1, keepSamples.size()); nSmp >= 1; nSmp--)
+	for (SAMPLEINDEX nSmp = (SAMPLEINDEX)min(GetNumSamples(), keepSamples.size() - 1); nSmp >= 1; nSmp--)
 	{
 		if(!keepSamples[nSmp])
 		{


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