[Scummvm-cvs-logs] SF.net SVN: scummvm:[36332] scummvm/trunk/graphics/scaler.cpp

[joostp at users.sourceforge.net]

Revision: 36332
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36332&view=rev
Author:   joostp
Date:     2009-02-14 18:16:21 +0000 (Sat, 14 Feb 2009)

Log Message:
-----------
add assert(g_system) for backends that call InitScalers() from their OSystem ctor (at which point g_system is still NULL)

Modified Paths:
--------------
    scummvm/trunk/graphics/scaler.cpp

Modified: scummvm/trunk/graphics/scaler.cpp
===================================================================
--- scummvm/trunk/graphics/scaler.cpp	2009-02-14 15:52:54 UTC (rev 36331)
+++ scummvm/trunk/graphics/scaler.cpp	2009-02-14 18:16:21 UTC (rev 36332)
@@ -144,6 +144,7 @@
 	} else if (gBitFormat == 565) {
 		format = Graphics::createPixelFormat<565>();
 	} else {
+		assert(g_system);
 		format = g_system->getOverlayFormat();
 	}
 
@@ -169,7 +170,7 @@
 
 /**
  * Trivial 'scaler' - in fact it doesn't do any scaling but just copies the
- * source to the destionation.
+ * source to the destination.
  */
 void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
 							int width, int height) {


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