blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 765 Projects 19 Wiki Activity

Compiler warnings: quiet warnings for gcc4.7x 

patch from Sergey
This commit is contained in:
Campbell Barton 2013-12-07 13:21:59 +11:00
parent 9b932c12c8
commit 69065b5b2c
Notes: blender-bot 2023-02-14 05:53:42 +01:00 
Referenced by commit 56edaf7867, Fix stupid strict flags in math_color_inline.c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_utildefines.h
View File

@ -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) { \

2
source/blender/blenlib/intern/math_color.c
View File

@ -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)
{