diff options
-rw-r--r-- | common.c | 4 | ||||
-rw-r--r-- | common.h | 4 | ||||
-rw-r--r-- | seduservice.c | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -94,12 +94,12 @@ int minMax(int x, int min, int max) return x; } -double _min(double a, double b) +double min(double a, double b) { return a < b ? a : b; } -double _max(double a, double b) +double max(double a, double b) { return a >= b ? a : b; } @@ -32,8 +32,8 @@ enum Misc int minMax(int x, int min, int max); int getrand(int min, int max); -float _min(float a, float b); -float _max(float a, float b); +double min(double a, double b); +double max(double a, double b); //*************************************************************************** // Time diff --git a/seduservice.c b/seduservice.c index 74d88f9..1f241da 100644 --- a/seduservice.c +++ b/seduservice.c @@ -43,8 +43,8 @@ void cSeduService::rgb2hsv(int r, int g, int b, double* h, double* s, double* v) rc = (double)r / 255.0; gc = (double)g / 255.0; bc = (double)b / 255.0; - maxC = _max(rc, _max(gc, bc)); - minC = _min(rc, _min(gc, bc)); + maxC = max(rc, max(gc, bc)); + minC = min(rc, min(gc, bc)); delta = maxC - minC; *v = maxC; |