[Scummvm-git-logs] scummvm master -> 298114e692f68e438eb389cdf78dee4a3c2f6542

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
298114e692 KYRA: Fix compilation


Commit: 298114e692f68e438eb389cdf78dee4a3c2f6542
    https://github.com/scummvm/scummvm/commit/298114e692f68e438eb389cdf78dee4a3c2f6542
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-16T19:54:35+01:00

Commit Message:
KYRA: Fix compilation

Changed paths:
    engines/kyra/graphics/screen.cpp


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index 6039934fbc..4bb6bc17b5 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -462,6 +462,10 @@ void Screen::scale2x(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, i
 	}
 }
 
+template void Screen::scale2x<uint8, uint16>(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, int w, int h);
+template void Screen::scale2x<uint16, uint32>(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, int w, int h);
+template void Screen::scale2x<uint8, uint32>(uint8 *dst, int dstPitch, const uint8 *src, int srcPitch, int w, int h);
+
 template<typename pixelType>
 void Screen::mergeOverlayImpl(int x, int y, int w, int h) {
 	const uint8 *src = _sjisOverlayPtrs[1] + y * 640 + x;
@@ -481,6 +485,9 @@ void Screen::mergeOverlayImpl(int x, int y, int w, int h) {
 	}
 }
 
+template void Screen::mergeOverlayImpl<uint8>(int x, int y, int w, int h);
+template void Screen::mergeOverlayImpl<uint16>(int x, int y, int w, int h);
+
 const ScreenDim *Screen::getScreenDim(int dim) const {
 	assert(dim < _dimTableCount);
 	return _customDimTable[dim] ? _customDimTable[dim] : &_dimTable[dim];