From f70d2c65d85c6ad983b9155daedb0dff0c085e90 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 23 Oct 2012 13:28:22 +0000 Subject: rename api functions... - minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii --- source/blender/compositor/operations/COM_InpaintOperation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/compositor/operations/COM_InpaintOperation.cpp') diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cpp b/source/blender/compositor/operations/COM_InpaintOperation.cpp index 70d4d987c81..81ca06cfff0 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cpp +++ b/source/blender/compositor/operations/COM_InpaintOperation.cpp @@ -133,9 +133,9 @@ void InpaintSimpleOperation::calc_manhatten_distance() if (this->get_pixel(i, j)[3] < 1.0f) { r = width + height; if (i > 0) - r = mini(r, m[j * width + i - 1] + 1); + r = min_ii(r, m[j * width + i - 1] + 1); if (j > 0) - r = mini(r, m[(j - 1) * width + i] + 1); + r = min_ii(r, m[(j - 1) * width + i] + 1); } m[j * width + i] = r; } @@ -146,9 +146,9 @@ void InpaintSimpleOperation::calc_manhatten_distance() int r = m[j * width + i]; if (i + 1 < width) - r = mini(r, m[j * width + i + 1] + 1); + r = min_ii(r, m[j * width + i + 1] + 1); if (j + 1 < height) - r = mini(r, m[(j + 1) * width + i] + 1); + r = min_ii(r, m[(j + 1) * width + i] + 1); m[j * width + i] = r; -- cgit v1.2.3