diff options
| -rw-r--r-- | qt-models/divepicturemodel.cpp | 10 | ||||
| -rw-r--r-- | subsurface-core/qthelper.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index 55f20cef9..602663ec1 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -6,19 +6,21 @@ #include <QtConcurrent> +extern QHash <QString, QImage > thumbnailCache; + + SPixmap scaleImages(picturepointer picture) { - static QHash <QString, QImage > cache; SPixmap ret; ret.first = picture; - if (cache.contains(picture->filename) && !cache.value(picture->filename).isNull()) { - ret.second = cache.value(picture->filename); + if (thumbnailCache.contains(picture->filename) && !thumbnailCache.value(picture->filename).isNull()) { + ret.second = thumbnailCache.value(picture->filename); } else { int dim = defaultIconMetrics().sz_pic; QImage p = SHashedImage(picture); if(!p.isNull()) { p = p.scaled(dim, dim, Qt::KeepAspectRatio); - cache.insert(picture->filename, p); + thumbnailCache.insert(picture->filename, p); } ret.second = p; } diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp index 40c507a7e..63248f6c4 100644 --- a/subsurface-core/qthelper.cpp +++ b/subsurface-core/qthelper.cpp @@ -1129,6 +1129,7 @@ extern "C" void reverseGeoLookup(degrees_t latitude, degrees_t longitude, uint32 QHash<QString, QByteArray> hashOf; QMutex hashOfMutex; QHash<QByteArray, QString> localFilenameOf; +QHash <QString, QImage > thumbnailCache; extern "C" char * hashstring(char * filename) { @@ -1152,6 +1153,7 @@ void read_hashes() QDataStream stream(&hashfile); stream >> localFilenameOf; stream >> hashOf; + stream >> thumbnailCache; hashfile.close(); } } @@ -1163,6 +1165,7 @@ void write_hashes() QDataStream stream(&hashfile); stream << localFilenameOf; stream << hashOf; + stream << thumbnailCache; hashfile.commit(); } else { qDebug() << "cannot open" << hashfile.fileName(); |