summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-04-27 14:31:58 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-04-27 14:35:53 (GMT)
commitae949b9d21470a9b9bf200774c246a0b86a69ff6 (patch)
treef2361cd740ddfdf9aae8af2fc72f5171757b85d9 /src/gui/image
parente7fdaf47dfdf5e2f6056aa5d5b4644e74a05492a (diff)
downloadQt-ae949b9d21470a9b9bf200774c246a0b86a69ff6.zip
Qt-ae949b9d21470a9b9bf200774c246a0b86a69ff6.tar.gz
Qt-ae949b9d21470a9b9bf200774c246a0b86a69ff6.tar.bz2
QPixmapCache:Remove the old pixmap if you insert one with the same key.
If you insert a new pixmap in the cache with a key that was already in the cache then we remove the old pixmap and add the new one. This avoid to fill the memory with garbage even if the cache has a protection to avoid running out of memory. This was discovered with QraphicsView and its cache. We don't need to keep old cached pixmaps for an item. Task-number: KDE Reviewed-by: Trond
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmapcache.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index eedb6a3..458d6b9 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -187,6 +187,11 @@ bool QPMCache::insert(const QString& key, const QPixmap &pixmap, int cost)
cacheKeys.insert(key, cacheKey);
return true;
}
+ qint64 oldCacheKey = cacheKeys.value(key, -1);
+ //If for the same key we add already a pixmap we should delete it
+ if (oldCacheKey != -1)
+ QCache<qint64, QDetachedPixmap>::remove(oldCacheKey);
+
bool success = QCache<qint64, QDetachedPixmap>::insert(cacheKey, new QDetachedPixmap(pixmap), cost);
if (success) {
cacheKeys.insert(key, cacheKey);