[Scummvm-git-logs] scummvm master -> 3651b8a27cb2eafb200312c2615dac323afcc5a8

tag2015 noreply at scummvm.org
Sat May 20 23:48:24 UTC 2023


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:
3651b8a27c ICB: Fix compilation


Commit: 3651b8a27cb2eafb200312c2615dac323afcc5a8
    https://github.com/scummvm/scummvm/commit/3651b8a27cb2eafb200312c2615dac323afcc5a8
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-05-21T01:46:17+02:00

Commit Message:
ICB: Fix compilation

Changed paths:
    engines/icb/movie_pc.cpp
    engines/icb/options_manager_pc.cpp
    engines/icb/set_pc.cpp


diff --git a/engines/icb/movie_pc.cpp b/engines/icb/movie_pc.cpp
index 884de097fb0..212c5f1e48d 100644
--- a/engines/icb/movie_pc.cpp
+++ b/engines/icb/movie_pc.cpp
@@ -179,7 +179,7 @@ uint32 MovieManager::drawFrame(uint32 surface_id) {
 	}
 
 	// For access to buffer
-	int16 pitch;
+	int32 pitch;
 	uint8 *surface_address;
 
 	// Lock the surface
diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 8dd845e6c76..600bff58c32 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -6203,7 +6203,7 @@ void OptionsManager::DrawSlideShow() {
 
 		// Lock the buffers now so bink has somewhere ot put it's data
 		uint8 *surface = (uint8 *)surface_manager->Lock_surface(m_mySlotSurface1ID);
-		int16 pitch = surface_manager->Get_pitch(m_mySlotSurface1ID);
+		int32 pitch = surface_manager->Get_pitch(m_mySlotSurface1ID);
 		uint32 height = surface_manager->Get_height(m_mySlotSurface1ID);
 
 		// Screen coordinates
diff --git a/engines/icb/set_pc.cpp b/engines/icb/set_pc.cpp
index 1de9ccfe77f..85e097cf18c 100644
--- a/engines/icb/set_pc.cpp
+++ b/engines/icb/set_pc.cpp
@@ -706,7 +706,7 @@ void _set::Init_base_bitmap_buffers() {
 	Graphics::Surface *jpegSurf = JpegDecode(ptr, 1024 * 1024);
 	assert(jpegSurf);
 	uint8 *surface_address = surface_manager->Lock_surface(bg_buffer_id);
-	int16 pitch = surface_manager->Get_pitch(bg_buffer_id);
+	int32 pitch = surface_manager->Get_pitch(bg_buffer_id);
 	uint32 height = surface_manager->Get_height(bg_buffer_id);
 	for (int32 i = 0; i < jpegSurf->h; i++) {
 		if (i >= (int32)height) {




More information about the Scummvm-git-logs mailing list