diff options
| author | aavit <qt-info@nokia.com> | 2010-03-08 10:57:03 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-03-08 10:57:03 (GMT) |
| commit | 6f17a21647fe50ea79dd902220c1887b893f25b3 (patch) | |
| tree | 7c4d58e61e454126c52ff8e18d1e8223d4b0c893 /src | |
| parent | ce1d5d10d0316a05a2bfce09239fd532a2d5ca7e (diff) | |
| download | Qt-6f17a21647fe50ea79dd902220c1887b893f25b3.zip Qt-6f17a21647fe50ea79dd902220c1887b893f25b3.tar.gz Qt-6f17a21647fe50ea79dd902220c1887b893f25b3.tar.bz2 | |
Fix crash on Win with 16bit screendepth when copy/pasting images
Task-number: QTBUG-4687
Reviewed-by: Trond
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qmime_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp index e191d7b..331626c 100644 --- a/src/gui/kernel/qmime_win.cpp +++ b/src/gui/kernel/qmime_win.cpp @@ -948,6 +948,8 @@ bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeD QDataStream s(&ba, QIODevice::WriteOnly); s.setByteOrder(QDataStream::LittleEndian);// Intel byte order #### if (cf == CF_DIB) { + if (img.format() > QImage::Format_ARGB32) + img = img.convertToFormat(QImage::Format_RGB32); if (qt_write_dib(s, img)) return setData(ba, pmedium); } else { |