Mercurial > hg > svcore
diff base/LogRange.cpp @ 1082:b6092700a73e
Merge
author | Chris Cannam |
---|---|
date | Wed, 10 Jun 2015 13:12:39 +0100 |
parents | d4212687520e |
children | b061b9f8fca5 |
line wrap: on
line diff
--- a/base/LogRange.cpp Wed Jun 10 13:12:29 2015 +0100 +++ b/base/LogRange.cpp Wed Jun 10 13:12:39 2015 +0100 @@ -26,8 +26,8 @@ if (min > max) std::swap(min, max); if (max == min) max = min + 1; -// SVDEBUG << "LogRange::mapRange: min = " << min << ", max = " << max << endl; - +// cerr << "LogRange::mapRange: min = " << min << ", max = " << max << endl; + if (min >= 0.f) { max = log10(max); // we know max != 0 @@ -35,7 +35,7 @@ if (min == 0.f) min = std::min(logthresh, max); else min = log10(min); -// SVDEBUG << "LogRange::mapRange: positive: min = " << min << ", max = " << max << endl; +// cerr << "LogRange::mapRange: positive: min = " << min << ", max = " << max << endl; } else if (max <= 0.f) { @@ -46,7 +46,7 @@ std::swap(min, max); -// SVDEBUG << "LogRange::mapRange: negative: min = " << min << ", max = " << max << endl; +// cerr << "LogRange::mapRange: negative: min = " << min << ", max = " << max << endl; } else { @@ -55,7 +55,7 @@ max = log10(std::max(max, -min)); min = std::min(logthresh, max); -// SVDEBUG << "LogRange::mapRange: spanning: min = " << min << ", max = " << max << endl; +// cerr << "LogRange::mapRange: spanning: min = " << min << ", max = " << max << endl; } if (min == max) min = max - 1;