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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Jan 7 22:43:54 CET 2009


Revision: 35774
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35774&view=rev
Author:   thebluegr
Date:     2009-01-07 21:43:54 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Move videoPalette inside setPalette(), as it's only used there

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

Modified: scummvm/trunk/graphics/video/video_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_player.cpp	2009-01-07 21:25:50 UTC (rev 35773)
+++ scummvm/trunk/graphics/video/video_player.cpp	2009-01-07 21:43:54 UTC (rev 35774)
@@ -123,14 +123,16 @@
 }
 
 void VideoPlayer::setPalette(byte *pal) {
+	byte videoPalette[256 * 4];
+
 	for (int i = 0; i < 256; i++) {
-		_videoPalette[i * 4 + 0] = *pal++;
-		_videoPalette[i * 4 + 1] = *pal++;
-		_videoPalette[i * 4 + 2] = *pal++;
-		_videoPalette[i * 4 + 3] = 0;
+		videoPalette[i * 4 + 0] = *pal++;
+		videoPalette[i * 4 + 1] = *pal++;
+		videoPalette[i * 4 + 2] = *pal++;
+		videoPalette[i * 4 + 3] = 0;
 	}
 
-	g_system->setPalette(_videoPalette, 0, 256);
+	g_system->setPalette(videoPalette, 0, 256);
 }
 
 bool VideoPlayer::decodeNextFrame() {

Modified: scummvm/trunk/graphics/video/video_player.h
===================================================================
--- scummvm/trunk/graphics/video/video_player.h	2009-01-07 21:25:50 UTC (rev 35773)
+++ scummvm/trunk/graphics/video/video_player.h	2009-01-07 21:43:54 UTC (rev 35774)
@@ -158,7 +158,6 @@
 
 	Common::SeekableReadStream *_fileStream;
 	byte *_videoFrameBuffer;
-	byte _videoPalette[256 * 4];
 	bool _skipVideo;
 
 private:


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