diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-07 00:25:57 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-07 00:25:57 (GMT) |
| commit | 765578cb91956d01631edd220be09463c620eadd (patch) | |
| tree | f4d646c008dbd433b6faca339cacf3cab456834d /src/gui/painting/qblendfunctions.cpp | |
| parent | 3e6dbc962111228d9ff7a7afe11d69dabf97fff8 (diff) | |
| parent | 15e78b8487ee223eb44acf3d34e1cb71f76234ca (diff) | |
| download | Qt-765578cb91956d01631edd220be09463c620eadd.zip Qt-765578cb91956d01631edd220be09463c620eadd.tar.gz Qt-765578cb91956d01631edd220be09463c620eadd.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qblendfunctions.cpp')
| -rw-r--r-- | src/gui/painting/qblendfunctions.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 16dd617..8f4a2bf 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE -static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; - struct SourceOnlyAlpha { inline uchar alpha(uchar src) const { return src; } @@ -140,14 +138,11 @@ struct Blend_ARGB32_on_RGB16_SourceAndConstAlpha { template <typename SRC, typename T> void qt_scale_image_16bit(uchar *destPixels, int dbpl, const uchar *srcPixels, int sbpl, - const QRectF &target, + const QRectF &targetRect, const QRectF &srcRect, const QRect &clip, T blender) { - const QRectF targetRect = target.translated(aliasedCoordinateDelta, - aliasedCoordinateDelta); - qreal sx = targetRect.width() / (qreal) srcRect.width(); qreal sy = targetRect.height() / (qreal) srcRect.height(); @@ -617,14 +612,11 @@ struct Blend_ARGB32_on_ARGB32_SourceAndConstAlpha { template <typename T> void qt_scale_image_32bit(uchar *destPixels, int dbpl, const uchar *srcPixels, int sbpl, - const QRectF &target, + const QRectF &targetRect, const QRectF &srcRect, const QRect &clip, T blender) { - const QRectF targetRect = target.translated(aliasedCoordinateDelta, - aliasedCoordinateDelta); - qreal sx = targetRect.width() / (qreal) srcRect.width(); qreal sy = targetRect.height() / (qreal) srcRect.height(); |