Morecompatibilitybitmapfile (#135)

* Fix reading structures

* style
This commit is contained in:
Michael Miller
2016-09-27 22:24:15 -07:00
committed by GitHub
parent 12d25bf317
commit b41674dec0

View File

@@ -102,9 +102,9 @@ public:
BitmapFileHeader bmpHeader; BitmapFileHeader bmpHeader;
BitmapInfoHeader bmpInfoHeader; BitmapInfoHeader bmpInfoHeader;
int result; size_t result;
result = _file.read(&bmpHeader, sizeof(bmpHeader)); result = _file.read((uint8_t*)(&bmpHeader), sizeof(bmpHeader));
if (result != sizeof(bmpHeader) || if (result != sizeof(bmpHeader) ||
bmpHeader.FileId != c_BitmapFileId || bmpHeader.FileId != c_BitmapFileId ||
@@ -113,7 +113,7 @@ public:
goto error; goto error;
} }
result = _file.read(&bmpInfoHeader, sizeof(bmpInfoHeader)); result = _file.read((uint8_t*)(&bmpInfoHeader), sizeof(bmpInfoHeader));
if (result != sizeof(bmpInfoHeader) || if (result != sizeof(bmpInfoHeader) ||
result != bmpInfoHeader.Size || result != bmpInfoHeader.Size ||