[Scummvm-cvs-logs] SF.net SVN: scummvm:[45109] scummvm/trunk/engines/sci/gui

[wjpalenstijn at users.sourceforge.net]

Revision: 45109
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45109&view=rev
Author:   wjpalenstijn
Date:     2009-10-15 09:54:45 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
SCI: Don't cache squares

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_palette.cpp
    scummvm/trunk/engines/sci/gui/gui_palette.h

Modified: scummvm/trunk/engines/sci/gui/gui_palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-15 08:38:42 UTC (rev 45108)
+++ scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-15 09:54:45 UTC (rev 45109)
@@ -64,10 +64,6 @@
 			}
 		};
 	}
-
-	// Init _clrPowers used in MatchColor
-	for(color = 0; color < 256; color++)
-	  _clrPowers[color] = color*color;
 }
 
 SciGuiPalette::~SciGuiPalette() {
@@ -251,7 +247,7 @@
 		dg = pPal->colors[i].g - g;
 		db = pPal->colors[i].b - b;
 //		minimum squares match
-		cdiff = _clrPowers[ABS(dr)] + _clrPowers[ABS(dg)] + _clrPowers[ABS(db)];
+		cdiff = (dr*dr) + (dg*dg) + (db*db);
 //		minimum sum match (Sierra's)
 //		cdiff = ABS(dr) + ABS(dg) + ABS(db);
 		if (cdiff < diff) {

Modified: scummvm/trunk/engines/sci/gui/gui_palette.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.h	2009-10-15 08:38:42 UTC (rev 45108)
+++ scummvm/trunk/engines/sci/gui/gui_palette.h	2009-10-15 09:54:45 UTC (rev 45109)
@@ -56,8 +56,6 @@
 	SciGuiScreen *_screen;
 	ResourceManager *_resMan;
 
-	uint16 _clrPowers[256];
-
 	Common::Array<GuiPalSchedule> _schedules;
 };
 


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