diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-11-16 16:29:27 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-11-16 16:32:25 (GMT) |
| commit | f816e5a928703850b7aa6c4a8b94136356c62a19 (patch) | |
| tree | 0ad60fa5de89b777bc7bc019db09b6993d3ca836 /src | |
| parent | 54132fc20df0c3362c96a974654e1bd88b0eb121 (diff) | |
| download | Qt-f816e5a928703850b7aa6c4a8b94136356c62a19.zip Qt-f816e5a928703850b7aa6c4a8b94136356c62a19.tar.gz Qt-f816e5a928703850b7aa6c4a8b94136356c62a19.tar.bz2 | |
Fixing merger errors.
Removing some unreferenced variables that were left overs after
revert&merge operation.
Reviewed-by: Kim Motoyoshi Kalland
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qblendfunctions.cpp | 3 |
1 files changed, 0 insertions, 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; |