diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-03-08 14:34:22 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 11:37:25 (GMT) |
| commit | c5b2e8f28c6797ede0759379f110a330e26075c1 (patch) | |
| tree | cc0e7588f3cbca483265e15e2373d4fc2093a866 /src/gui | |
| parent | a570ad0ced6f91eb878f90df2731ceba8f8cfe9f (diff) | |
| download | Qt-c5b2e8f28c6797ede0759379f110a330e26075c1.zip Qt-c5b2e8f28c6797ede0759379f110a330e26075c1.tar.gz Qt-c5b2e8f28c6797ede0759379f110a330e26075c1.tar.bz2 | |
Removed invalid assert in BMP loader code.
Task-number: QTBUG-24505
Change-Id: Icec4d2c06175e29c5995399d0584c1ca76dc39d2
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 27bec61..070330a 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)) |