diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-19 08:55:43 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-19 08:55:43 (GMT) |
| commit | c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2 (patch) | |
| tree | d99496ae00c9e9cddb5df85b372065a2c44135cb /src/gui/image/qimage.cpp | |
| parent | f90c18e09e8b2e275230080cb51656e3f8a31fba (diff) | |
| parent | 8051a73be276995adfc4508a0cb5ad6451e8ab45 (diff) | |
| download | Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.zip Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.tar.gz Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/image/qimage.cpp')
| -rw-r--r-- | src/gui/image/qimage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index a3378de..f527bcf 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -5908,12 +5908,12 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth uchar *dptr, int dbpl, int p_inc, int dHeight, const uchar *sptr, int sbpl, int sWidth, int sHeight) { - int m11 = int(trueMat.m11()*4096.0); - int m12 = int(trueMat.m12()*4096.0); - int m21 = int(trueMat.m21()*4096.0); - int m22 = int(trueMat.m22()*4096.0); - int dx = qRound(trueMat.dx()*4096.0); - int dy = qRound(trueMat.dy()*4096.0); + int m11 = int(trueMat.m11()*qreal(4096.0)); + int m12 = int(trueMat.m12()*qreal(4096.0)); + int m21 = int(trueMat.m21()*qreal(4096.0)); + int m22 = int(trueMat.m22()*qreal(4096.0)); + int dx = qRound(trueMat.dx()*qreal(4096.0)); + int dy = qRound(trueMat.dy()*qreal(4096.0)); int m21ydx = dx + (xoffset<<16) + (m11 + m21) / 2; int m22ydy = dy + (m12 + m22) / 2; |