diff options
Diffstat (limited to 'fluid/nodes/Widget_Node.cxx')
| -rw-r--r-- | fluid/nodes/Widget_Node.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx index 5b51db75e..b02e53e66 100644 --- a/fluid/nodes/Widget_Node.cxx +++ b/fluid/nodes/Widget_Node.cxx @@ -42,9 +42,13 @@ #include <stdio.h> #include <stdlib.h> -#undef min -#undef max -#include <algorithm> + +#ifndef MIN +#define MIN(a,b) ((a)<=(b) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a,b) ((a)>=(b) ? (a) : (b)) +#endif using namespace fld; using namespace fld::proj; @@ -518,10 +522,10 @@ static void calculate_bbox(Node* p) { bbox_r = o->x() + o->w(); bbox_b = o->y() + o->h(); first = 0; } else { - bbox_x = std::min(bbox_x, o->x()); - bbox_y = std::min(bbox_y, o->y()); - bbox_r = std::max(bbox_r, o->x() + o->w()); - bbox_b = std::max(bbox_b, o->y() + o->h()); + bbox_x = MIN(bbox_x, o->x()); + bbox_y = MIN(bbox_y, o->y()); + bbox_r = MAX(bbox_r, o->x() + o->w()); + bbox_b = MAX(bbox_b, o->y() + o->h()); } } } |
