diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-12-06 14:06:56 +0100 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-12-06 15:14:28 +0100 |
commit | 9a63863d6f0c614c041c3d4b375bf88d93148ef7 (patch) | |
tree | 73397d058acc2051261f6550b46d97a31faa8195 /src/gui/image/qimage.cpp | |
parent | 6ae84f1183e91c910ca92a55e37f8254ace805c0 (diff) |
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
Diffstat (limited to 'src/gui/image/qimage.cpp')
-rw-r--r-- | src/gui/image/qimage.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 1157b93236..6ba3858080 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1121,9 +1121,14 @@ QImage::QImage(const char * const xpm[]) QImage::QImage(const QImage &image) : QPaintDevice() { - d = image.d; - if (d) - d->ref.ref(); + if (image.paintingActive()) { + d = 0; + operator=(image.copy()); + } else { + d = image.d; + if (d) + d->ref.ref(); + } } #ifdef QT3_SUPPORT @@ -1320,11 +1325,15 @@ QImage::~QImage() QImage &QImage::operator=(const QImage &image) { - if (image.d) - image.d->ref.ref(); - if (d && !d->ref.deref()) - delete d; - d = image.d; + if (image.paintingActive()) { + operator=(image.copy()); + } else { + if (image.d) + image.d->ref.ref(); + if (d && !d->ref.deref()) + delete d; + d = image.d; + } return *this; } |