Mercurial > hg > svgui

diff layer/SpectrogramLayer.h @ 920:e39d5d2734ed osx-retina

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash caused by using proxy (of unknown lifecycle) instead of view as cache key
author Chris Cannam
date Wed, 18 Mar 2015 15:10:36 +0000
parents 4fe7a09be0fe
children 98827470ada2
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Wed Mar 18 13:52:07 2015 +0000
+++ b/layer/SpectrogramLayer.h	Wed Mar 18 15:10:36 2015 +0000
@@ -313,7 +313,7 @@
         sv_frame_t startFrame;
         int zoomLevel;
     };
-    typedef std::map<const LayerGeometryProvider *, ImageCache> ViewImageCache;
+    typedef std::map<const View *, ImageCache> ViewImageCache;
     void invalidateImageCaches();
     void invalidateImageCaches(sv_frame_t startFrame, sv_frame_t endFrame);
     mutable ViewImageCache m_imageCaches;
@@ -374,8 +374,8 @@
     void invalidateFFTModels();
 
     typedef std::pair<FFTModel *, sv_frame_t> FFTFillPair; // model, last fill
-    typedef std::map<const LayerGeometryProvider *, FFTFillPair> ViewFFTMap;
-    typedef std::map<const LayerGeometryProvider *, Dense3DModelPeakCache *> PeakCacheMap;
+    typedef std::map<const View *, FFTFillPair> ViewFFTMap;
+    typedef std::map<const View *, Dense3DModelPeakCache *> PeakCacheMap;
     mutable ViewFFTMap m_fftModels;
     mutable PeakCacheMap m_peakCaches;
     mutable Model *m_sliceableModel;