Skip to content

Commit ed9d45b

Browse files
committed
Fix
1 parent f5732e8 commit ed9d45b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

yy_color_converter.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void RGB2HSB(CGFloat r, CGFloat g, CGFloat b,
8787
CLAMP_COLOR_VALUE(b);
8888

8989
CGFloat max, min, delta;
90-
max = fmaxf(r, fmaxf(g, b));
91-
min = fminf(r, fminf(g, b));
90+
max = fmax(r, fmax(g, b));
91+
min = fmin(r, fmin(g, b));
9292
delta = max - min;
9393

9494
*v = max; // Brightness
@@ -118,7 +118,7 @@ void HSB2RGB(CGFloat h, CGFloat s, CGFloat v,
118118
CGFloat f, p, q, t;
119119
if (h == 1) h = 0;
120120
h *= 6;
121-
sextant = floorf(h);
121+
sextant = floor(h);
122122
f = h - sextant;
123123
p = v * (1 - s);
124124
q = v * (1 - s * f);
@@ -147,7 +147,7 @@ void RGB2CMYK(CGFloat r, CGFloat g, CGFloat b,
147147
*c = 1 - r;
148148
*m = 1 - g;
149149
*y = 1 - b;
150-
*k = fminf(*c, fminf(*m, *y));
150+
*k = fmin(*c, fmin(*m, *y));
151151

152152
if (*k == 1) {
153153
*c = *m = *y = 0; // Pure black
@@ -206,7 +206,7 @@ void CMY2CMYK(CGFloat c, CGFloat m, CGFloat y,
206206
CLAMP_COLOR_VALUE(m);
207207
CLAMP_COLOR_VALUE(y);
208208

209-
*kk = fminf(c, fminf(m, y));
209+
*kk = fmin(c, fmin(m, y));
210210
if (*kk == 1) {
211211
*cc = *mm = *yy = 0; // Pure black
212212
} else {

yy_color_converter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ extern void CIELCHuv2CIELuv(CGFloat L, CGFloat C, CGFloat H,
263263

264264

265265

266-
extern extern void CIEXYZ2LMS(CGFloat x, CGFloat y, CGFloat z,
266+
extern void CIEXYZ2LMS(CGFloat x, CGFloat y, CGFloat z,
267267
CGFloat *L, CGFloat *M, CGFloat *S);
268268

269-
extern extern void LMSToCIEXYZ(CGFloat L, CGFloat M, CGFloat S,
269+
extern void LMSToCIEXYZ(CGFloat L, CGFloat M, CGFloat S,
270270
CGFloat *X, CGFloat *Y, CGFloat *Z);
271271

272272

0 commit comments

Comments
 (0)