Merge pull request #613 from jdpurcell/memory2

Cache memory usage fix (regression due to merge error)
jurplel · Aug 12, 2023 · 783807d · 783807d
2 parents 2a6bdfa + 18d49b8
commit 783807d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/qvimagecore.cpp b/src/qvimagecore.cpp
@@ -477,8 +477,9 @@ void QVImageCore::addToCache(const ReadData &readData)
         return;
 
     QString cacheKey = getPixmapCacheKey(readData.absoluteFilePath, readData.fileSize, readData.targetColorSpace);
+    qint64 pixmapMemoryBytes = static_cast<qint64>(readData.pixmap.width()) * readData.pixmap.height() * readData.pixmap.depth() / 8;
 
-    QVImageCore::pixmapCache.insert(cacheKey, new ReadData(readData), readData.fileSize/1024);
+    QVImageCore::pixmapCache.insert(cacheKey, new ReadData(readData), qMax(pixmapMemoryBytes / 1024, 1LL));
 }
 
 QString QVImageCore::getPixmapCacheKey(const QString &absoluteFilePath, const qint64 &fileSize, const QColorSpace &targetColorSpace)