libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 03:34:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Fix int/int32 build failures

Browse Source 
All of this is because Rect and Surface have moved to int32
This commit is contained in:
Le Philousophe 2021-07-05 23:19:10 +02:00
parent f94c56f100
commit d77074490f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/coktel_decoder.cpp
View File

@ -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