diff options
| author | Max Horn | 2003-10-02 23:29:58 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-02 23:29:58 +0000 |
| commit | a02c13a52e2532e50ac768ed0dc730982f4c130e (patch) | |
| tree | 2662d7a6414cea61c51f8934353010c86053e84b /common/scaler/2xsai.cpp | |
| parent | bb5351f0a8680845eb975a60eab961aa15e08729 (diff) | |
| download | scummvm-rg350-a02c13a52e2532e50ac768ed0dc730982f4c130e.tar.gz scummvm-rg350-a02c13a52e2532e50ac768ed0dc730982f4c130e.tar.bz2 scummvm-rg350-a02c13a52e2532e50ac768ed0dc730982f4c130e.zip | |
fix scaler compilation for MSVC6. However, the produced code stll seems to be incorrect... Jamieson, maybe the MSVC6_COMPAT should be re-added then after all?
svn-id: r10552
Diffstat (limited to 'common/scaler/2xsai.cpp')
| -rw-r--r-- | common/scaler/2xsai.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/scaler/2xsai.cpp b/common/scaler/2xsai.cpp index 1c99168e63..dd5cf23c4a 100644 --- a/common/scaler/2xsai.cpp +++ b/common/scaler/2xsai.cpp @@ -47,7 +47,7 @@ static inline int GetResult(uint32 A, uint32 B, uint32 C, uint32 D) { #define Q_INTERPOLATE Q_INTERPOLATE<bitFormat> template<int bitFormat> -void Super2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void Super2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; const uint32 nextlineSrc = srcPitch >> 1; @@ -156,7 +156,7 @@ void Super2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstP MAKE_WRAPPER(Super2xSaI) template<int bitFormat> -void SuperEagle(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void SuperEagleTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; const uint32 nextlineSrc = srcPitch >> 1; @@ -267,7 +267,7 @@ void SuperEagle(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstP MAKE_WRAPPER(SuperEagle) template<int bitFormat> -void _2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void _2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { const uint16 *bP; uint16 *dP; const uint32 nextlineSrc = srcPitch >> 1; |