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: Inline SMK palette

Browse Source 
svn-id: r55805
This commit is contained in:
Max Horn 2011-02-07 17:47:20 +00:00
parent 653196640a
commit 8981fa3f16
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/smk_decoder.cpp
View File

@ -485,7 +485,6 @@ bool SmackerDecoder::load(Common::SeekableReadStream *stream) {
// Height needs to be doubled if we have flags (Y-interlaced or Y-doubled) // Height needs to be doubled if we have flags (Y-interlaced or Y-doubled)
_surface->create(width, height * (_header.flags ? 2 : 1), 1); _surface->create(width, height * (_header.flags ? 2 : 1), 1);
_palette = (byte *)malloc(3 * 256);
memset(_palette, 0, 3 * 256); memset(_palette, 0, 3 * 256);
return true; return true;
} }
@ -519,7 +518,6 @@ void SmackerDecoder::close() {
delete[] _frameSizes; delete[] _frameSizes;
delete[] _frameTypes; delete[] _frameTypes;
free(_palette);
reset(); reset();
} }
@ -858,8 +856,8 @@ void SmackerDecoder::unpackPalette() {
uint32 len = 4 * _fileStream->readByte(); uint32 len = 4 * _fileStream->readByte();
byte *chunk = (byte *)malloc(len); byte *chunk = (byte *)malloc(len);
_fileStream->read(&chunk[0], len); _fileStream->read(chunk, len);
byte *p = &chunk[0]; byte *p = chunk;
byte oldPalette[3*256]; byte oldPalette[3*256];
memcpy(oldPalette, _palette, 3 * 256); memcpy(oldPalette, _palette, 3 * 256);

2
video/smk_decoder.h
View File

@ -119,7 +119,7 @@ protected:
byte *_frameTypes; byte *_frameTypes;
byte *_frameData; byte *_frameData;
// The RGB palette // The RGB palette
byte *_palette; byte _palette[3 * 256];
bool _dirtyPalette; bool _dirtyPalette;
Common::Rational _frameRate; Common::Rational _frameRate;