diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /graphics/scaler.cpp | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'graphics/scaler.cpp')
| -rw-r--r-- | graphics/scaler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index b81e8937a8..3325fd4db2 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -152,7 +152,7 @@ void InitScalers(uint32 BitFormat) { g_dotmatrix[12] = g_dotmatrix[14] = format.RGBToColor(63, 63, 63); } -void DestroyScalers(){ +void DestroyScalers() { #ifdef USE_HQ_SCALERS free(RGBtoYUV); RGBtoYUV = 0; |