Merge branch 'develop' of projects.vdr-developer.org:vdr-plugin-seduatmo into develop

3 files changed, 6 insertions, 6 deletions

diff --git a/common.c b/common.c
index 99e8fa1..17b594b 100644
--- a/common.c
+++ b/common.c
@@ -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;
 }
diff --git a/common.h b/common.h
index b325af9..a774793 100644
--- a/common.h
+++ b/common.h
@@ -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;