[Scummvm-git-logs] scummvm master -> 1ff3dba9364d60a4338436ab7b2f58aff15c781f

[ccawley2011]

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:
1ff3dba936 GRAPHICS: Support 8bpp formats with the Normal scaler


Commit: 1ff3dba9364d60a4338436ab7b2f58aff15c781f
    https://github.com/scummvm/scummvm/commit/1ff3dba9364d60a4338436ab7b2f58aff15c781f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-08-25T21:46:35+01:00

Commit Message:
GRAPHICS: Support 8bpp formats with the Normal scaler

Changed paths:
    graphics/scaler/normal.cpp


diff --git a/graphics/scaler/normal.cpp b/graphics/scaler/normal.cpp
index 546e79e2c15..1b5d1c22a6d 100644
--- a/graphics/scaler/normal.cpp
+++ b/graphics/scaler/normal.cpp
@@ -208,7 +208,22 @@ void Normal5x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
 void NormalScaler::scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
 							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) {
 #ifdef USE_SCALERS
-	if (_format.bytesPerPixel == 2) {
+	if (_format.bytesPerPixel == 1) {
+		switch (_factor) {
+		case 2:
+			Normal2x<uint8>(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
+			break;
+		case 3:
+			Normal3x<uint8>(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
+			break;
+		case 4:
+			Normal4x<uint8>(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
+			break;
+		case 5:
+			Normal5x<uint8>(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
+			break;
+		}
+	} else if (_format.bytesPerPixel == 2) {
 		switch (_factor) {
 		case 2:
 #ifdef USE_ARM_SCALER_ASM