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

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 2000c707b8e..d62ea73876f 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -307,26 +307,26 @@ int area_getorientation(ScrArea *sa, ScrArea *sb)
   int tolerance = U.pixelsize * 4;
 
   if (saBL->vec.x == sbBR->vec.x && saTL->vec.x == sbTR->vec.x) { /* sa to right of sb = W */
-    if ((ABS(saBL->vec.y - sbBR->vec.y) <= tolerance) &&
-        (ABS(saTL->vec.y - sbTR->vec.y) <= tolerance)) {
+    if ((abs(saBL->vec.y - sbBR->vec.y) <= tolerance) &&
+        (abs(saTL->vec.y - sbTR->vec.y) <= tolerance)) {
       return 0;
     }
   }
   else if (saTL->vec.y == sbBL->vec.y && saTR->vec.y == sbBR->vec.y) { /* sa to bottom of sb = N */
-    if ((ABS(saTL->vec.x - sbBL->vec.x) <= tolerance) &&
-        (ABS(saTR->vec.x - sbBR->vec.x) <= tolerance)) {
+    if ((abs(saTL->vec.x - sbBL->vec.x) <= tolerance) &&
+        (abs(saTR->vec.x - sbBR->vec.x) <= tolerance)) {
       return 1;
     }
   }
   else if (saTR->vec.x == sbTL->vec.x && saBR->vec.x == sbBL->vec.x) { /* sa to left of sb = E */
-    if ((ABS(saTR->vec.y - sbTL->vec.y) <= tolerance) &&
-        (ABS(saBR->vec.y - sbBL->vec.y) <= tolerance)) {
+    if ((abs(saTR->vec.y - sbTL->vec.y) <= tolerance) &&
+        (abs(saBR->vec.y - sbBL->vec.y) <= tolerance)) {
       return 2;
     }
   }
   else if (saBL->vec.y == sbTL->vec.y && saBR->vec.y == sbTR->vec.y) { /* sa on top of sb = S*/
-    if ((ABS(saBL->vec.x - sbTL->vec.x) <= tolerance) &&
-        (ABS(saBR->vec.x - sbTR->vec.x) <= tolerance)) {
+    if ((abs(saBL->vec.x - sbTL->vec.x) <= tolerance) &&
+        (abs(saBR->vec.x - sbTR->vec.x) <= tolerance)) {
       return 3;
     }
   }