diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-06 19:18:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-09 16:47:59 +0300 |
| commit | 598ab525da3df3fef2033c159c570688c7282a8f (patch) | |
| tree | ba2bd0b8fc6ee5d264512bf655def1a6ee5d7b31 /source/blender/compositor | |
| parent | ee5d7bc16b243f309c84bce5deddf3a86b7f4c14 (diff) | |
Cleanup: Replace ABS/SQUARE/CUBE with function calls
While it might be handy to have type-less functionality which is
similar to how C++ math is implemented it can not be easily achieved
with just preprocessor in a way which does not have side-effects on
wrong usage.
There macros where often used on a non-trivial expression, and there
was at least one usage where it was causing an actual side effect/bug
on Windows (see change around square_f(sh[index++]) in studiolight.c).
For such cases it is handy to have a function which is guaranteed to
have zero side-effects. The motivation behind actually removing the
macros is that there is already a way to do similar calculation. Also,
not having such macros is a way to guarantee that its usage is not
changed in a way which have side-effects and that it's not used as an
inspiration for cases where it should not be used.
Differential Revision: https://developer.blender.org/D7051
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_VectorBlurOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 8e67b8ac786..80df13966b1 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -659,7 +659,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd, dvz[1] = dvec2[-3]; div++; } - else if ((ABS(dvec2[-4]) + ABS(dvec2[-3])) < (ABS(dvz[0]) + ABS(dvz[1]))) { + else if ((fabsf(dvec2[-4]) + fabsf(dvec2[-3])) < (fabsf(dvz[0]) + fabsf(dvz[1]))) { dvz[0] = dvec2[-4]; dvz[1] = dvec2[-3]; } @@ -673,7 +673,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd, dvz[1] = dvec1[1]; div++; } - else if ((ABS(dvec1[0]) + ABS(dvec1[1])) < (ABS(dvz[0]) + ABS(dvz[1]))) { + else if ((fabsf(dvec1[0]) + fabsf(dvec1[1])) < (fabsf(dvz[0]) + fabsf(dvz[1]))) { dvz[0] = dvec1[0]; dvz[1] = dvec1[1]; } @@ -683,7 +683,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd, dvz[0] = dvec2[0]; dvz[1] = dvec2[1]; } - else if ((ABS(dvec2[0]) + ABS(dvec2[1])) < (ABS(dvz[0]) + ABS(dvz[1]))) { + else if ((fabsf(dvec2[0]) + fabsf(dvec2[1])) < (fabsf(dvz[0]) + fabsf(dvz[1]))) { dvz[0] = dvec2[0]; dvz[1] = dvec2[1]; } |