comparison 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
comparison
equal deleted inserted replaced
632:9d8f6552014d 640:c6d705bf1672
2291 } 2291 }
2292 usePeaksCache = (increment * 8) < zoomLevel; 2292 usePeaksCache = (increment * 8) < zoomLevel;
2293 if (m_colourScale == PhaseColourScale) usePeaksCache = false; 2293 if (m_colourScale == PhaseColourScale) usePeaksCache = false;
2294 } 2294 }
2295 2295
2296 m_drawBuffer.setNumColors(256); 2296 // No longer exists in Qt5: m_drawBuffer.setNumColors(256);
2297 for (int pixel = 0; pixel < 256; ++pixel) { 2297 for (int pixel = 0; pixel < 256; ++pixel) {
2298 m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb()); 2298 m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb());
2299 } 2299 }
2300 2300
2301 m_drawBuffer.fill(0); 2301 m_drawBuffer.fill(0);