Make sure to do a deep copy of a QImage when it's being painted on.

Not doing so can produce some hard-to-track-down bugs in the app.

Task-number: QTBUG-15749
Reviewed-by: Gunnar Sletta

2 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index b446941..b2c59fc 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -142,6 +142,8 @@ private slots:
 
     void rgbSwapped_data();
     void rgbSwapped();
+
+    void deepCopyWhenPaintingActive();
 };
 
 tst_QImage::tst_QImage()
@@ -1886,5 +1888,19 @@ void tst_QImage::rgbSwapped()
     QCOMPARE(memcmp(image.constBits(), imageSwappedTwice.constBits(), image.numBytes()), 0);
 }
 
+void tst_QImage::deepCopyWhenPaintingActive()
+{
+    QImage image(64, 64, QImage::Format_ARGB32_Premultiplied);
+    image.fill(0);
+
+    QPainter painter(&image);
+    QImage copy = image;
+
+    painter.setBrush(Qt::black);
+    painter.drawEllipse(image.rect());
+
+    QVERIFY(copy != image);
+}
+
 QTEST_MAIN(tst_QImage)
 #include "tst_qimage.moc"
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 51e6cf5..d5267b5 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -185,6 +185,8 @@ private slots:
     void preserveDepth();
     void splash_crash();
 
+    void toImageDeepCopy();
+
     void loadAsBitmapOrPixmap();
 };
 
@@ -1751,6 +1753,21 @@ void tst_QPixmap::loadAsBitmapOrPixmap()
     QVERIFY(bitmap.isQBitmap());
 }
 
+void tst_QPixmap::toImageDeepCopy()
+{
+    QPixmap pixmap(64, 64);
+    pixmap.fill(Qt::white);
+
+    QPainter painter(&pixmap);
+    QImage first = pixmap.toImage();
+
+    painter.setBrush(Qt::black);
+    painter.drawEllipse(pixmap.rect());
+
+    QImage second = pixmap.toImage();
+
+    QVERIFY(first != second);
+}
 
 
 QTEST_MAIN(tst_QPixmap)