From dfb325b88b3e13e2e6d157371a1b83b9c5bc51fa Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Sat, 9 Dec 2006 14:14:58 +0000
Subject: NDS : Scaler cleaning

svn-id: r24821
---
 backends/platform/ds/arm9/source/blitters.cpp | 4 ++--
 backends/platform/ds/arm9/source/blitters.h   | 2 --
 backends/platform/ds/arm9/source/dsmain.cpp   | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'backends/platform/ds')

diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 4760fa484b..0858789061 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -271,7 +271,7 @@ static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3
 }
 
 // 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 @@ void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, cons
 
 
 // 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();
     
diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h
index b24ceb7f7d..a365420182 100644
--- a/backends/platform/ds/arm9/source/blitters.h
+++ b/backends/platform/ds/arm9/source/blitters.h
@@ -26,8 +26,6 @@ namespace DS {
 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);
 
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index a15534e770..1367c72260 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -701,10 +701,7 @@ void displayMode16BitFlipBuffer() {
 		
 		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
 		{
-- 
cgit v1.2.3