Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a better algorithm for brightness adjustment

Browse Source
This commit is contained in:
o9000
2016-03-21 23:01:43 +01:00
parent fc7aa2d342
commit b608cd5960
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/common.c
View File

@@ -241,7 +241,8 @@ void extract_values(const char *value, char **value1, char **value2, char **valu
void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright) void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright)
{ {
unsigned int x, y; unsigned int x, y;
unsigned int a, r, g, b, argb; unsigned int argb;
int a, r, g, b;
unsigned long id; unsigned long id;
int cmax, cmin; int cmax, cmin;
float h2, f, p, q, t; float h2, f, p, q, t;
@@ -294,7 +295,7 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
saturation = 0.0; saturation = 0.0;
if (saturation > 1.0) if (saturation > 1.0)
saturation = 1.0; saturation = 1.0;
brightness += bright; //brightness += bright;
if (brightness < 0.0) if (brightness < 0.0)
brightness = 0.0; brightness = 0.0;
if (brightness > 1.0) if (brightness > 1.0)
@@ -345,6 +346,14 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
} }
} }
r += bright * 255;
g += bright * 255;
b += bright * 255;
r = MAX(0, MIN(255, r));
g = MAX(0, MIN(255, g));
b = MAX(0, MIN(255, b));
argb = a; argb = a;
argb = (argb << 8) + r; argb = (argb << 8) + r;
argb = (argb << 8) + g; argb = (argb << 8) + g;
@@ -503,8 +512,8 @@ Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int bri
imlib_image_get_width(), imlib_image_get_width(),
imlib_image_get_height(), imlib_image_get_height(),
alpha, alpha,
(float)saturation / 100, saturation / 100.0,
(float)brightness / 100); brightness / 100.0);
imlib_image_put_back_data(data); imlib_image_put_back_data(data);
return copy; return copy;
} }