aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/bitmap.h
diff options
context:
space:
mode:
authorBastien Bouclet2018-03-31 12:52:08 +0200
committerBastien Bouclet2018-03-31 13:36:09 +0200
commit84b2dc5cc85721570aa7aafdd9e3e96f0f04a025 (patch)
tree0326a67ec3cfda91f2419353fdd30b069d9e65c3 /engines/mohawk/bitmap.h
parent494fd3bb52e054969eb94ed72dc2d12a6e412fd1 (diff)
downloadscummvm-rg350-84b2dc5cc85721570aa7aafdd9e3e96f0f04a025.tar.gz
scummvm-rg350-84b2dc5cc85721570aa7aafdd9e3e96f0f04a025.tar.bz2
scummvm-rg350-84b2dc5cc85721570aa7aafdd9e3e96f0f04a025.zip
MOHAWK: Fix some clang-tidy warnings
Diffstat (limited to 'engines/mohawk/bitmap.h')
-rw-r--r--engines/mohawk/bitmap.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/mohawk/bitmap.h b/engines/mohawk/bitmap.h
index ea8664f39d..18ea72b3ee 100644
--- a/engines/mohawk/bitmap.h
+++ b/engines/mohawk/bitmap.h
@@ -148,16 +148,16 @@ private:
// Mohawk Bitmap format.
class MystBitmap : public MohawkBitmap {
public:
- MystBitmap() : MohawkBitmap() {}
- ~MystBitmap() {}
+ MystBitmap() : MohawkBitmap(), _bitsPerPixel(8) {}
+ ~MystBitmap() override {}
- MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
+ MohawkSurface *decodeImage(Common::SeekableReadStream *stream) override;
protected:
- byte getBitsPerPixel() { return _bitsPerPixel; }
+ byte getBitsPerPixel() override { return _bitsPerPixel; }
private:
- uint16 _bitsPerPixel;
+ byte _bitsPerPixel;
};
#endif
@@ -165,23 +165,23 @@ private:
class LivingBooksBitmap_v1 : public MohawkBitmap {
public:
LivingBooksBitmap_v1() : MohawkBitmap() {}
- ~LivingBooksBitmap_v1() {}
+ ~LivingBooksBitmap_v1() override {}
- MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
+ MohawkSurface *decodeImage(Common::SeekableReadStream *stream) override;
protected:
- byte getBitsPerPixel() { return 8; }
+ byte getBitsPerPixel() override { return 8; }
};
class DOSBitmap : public MohawkBitmap {
public:
DOSBitmap() : MohawkBitmap() {}
- ~DOSBitmap() {}
+ ~DOSBitmap() override {}
- MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
+ MohawkSurface *decodeImage(Common::SeekableReadStream *stream) override;
protected:
- byte getBitsPerPixel() { return ((_header.format & 0x30) >> 4) + 1; }
+ byte getBitsPerPixel() override { return ((_header.format & 0x30) >> 4) + 1; }
private:
void expandMonochromePlane(Graphics::Surface *surface, Common::SeekableReadStream *rawStream);