[Scummvm-cvs-logs] SF.net SVN: scummvm:[35462] scummvm/trunk/graphics

[Kirben at users.sourceforge.net]

Revision: 35462
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35462&view=rev
Author:   Kirben
Date:     2008-12-21 11:49:58 +0000 (Sun, 21 Dec 2008)

Log Message:
-----------
Fix warnings.

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

Modified: scummvm/trunk/graphics/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/dxa_player.cpp	2008-12-21 11:47:50 UTC (rev 35461)
+++ scummvm/trunk/graphics/dxa_player.cpp	2008-12-21 11:49:58 UTC (rev 35462)
@@ -76,13 +76,13 @@
 	return _height;
 }
 
-int DXAPlayer::getCurFrame() {
+int32 DXAPlayer::getCurFrame() {
 	if (!_fileStream)
 		return -1;
 	return _frameNum;
 }
 
-int DXAPlayer::getFrameCount() {
+int32 DXAPlayer::getFrameCount() {
 	if (!_fileStream)
 		return 0;
 	return _framesCount;
@@ -142,20 +142,20 @@
 		_curHeight = _height;
 	}
 
-	debug(2, "flags 0x0%x framesCount %d width %d height %d rate %d ticks %d", flags, _framesCount, _width, _height, _framesPerSec, _frameTicks);
+	debug(2, "flags 0x0%x framesCount %d width %d height %d rate %d ticks %d", flags, getFrameCount(), getWidth(), getHeight(), getFrameRate(), getFrameDelay());
 
 	_frameSize = _width * _height;
 	_decompBufferSize = _frameSize;
 	_frameBuffer1 = (uint8 *)malloc(_frameSize);
 	_frameBuffer2 = (uint8 *)malloc(_frameSize);
 	if (!_frameBuffer1 || !_frameBuffer2)
-		error("DXAPlayer: Error allocating frame buffers (size %d)", _frameSize);
+		error("DXAPlayer: Error allocating frame buffers (size %u)", _frameSize);
 
 	_scaledBuffer = 0;
 	if (_scaleMode != S_NONE) {
 		_scaledBuffer = (uint8 *)malloc(_frameSize);
 		if (!_scaledBuffer)
-			error("Error allocating scale buffer (size %d)", _frameSize);
+			error("Error allocating scale buffer (size %u)", _frameSize);
 	}
 
 #ifdef DXA_EXPERIMENT_MAXD
@@ -236,7 +236,7 @@
 	if (_decompBuffer == NULL) {
 		_decompBuffer = (byte *)malloc(_decompBufferSize);
 		if (_decompBuffer == NULL)
-			error("Error allocating decomp buffer (size %d)", _decompBufferSize);
+			error("Error allocating decomp buffer (size %u)", _decompBufferSize);
 	}
 	/* decompress the input data */
 	decodeZlib(_decompBuffer, size, _decompBufferSize);
@@ -337,7 +337,7 @@
 	if (_decompBuffer == NULL) {
 		_decompBuffer = (byte *)malloc(_decompBufferSize);
 		if (_decompBuffer == NULL)
-			error("Error allocating decomp buffer (size %d)", _decompBufferSize);
+			error("Error allocating decomp buffer (size %u)", _decompBufferSize);
 	}
 
 	/* decompress the input data */
@@ -536,7 +536,7 @@
 			free(_inBuffer);
 			_inBuffer = (byte *)malloc(size);
 			if (_inBuffer == NULL)
-				error("Error allocating input buffer (size %d)", size);
+				error("Error allocating input buffer (size %u)", size);
 			_inBufferSize = size;
 		}
 

Modified: scummvm/trunk/graphics/dxa_player.h
===================================================================
--- scummvm/trunk/graphics/dxa_player.h	2008-12-21 11:47:50 UTC (rev 35461)
+++ scummvm/trunk/graphics/dxa_player.h	2008-12-21 11:49:58 UTC (rev 35462)
@@ -76,13 +76,13 @@
 	 * Returns the current frame number of the video
 	 * @return the current frame number of the video
 	 */
-	int getCurFrame();
+	int32 getCurFrame();
 
 	/**
 	 * Returns the amount of frames in the video
 	 * @return the amount of frames in the video
 	 */
-	int getFrameCount();
+	int32 getFrameCount();
 
 	/**
 	 * Returns the frame rate of the video


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