changeset 1251:9e1559b08f0d

Fix a couple of compiler warnings
author Chris Cannam
date Tue, 28 Feb 2017 14:47:13 +0000
parents c49a48fcc364
children b0b5776d2156
files layer/SliceLayer.cpp layer/SpectrogramLayer.cpp layer/SpectrumLayer.cpp
diffstat 3 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/layer/SliceLayer.cpp	Tue Feb 28 14:33:31 2017 +0000
+++ b/layer/SliceLayer.cpp	Tue Feb 28 14:47:13 2017 +0000
@@ -368,8 +368,6 @@
     }
 
     int xorigin = getVerticalScaleWidth(v, true, paint) + 1;
-    int w = v->getPaintWidth() - xorigin - 1;
-
     m_xorigins[v->getId()] = xorigin; // for use in getFeatureDescription
     
     int yorigin = v->getPaintHeight() - 20 - paint.fontMetrics().height() - 7;
--- a/layer/SpectrogramLayer.cpp	Tue Feb 28 14:33:31 2017 +0000
+++ b/layer/SpectrogramLayer.cpp	Tue Feb 28 14:47:13 2017 +0000
@@ -200,6 +200,7 @@
     case ColumnNormalization::Hybrid: return 3;
 
     case ColumnNormalization::Sum1:
+    case ColumnNormalization::Range01:
     default: return 0;
     }
 }
--- a/layer/SpectrumLayer.cpp	Tue Feb 28 14:33:31 2017 +0000
+++ b/layer/SpectrumLayer.cpp	Tue Feb 28 14:47:13 2017 +0000
@@ -415,8 +415,6 @@
     paint.setPen(mapper.getContrastingColour());
 
     int xorigin = m_xorigins[v->getId()];
-    int w = v->getPaintWidth() - xorigin - 1;
-    
     paint.drawLine(xorigin, cursorPos.y(), v->getPaintWidth(), cursorPos.y());
     paint.drawLine(cursorPos.x(), cursorPos.y(), cursorPos.x(), v->getPaintHeight());