ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

VIDEO: 4XM: fix ubsan warnings

Browse Source
This commit is contained in:
Vladimir Menshakov
2026-03-10 22:33:04 +00:00
parent 7b0a692f48
commit ecd12fb2ff
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/4xm_decoder.cpp
+8 -11
View File
@@ -348,18 +348,16 @@ void mcdc(uint16_t *dst, const uint16_t *src, int log2w,
int h = 1 << log2h;
if (Scale) {
for (int i = 0; i < h; ++i) {
auto *dst32 = reinterpret_cast<uint32_t *>(dst);
auto *src32 = reinterpret_cast<const uint32_t *>(src);
switch (log2w) {
case 3:
dst32[2] = src32[2] + dc;
dst32[3] = src32[3] + dc;
WRITE_UINT32(dst + 4, READ_UINT32(src + 4) + dc);
WRITE_UINT32(dst + 6, READ_UINT32(src + 6) + dc);
// fall through
case 2:
dst32[1] = src32[1] + dc;
WRITE_UINT32(dst + 2, READ_UINT32(src + 2) + dc);
// fall through
case 1:
dst32[0] = src32[0] + dc;
WRITE_UINT32(dst, READ_UINT32(src) + dc);
break;
case 0:
*dst = *src + dc;
@@ -369,17 +367,16 @@ void mcdc(uint16_t *dst, const uint16_t *src, int log2w,
}
} else {
for (int i = 0; i < h; ++i) {
auto *dst32 = reinterpret_cast<uint32_t *>(dst);
switch (log2w) {
case 3:
dst32[2] = dc;
dst32[3] = dc;
WRITE_UINT32(dst + 4, dc);
WRITE_UINT32(dst + 6, dc);
// fall through
case 2:
dst32[1] = dc;
WRITE_UINT32(dst + 2, dc);
// fall through
case 1:
dst32[0] = dc;
WRITE_UINT32(dst, dc);
break;
case 0:
*dst = dc;
video/4xm_utils.h
+2
View File
@@ -54,6 +54,8 @@ HuffmanType loadStatistics(const byte *&huff, uint &offset) {
void idct(int16_t block[64], int shift = 6);
inline int readInt(int value, unsigned n) {
if (n == 0)
return 0;
if ((value & (1 << (n - 1))) == 0)
value += 1 - (1 << n);
return value;