diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-03-13 15:25:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 06:01:38 +0100 |
| commit | c45146b48c66a18269d9b9907ddcf5394722ca83 (patch) | |
| tree | 0f7ff12d512b642155634a3854972012e0c47811 /src/gui | |
| parent | bbad6fcf236d6c65274e345529f192384f23c6fc (diff) | |
Removed invalid assert in BMP loader code.
Task-number: QTBUG-24505
Change-Id: I2e369b6d92f072caadeda41125303856ddfabd48
Reviewed-by: aavit <qt_aavit@ovi.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qbmphandler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index f9e11f1390..8ff1e43b71 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -260,8 +260,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap if (bi.biSize >= BMP_WIN4 || (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32))) { - Q_ASSERT(ncols == 0); - if (d->read((char *)&red_mask, sizeof(red_mask)) != sizeof(red_mask)) return false; if (d->read((char *)&green_mask, sizeof(green_mask)) != sizeof(green_mask)) |