summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-27 14:17:56 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-30 13:06:23 +0000
commit61101bd958bce4f672618a5f9db2e6a7a97614f2 (patch)
tree8c4bbbbfcf98d7760e58fc03aab39961bde22192
parent3203ac3f4e245427902bd912cb0c644c7e870657 (diff)
Windows: Remove duplicated color masks in qt_write/write_dibv5.
They are apparently a relic of some old bitmap header that did not contain them (superseded by BITMAPV5HEADER). Task-number: QTBUG-45265 Change-Id: I993dda7d409f7963c9fabd42b0fac5f5586c6248 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 13260edc82..d8ccccdf45 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -166,11 +166,6 @@ static bool qt_write_dibv5(QDataStream &s, QImage image)
if (s.status() != QDataStream::Ok)
return false;
- DWORD colorSpace[3] = {0x00ff0000,0x0000ff00,0x000000ff};
- d->write(reinterpret_cast<const char*>(colorSpace), sizeof(colorSpace));
- if (s.status() != QDataStream::Ok)
- return false;
-
if (image.format() != QImage::Format_ARGB32)
image = image.convertToFormat(QImage::Format_ARGB32);
@@ -255,10 +250,6 @@ static bool qt_read_dibv5(QDataStream &s, QImage &image)
}
image.setDotsPerMeterX(bi.bV5XPelsPerMeter);
image.setDotsPerMeterY(bi.bV5YPelsPerMeter);
- // read color table
- DWORD colorSpace[3];
- if (d->read((char *)colorSpace, sizeof(colorSpace)) != sizeof(colorSpace))
- return false;
red_shift = calc_shift(red_mask);
green_shift = calc_shift(green_mask);