Fix regression in reading certain compressed bmp images
authorAndy Shaw <andy.shaw@digia.com>
Tue, 7 Apr 2015 13:06:20 +0000 (15:06 +0200)
committeraavit <eirik.aavitsland@theqtcompany.com>
Thu, 20 Aug 2015 11:25:19 +0000 (11:25 +0000)
commitd99c9bcf2c4e14d3db02ad375aa624a0695e838d
treea6ba141a1844149ebbfd7bd77ec362d530221691
parent025d6a778ceb377e688f1b394aa5252d74d77199
Fix regression in reading certain compressed bmp images

For BITFIELDS compressed images, the image data may be preceded by
bitmask fields. The file positioning code that should make sure those
were read correctly was erroneously included in the block of code that
was moved in 6f1b82fccdaf202856dcc6510c16b0531680fe23.

Task-number: QTBUG-45559
Task-number: QTBUG-40890
Done-with: Eirik Aavitsland
Change-Id: Id2b3ce078f67ac6ebf75ab0cc463dc719af83393
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
src/gui/image/qbmphandler.cpp