riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10067 from gebart/pr/color-Wdouble-promotion

Browse Source 
color: Fix -Wdouble-promotion warnings
This commit is contained in:
Kaspar Schleiser 2018-09-28 10:16:13 +02:00 committed by GitHub
commit b4664a5bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/color/color.c
View File

@ -55,7 +55,7 @@ void color_rgb2hsv(color_rgb_t *rgb, color_hsv_t *hsv)
/* compute hue */ /* compute hue */
hsv->h = 0.0f; hsv->h = 0.0f;
if (hsv->s != 0.0) { if (hsv->s != 0.0f) {
float rc, gc, bc; float rc, gc, bc;
rc = (hsv->v - rd) / delta; rc = (hsv->v - rd) / delta;
@ -73,7 +73,7 @@ void color_rgb2hsv(color_rgb_t *rgb, color_hsv_t *hsv)
} }
hsv->h *= 60.0f; hsv->h *= 60.0f;
if (hsv->h < 0.0f) { if (hsv->h < 0.0f) {
hsv->h += 360.0; hsv->h += 360.0f;
} }
} }
} }
@ -90,7 +90,7 @@ void color_hsv2rgb(color_hsv_t *hsv, color_rgb_t *rgb)
return; return;
} }
h = (hsv->h == 360.0f) ? 0.0 : hsv->h; h = (hsv->h == 360.0f) ? 0.0f : hsv->h;
h /= 60.0f; h /= 60.0f;
i = (int)h; i = (int)h;
f = h - i; f = h - i;