[Scummvm-cvs-logs] SF.net SVN: scummvm:[42380] scummvm/trunk/engines/scumm/he/wiz_he.cpp

[drmccoy at users.sourceforge.net]

Revision: 42380
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42380&view=rev
Author:   drmccoy
Date:     2009-07-11 10:24:06 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Explicitely instantiate the decompressWizImage() templates, so that they won't be optimized away, as they are also used in akos.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/wiz_he.cpp

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2009-07-11 10:13:00 UTC (rev 42379)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2009-07-11 10:24:06 UTC (rev 42380)
@@ -831,6 +831,11 @@
 	}
 }
 
+// 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.