From d77074490fb0b0832ee6a6b6e58ebcd2200dd775 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Mon, 5 Jul 2021 23:19:10 +0200 Subject: [PATCH] VIDEO: Fix int/int32 build failures All of this is because Rect and Surface have moved to int32 --- video/coktel_decoder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index d4a08ef6e45..9862c7fe5ab 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((pixCount & 0x7F) + 1, srcRect.width() - pixWritten); copyCount = CLIP(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((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((pixCount & 0x7F) + 1, srcRect.width() - pixWritten); copyCount = CLIP(rect.width() - pixWritten, 0, pixCount); if (*src != 0xFF) { // Normal copy