[Scummvm-git-logs] scummvm master -> b0822e850d75ea1f3a1ec3c82db3cb686e66eb26

[tag2015]

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:
b0822e850d TITANIC: Don't assert when loading 3BPP bitmaps


Commit: b0822e850d75ea1f3a1ec3c82db3cb686e66eb26
    https://github.com/scummvm/scummvm/commit/b0822e850d75ea1f3a1ec3c82db3cb686e66eb26
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-06-25T12:57:50+02:00

Commit Message:
TITANIC: Don't assert when loading 3BPP bitmaps

Was broken by b458ced. Fixes TRAC #14518

Changed paths:
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 55eb7618977..09e52cf0d8c 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -317,8 +317,8 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS
 			s->free();
 			delete s;
 		}
-	} else if (src.format.bytesPerPixel == 2) {
-		// Source is already 16-bit, with no alpha, so do a straight copy
+	} else if ((src.format.bytesPerPixel == 2) || (src.format.bytesPerPixel == 3)) {
+		// Source is 16-bit or 24-bit, with no alpha, so do a straight copy
 		dest.blitFrom(src, copyRect, Common::Point(0, 0));
 	} else {
 		// Source is 32-bit which may have transparent pixels. Copy over each