m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce_palette(): fix warnings and reduce code complexity

Browse Source
This commit is contained in:
Thomas Bernard 2018-03-20 12:21:39 +01:00
parent 91e6796b92
commit 00d51d5494
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/palette.c
View File

@ -596,7 +596,6 @@ void Reduce_palette(short * used_colors,int nb_colors_asked,T_Palette palette,dw
int color_2; // | de la palette int color_2; // | de la palette
int best_color_1=0; int best_color_1=0;
int best_color_2=0; int best_color_2=0;
long difference;
long best_difference; long best_difference;
dword used; dword used;
dword best_used; dword best_used;
@ -665,12 +664,13 @@ void Reduce_palette(short * used_colors,int nb_colors_asked,T_Palette palette,dw
for (color_2=color_1+1;color_2<(*used_colors);color_2++) for (color_2=color_1+1;color_2<(*used_colors);color_2++)
if (color_1!=color_2) if (color_1!=color_2)
{ {
difference =26*abs((long)palette[color_1].R-palette[color_2].R)* long dr, dg, db;
26*abs((long)palette[color_1].R-palette[color_2].R)+ long difference; // could also be called distance (or distance square)
55*abs((long)palette[color_1].G-palette[color_2].G)*
55*abs((long)palette[color_1].G-palette[color_2].G)+ dr = (long)palette[color_1].R - (long)palette[color_2].R;
19*abs((long)palette[color_1].B-palette[color_2].B)* dg = (long)palette[color_1].G - (long)palette[color_2].G;
19*abs((long)palette[color_1].B-palette[color_2].B); db = (long)palette[color_1].B - (long)palette[color_2].B;
difference =26*26*dr*dr + 55*55*dg*dg + 19*19*db*db;
if (difference<=best_difference) if (difference<=best_difference)
{ {