qpa: incorrect rendering when stretching and clipping

When using QBlittable with SourceOverScaledPixmapCapability, rendering
through clipAndDrawPixmap is incorrect when stretching: source pixmap
rectangle has to be corrected using scaling factor.

Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

1 files changed, 17 insertions, 5 deletions

diff --git a/src/gui/painting/qpaintengine_blitter.cpp b/src/gui/painting/qpaintengine_blitter.cpp
index c2cab0cb61..d4eb6199a1 100644
--- a/src/gui/painting/qpaintengine_blitter.cpp
+++ b/src/gui/painting/qpaintengine_blitter.cpp
@@ -330,11 +330,23 @@ void QBlitterPaintEnginePrivate::clipAndDrawPixmap(const QRectF &clip, const QRe
         return;
     QRectF source = sr;
     if (intersectedRect.size() != target.size()) {
-        qreal deltaTop = target.top() - intersectedRect.top();
-        qreal deltaLeft = target.left() - intersectedRect.left();
-        qreal deltaBottom = target.bottom() - intersectedRect.bottom();
-        qreal deltaRight = target.right() - intersectedRect.right();
-        source.adjust(-deltaLeft, -deltaTop, -deltaRight, -deltaBottom);
+        if (sr.size() == target.size()) {
+            // no resize
+            qreal deltaTop = target.top() - intersectedRect.top();
+            qreal deltaLeft = target.left() - intersectedRect.left();
+            qreal deltaBottom = target.bottom() - intersectedRect.bottom();
+            qreal deltaRight = target.right() - intersectedRect.right();
+            source.adjust(-deltaLeft, -deltaTop, -deltaRight, -deltaBottom);
+        } else {
+            // resize case
+            qreal hFactor = sr.size().width() / target.size().width();
+            qreal vFactor = sr.size().height() / target.size().height();
+            qreal deltaTop = (target.top() - intersectedRect.top()) * vFactor;
+            qreal deltaLeft = (target.left() - intersectedRect.left()) * hFactor;
+            qreal deltaBottom = (target.bottom() - intersectedRect.bottom()) * vFactor;
+            qreal deltaRight = (target.right() - intersectedRect.right()) * hFactor;
+            source.adjust(-deltaLeft, -deltaTop, -deltaRight, -deltaBottom);
+        }
     }
     pmData->unmarkRasterOverlay(intersectedRect);
     pmData->blittable()->drawPixmap(intersectedRect, pm, source);