KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

fix #2

Browse Source 
git-svn-id: svn://kolibrios.org@6052 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-01-10 20:07:03 +00:00
parent 30ae539a5e
commit de145064c8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/cmm/lib/patterns/rgb.h
View File

@ -4,7 +4,7 @@ struct _rgb
byte r,g,b;
void DwordToRgb();
dword RgbToDword();
};
} rgb;
void _rgb::DwordToRgb(dword _dword)
{
@ -21,9 +21,9 @@ dword _rgb::RgbToDword()
return _b + _g + r;
}
dword MixColors(dword _base, _overlying, byte a)
:dword MixColors(dword _base, _overlying, byte a)
{
_rgb rgb1, rgb2, rgb;
_rgb rgb1, rgb2, rgb_final;
byte n_a;
rgb1.DwordToRgb(_base);
@ -31,9 +31,9 @@ dword MixColors(dword _base, _overlying, byte a)
n_a = 255 - a;
rgb.b = calc(rgb1.b*a/255) + calc(rgb2.b*n_a/255);
rgb.g = calc(rgb1.g*a/255) + calc(rgb2.g*n_a/255);
rgb.r = calc(rgb1.r*a/255) + calc(rgb2.r*n_a/255);
rgb_final.b = calc(rgb1.b*a/255) + calc(rgb2.b*n_a/255);
rgb_final.g = calc(rgb1.g*a/255) + calc(rgb2.g*n_a/255);
rgb_final.r = calc(rgb1.r*a/255) + calc(rgb2.r*n_a/255);
return rgb.RgbToDword();
return rgb_final.RgbToDword();
}