Commit c913351c authored by Alan Alpert's avatar Alan Alpert Committed by Qt by Nokia

Fix Sprite Assembly

This optimization doesn't account for the width of the assembled image
possibly being too small to fit the whole source image width. Since it
meant copying more image data than we needed, I'm no longer convinced
that it actually is an optimization over a simple cut (as this patch

Change-Id: I3fe502a75979e972f62d9dbf26f1ffec9069a102
Reviewed-by: default avatarYann Bodson <>
parent ddff2017
......@@ -411,9 +411,9 @@ QImage QQuickSpriteEngine::assembledImage()
int frameWidth = state->m_frameWidth;
int frameHeight = state->m_frameHeight;
if (img.height() == frameHeight && img.width() < maxSize){//Simple case
p.drawImage(0,y,img.copy(state->m_frameX,0,state->m_frames * frameWidth, frameHeight));
state->m_rowStartX = 0;
state->m_rowY = y;
state->m_rowStartX = state->m_frameX;//In case it was offset, but we took the simple route of not chopping out the other bits
y += frameHeight;
}else{//Chopping up image case
state->m_framesPerRow = image.width()/frameWidth;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment