aboutsummaryrefslogtreecommitdiff
path: root/graphics/scaler.cpp
diff options
context:
space:
mode:
authorJoost Peters2009-02-14 18:16:21 +0000
committerJoost Peters2009-02-14 18:16:21 +0000
commit7fc721617599b82b2e53f6dd1d62193e72689875 (patch)
tree8062e3005d5b4b8298780a95726eb8ee3aaca547 /graphics/scaler.cpp
parent6d700452288010202ffff4915c172df2fc086cbe (diff)
downloadscummvm-rg350-7fc721617599b82b2e53f6dd1d62193e72689875.tar.gz
scummvm-rg350-7fc721617599b82b2e53f6dd1d62193e72689875.tar.bz2
scummvm-rg350-7fc721617599b82b2e53f6dd1d62193e72689875.zip
add assert(g_system) for backends that call InitScalers() from their OSystem ctor (at which point g_system is still NULL)
svn-id: r36332
Diffstat (limited to 'graphics/scaler.cpp')
-rw-r--r--graphics/scaler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index 7b4abf9155..60070e7602 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -144,6 +144,7 @@ void InitScalers(uint32 BitFormat) {
} else if (gBitFormat == 565) {
format = Graphics::createPixelFormat<565>();
} else {
+ assert(g_system);
format = g_system->getOverlayFormat();
}
@@ -169,7 +170,7 @@ void DestroyScalers(){
/**
* 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) {