summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-26 00:54:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-26 00:54:50 (GMT)
commit2aaad2476345e0c44da488ed33c71b8f378a582c (patch)
tree7546619c4d6b128bb6cd6c89bc323bf4ca29b74a /src
parent2dd38c17741536c85ed24536addcee8a7b12fe50 (diff)
parent9ca30bd3ab50c48d0cddfa7265a3514d288845f4 (diff)
downloadQt-2aaad2476345e0c44da488ed33c71b8f378a582c.zip
Qt-2aaad2476345e0c44da488ed33c71b8f378a582c.tar.gz
Qt-2aaad2476345e0c44da488ed33c71b8f378a582c.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix another off-by-1 error in OpenVG image painting.
Diffstat (limited to 'src')
-rw-r--r--src/openvg/qpaintengine_vg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 4a97a6f..ce6e21b 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -538,7 +538,7 @@ void QVGPaintEnginePrivate::updateTransform(QPaintDevice *pdev)
// adds 0.5 to each co-ordinate.
QTransform viewport2(1.0f, 0.0f, 0.0f,
0.0f, -1.0f, 0.0f,
- 0.0f, devh, 1.0f);
+ 0.0f, devh + 1, 1.0f);
imageTransform = transform * viewport2;
// Calculate the scaling factor to use for turning cosmetic pens