[Scummvm-cvs-logs] SF.net SVN: scummvm:[55805] scummvm/trunk/video
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 7 18:47:20 CET 2011
Revision: 55805
http://scummvm.svn.sourceforge.net/scummvm/?rev=55805&view=rev
Author: fingolfin
Date: 2011-02-07 17:47:20 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
VIDEO: Inline SMK palette
Modified Paths:
--------------
scummvm/trunk/video/smk_decoder.cpp
scummvm/trunk/video/smk_decoder.h
Modified: scummvm/trunk/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/video/smk_decoder.cpp 2011-02-07 16:39:10 UTC (rev 55804)
+++ scummvm/trunk/video/smk_decoder.cpp 2011-02-07 17:47:20 UTC (rev 55805)
@@ -485,7 +485,6 @@
// Height needs to be doubled if we have flags (Y-interlaced or Y-doubled)
_surface->create(width, height * (_header.flags ? 2 : 1), 1);
- _palette = (byte *)malloc(3 * 256);
memset(_palette, 0, 3 * 256);
return true;
}
@@ -519,7 +518,6 @@
delete[] _frameSizes;
delete[] _frameTypes;
- free(_palette);
reset();
}
@@ -858,8 +856,8 @@
uint32 len = 4 * _fileStream->readByte();
byte *chunk = (byte *)malloc(len);
- _fileStream->read(&chunk[0], len);
- byte *p = &chunk[0];
+ _fileStream->read(chunk, len);
+ byte *p = chunk;
byte oldPalette[3*256];
memcpy(oldPalette, _palette, 3 * 256);
Modified: scummvm/trunk/video/smk_decoder.h
===================================================================
--- scummvm/trunk/video/smk_decoder.h 2011-02-07 16:39:10 UTC (rev 55804)
+++ scummvm/trunk/video/smk_decoder.h 2011-02-07 17:47:20 UTC (rev 55805)
@@ -119,7 +119,7 @@
byte *_frameTypes;
byte *_frameData;
// The RGB palette
- byte *_palette;
+ byte _palette[3 * 256];
bool _dirtyPalette;
Common::Rational _frameRate;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list