[Scummvm-cvs-logs] SF.net SVN: scummvm: [25953] scummvm/trunk/backends/platform/symbian

[anotherguest at users.sourceforge.net]

Revision: 25953
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25953&view=rev
Author:   anotherguest
Date:     2007-03-03 10:36:05 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
Updated Icons for UIQ3 and updated #defs and fix for scalers.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_loc.rss
    scummvm/trunk/backends/platform/symbian/res/scummLarge.bmp
    scummvm/trunk/backends/platform/symbian/res/scummLargeMask.bmp
    scummvm/trunk/backends/platform/symbian/res/scummxLarge.bmp
    scummvm/trunk/backends/platform/symbian/res/scummxLargeMask.bmp
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/backends/platform/symbian/src/portdefs.h

Modified: scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_loc.rss
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_loc.rss	2007-03-03 13:19:22 UTC (rev 25952)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/scummvm_loc.rss	2007-03-03 18:36:05 UTC (rev 25953)
@@ -49,7 +49,7 @@
 		VIEW_DATA 
 		{ 
 		uid = 0x10000001; 
-		screen_mode = EQikScreenModeSmallLandscape; 
+		screen_mode = EQikScreenModeSmallPortrait; 
 		caption_and_icon = CAPTION_AND_ICON_INFO 
 		{ 
 		}; 

Modified: scummvm/trunk/backends/platform/symbian/res/scummLarge.bmp
===================================================================
(Binary files differ)

Modified: scummvm/trunk/backends/platform/symbian/res/scummLargeMask.bmp
===================================================================
(Binary files differ)

Modified: scummvm/trunk/backends/platform/symbian/res/scummxLarge.bmp
===================================================================
(Binary files differ)

Modified: scummvm/trunk/backends/platform/symbian/res/scummxLargeMask.bmp
===================================================================
(Binary files differ)

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-03-03 13:19:22 UTC (rev 25952)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-03-03 18:36:05 UTC (rev 25953)
@@ -136,27 +136,6 @@
 		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();

Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h	2007-03-03 13:19:22 UTC (rev 25952)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h	2007-03-03 18:36:05 UTC (rev 25953)
@@ -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!


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