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

[lephilousophe]

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:
d4702047da AGS: Fix int/int32 build failure


Commit: d4702047dacca51760a5cf0d20bd9dd22d7e9272
    https://github.com/scummvm/scummvm/commit/d4702047dacca51760a5cf0d20bd9dd22d7e9272
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-08T13:28:47+02:00

Commit Message:
AGS: Fix int/int32 build failure

Changed paths:
    engines/ags/shared/util/compress.cpp


diff --git a/engines/ags/shared/util/compress.cpp b/engines/ags/shared/util/compress.cpp
index 6af5f03ea6..a58d2dc0b0 100644
--- a/engines/ags/shared/util/compress.cpp
+++ b/engines/ags/shared/util/compress.cpp
@@ -297,10 +297,10 @@ void rle_compress(Bitmap *bmp, Shared::Stream *out) {
 			cpackbitl(&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), out);
 	} else if (depth == 2) {
 		for (int y = 0; y < bmp->GetHeight(); y++)
-			cpackbitl16((unsigned short *)&bmp->GetScanLine(y)[0], bmp->GetWidth(), out);
+			cpackbitl16((uint16_t *)&bmp->GetScanLine(y)[0], bmp->GetWidth(), out);
 	} else {
 		for (int y = 0; y < bmp->GetHeight(); y++)
-			cpackbitl32((unsigned int *)&bmp->GetScanLine(y)[0], bmp->GetWidth(), out);
+			cpackbitl32((uint32_t *)&bmp->GetScanLine(y)[0], bmp->GetWidth(), out);
 	}
 }
 
@@ -311,10 +311,10 @@ void rle_decompress(Bitmap *bmp, Shared::Stream *in) {
 			cunpackbitl(&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), in);
 	} else if (depth == 2) {
 		for (int y = 0; y < bmp->GetHeight(); y++)
-			cunpackbitl16((unsigned short *)&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), in);
+			cunpackbitl16((uint16_t *)&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), in);
 	} else {
 		for (int y = 0; y < bmp->GetHeight(); y++)
-			cunpackbitl32((unsigned int *)&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), in);
+			cunpackbitl32((uint32_t *)&bmp->GetScanLineForWriting(y)[0], bmp->GetWidth(), in);
 	}
 }