diff layer/SpectrogramLayer.cpp @ 640:c6d705bf1672

Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:43 +0100
parents d632a1e87018
children 1a0dfcbffaf1
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Tue Apr 16 15:17:33 2013 +0100
+++ b/layer/SpectrogramLayer.cpp	Tue May 14 12:36:43 2013 +0100
@@ -2293,7 +2293,7 @@
         if (m_colourScale == PhaseColourScale) usePeaksCache = false;
     }
 
-    m_drawBuffer.setNumColors(256);
+// No longer exists in Qt5:    m_drawBuffer.setNumColors(256);
     for (int pixel = 0; pixel < 256; ++pixel) {
         m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb());
     }