From 488873353b0acea39d500e4732985603d03b812b Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 14 Dec 2006 05:32:16 +0000 Subject: Only allocate _scaleBuffer when required. svn-id: r24847 --- graphics/dxa_player.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'graphics/dxa_player.cpp') diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp index 157b5ef24e..87ba60bb40 100644 --- a/graphics/dxa_player.cpp +++ b/graphics/dxa_player.cpp @@ -123,9 +123,14 @@ bool DXAPlayer::loadFile(const char *filename) { _frameSize = _width * _height; _frameBuffer1 = (uint8 *)malloc(_frameSize); _frameBuffer2 = (uint8 *)malloc(_frameSize); - _scaledBuffer = (uint8 *)malloc(_frameSize); - if (!_frameBuffer1 || !_frameBuffer2 || !_scaledBuffer) - error("DXAPlayer: Error allocating buffers (size %d)", _frameSize); + if (!_frameBuffer1 || !_frameBuffer2) + error("DXAPlayer: Error frame buffers (size %d)", _frameSize); + + if (_scaleMode != S_NONE) { + _scaledBuffer = (uint8 *)malloc(_frameSize); + if (!_scaledBuffer) + error("Error allocating scale buffer (size %d)", _frameSize); + } _frameNum = 0; _frameSkipped = 0; -- cgit v1.2.3