diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-27 17:29:48 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 05:49:28 +0200 |
commit | ed37dd9bb1f63d47a5daafc06af3a13549000f0c (patch) | |
tree | b07552951a4283929a819124b782c42a2009198c | |
parent | 4d3ccce54a5e58bab878170b1552acd0d4a20cec (diff) |
Use pixmapCache in sprite assembly
Change-Id: Ibd4f5ea08a548e3c255db3e771b667f5850978e2
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
-rw-r--r-- | src/quick/items/qquickspriteengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index d4ddbc400d..900cb84de8 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -389,6 +389,7 @@ QImage QQuickSpriteEngine::assembledImage() else qmlInfo(state) << "SpriteEngine: Animations too large to fit in one texture, pushed over the edge by:" << state->source().toLocalFile(); qmlInfo(state) << "SpriteEngine: Your texture max size today is " << maxSize; + return QImage(); } state->m_generatedCount = rowsNeeded; h += state->frameHeight() * rowsNeeded; @@ -407,7 +408,7 @@ QImage QQuickSpriteEngine::assembledImage() QPainter p(&image); int y = 0; foreach (QQuickSprite* state, m_sprites){ - QImage img(state->source().toLocalFile()); + QImage img(state->m_pix.image()); int frameWidth = state->m_frameWidth; int frameHeight = state->m_frameHeight; if (img.height() == frameHeight && img.width() < maxSize){//Simple case |