diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-13 05:26:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-13 05:26:31 +0400 |
| commit | 2025e4cbb9772ad6c72b56ad28e5bdd62d596b9a (patch) | |
| tree | 1ac23304e3c45b0063df4c21d40d9c15320b5dea /source/blender/blenlib | |
| parent | a2b3c938527aed00a72895f37c634db883d95db9 (diff) | |
Code cleanup: quiet warnings & style
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 12 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index ef6edda1118..ea3701f804a 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -211,8 +211,10 @@ } (void)0 -#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 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)), \ + ((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) { \ (v1)[0] = FTOCHAR((v2[0])); \ @@ -260,9 +262,9 @@ *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ } (void)0 #define VECMADD(v1, v2, v3, v4) { \ - *(v1) = *(v2) + *(v3) * (*(v4)); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (*(v4 + 1)); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (*(v4 + 2)); \ + *(v1) = *(v2) + *(v3) * (*(v4)); \ + *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (*(v4 + 1)); \ + *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (*(v4 + 2)); \ } (void)0 #define VECSUBFAC(v1, v2, v3, fac) { \ *(v1) = *(v2) - *(v3) * (fac); \ diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index de40cab425d..20830570432 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -361,7 +361,7 @@ static void bli_adddirstrings(struct BuildDirCtx *dir_ctx) BLI_strncpy(file->owner, pwuser->pw_name, sizeof(file->owner)); } else { - BLI_snprintf(file->owner, sizeof(file->owner), "%d", file->s.st_uid); + BLI_snprintf(file->owner, sizeof(file->owner), "%u", file->s.st_uid); } } #endif |