Mercurial > hg > svgui
diff layer/ColourScale.cpp @ 1265:6e724c81f18f
Convert some cerrs to SVCERRs. Apart from anything else, this makes MSVC2017 happy
author | Chris Cannam |
---|---|
date | Thu, 01 Mar 2018 14:43:53 +0000 |
parents | 822edd9bb665 |
children | a34a2a25907c |
line wrap: on
line diff
--- a/layer/ColourScale.cpp Tue Dec 12 11:19:15 2017 +0000 +++ b/layer/ColourScale.cpp Thu Mar 01 14:43:53 2018 +0000 @@ -30,7 +30,7 @@ m_mapper(m_params.colourMap, 1.f, double(m_maxPixel)) { if (m_params.minValue >= m_params.maxValue) { - cerr << "ERROR: ColourScale::ColourScale: minValue = " + SVCERR << "ERROR: ColourScale::ColourScale: minValue = " << m_params.minValue << ", maxValue = " << m_params.maxValue << endl; throw std::logic_error("maxValue must be greater than minValue"); } @@ -78,7 +78,7 @@ } if (m_mappedMin >= m_mappedMax) { - cerr << "ERROR: ColourScale::ColourScale: minValue = " << m_params.minValue + SVCERR << "ERROR: ColourScale::ColourScale: minValue = " << m_params.minValue << ", maxValue = " << m_params.maxValue << ", threshold = " << m_params.threshold << ", scale = " << int(m_params.scaleType) @@ -106,7 +106,7 @@ if (m_params.scaleType == ColourScaleType::Phase) { double half = (maxPixF - 1.f) / 2.f; int pixel = 1 + int((value * half) / M_PI + half); -// cerr << "phase = " << value << " pixel = " << pixel << endl; +// SVCERR << "phase = " << value << " pixel = " << pixel << endl; return pixel; }