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

[kirben at users.sourceforge.net]

Revision: 24871
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24871&view=rev
Author:   kirben
Date:     2006-12-17 23:51:02 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
Change position of scale code, Scale code shouldn't have been FRAM specific

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

Modified: scummvm/trunk/graphics/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/dxa_player.cpp	2006-12-18 07:24:36 UTC (rev 24870)
+++ scummvm/trunk/graphics/dxa_player.cpp	2006-12-18 07:51:02 UTC (rev 24871)
@@ -124,7 +124,7 @@
 	_frameBuffer1 = (uint8 *)malloc(_frameSize);
 	_frameBuffer2 = (uint8 *)malloc(_frameSize);
 	if (!_frameBuffer1 || !_frameBuffer2)
-		error("DXAPlayer: Error frame buffers (size %d)", _frameSize);
+		error("DXAPlayer: Error allocating frame buffers (size %d)", _frameSize);
 
 	if (_scaleMode != S_NONE) {
 		_scaledBuffer = (uint8 *)malloc(_frameSize);
@@ -513,34 +513,27 @@
 				}
 			}
 		}
+	}
 
-		switch (_scaleMode) {
-		case S_INTERLACED:
-			for (int cy = 0; cy < _curHeight; cy++) {
-				memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width);
-				memset(&_scaledBuffer[((2 * cy) + 1) * _width], 0, _width);
-			}
-			_drawBuffer = _scaledBuffer;
-			break;
-		case S_DOUBLE:
-			for (int cy = 0; cy < _curHeight; cy++) {
-				memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width);
-				memcpy(&_scaledBuffer[((2 * cy) + 1) * _width], &_frameBuffer1[cy * _width], _width);
-			}
-			_drawBuffer = _scaledBuffer;
-			break;
-		case S_NONE:
-			_drawBuffer = _frameBuffer1;
-			break;
+	switch (_scaleMode) {
+	case S_INTERLACED:
+		for (int cy = 0; cy < _curHeight; cy++) {
+			memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width);
+			memset(&_scaledBuffer[((2 * cy) + 1) * _width], 0, _width);
 		}
+		_drawBuffer = _scaledBuffer;
+		break;
+	case S_DOUBLE:
+		for (int cy = 0; cy < _curHeight; cy++) {
+			memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width);
+			memcpy(&_scaledBuffer[((2 * cy) + 1) * _width], &_frameBuffer1[cy * _width], _width);
+		}
+		_drawBuffer = _scaledBuffer;
+		break;
+	case S_NONE:
+		_drawBuffer = _frameBuffer1;
+		break;
 	}
-
-	if (tag == MKID_BE('NULL')) {
-		if (_scaleMode == S_NONE)
-			_drawBuffer = _frameBuffer1;
-		else
-			_drawBuffer = _scaledBuffer;
-	}
 }
 
 } // End of namespace Graphics


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.