thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of doubling memory allocation and a lot of copying.

Browse source 
The Sprite class points to the original buffer (which is cached in the memory
thanks to BArchive machinery) instead of allocating its own buffer and
copying the source there.

svn-id: r45594
This commit is contained in:
Robert Špalek 2009-11-01 10:03:37 +00:00
parent b3eef9e066
commit f91c89560f
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

44
engines/draci/sprite.cpp
View file

@ -58,8 +58,8 @@ static void transformToRows(byte *img, uint16 width, uint16 height) {
/**
* Constructor for loading sprites from a raw data buffer, one byte per pixel.
*/
Sprite::Sprite(const byte *raw_data, uint16 width, uint16 height, int x, int y,
bool columnwise) : _data(NULL) {
Sprite::Sprite(uint16 width, uint16 height, byte *raw_data, int x, int y, bool columnwise)
: _ownsData(true), _data(raw_data), _mirror(false) {
_width = width;
_height = height;
@ -72,17 +72,9 @@ Sprite::Sprite(const byte *raw_data, uint16 width, uint16 height, int x, int y,
_delay = 0;
_mirror = false;
byte *data = new byte[width * height];
memcpy(data, raw_data, width * height);
// If the sprite is stored column-wise, transform it to row-wise
if (columnwise) {
transformToRows(data, width, height);
transformToRows(raw_data, _width, _height);
}
_data = data;
}
/**
@ -90,36 +82,36 @@ Sprite::Sprite(const byte *raw_data, uint16 width, uint16 height, int x, int y,
* pixel.
*/
Sprite::Sprite(const byte *sprite_data, uint16 length, int x, int y, bool columnwise)
: _data(NULL) {
_x = x;
_y = y;
_delay = 0;
_mirror = false;
: _ownsData(false), _data(NULL), _mirror(false) {
Common::MemoryReadStream reader(sprite_data, length);
_width = reader.readSint16LE();
_height = reader.readSint16LE();
_scaledWidth = _width;
_scaledHeight = _height;
byte *data = new byte[_width * _height];
_x = x;
_y = y;
reader.read(data, _width * _height);
_delay = 0;
// If the sprite is stored column-wise, transform it to row-wise
if (columnwise) {
if (!columnwise) {
_ownsData = false;
_data = sprite_data + 4;
} else {
_ownsData = true;
byte *data = new byte[_width * _height];
memcpy(data, sprite_data + 4, _width * _height);
transformToRows(data, _width, _height);
_data = data;
}
_data = data;
}
Sprite::~Sprite() {
delete[] _data;
if (_ownsData) {
delete[] _data;
}
}
// Macro to simulate lround() for non-C99 compilers