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

IMAGE: Remove unnecessary heap allocation in BitmapRawDecoder

Browse source
This commit is contained in:
Colin Snover 2017-09-24 12:15:22 -05:00
parent f806b95eda
commit 56cc138e58
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
image/codecs/bmp_raw.cpp
View file

@ -29,16 +29,12 @@
namespace Image { namespace Image {
BitmapRawDecoder::BitmapRawDecoder(int width, int height, int bitsPerPixel) : Codec(), BitmapRawDecoder::BitmapRawDecoder(int width, int height, int bitsPerPixel) : Codec(),
_surface(0), _width(width), _height(height), _bitsPerPixel(bitsPerPixel) { _width(width), _height(height), _bitsPerPixel(bitsPerPixel) {
_surface = new Graphics::Surface(); _surface.create(_width, _height, getPixelFormat());
_surface->create(_width, _height, getPixelFormat());
} }
BitmapRawDecoder::~BitmapRawDecoder() { BitmapRawDecoder::~BitmapRawDecoder() {
if (_surface) { _surface.free();
_surface->free();
delete _surface;
}
} }
const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStream &stream) { const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStream &stream) {
@ -54,7 +50,7 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
if (_bitsPerPixel == 1) { if (_bitsPerPixel == 1) {
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
byte *dst = (byte *)_surface->getBasePtr(0, i); byte *dst = (byte *)_surface.getBasePtr(0, i);
for (int j = 0; j != _width;) { for (int j = 0; j != _width;) {
byte color = stream.readByte(); byte color = stream.readByte();
for (int k = 0; k < 8; k++) { for (int k = 0; k < 8; k++) {
@ -70,7 +66,7 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
} }
} else if (_bitsPerPixel == 4) { } else if (_bitsPerPixel == 4) {
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
byte *dst = (byte *)_surface->getBasePtr(0, _height - i - 1); byte *dst = (byte *)_surface.getBasePtr(0, _height - i - 1);
for (int j = 0; j < _width; j++) { for (int j = 0; j < _width; j++) {
byte color = stream.readByte(); byte color = stream.readByte();
@ -86,14 +82,14 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
stream.skip(extraDataLength); stream.skip(extraDataLength);
} }
} else if (_bitsPerPixel == 8) { } else if (_bitsPerPixel == 8) {
byte *dst = (byte *)_surface->getPixels(); byte *dst = (byte *)_surface.getPixels();
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
stream.read(dst + (_height - i - 1) * _width, _width); stream.read(dst + (_height - i - 1) * _width, _width);
stream.skip(extraDataLength); stream.skip(extraDataLength);
} }
} else if (_bitsPerPixel == 24) { } else if (_bitsPerPixel == 24) {
byte *dst = (byte *)_surface->getBasePtr(0, _height - 1); byte *dst = (byte *)_surface.getBasePtr(0, _height - 1);
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
for (int j = 0; j < _width; j++) { for (int j = 0; j < _width; j++) {
@ -107,10 +103,10 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
} }
stream.skip(extraDataLength); stream.skip(extraDataLength);
dst -= _surface->pitch * 2; dst -= _surface.pitch * 2;
} }
} else { // 32 bpp } else { // 32 bpp
byte *dst = (byte *)_surface->getBasePtr(0, _height - 1); byte *dst = (byte *)_surface.getBasePtr(0, _height - 1);
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
for (int j = 0; j < _width; j++) { for (int j = 0; j < _width; j++) {
@ -128,11 +124,11 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
} }
stream.skip(extraDataLength); stream.skip(extraDataLength);
dst -= _surface->pitch * 2; dst -= _surface.pitch * 2;
} }
} }
return _surface; return &_surface;
} }
Graphics::PixelFormat BitmapRawDecoder::getPixelFormat() const { Graphics::PixelFormat BitmapRawDecoder::getPixelFormat() const {

2
image/codecs/bmp_raw.h
View file

@ -41,7 +41,7 @@ public:
Graphics::PixelFormat getPixelFormat() const; Graphics::PixelFormat getPixelFormat() const;
private: private:
Graphics::Surface *_surface; Graphics::Surface _surface;
int _width, _height; int _width, _height;
int _bitsPerPixel; int _bitsPerPixel;
}; };