From f68cfd6bb078482c4a779a6e26a56e2734edb5b8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 25 Sep 2022 18:33:28 +1000 Subject: Cleanup: replace C-style casts with functional casts for numeric types --- source/blender/freestyle/intern/system/PseudoNoise.cpp | 2 +- source/blender/freestyle/intern/system/RandGen.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/freestyle/intern/system') diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 354aef13115..9bb597a8a67 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -15,7 +15,7 @@ static int modf_to_index(Freestyle::real x, uint range) { if (isfinite(x)) { Freestyle::real tmp; - int i = abs((int)(modf(x, &tmp) * range)); + int i = abs(int(modf(x, &tmp) * range)); BLI_assert(i >= 0 && i < range); return i; } diff --git a/source/blender/freestyle/intern/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp index c5559f39147..bb6970bc27a 100644 --- a/source/blender/freestyle/intern/system/RandGen.cpp +++ b/source/blender/freestyle/intern/system/RandGen.cpp @@ -32,13 +32,13 @@ namespace Freestyle { #define MUL(x, y, z) \ { \ - long l = (long)(x) * (long)(y); \ + long l = long(x) * long(y); \ (z)[0] = LOW(l); \ (z)[1] = HIGH(l); \ } \ ((void)0) -#define CARRY(x, y) ((ulong)((long)(x) + (long)(y)) > MASK) +#define CARRY(x, y) (ulong(long(x) + long(y)) > MASK) #define ADDEQU(x, y, z) (z = CARRY(x, (y)), x = LOW(x + (y))) #define SET3(x, x0, x1, x2) ((x)[0] = (x0), (x)[1] = (x1), (x)[2] = (x2)) #if 0 // XXX, unused -- cgit v1.2.3