aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorEugene Sandulenko2005-05-14 23:28:22 +0000
committerEugene Sandulenko2005-05-14 23:28:22 +0000
commit80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd (patch)
tree61a692342f0c6762919d3701811438d77991c5f7 /common
parent3588b96d4fc6c1100a01f21987f34dab9c0e97bf (diff)
downloadscummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.tar.gz
scummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.tar.bz2
scummvm-rg350-80ee8188d3d7fdd43c36a47fa68283ee78f9e8dd.zip
Improvements to --disable-* stuff. Now less ugly #ifdefs with #includes.
svn-id: r18100
Diffstat (limited to 'common')
-rw-r--r--common/scaler.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp
index 0d059f84ec..2d1996b6ba 100644
--- a/common/scaler.cpp
+++ b/common/scaler.cpp
@@ -103,10 +103,8 @@ void InitScalers(uint32 BitFormat) {
InitLUT(BitFormat);
}
-#ifdef DISABLE_HQ_SCALERS
-void InitLUT(uint32 BitFormat) {}
-#else
void InitLUT(uint32 BitFormat) {
+#ifndef DISABLE_HQ_SCALERS
int r, g, b;
int Y, u, v;
int gInc, gShift;
@@ -133,8 +131,8 @@ void InitLUT(uint32 BitFormat) {
}
}
}
-}
#endif
+}
/**
* Trivial 'scaler' - in fact it doesn't do any scaling but just copies the