aboutsummaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-08-31 15:18:29 +0200
committermarha <marha@users.sourceforge.net>2012-09-04 14:23:28 +0200
commitd7fc06ac528d54e0e1416cb8aa89b6fd072400a5 (patch)
tree74cccede044412bba5723a132f1385aa9259f04b /pixman
parent9dec848b23cf905ded387820f2893425cc00d545 (diff)
downloadvcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.gz
vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.bz2
vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.zip
randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver
git update 31 Aug 2012
Diffstat (limited to 'pixman')
-rw-r--r--pixman/test/utils.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/pixman/test/utils.c b/pixman/test/utils.c
index 85b58d038..c922ae5d5 100644
--- a/pixman/test/utils.c
+++ b/pixman/test/utils.c
@@ -772,7 +772,7 @@ convert_srgb_to_linear (double c)
if (c <= 0.04045)
return c / 12.92;
else
- return powf ((c + 0.055) / 1.055, 2.4);
+ return pow ((c + 0.055) / 1.055, 2.4);
}
double
@@ -781,7 +781,7 @@ convert_linear_to_srgb (double c)
if (c <= 0.0031308)
return c * 12.92;
else
- return 1.055 * powf (c, 1.0/2.4) - 0.055;
+ return 1.055 * pow (c, 1.0/2.4) - 0.055;
}
void
@@ -962,6 +962,18 @@ get_limits (const pixel_checker_t *checker, double limit,
color_t *color,
int *ao, int *ro, int *go, int *bo)
{
+ color_t tmp;
+
+ if (PIXMAN_FORMAT_TYPE (checker->format) == PIXMAN_TYPE_ARGB_SRGB)
+ {
+ tmp.a = color->a;
+ tmp.r = convert_linear_to_srgb (color->r);
+ tmp.g = convert_linear_to_srgb (color->g);
+ tmp.b = convert_linear_to_srgb (color->b);
+
+ color = &tmp;
+ }
+
*ao = convert (color->a + limit, checker->aw, checker->am, checker->as, 1.0);
*ro = convert (color->r + limit, checker->rw, checker->rm, checker->rs, 0.0);
*go = convert (color->g + limit, checker->gw, checker->gm, checker->gs, 0.0);
@@ -988,25 +1000,11 @@ pixel_checker_get_min (const pixel_checker_t *checker, color_t *color,
pixman_bool_t
pixel_checker_check (const pixel_checker_t *checker, uint32_t pixel,
- color_t *color_in)
+ color_t *color)
{
int32_t a_lo, a_hi, r_lo, r_hi, g_lo, g_hi, b_lo, b_hi;
int32_t ai, ri, gi, bi;
pixman_bool_t result;
- color_t tmp, *color;
-
- if (PIXMAN_FORMAT_TYPE (checker->format) == PIXMAN_TYPE_ARGB_SRGB)
- {
- tmp.a = color_in->a;
- tmp.r = convert_linear_to_srgb (color_in->r);
- tmp.g = convert_linear_to_srgb (color_in->g);
- tmp.b = convert_linear_to_srgb (color_in->b);
- color = &tmp;
- }
- else
- {
- color = color_in;
- }
pixel_checker_get_min (checker, color, &a_lo, &r_lo, &g_lo, &b_lo);
pixel_checker_get_max (checker, color, &a_hi, &r_hi, &g_hi, &b_hi);