[Scummvm-cvs-logs] SF.net SVN: scummvm: [24847] scummvm/trunk/graphics/dxa_player.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Thu Dec 14 06:32:18 CET 2006


Revision: 24847
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24847&view=rev
Author:   kirben
Date:     2006-12-13 21:32:16 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
Only allocate _scaleBuffer when required.

Modified Paths:
--------------
    scummvm/trunk/graphics/dxa_player.cpp

Modified: scummvm/trunk/graphics/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/dxa_player.cpp	2006-12-14 05:21:19 UTC (rev 24846)
+++ scummvm/trunk/graphics/dxa_player.cpp	2006-12-14 05:32:16 UTC (rev 24847)
@@ -123,10 +123,15 @@
 	_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;
 


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