timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xcf: fix float comparison in xcf generic loader.

This commit is contained in:
Cedric BAIL 2016-12-19 12:11:37 -08:00
parent 3d0c4ac0f6
commit 3751e29a9b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/evas/xcf/pixelfuncs.c
View File

@ -20,6 +20,10 @@
#include "common.h" #include "common.h"
#include <float.h>
#define EINA_FLT_CMP(a, b) (fabsf((float)a - (float)b) <= FLT_EPSILON)
#define RS R_VAL(src + s_idx) #define RS R_VAL(src + s_idx)
#define GS G_VAL(src + s_idx) #define GS G_VAL(src + s_idx)
#define BS B_VAL(src + s_idx) #define BS B_VAL(src + s_idx)
@ -128,7 +132,7 @@ hls_to_rgb (DATA8 *hue, DATA8 *lightness, DATA8 *saturation)
l = *lightness; l = *lightness;
s = *saturation; s = *saturation;
if (s == 0) if (EINA_FLT_CMP(s, 0))
{ {
/* achromatic case */ /* achromatic case */
*hue = l; *hue = l;
@ -138,9 +142,9 @@ hls_to_rgb (DATA8 *hue, DATA8 *lightness, DATA8 *saturation)
else else
{ {
if (l < 128) if (l < 128)
m2 = (l * (255 + s)) / 65025.0; m2 = (l * (255 + s)) / 65025.0;
else else
m2 = (l + s - (l * s) / 255.0) / 255.0; m2 = (l + s - (l * s) / 255.0) / 255.0;
m1 = (l / 127.5) - m2; m1 = (l / 127.5) - m2;
@ -184,23 +188,23 @@ rgb_to_hsv (DATA8 *red, DATA8 *green, DATA8 *blue)
else else
s = 0; s = 0;
if (s == 0) if (EINA_FLT_CMP(s, 0))
h = 0; h = 0;
else else
{ {
delta = max - min; delta = max - min;
if (r == max) if (r == max)
h = (g - b) / (double) delta; h = (g - b) / (double) delta;
else if (g == max) else if (g == max)
h = 2 + (b - r) / (double) delta; h = 2 + (b - r) / (double) delta;
else if (b == max) else if (b == max)
h = 4 + (r - g) / (double) delta; h = 4 + (r - g) / (double) delta;
h *= 42.5; h *= 42.5;
if (h < 0) if (h < 0)
h += 255; h += 255;
if (h > 255) if (h > 255)
h -= 255; h -= 255;
} }
*red = h; *red = h;