qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QDeclarativePixmapCache: Add missing enumeration values and break. 

Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576
Reviewed-by: Martin Jones <martin.jones@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-11-07 14:39:56 +01:00 committed by Qt by Nokia
parent 3226ae7f0f
commit cc8f0227a4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qtquick1/util/qdeclarativepixmapcache.cpp
View File

@ -602,7 +602,8 @@ private:
int m_unreferencedCost; int m_unreferencedCost;
int m_timerId; int m_timerId;
}; };
Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore);
Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore)
QDeclarative1PixmapStore::QDeclarative1PixmapStore() QDeclarative1PixmapStore::QDeclarative1PixmapStore()
: m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1) : m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1)
@ -790,6 +791,7 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
return new QDeclarative1PixmapData(url, QPixmap::fromImage(image), readSize, requestSize); return new QDeclarative1PixmapData(url, QPixmap::fromImage(image), readSize, requestSize);
} }
} }
break;
case QDeclarativeImageProvider::Pixmap: case QDeclarativeImageProvider::Pixmap:
{ {
QPixmap pixmap = ep->getPixmapFromProvider(url, &readSize, requestSize); QPixmap pixmap = ep->getPixmapFromProvider(url, &readSize, requestSize);
@ -798,6 +800,10 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
return new QDeclarative1PixmapData(url, pixmap, readSize, requestSize); return new QDeclarative1PixmapData(url, pixmap, readSize, requestSize);
} }
} }
break;
case QDeclarativeImageProvider::Texture:
case QDeclarativeImageProvider::Invalid:
break;
} }
// no matching provider, or provider has bad image type, or provider returned null image // no matching provider, or provider has bad image type, or provider returned null image