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: Rename variables and remove pointless assertion

Browse Source 
It's RGB, not BGR apparently. This seems to contradict the
Multimedia Wiki, but not reality.
This commit is contained in:
Torbjörn Andersson
2014-01-01 19:55:04 +01:00
parent 75806cd73c
commit 84d4e97d08
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/smk_decoder.cpp
+4 -6
View File
@@ -726,17 +726,15 @@ void SmackerDecoder::SmackerVideoTrack::unpackPalette(Common::SeekableReadStream
} else { // top 2 bits are 00
sz++;
// get the lower 6 bits for each component (0x3f = 00111111)
byte b = b0 & 0x3f;
byte r = b0 & 0x3f;
byte g = (*p++) & 0x3f;
byte r = (*p++) & 0x3f;
assert(g < 0xc0 && b < 0xc0);
byte b = (*p++) & 0x3f;
// upscale to full 8-bit color values. The Multimedia Wiki suggests
// a lookup table for this, but this should produce the same result.
*pal++ = (b * 4 + b / 16);
*pal++ = (g * 4 + g / 16);
*pal++ = (r * 4 + r / 16);
*pal++ = (g * 4 + g / 16);
*pal++ = (b * 4 + b / 16);
}
}