diff options
| author | axis <qt-info@nokia.com> | 2009-11-17 09:16:21 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-17 09:16:21 (GMT) |
| commit | db803b363785b6892cbf7809aabba1fb7d5fb934 (patch) | |
| tree | e504ec5339d40cd3b29a68bbccee84778be2ee7f | |
| parent | 5f2489ef78956223d7f52ed02c1e580921883803 (diff) | |
| parent | f816e5a928703850b7aa6c4a8b94136356c62a19 (diff) | |
| download | Qt-db803b363785b6892cbf7809aabba1fb7d5fb934.zip Qt-db803b363785b6892cbf7809aabba1fb7d5fb934.tar.gz Qt-db803b363785b6892cbf7809aabba1fb7d5fb934.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
| -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; |