diff layer/Colour3DPlotLayer.cpp @ 663:1a0fdad4af4d tonioni

Merge from the default branch
author Chris Cannam
date Fri, 12 Jul 2013 13:25:22 +0100
parents d632a1e87018
children 41029a6e55c6
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Thu Jun 20 13:47:36 2013 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Fri Jul 12 13:25:22 2013 +0100
@@ -952,13 +952,13 @@
     if (!m_cache) {
         m_cache = new QImage
             (cacheWidth, cacheHeight, QImage::Format_Indexed8);
-        m_cache->setNumColors(256);
+// No longer exists in Qt5:        m_cache->setNumColors(256);
         m_cache->fill(0);
         if (!m_normalizeVisibleArea) {
             m_peaksCache = new QImage
                 (cacheWidth / m_peakResolution + 1, cacheHeight,
                  QImage::Format_Indexed8);
-            m_peaksCache->setNumColors(256);
+// No longer exists in Qt5:            m_peaksCache->setNumColors(256);
             m_peaksCache->fill(0);
         } else if (m_peaksCache) {
             delete m_peaksCache;