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

[lephilousophe]

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:
d77074490f VIDEO: Fix int/int32 build failures
c2bd0cfb90 GUI: Fix int/int32 build failures


Commit: d77074490fb0b0832ee6a6b6e58ebcd2200dd775
    https://github.com/scummvm/scummvm/commit/d77074490fb0b0832ee6a6b6e58ebcd2200dd775
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-05T23:19:47+02:00

Commit Message:
VIDEO: Fix int/int32 build failures

All of this is because Rect and Surface have moved to int32

Changed paths:
    video/coktel_decoder.cpp


diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index d4a08ef6e4..9862c7fe5a 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -541,7 +541,7 @@ void CoktelDecoder::renderBlockSparse(Graphics::Surface &dstSurf, const byte *sr
 			if (pixCount & 0x80) { // Data
 				int16 copyCount;
 
-				pixCount  = MIN((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
+				pixCount  = MIN<int16>((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
 				copyCount = CLIP<int16>(rect.width() - pixWritten, 0, pixCount);
 				memcpy(dstRow, src, copyCount);
 
@@ -576,7 +576,7 @@ void CoktelDecoder::renderBlockSparse2Y(Graphics::Surface &dstSurf, const byte *
 			int16 pixCount = *src++;
 
 			if (pixCount & 0x80) { // Data
-				pixCount  = MIN((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
+				pixCount  = MIN<int16>((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
 				memcpy(dstRow                 , src, pixCount);
 				memcpy(dstRow + dstSurf.pitch, src, pixCount);
 
@@ -610,7 +610,7 @@ void CoktelDecoder::renderBlockRLE(Graphics::Surface &dstSurf, const byte *src,
 			if (pixCount & 0x80) {
 				int16 copyCount;
 
-				pixCount  = MIN((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
+				pixCount  = MIN<int16>((pixCount & 0x7F) + 1, srcRect.width() - pixWritten);
 				copyCount = CLIP<int16>(rect.width() - pixWritten, 0, pixCount);
 
 				if (*src != 0xFF) { // Normal copy


Commit: c2bd0cfb90ab7a852d27515bd59b48969c12d9d1
    https://github.com/scummvm/scummvm/commit/c2bd0cfb90ab7a852d27515bd59b48969c12d9d1
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-05T23:21:55+02:00

Commit Message:
GUI: Fix int/int32 build failures

All of this is because Rect and Surface have moved to int32

Changed paths:
    gui/widgets/editable.cpp


diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index ea85a08a3d..e002afb091 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -315,7 +315,7 @@ void EditableWidget::drawCaret(bool erase) {
 
 	if (erase) {
 		GUI::EditableWidget::String character;
-		int width;
+		int32 width;
 
 		if ((uint)_caretPos < _editString.size()) {
 			const byte chr = _editString[_caretPos];