Removed invalid assert in BMP loader code.
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>
Tue, 13 Mar 2012 14:25:36 +0000 (15:25 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 05:01:38 +0000 (06:01 +0100)
Task-number: QTBUG-24505

Change-Id: I2e369b6d92f072caadeda41125303856ddfabd48
Reviewed-by: aavit <qt_aavit@ovi.com>
src/gui/image/qbmphandler.cpp

index f9e11f1..8ff1e43 100644 (file)
@@ -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))