diff options
| author | Sven Hesse | 2009-07-11 10:24:06 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-07-11 10:24:06 +0000 |
| commit | 2ceea652e62b301adea4628cebe4116191aa4998 (patch) | |
| tree | 186b567eedc7a89a2975f76a2a728df3d2d36efc | |
| parent | d3d06626e41a28c70b489a164a018c0ba65d0547 (diff) | |
| download | scummvm-rg350-2ceea652e62b301adea4628cebe4116191aa4998.tar.gz scummvm-rg350-2ceea652e62b301adea4628cebe4116191aa4998.tar.bz2 scummvm-rg350-2ceea652e62b301adea4628cebe4116191aa4998.zip | |
Explicitely instantiate the decompressWizImage() templates, so that they won't be optimized away, as they are also used in akos.cpp
svn-id: r42380
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index b23b7ac869..4c20ed7835 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -831,6 +831,11 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C } } +// NOTE: These templates are used outside this file. We don't want the compiler to optimize them away, so we need to explicitely instantiate them. +template void Wiz::decompressWizImage<kWizXMap>(uint8 *dst, int dstPitch, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr); +template void Wiz::decompressWizImage<kWizRMap>(uint8 *dst, int dstPitch, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr); +template void Wiz::decompressWizImage<kWizCopy>(uint8 *dst, int dstPitch, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr); + template <int type> void Wiz::decompressRawWizImage(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, int w, int h, int transColor, const uint8 *palPtr) { if (type == kWizRMap) { |