aboutsummaryrefslogtreecommitdiff
path: root/common/scaler/thumbnail.cpp
diff options
context:
space:
mode:
authorLars Persson2005-09-30 21:13:49 +0000
committerLars Persson2005-09-30 21:13:49 +0000
commit7dc6b6adbdd127b72d605eb1b8b75a34da59bddf (patch)
tree07b575647c4e68ee4b2bbf6aea11d5129b248d8c /common/scaler/thumbnail.cpp
parent654ab46cf1aef64e756412751b907725f3a0076e (diff)
downloadscummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.tar.gz
scummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.tar.bz2
scummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.zip
1.Removed warning from symbian portdefs
2.Made thumbnail.cpp compile for VC6 (Symbian Emulator environment). Order of template declaration and includes causing the problems 3.Moved int i declaration from for;loop into local variable 4.Updated stdafx uio.h is not part of the Symbian build chain. svn-id: r18909
Diffstat (limited to 'common/scaler/thumbnail.cpp')
-rw-r--r--common/scaler/thumbnail.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/scaler/thumbnail.cpp b/common/scaler/thumbnail.cpp
index 8ada19a670..49d2eb9154 100644
--- a/common/scaler/thumbnail.cpp
+++ b/common/scaler/thumbnail.cpp
@@ -24,7 +24,6 @@
#include "common/scummsys.h"
#include "common/system.h"
-#include "common/scaler.h"
#include "common/scaler/intern.h"
template<int bitFormat>
@@ -69,6 +68,8 @@ void createThumbnail_4(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32
}
}
+#include "common/scaler.h"
+
void createThumbnail(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 dstPitch, int width, int height) {
// only 1/2 and 1/4 downscale supported
if (width != 320 && width != 640)