Merge branch '4.8-upstream' into master-water

2 files changed, 14 insertions, 12 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;
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index 9734c82..350d70f 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -248,12 +248,14 @@ void QVolatileImage::copyFrom(QVolatileImage *source, const QRect &rect)
     const uchar *sptr = srcImgRef.constBits() + r.y() * srcbpl;
     beginDataAccess();
     QImage &dstImgRef(imageRef());
-    int dstbpl = dstImgRef.bytesPerLine();
-    uchar *dptr = dstImgRef.bits();
-    for (int y = 0; y < r.height(); ++y) {
-        qMemCopy(dptr, sptr + r.x() * srcbpp, r.width() * srcbpp);
-        sptr += srcbpl;
-        dptr += dstbpl;
+    if (!dstImgRef.isNull()) {
+        int dstbpl = dstImgRef.bytesPerLine();
+        uchar *dptr = dstImgRef.bits();
+        for (int y = 0; y < r.height(); ++y) {
+            qMemCopy(dptr, sptr + r.x() * srcbpp, r.width() * srcbpp);
+            sptr += srcbpl;
+            dptr += dstbpl;
+        }
     }
     endDataAccess();
     source->endDataAccess(true);