[Scummvm-cvs-logs] scummvm master -> a5bce746354aa5711f06de7abac442995ae0d956

lordhoto lordhoto at gmail.com
Tue Oct 9 23:36:41 CEST 2012


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:
a5bce74635 GRAPHICS: Fix compilation of conversion.cpp on motomagx.


Commit: a5bce746354aa5711f06de7abac442995ae0d956
    https://github.com/scummvm/scummvm/commit/a5bce746354aa5711f06de7abac442995ae0d956
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-10-09T14:32:51-07:00

Commit Message:
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.

Changed paths:
    graphics/conversion.cpp



diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp
index fec1d24..2da8b6f 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;






More information about the Scummvm-git-logs mailing list