[Scummvm-cvs-logs] SF.net SVN: scummvm:[39483] scummvm/trunk/engines/sci/gfx/gfx_system.h

[fingolfin at users.sourceforge.net]

Revision: 39483
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39483&view=rev
Author:   fingolfin
Date:     2009-03-17 16:07:18 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
SCI: fix warning

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_system.h

Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-17 13:55:23 UTC (rev 39482)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-17 16:07:18 UTC (rev 39483)
@@ -129,10 +129,15 @@
 	return rect;
 }
 
-// Temporary helper defines to ease the transition from rect_t to Common::Rect
-#define toSCIRect(in) gfx_rect(in.left, in.top, in.width(), in.height())
-#define toCommonRect(in) Common::Rect(in.x, in.y, in.x + in.width, in.y + in.height)
+// Temporary helper functions to ease the transition from rect_t to Common::Rect
+static inline rect_t toSCIRect(Common::Rect in) {
+	return gfx_rect(in.left, in.top, in.width(), in.height());
+}
 
+static inline Common::Rect toCommonRect(rect_t in) {
+	return Common::Rect(in.x, in.y, in.x + in.width, in.y + in.height);
+}
+
 #define GFX_PRINT_RECT(rect) (rect).x, (rect).y, (rect).width, (rect).height
 
 #define OVERLAP(a, b, z, zl) (a.z >= b.z && a.z < (b.z + b.zl))


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