mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Empty image hashes are not valid

Browse source 
I don't know how those arose in the first place, but an
empty QByteArray is never a valid hash value for an image. So
we should not store those in our translation tables and also
get rid of them when loading the tables from disk.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-12-02 23:43:30 +01:00 • committed by Dirk Hohndel
parent cac40bd659
commit 1ab5db3726
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/qthelper.cpp
View file

@ -1026,6 +1026,20 @@ void read_hashes()
stream >> thumbnailCache; stream >> thumbnailCache;
hashfile.close(); hashfile.close();
} }
localFilenameOf.remove("");
QMutableHashIterator<QString, QByteArray> iter(hashOf);
while (iter.hasNext()) {
iter.next();
if (iter.value().isEmpty())
iter.remove();
}
qDebug() << "localFilenameOf empty" << localFilenameOf[""];
QHash<QString, QImage>::const_iterator i = thumbnailCache.constBegin();
while (i != thumbnailCache.constEnd()) {
qDebug() << i.key() << *i;
++i;
}
} }
void write_hashes() void write_hashes()
@ -1046,6 +1060,8 @@ void write_hashes()
void add_hash(const QString filename, QByteArray hash) void add_hash(const QString filename, QByteArray hash)
{ {
if (hash.isEmpty())
return;
QMutexLocker locker(&hashOfMutex); QMutexLocker locker(&hashOfMutex);
hashOf[filename] = hash; hashOf[filename] = hash;
localFilenameOf[hash] = filename; localFilenameOf[hash] = filename;