Updated Icons for UIQ3 and updated #defs and fix for scalers.

svn-id: r25953

7 files changed, 2 insertions, 22 deletions

diff --git a/backends/platform/symbian/UIQ3/scummvm_loc.rss b/backends/platform/symbian/UIQ3/scummvm_loc.rss
index 1b068a1c2c..bd3bc5129f 100644
--- a/backends/platform/symbian/UIQ3/scummvm_loc.rss
+++ b/backends/platform/symbian/UIQ3/scummvm_loc.rss
@@ -49,7 +49,7 @@ RESOURCE LOCALISABLE_APP_INFO
 		VIEW_DATA 
 		{ 
 		uid = 0x10000001; 
-		screen_mode = EQikScreenModeSmallLandscape; 
+		screen_mode = EQikScreenModeSmallPortrait; 
 		caption_and_icon = CAPTION_AND_ICON_INFO 
 		{ 
 		}; 
diff --git a/backends/platform/symbian/res/scummLarge.bmp b/backends/platform/symbian/res/scummLarge.bmp
index 400dca6dcb..4fba852cd6 100644
--- a/backends/platform/symbian/res/scummLarge.bmp
+++ b/backends/platform/symbian/res/scummLarge.bmp
diff --git a/backends/platform/symbian/res/scummLargeMask.bmp b/backends/platform/symbian/res/scummLargeMask.bmp
index c13a546122..369c12c3a8 100644
--- a/backends/platform/symbian/res/scummLargeMask.bmp
+++ b/backends/platform/symbian/res/scummLargeMask.bmp
diff --git a/backends/platform/symbian/res/scummxLarge.bmp b/backends/platform/symbian/res/scummxLarge.bmp
index cf590d17d4..6d93b1ea52 100644
--- a/backends/platform/symbian/res/scummxLarge.bmp
+++ b/backends/platform/symbian/res/scummxLarge.bmp
diff --git a/backends/platform/symbian/res/scummxLargeMask.bmp b/backends/platform/symbian/res/scummxLargeMask.bmp
index 1c3de48e3e..3d02bcf72f 100644
--- a/backends/platform/symbian/res/scummxLargeMask.bmp
+++ b/backends/platform/symbian/res/scummxLargeMask.bmp
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 38ab872ae5..3e615e4cc8 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -136,27 +136,6 @@ void OSystem_SDL_Symbian::quitWithErrorMsg(const char *msg) {
 		g_system->quit();
 }
 
-/*
- * SumthinWicked says: the stuff below is copied from common/scaler.cpp, 
- * so we can skip compiling the scalers. ESDL still needs 1x and the scaler
- * architecture because we inherit from OSystem_SDL.
- */
-int gBitFormat = 565;
-void InitScalers(uint32 /*BitFormat*/) {} // called by OSystem_SDL functions, not relevant for ESDL
-	
-/** 
- * Trivial 'scaler' - in fact it doesn't do any scaling but just copies the
- * source to the destination.
- */
-void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
-							int width, int height) {
-	while (height--) {
-		memcpy(dstPtr, srcPtr, 2 * width);
-		srcPtr += srcPitch;
-		dstPtr += dstPitch;
-	}
-}
-
 // Overloaded from SDL_Commmon
 void OSystem_SDL_Symbian::quit() {
 	delete GUI_Actions::Instance();
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 4afdf33fb9..906b6317d3 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -36,6 +36,7 @@
 #include <math.h>
 
 #define DISABLE_SCALERS // we only need 1x
+#define DISABLE_HQ_SCALERS
 
 #if defined(USE_TREMOR) && !defined(USE_VORBIS)
 #define USE_VORBIS // make sure this one is defined together with USE_TREMOR!