From 905eeb0bc7f46efb95cb5450cc6c2ec27f02730c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 May 2018 17:14:28 +0200 Subject: Cleanup: move unit char/short/float to functions This caused GCC 8.1 to crash at build time, but was also not very nice use of macros. --- source/blender/blenlib/BLI_utildefines.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'source/blender/blenlib/BLI_utildefines.h') diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 46b3748c7ce..65dcbf04913 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -224,29 +224,6 @@ extern "C" { b = tmp; \ } (void)0 - -#define FTOCHAR(val) ((CHECK_TYPE_INLINE(val, float)), \ - (char)(((val) <= 0.0f) ? 0 : (((val) > (1.0f - 0.5f / 255.0f)) ? 255 : ((255.0f * (val)) + 0.5f)))) -#define FTOUSHORT(val) ((CHECK_TYPE_INLINE(val, float)), \ - (unsigned short)((val >= 1.0f - 0.5f / 65535) ? 65535 : (val <= 0.0f) ? 0 : (val * 65535.0f + 0.5f))) -#define USHORTTOUCHAR(val) ((unsigned char)(((val) >= 65535 - 128) ? 255 : ((val) + 128) >> 8)) -#define F3TOCHAR3(v2, v1) { \ - (v1)[0] = FTOCHAR((v2[0])); \ - (v1)[1] = FTOCHAR((v2[1])); \ - (v1)[2] = FTOCHAR((v2[2])); \ -} (void)0 -#define F3TOCHAR4(v2, v1) { \ - (v1)[0] = FTOCHAR((v2[0])); \ - (v1)[1] = FTOCHAR((v2[1])); \ - (v1)[2] = FTOCHAR((v2[2])); \ - (v1)[3] = 255; \ -} (void)0 -#define F4TOCHAR4(v2, v1) { \ - (v1)[0] = FTOCHAR((v2[0])); \ - (v1)[1] = FTOCHAR((v2[1])); \ - (v1)[2] = FTOCHAR((v2[2])); \ - (v1)[3] = FTOCHAR((v2[3])); \ -} (void)0 #define VECCOPY(v1, v2) { \ *(v1) = *(v2); \ *(v1 + 1) = *(v2 + 1); \ -- cgit v1.2.3