Changeset 1130 for cpp/frams/canvas

Timestamp:

04/16/21 15:55:34 (3 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

Location:

cpp/frams/canvas

Files:

• neurodiagram.cpp (modified) (4 diffs)
• nn_smart_layout.cpp (modified) (3 diffs)

cpp/frams/canvas/neurodiagram.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -13 +13 @@
 #include <frams/simul/simul.h>
 #include "common/nonstd_time.h"
+#include <algorithm>
 
 #define FIELDSTRUCT NeuroDiagram
@@ -231 +232 @@
         NeuroProbe *probe = new NeuroProbe(getNS(i));
         Pixel s = getSize();
-        s.x = s.y = max(probe->getSize().x, min(s.x / 3, s.y / 3));
+        s.x = s.y = std::max(probe->getSize().x, std::min(s.x / 3, s.y / 3));
         probes += (void*)probe;
         add(probe);
@@ -503 +504 @@
                                 int *dr = drawing;
                                 int w = size.x - 2, h = size.y - clienttop - clientbottom;
-                                int scale = min(w, h);
+                                int scale = std::min(w, h);
                                 int x0 = clienttop + leftborder + ((w > h) ? (w - h) / 2 : 0);
                                 int y0 = clientleft + topborder + ((h > w) ? (h - w) / 2 : 0);

cpp/frams/canvas/nn_smart_layout.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "nn_layout.h"
 #include <vector>
-#include "common/nonstd_stl.h"
+#include <algorithm>
 #ifdef __BORLANDC__
  #include <alloc.h> //borland needs for alloc/free
@@ -131 +131 @@
            */
         int x1, y1, x2, y2; // union rectangle
-        x1 = max(0, b2->minx - b->minx + dx);
-        x2 = min(b->maxx - b->minx, -b->minx + dx + b2->maxx);
+        x1 = std::max(0, b2->minx - b->minx + dx);
+        x2 = std::min(b->maxx - b->minx, -b->minx + dx + b2->maxx);
         if (x1 > x2) return 1;
-        y1 = max(0, b2->miny - b->miny + dy);
-        y2 = min(b->maxy - b->miny, -b->miny + dy + b2->maxy);
+        y1 = std::max(0, b2->miny - b->miny + dy);
+        y2 = std::min(b->maxy - b->miny, -b->miny + dy + b2->maxy);
         if (y1 > y2) return 1;
         int x, y;
@@ -162 +162 @@
                 b->dodajelement(e, einfo[e].x + dx, einfo[e].y + dy);
         }
-        b->minx = min(b->minx, dx + b2->minx);
-        b->miny = min(b->miny, dy + b2->miny);
-        b->maxx = max(b->maxx, dx + b2->maxx);
-        b->maxy = max(b->maxy, dy + b2->maxy);
+        b->minx = std::min(b->minx, dx + b2->minx);
+        b->miny = std::min(b->miny, dy + b2->miny);
+        b->maxx = std::max(b->maxx, dx + b2->maxx);
+        b->maxy = std::max(b->maxy, dy + b2->maxy);
 
         DB(