[Scummvm-git-logs] scummvm master -> 8feb679e929dfcf6cbf0fe80a08673cb9f5a11c4

[sev-]

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

Summary:
c4afc4ac3e JANITORIAL: Remove excess empty lines
8feb679e92 DIRECTOR: Fix warnings


Commit: c4afc4ac3e4b474b83f22c9c4581d997a9800912
    https://github.com/scummvm/scummvm/commit/c4afc4ac3e4b474b83f22c9c4581d997a9800912
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-20T14:01:20+01:00

Commit Message:
JANITORIAL: Remove excess empty lines

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index b6fbc660b62..976276dfc64 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -158,8 +158,6 @@ void Window::probeMacBinary(MacArchive *archive) {
 				warning("Couldn't find score with name: %s", sname.c_str());
 			}
 			delete name;
-
-
 		}
 	}
 


Commit: 8feb679e929dfcf6cbf0fe80a08673cb9f5a11c4
    https://github.com/scummvm/scummvm/commit/8feb679e929dfcf6cbf0fe80a08673cb9f5a11c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-20T14:01:20+01:00

Commit Message:
DIRECTOR: Fix warnings

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index b9b52a21e11..0412a49a0bb 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -103,7 +103,9 @@ bool DIBDecoder::loadStream(Common::SeekableReadStream &stream) {
 	if (bitsPerPixel == 8) {
 		for (int y = 0; y < _surface->h; y++) {
 			for (int x = 0; x < _surface->w; x++) {
-				*(byte *)_surface->getBasePtr(x, y) = 255 - *(byte *)_surface->getBasePtr(x, y);
+				// We're not su[pposed to modify the image that is coming from the decoder
+				// However, in this case, we know what we're doing.
+				*Common::remove_const<byte *>::type(_surface->getBasePtr(x, y)) = 255 - *(const byte *)_surface->getBasePtr(x, y);
 			}
 		}
 	}