mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 15:59:42 +01:00
Code Issues Releases Wiki Activity

* Fixed ImageRegistry's size key.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-12-23 09:06:38 +01:00
parent 93951bfdd4
commit 02668de6f8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libtomahawk/utils/ImageRegistry.cpp
View File

@ -23,7 +23,7 @@
#include "utils/Logger.h"
static QHash< QString, QHash< int, QHash< int, QPixmap > > > s_cache;
static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
ImageRegistry* ImageRegistry::s_instance = 0;
@ -50,8 +50,8 @@ ImageRegistry::icon( const QString& image, TomahawkUtils::ImageMode mode )
QPixmap
ImageRegistry::pixmap( const QString& image, const QSize& size, TomahawkUtils::ImageMode mode )
{
QHash< int, QPixmap > subsubcache;
QHash< int, QHash< int, QPixmap > > subcache;
QHash< qint64, QPixmap > subsubcache;
QHash< int, QHash< qint64, QPixmap > > subcache;
if ( s_cache.contains( image ) )
{
@ -61,9 +61,9 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, TomahawkUtils::I
{
subsubcache = subcache.value( mode );
if ( subsubcache.contains( size.width() ) )
if ( subsubcache.contains( size.width() * size.height() ) )
{
return subsubcache.value( size.width() );
return subsubcache.value( size.width() * size.height() );
}
}
}
@ -111,8 +111,8 @@ ImageRegistry::putInCache( const QString& image, const QSize& size, TomahawkUtil
{
tDebug() << Q_FUNC_INFO << "Adding to image cache:" << image << size << mode;
QHash< int, QPixmap > subsubcache;
QHash< int, QHash< int, QPixmap > > subcache;
QHash< qint64, QPixmap > subsubcache;
QHash< int, QHash< qint64, QPixmap > > subcache;
if ( s_cache.contains( image ) )
{
@ -122,14 +122,14 @@ ImageRegistry::putInCache( const QString& image, const QSize& size, TomahawkUtil
{
subsubcache = subcache.value( mode );
/* if ( subsubcache.contains( size.width() ) )
/* if ( subsubcache.contains( size.width() * size.height() ) )
{
Q_ASSERT( false );
}*/
}
}
subsubcache.insert( size.width(), pixmap );
subsubcache.insert( size.width() * size.height(), pixmap );
subcache.insert( mode, subsubcache );
s_cache.insert( image, subcache );
}