diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-07 06:21:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-07 06:21:59 +0400 |
| commit | 69065b5b2c4119911dc49f9ee773fded57dcff51 (patch) | |
| tree | c6fc9b67cc8579b2956828f8c1a49c9f3149b62f /source/blender/blenlib | |
| parent | 9b932c12c8ad055a9a139041914e9a5c75de9ba8 (diff) | |
Compiler warnings: quiet warnings for gcc4.7x
patch from Sergey
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_color.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index db607d6d0c7..053edcc28d7 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -182,7 +182,7 @@ #define ABS(a) ( (a) < 0 ? (-(a)) : (a) ) -#define FTOCHAR(val) ((val) <= 0.0f) ? 0 : (((val) > (1.0f - 0.5f / 255.0f)) ? 255 : (char)((255.0f * (val)) + 0.5f)) +#define FTOCHAR(val) (char)(((val) <= 0.0f) ? 0 : (((val) > (1.0f - 0.5f / 255.0f)) ? 255 : ((255.0f * (val)) + 0.5f))) #define FTOUSHORT(val) ((val >= 1.0f - 0.5f / 65535) ? 65535 : (val <= 0.0f) ? 0 : (unsigned short)(val * 65535.0f + 0.5f)) #define USHORTTOUCHAR(val) ((unsigned char)(((val) >= 65535 - 128) ? 255 : ((val) + 128) >> 8)) #define F3TOCHAR3(v2, v1) { \ diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index 4c1620fe4bb..f57ae96e933 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -35,9 +35,7 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#ifndef __MINGW32__ #include "BLI_strict_flags.h" -#endif void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b) { |