From 2cdf8996f3394e3bde74eba404bdde121b41abe7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 8 Mar 2010 10:31:42 +0000
Subject: Rename PocketPCLandscapeAspect to Normal1xAspect and move it to
 graphics/scaler/aspect.cpp

svn-id: r48192
---
 graphics/scaler.h | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'graphics/scaler.h')

diff --git a/graphics/scaler.h b/graphics/scaler.h
index 9d2e578bde..f00226cab9 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -38,18 +38,22 @@ typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch,
 	extern void x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, \
 					uint32 dstPitch, int width, int height)
 
+
+DECLARE_SCALER(Normal1x);
+
+#ifndef DISABLE_SCALERS
+
+DECLARE_SCALER(Normal2x);
+DECLARE_SCALER(Normal3x);
+DECLARE_SCALER(Normal1o5x);
+
 DECLARE_SCALER(_2xSaI);
 DECLARE_SCALER(Super2xSaI);
 DECLARE_SCALER(SuperEagle);
+
 DECLARE_SCALER(AdvMame2x);
 DECLARE_SCALER(AdvMame3x);
-DECLARE_SCALER(Normal1x);
-DECLARE_SCALER(Normal2x);
-#ifdef USE_ARM_SCALER_ASM
-DECLARE_SCALER(Normal2xAspect);
-#endif
-DECLARE_SCALER(Normal3x);
-DECLARE_SCALER(Normal1o5x);
+
 DECLARE_SCALER(TV2x);
 DECLARE_SCALER(DotMatrix);
 
@@ -58,6 +62,8 @@ DECLARE_SCALER(HQ2x);
 DECLARE_SCALER(HQ3x);
 #endif
 
+#endif // #ifndef DISABLE_SCALERS
+
 // creates a 160x100 thumbnail for 320x200 games
 // and 160x120 thumbnail for 320x240 and 640x480 games
 // only 565 mode
-- 
cgit v1.2.3