From f816e5a928703850b7aa6c4a8b94136356c62a19 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Mon, 16 Nov 2009 17:29:27 +0100
Subject: Fixing merger errors.

Removing some unreferenced variables that were left overs after
revert&merge operation.

Reviewed-by: Kim Motoyoshi Kalland
---
 src/gui/painting/qblendfunctions.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
index ba1b642..b92c5c2 100644
--- a/src/gui/painting/qblendfunctions.cpp
+++ b/src/gui/painting/qblendfunctions.cpp
@@ -227,9 +227,6 @@ void qt_scale_image_16bit(uchar *destPixels, int dbpl,
     quint32 basex;
     quint32 srcy;
 
-    const int dstx = qCeil((tx1 + 0.5 - qMin(targetRect.left(), targetRect.right())) * ix) - 1;
-    const int dsty = qCeil((ty1 + 0.5 - qMin(targetRect.top(), targetRect.bottom())) * iy) - 1;
-
     if (sx < 0) {
         int dstx = qFloor((tx1 + qreal(0.5) - targetRect.right()) * ix) + 1;
         basex = quint32(srcRect.right() * 65536) + dstx;
-- 
cgit v0.12