Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-15 00:51:21 +01:00
Code Issues Releases Wiki Activity

More uses of min and max

Browse Source
This commit is contained in:
Paul Licameli
2016-09-02 12:50:40 -04:00
parent f372aee9a1
commit 919d77d176
8 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blockfile/SimpleBlockFile.cpp
View File

@@ -395,15 +395,14 @@ int SimpleBlockFile::ReadData(samplePtr data, sampleFormat format,
{
//wxLogDebug("SimpleBlockFile::ReadData(): Data are already in cache.");
if (len > mLen - start)
len = mLen - start;
len = std::min(len, std::max(start, mLen) - start);
CopySamples(
(samplePtr)(((char*)mCache.sampleData) +
start * SAMPLE_SIZE(mCache.format)),
mCache.format, data, format, len);
return len;
} else
{
}
else {
//wxLogDebug("SimpleBlockFile::ReadData(): Reading data from disk.");
SF_INFO info;