github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

c++11 fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8593 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-24 18:18:58 +00:00
commit 73cc9c70d8
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/IconDes/Image.cpp
View file

@ -290,9 +290,9 @@ Image Colorize2(const Image& img, Color color, int alpha, int gray)
int div = 255 - gray;
int ao = ga - gray;
int ac = div - ao;
r = (ao * s->r + ac * r) / div;
g = (ao * s->g + ac * g) / div;
b = (ao * s->b + ac * b) / div;
r = (ao * s->r + ac * r0) / div;
g = (ao * s->g + ac * g0) / div;
b = (ao * s->b + ac * b0) / div;
}
t->r = (alpha * (r - s->r) >> 8) + s->r;
t->g = (alpha * (g - s->g) >> 8) + s->g;