[Scummvm-cvs-logs] SF.net SVN: scummvm: [24821] scummvm/trunk/backends/platform/ds/arm9/source

[Tramboi at users.sourceforge.net]

Revision: 24821
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24821&view=rev
Author:   Tramboi
Date:     2006-12-09 06:14:58 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
NDS : Scaler cleaning

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp	2006-12-09 13:42:00 UTC (rev 24820)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp	2006-12-09 14:14:58 UTC (rev 24821)
@@ -271,7 +271,7 @@
 }
 
 // Can't work in place
-void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u32* palette)
+static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u32* palette)
 {
     ComputeDivBy5TableIFN();
     
@@ -289,7 +289,7 @@
 
 
 // Can work in place, because it's a contraction
-void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src)
+static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src)
 {
     ComputeDivBy5TableIFN();
     

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2006-12-09 13:42:00 UTC (rev 24820)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2006-12-09 14:14:58 UTC (rev 24821)
@@ -26,8 +26,6 @@
 void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst, 
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
 void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u16* palette);
-void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src);
 void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride);
 void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
 

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2006-12-09 13:42:00 UTC (rev 24820)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2006-12-09 14:14:58 UTC (rev 24821)
@@ -701,10 +701,7 @@
 		
 		if (cpuScaler)
 		{
-			for(int i=0; i<200; ++i)
-			{                 
-				DS::Rescale_320x1555Scanline_To_256x1555Scanline(BG_GFX+i*512, back+i*512);
-			}
+            Rescale_320x256x1555_To_256x256x1555(BG_GFX, back, 512, 512);
 		}
 		else
 		{


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