# HG changeset patch
# User Chris Cannam
# Date 1519915433 0
# Node ID 6e724c81f18f9302cf26778cdfadacea3f5cc2ed
# Parent  5f68f5c74904801286fd1ef1453694bde3c02e51
Convert some cerrs to SVCERRs. Apart from anything else, this makes MSVC2017 happy

diff -r 5f68f5c74904 -r 6e724c81f18f layer/Colour3DPlotRenderer.cpp
--- a/layer/Colour3DPlotRenderer.cpp	Tue Dec 12 11:19:15 2017 +0000
+++ b/layer/Colour3DPlotRenderer.cpp	Thu Mar 01 14:43:53 2018 +0000
@@ -297,7 +297,7 @@
                     pr.x(), pr.y(), pr.width(), pr.height());
 
     if (!timeConstrained && (pr != rect)) {
-        cerr << "WARNING: failed to render entire requested rect "
+        SVCERR << "WARNING: failed to render entire requested rect "
              << "even when not time-constrained" << endl;
     }
 
diff -r 5f68f5c74904 -r 6e724c81f18f layer/ColourMapper.cpp
--- a/layer/ColourMapper.cpp	Tue Dec 12 11:19:15 2017 +0000
+++ b/layer/ColourMapper.cpp	Thu Mar 01 14:43:53 2018 +0000
@@ -67,7 +67,7 @@
     m_max(max)
 {
     if (m_min == m_max) {
-        cerr << "WARNING: ColourMapper: min == max (== " << m_min
+        SVCERR << "WARNING: ColourMapper: min == max (== " << m_min
                   << "), adjusting" << endl;
         m_max = m_min + 1;
     }
diff -r 5f68f5c74904 -r 6e724c81f18f layer/ColourScale.cpp
--- 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;
     }
     
diff -r 5f68f5c74904 -r 6e724c81f18f layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Tue Dec 12 11:19:15 2017 +0000
+++ b/layer/SpectrogramLayer.cpp	Thu Mar 01 14:43:53 2018 +0000
@@ -2625,7 +2625,7 @@
         } else if (columnNormalization == "none") {
             setNormalization(ColumnNormalization::None);
         } else {
-            cerr << "NOTE: Unknown or unsupported columnNormalization attribute \""
+            SVCERR << "NOTE: Unknown or unsupported columnNormalization attribute \""
                  << columnNormalization << "\"" << endl;
         }
     }