[Scummvm-git-logs] scummvm master -> 87f2f5c196fb47486de70378fd05bf342152a825

[digitall]

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:
87f2f5c196 AGS: Fixes for Various Warnings in Sprite File Code


Commit: 87f2f5c196fb47486de70378fd05bf342152a825
    https://github.com/scummvm/scummvm/commit/87f2f5c196fb47486de70378fd05bf342152a825
Author: D G Turner (digitall at scummvm.org)
Date: 2022-04-01T23:10:25+01:00

Commit Message:
AGS: Fixes for Various Warnings in Sprite File Code

These were introduced by:
"AGS: SpriteFile's extended format, let store as indexed bitmaps
>From upstream 34f32e3b71b2f8d0f7480aa04a2fcd38d77fb83b"

This fixes various GCC Compiler Warnings, but also removes some
fallthrough in the saving of palette data in the SaveSpriteData()
calls which looks very wrong. This probably should be flagged upstream
unless this has already been fixed there.

Changed paths:
    engines/ags/shared/ac/sprite_file.cpp


diff --git a/engines/ags/shared/ac/sprite_file.cpp b/engines/ags/shared/ac/sprite_file.cpp
index dcbee02cab5..fe71c4b2603 100644
--- a/engines/ags/shared/ac/sprite_file.cpp
+++ b/engines/ags/shared/ac/sprite_file.cpp
@@ -89,7 +89,7 @@ static bool CreateIndexedBitmap(const Bitmap *image, std::vector<uint8_t> &dst_d
 		default: assert(0); break;
 		}
 
-		if (pal_n == -1) {
+		if ((int)pal_n == -1) {
 			if (pal_count == 256) return false;
 			pal_n = pal_count;
 			palette[pal_count++] = col;
@@ -135,6 +135,7 @@ static inline uint8_t GetPaletteBPP(SpriteFormat fmt) {
 	case kSprFmt_PaletteRgb888: return 3;
 	case kSprFmt_PaletteArgb8888: return 4;
 	case kSprFmt_PaletteRgb565: return 2;
+	case kSprFmt_Undefined: return 0;
 	}
 	return 0; // means no palette
 }
@@ -630,8 +631,10 @@ void SpriteFileWriter::WriteSpriteData(const SpriteDatHeader &hdr,
 	if (pal_bpp > 0) {
 		assert(hdr.PalCount > 0);
 		switch (pal_bpp) {
-		case 2: for (uint32_t i = 0; i < hdr.PalCount; ++i) _out->WriteInt16(palette[i]);
-		case 4: for (uint32_t i = 0; i < hdr.PalCount; ++i) _out->WriteInt32(palette[i]);
+		case 1: break;
+		case 2: for (uint32_t i = 0; i < hdr.PalCount; ++i) _out->WriteInt16(palette[i]); break;
+		case 4: for (uint32_t i = 0; i < hdr.PalCount; ++i) _out->WriteInt32(palette[i]); break;
+		default: assert(0); break;
 		}
 	}
 	// write the image pixel data