[Scummvm-git-logs] scummvm master -> 620dc8a1df3c81742b28461733b5f21d8e69c642

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
620dc8a1df IMAGE: Fix BitmapRawDecoder constructor regression


Commit: 620dc8a1df3c81742b28461733b5f21d8e69c642
    https://github.com/scummvm/scummvm/commit/620dc8a1df3c81742b28461733b5f21d8e69c642
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-11-04T00:46:46-05:00

Commit Message:
IMAGE: Fix BitmapRawDecoder constructor regression

Fixes parameter order mismatch between definition and declaration
introduced in: 5d093e725fd6832280d0865abdb685e41bf3efda

Fixes flipped QFG4 intro movie, bug #13059

Changed paths:
    image/codecs/bmp_raw.cpp
    image/codecs/bmp_raw.h


diff --git a/image/codecs/bmp_raw.cpp b/image/codecs/bmp_raw.cpp
index d8943e15f6..b69c2a8e80 100644
--- a/image/codecs/bmp_raw.cpp
+++ b/image/codecs/bmp_raw.cpp
@@ -28,8 +28,8 @@
 
 namespace Image {
 
-BitmapRawDecoder::BitmapRawDecoder(int width, int height, int bitsPerPixel, bool flip, bool ignoreAlpha) : Codec(),
-		_width(width), _height(height), _bitsPerPixel(bitsPerPixel), _flip(flip), _ignoreAlpha(ignoreAlpha) {
+BitmapRawDecoder::BitmapRawDecoder(int width, int height, int bitsPerPixel, bool ignoreAlpha, bool flip) : Codec(),
+		_width(width), _height(height), _bitsPerPixel(bitsPerPixel), _ignoreAlpha(ignoreAlpha), _flip(flip)  {
 	_surface.create(_width, _height, getPixelFormat());
 }
 
diff --git a/image/codecs/bmp_raw.h b/image/codecs/bmp_raw.h
index 50273ddd21..5092ba5031 100644
--- a/image/codecs/bmp_raw.h
+++ b/image/codecs/bmp_raw.h
@@ -34,7 +34,7 @@ namespace Image {
  */
 class BitmapRawDecoder : public Codec {
 public:
-	BitmapRawDecoder(int width, int height, int bitsPerPixel, bool ignoreAlpha, bool _flip = false);
+	BitmapRawDecoder(int width, int height, int bitsPerPixel, bool ignoreAlpha, bool flip = false);
 	~BitmapRawDecoder();
 
 	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);