comparison layer/Colour3DPlotLayer.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 41029a6e55c6
comparison
equal deleted inserted replaced
632:9d8f6552014d 640:c6d705bf1672
950 } 950 }
951 951
952 if (!m_cache) { 952 if (!m_cache) {
953 m_cache = new QImage 953 m_cache = new QImage
954 (cacheWidth, cacheHeight, QImage::Format_Indexed8); 954 (cacheWidth, cacheHeight, QImage::Format_Indexed8);
955 m_cache->setNumColors(256); 955 // No longer exists in Qt5: m_cache->setNumColors(256);
956 m_cache->fill(0); 956 m_cache->fill(0);
957 if (!m_normalizeVisibleArea) { 957 if (!m_normalizeVisibleArea) {
958 m_peaksCache = new QImage 958 m_peaksCache = new QImage
959 (cacheWidth / m_peakResolution + 1, cacheHeight, 959 (cacheWidth / m_peakResolution + 1, cacheHeight,
960 QImage::Format_Indexed8); 960 QImage::Format_Indexed8);
961 m_peaksCache->setNumColors(256); 961 // No longer exists in Qt5: m_peaksCache->setNumColors(256);
962 m_peaksCache->fill(0); 962 m_peaksCache->fill(0);
963 } else if (m_peaksCache) { 963 } else if (m_peaksCache) {
964 delete m_peaksCache; 964 delete m_peaksCache;
965 m_peaksCache = 0; 965 m_peaksCache = 0;
966 } 966 }