Manually applies latest commit from master

This commit is contained in:
krypt-n 2014-11-25 13:17:48 +01:00
parent 585d1633fb
commit 3d64addd45

6
bar.c
View File

@ -295,9 +295,9 @@ parse_color (const char *str, char **end, const uint32_t def)
if (a == 0) {
r = g = b = 0;
} else {
r = (r * 255) / a;
g = (g * 255) / a;
b = (b * 255) / a;
r = (r * a) / 255;
g = (g * a) / 255;
b = (b * a) / 255;
/* Clamp on overflow */
if (r > 255) r = 255;