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

[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:
c76ad2acca DIRECTOR: Fix Signed vs. Unsigned Comparison GCC Compiler Warnings


Commit: c76ad2acca3fd6084c03bbf36f9b06dfb56555b2
    https://github.com/scummvm/scummvm/commit/c76ad2acca3fd6084c03bbf36f9b06dfb56555b2
Author: D G Turner (digitall at scummvm.org)
Date: 2024-05-26T19:23:09+01:00

Commit Message:
DIRECTOR: Fix Signed vs. Unsigned Comparison GCC Compiler Warnings

Changed paths:
    engines/director/debugtools.cpp
    engines/director/resource.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 6704225136e..c2e4314b502 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -2986,7 +2986,7 @@ static void showScore() {
 		if (!numFrames || _state->_selectedScoreCast.channel >= (int)score->_scoreCache[0]->_sprites.size())
 			_state->_selectedScoreCast.channel = 0;
 
-		if (_state->_scoreFrameOffset >= numFrames)
+		if (_state->_scoreFrameOffset >= (int) numFrames)
 			_state->_scoreFrameOffset = 1;
 
 		{ // Render sprite details
@@ -3156,7 +3156,7 @@ static void showScore() {
 		uint tableColumns = MAX(numFrames + 5, 25U); // Set minimal table width to 25
 
 		{  // Render pagination
-			int frame = 1;
+			uint frame = 1;
 
 			ImGui::Text("   Jump to frame: ");
 
@@ -3165,7 +3165,7 @@ static void showScore() {
 			do {
 				ImGui::SameLine(0, 20);
 
-				if (ImGui::Selectable(Common::String::format("%d", frame).c_str(), frame == _state->_scoreFrameOffset, 0, ImVec2(30, 10)))
+				if (ImGui::Selectable(Common::String::format("%d", frame).c_str(), (int) frame == _state->_scoreFrameOffset, 0, ImVec2(30, 10)))
 					_state->_scoreFrameOffset = frame;
 
 				frame += 300;
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 9358f8b377a..2e15e20f97b 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -876,7 +876,7 @@ Common::SeekableReadStream *ProjectorArchive::createReadStreamForMember(const Co
 			ptr += 4; // tag
 			uint32 size = isBigEndian ? READ_LE_UINT32(ptr) : READ_BE_UINT32(ptr);
 			ptr += 4;
-			int32 offset = isBigEndian ? READ_LE_UINT32(ptr) : READ_BE_UINT32(ptr);
+			uint32 offset = isBigEndian ? READ_LE_UINT32(ptr) : READ_BE_UINT32(ptr);
 
 			if (size > 0 || offset >= fDesc->_value.offset)  {
 				debugC(8, kDebugLoading, "ProjectorArchive::createReadStreamForMember(): Patched offset at 0x%08x from %u to %u",