diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:54:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:54:43 +0100 |
| commit | 155ec2223c8f60ae88dd72e705c3621cf490dac2 (patch) | |
| tree | 56dac84375472355936db118252d2cbe49827bff /Source/WebCore | |
| parent | cc83829fde79c21622ca1db16a2e8fdc9bac91bc (diff) | |
| parent | 840e2817de1eda68f656f9764f824898ebf6d9c2 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9088052f76de19e584cd16fd039502de6b22bec2
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp index a3f44650f..2917815bd 100644 --- a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp +++ b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp @@ -274,7 +274,7 @@ PassNativeImagePtr ImageFrame::asNewNativeImage() const QImage img(reinterpret_cast<uchar*>(m_bytes), m_size.width(), m_size.height(), sizeof(PixelData) * m_size.width(), format); - return new QPixmap(QPixmap::fromImage(img)); + return new QPixmap(QPixmap::fromImage(img).copy()); } } |