X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Fcommon.c;h=9f122d6a3ca9b54b816851dc028b9a7e4888678d;hb=367bf8f76227dea6e7e10e974967ae1d60cfe38e;hp=31c2d2eb2d67cafc67d39777bde97a41f9da5672;hpb=883046095800fc78649d943d2b0da22f8732d31e;p=chaz%2Ftint2 diff --git a/src/util/common.c b/src/util/common.c index 31c2d2e..9f122d6 100644 --- a/src/util/common.c +++ b/src/util/common.c @@ -21,30 +21,128 @@ #include #include #include +#include #include #include #include #include "common.h" +#include "server.h" -void adjust_hsb(unsigned int *data, int w, int h, float hu, float satur, float bright) +void copy_file(const char *pathSrc, const char *pathDest) { - unsigned int *pt = data; - int x, y; + FILE *fileSrc, *fileDest; + char line[100]; + int nb; + + fileSrc = fopen(pathSrc, "rb"); + if (fileSrc == NULL) return; + + fileDest = fopen(pathDest, "wb"); + if (fileDest == NULL) return; + + while ((nb = fread(line, 1, 100, fileSrc)) > 0) fwrite(line, 1, nb, fileDest); + + fclose (fileDest); + fclose (fileSrc); +} + + +int parse_line (const char *line, char **key, char **value) +{ + char *a, *b; + + /* Skip useless lines */ + if ((line[0] == '#') || (line[0] == '\n')) return 0; + if (!(a = strchr (line, '='))) return 0; + + /* overwrite '=' with '\0' */ + a[0] = '\0'; + *key = strdup (line); + a++; + + /* overwrite '\n' with '\0' if '\n' present */ + if ((b = strchr (a, '\n'))) b[0] = '\0'; + + *value = strdup (a); + + g_strstrip(*key); + g_strstrip(*value); + return 1; +} + + +int hex_char_to_int (char c) +{ + int r; + + if (c >= '0' && c <= '9') r = c - '0'; + else if (c >= 'a' && c <= 'f') r = c - 'a' + 10; + else if (c >= 'A' && c <= 'F') r = c - 'A' + 10; + else r = 0; + + return r; +} + + +int hex_to_rgb (char *hex, int *r, int *g, int *b) +{ + int len; + + if (hex == NULL || hex[0] != '#') return (0); + + len = strlen (hex); + if (len == 3 + 1) { + *r = hex_char_to_int (hex[1]); + *g = hex_char_to_int (hex[2]); + *b = hex_char_to_int (hex[3]); + } + else if (len == 6 + 1) { + *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]); + *g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]); + *b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]); + } + else if (len == 12 + 1) { + *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]); + *g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]); + *b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]); + } + else return 0; + + return 1; +} + + +void get_color (char *hex, double *rgb) +{ + int r, g, b; + hex_to_rgb (hex, &r, &g, &b); + + rgb[0] = (r / 255.0); + rgb[1] = (g / 255.0); + rgb[2] = (b / 255.0); +} + + +void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright) +{ + unsigned int x, y; unsigned int a, r, g, b, argb; + unsigned long id; int cmax, cmin; float h2, f, p, q, t; float hue, saturation, brightness; float redc, greenc, bluec; - for(y = 0; y < h; y++) { - for(x = 0; x < w; x++) { - argb = pt[y * h + x]; + for(id = y * w, x = 0; x < w; x++, id++) { + argb = data[id]; a = (argb >> 24) & 0xff; + // transparent => nothing to do. + if (a == 0) continue; r = (argb >> 16) & 0xff; g = (argb >> 8) & 0xff; b = (argb) & 0xff; @@ -83,9 +181,8 @@ void adjust_hsb(unsigned int *data, int w, int h, float hu, float satur, float b brightness += bright; if (brightness < 0.0) brightness = 0.0; if (brightness > 1.0) brightness = 1.0; - hue += hu; - if (hue < 0.0) hue = 0.0; - if (hue > 1.0) hue = 1.0; + if (alpha != 100) + a = (a * alpha)/100; // convert HSB to RGB if (saturation == 0) { @@ -134,9 +231,43 @@ void adjust_hsb(unsigned int *data, int w, int h, float hu, float satur, float b argb = (argb << 8) + r; argb = (argb << 8) + g; argb = (argb << 8) + b; - pt[y * h + x] = argb; + data[id] = argb; } } } +void createHeuristicMask(DATA32* data, int w, int h) +{ + unsigned char* udata = (unsigned char*)data; + int b = udata[0]; + int g = udata[1]; + int r = udata[2]; + int i; + for (i=0; i