diff options
| author | Johannes Schickel | 2012-10-09 23:32:51 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-10-09 23:32:51 +0200 |
| commit | a5bce746354aa5711f06de7abac442995ae0d956 (patch) | |
| tree | 92da987b7f75010e88e87c6b29f0fec9253d972c /graphics/conversion.cpp | |
| parent | 6b6b7532aea5efe236f76f25f26d1b455b8d5b04 (diff) | |
| download | scummvm-rg350-a5bce746354aa5711f06de7abac442995ae0d956.tar.gz scummvm-rg350-a5bce746354aa5711f06de7abac442995ae0d956.tar.bz2 scummvm-rg350-a5bce746354aa5711f06de7abac442995ae0d956.zip | |
GRAPHICS: Fix compilation of conversion.cpp on motomagx.
Using plain "inline" instead of "FORCEINLINE" allows the compiler to continue
even when it fails to inline crossBlitLogic/crossBlitLogic3BppSource. The
impact of other systems now not inlining the functions anymore is hopefully
small enough to not cause any problems.
Diffstat (limited to 'graphics/conversion.cpp')
| -rw-r--r-- | graphics/conversion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp index fec1d240e2..2da8b6f0ce 100644 --- a/graphics/conversion.cpp +++ b/graphics/conversion.cpp @@ -31,9 +31,9 @@ namespace Graphics { namespace { template<typename SrcColor, typename DstColor, bool backward> -FORCEINLINE void crossBlitLogic(byte *dst, const byte *src, const uint w, const uint h, - const PixelFormat &srcFmt, const PixelFormat &dstFmt, - const uint srcDelta, const uint dstDelta) { +inline void crossBlitLogic(byte *dst, const byte *src, const uint w, const uint h, + const PixelFormat &srcFmt, const PixelFormat &dstFmt, + const uint srcDelta, const uint dstDelta) { for (uint y = 0; y < h; ++y) { for (uint x = 0; x < w; ++x) { const uint32 color = *(const SrcColor *)src; @@ -61,9 +61,9 @@ FORCEINLINE void crossBlitLogic(byte *dst, const byte *src, const uint w, const } template<typename DstColor, bool backward> -FORCEINLINE void crossBlitLogic3BppSource(byte *dst, const byte *src, const uint w, const uint h, - const PixelFormat &srcFmt, const PixelFormat &dstFmt, - const uint srcDelta, const uint dstDelta) { +inline void crossBlitLogic3BppSource(byte *dst, const byte *src, const uint w, const uint h, + const PixelFormat &srcFmt, const PixelFormat &dstFmt, + const uint srcDelta, const uint dstDelta) { uint32 color; byte r, g, b, a; uint8 *col = (uint8 *)&color; |