diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 17:28:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 17:28:22 +0400 |
| commit | f70d2c65d85c6ad983b9155daedb0dff0c085e90 (patch) | |
| tree | 726eb4833b6c45eaa372f779af50ae6b379c238e /source/blender/blenlib/intern/boxpack2d.c | |
| parent | 9599c2a02b65864e014ec4713629c96c0662e31e (diff) | |
rename api functions...
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
Diffstat (limited to 'source/blender/blenlib/intern/boxpack2d.c')
| -rw-r--r-- | source/blender/blenlib/intern/boxpack2d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 2e9f5c151c5..8a97fdcab67 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -96,7 +96,7 @@ typedef struct BoxVert { BOXTOP(b1) - EPSILON <= BOXBOTTOM(b2)) /* compiler should inline */ -static float maxf(const float a, const float b) { return b > a ? b : a; } +static float max_ff(const float a, const float b) { return b > a ? b : a; } #if 0 #define BOXDEBUG(b) \ @@ -133,8 +133,8 @@ static int vertex_sort(const void *p1, const void *p2) v1 = vertarray + ((int *)p1)[0]; v2 = vertarray + ((int *)p2)[0]; - a1 = maxf(v1->x + box_width, v1->y + box_height); - a2 = maxf(v2->x + box_width, v2->y + box_height); + a1 = max_ff(v1->x + box_width, v1->y + box_height); + a2 = max_ff(v2->x + box_width, v2->y + box_height); /* sort largest to smallest */ if (a1 > a2) return 1; @@ -314,8 +314,8 @@ void BLI_box_pack_2D(BoxPack *boxarray, const int len, float *tot_width, float * if (!isect) { /* maintain the total width and height */ - (*tot_width) = maxf(BOXRIGHT(box), (*tot_width)); - (*tot_height) = maxf(BOXTOP(box), (*tot_height)); + (*tot_width) = max_ff(BOXRIGHT(box), (*tot_width)); + (*tot_height) = max_ff(BOXTOP(box), (*tot_height)); /* Place the box */ vert->free &= ~quad_flags[j]; |