From ace1c998c42263712bccbce5e2942aecdc8c592e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 24 Apr 2010 10:08:07 +0000 Subject: warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file. --- source/blender/blenlib/intern/voxel.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'source/blender/blenlib/intern/voxel.c') diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index 31ed116c40a..2b04a49e848 100644 --- a/source/blender/blenlib/intern/voxel.c +++ b/source/blender/blenlib/intern/voxel.c @@ -30,12 +30,7 @@ #include "BKE_utildefines.h" - -#if defined( _MSC_VER ) && !defined( __cplusplus ) -# define inline __inline -#endif // defined( _MSC_VER ) && !defined( __cplusplus ) - -static inline float D(float *data, int *res, int x, int y, int z) +BM_INLINE float D(float *data, int *res, int x, int y, int z) { CLAMP(x, 0, res[0]-1); CLAMP(y, 0, res[1]-1); @@ -57,7 +52,7 @@ float voxel_sample_nearest(float *data, int *res, float *co) } // returns highest integer <= x as integer (slightly faster than floor()) -inline int FLOORI(float x) +BM_INLINE int FLOORI(float x) { const int r = (int)x; return ((x >= 0.f) || (float)r == x) ? r : (r - 1); @@ -65,7 +60,7 @@ inline int FLOORI(float x) // clamp function, cannot use the CLAMPIS macro, it sometimes returns unwanted results apparently related to gcc optimization flag -fstrict-overflow which is enabled at -O2 // this causes the test (x + 2) < 0 with int x == 2147483647 to return false (x being an integer, x + 2 should wrap around to -2147483647 so the test < 0 should return true, which it doesn't) -inline int _clamp(int a, int b, int c) +BM_INLINE int _clamp(int a, int b, int c) { return (a < b) ? b : ((a > c) ? c : a); } -- cgit v1.2.3