[Scummvm-cvs-logs] SF.net SVN: scummvm:[35818] scummvm/trunk/graphics/video/video_player.cpp

[thebluegr at users.sourceforge.net]

Revision: 35818
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35818&view=rev
Author:   thebluegr
Date:     2009-01-11 04:23:57 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
Oops... *really* fixed compilation

Modified Paths:
--------------
    scummvm/trunk/graphics/video/video_player.cpp

Modified: scummvm/trunk/graphics/video/video_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_player.cpp	2009-01-11 04:20:59 UTC (rev 35817)
+++ scummvm/trunk/graphics/video/video_player.cpp	2009-01-11 04:23:57 UTC (rev 35818)
@@ -36,8 +36,8 @@
 namespace Graphics {
 
 VideoDecoder::VideoDecoder() : _fileStream(0) {
-	_black = 0;
-	_white = 255;
+	_curFrameBlack = 0;
+	_curFrameWhite = 255;
 }
 
 VideoDecoder::~VideoDecoder() {
@@ -138,12 +138,12 @@
 		weight = 3 * r * r + 6 * g * g + 2 * b * b;
 
 		if (weight >= maxWeight) {
-			_white = i;
+			_curFrameWhite = i;
 			maxWeight = weight;
 		}
 
 		if (weight <= minWeight) {
-			_black = i;
+			_curFrameBlack = i;
 			minWeight = i;
 		}
 	}


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