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

[thebluegr at users.sourceforge.net]

Revision: 26731
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26731&view=rev
Author:   thebluegr
Date:     2007-05-01 14:40:56 -0700 (Tue, 01 May 2007)

Log Message:
-----------
Renamed decodeILBM to decodePBM, removed a TODO

Modified Paths:
--------------
    scummvm/trunk/engines/saga/scene.cpp
    scummvm/trunk/graphics/iff.cpp
    scummvm/trunk/graphics/iff.h

Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp	2007-05-01 20:57:41 UTC (rev 26730)
+++ scummvm/trunk/engines/saga/scene.cpp	2007-05-01 21:40:56 UTC (rev 26731)
@@ -437,7 +437,7 @@
 				_vm->_interface->setMode(kPanelSceneSubstitute);
 
 				if (file.open(sceneSubstitutes[i].image)) {
-					Graphics::decodeILBM(file, bbmBuffer, pal);
+					Graphics::decodePBM(file, bbmBuffer, pal);
 					colors = pal;
 					rect.setWidth(bbmBuffer.w);
 					rect.setHeight(bbmBuffer.h);

Modified: scummvm/trunk/graphics/iff.cpp
===================================================================
--- scummvm/trunk/graphics/iff.cpp	2007-05-01 20:57:41 UTC (rev 26730)
+++ scummvm/trunk/graphics/iff.cpp	2007-05-01 21:40:56 UTC (rev 26731)
@@ -304,7 +304,7 @@
 }
 
 
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
+void decodePBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
 	PBMDecoder decoder(input, surface, colors);
 	decoder.decode();
 }

Modified: scummvm/trunk/graphics/iff.h
===================================================================
--- scummvm/trunk/graphics/iff.h	2007-05-01 20:57:41 UTC (rev 26730)
+++ scummvm/trunk/graphics/iff.h	2007-05-01 21:40:56 UTC (rev 26731)
@@ -92,11 +92,7 @@
 	void decode();
 };
 
-/*
-	TODO: rename this routine to decodePBM, and update the SAGA code that's
-	using it. The routine has already been implemented using the above PBMDecoder.
-*/
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors);
+void decodePBM(Common::ReadStream &input, Surface &surface, byte *&colors);
 
 
 /*


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