From a5bce746354aa5711f06de7abac442995ae0d956 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 9 Oct 2012 23:32:51 +0200 Subject: 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. --- graphics/conversion.cpp | 12 ++++++------ 1 file 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 -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 -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; -- cgit v1.2.3