aboutsummaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-25 08:21:39 +0000
committermarha <marha@users.sourceforge.net>2011-05-25 08:21:39 +0000
commit741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd (patch)
tree54152e84082431bb25a59a82c51249769de08202 /pixman
parent94d512f7295ade7b381fba2e9e0bc0c434cf8b65 (diff)
downloadvcxsrv-741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd.tar.gz
vcxsrv-741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd.tar.bz2
vcxsrv-741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd.zip
xkeyboard-config libX11 pixman mesa git update 25 May 2011
Diffstat (limited to 'pixman')
-rw-r--r--pixman/pixman/pixman-combine.c.template7
1 files changed, 3 insertions, 4 deletions
diff --git a/pixman/pixman/pixman-combine.c.template b/pixman/pixman/pixman-combine.c.template
index f5dd8e120..806a18498 100644
--- a/pixman/pixman/pixman-combine.c.template
+++ b/pixman/pixman/pixman-combine.c.template
@@ -437,7 +437,7 @@ combine_saturate_u (pixman_implementation_t *imp,
* PDF_NON_SEPARABLE_BLEND_MODE macros, which take the blend function as an
* argument. Note that this implementation operates on premultiplied colors,
* while the PDF specification does not. Therefore the code uses the formula
- * ar.Cra = (1 – as) . Dca + (1 – ad) . Sca + B(Dca, ad, Sca, as)
+ * Cra = (1 – as) . Dca + (1 – ad) . Sca + B(Dca, ad, Sca, as)
*/
/*
@@ -849,7 +849,7 @@ PDF_SEPARABLE_BLEND_MODE (exclusion)
*
* r * set_sat (C, s) = set_sat (x * C, r * s)
*
- * The above holds for all non-zero x, because they x'es in the fraction for
+ * The above holds for all non-zero x, because the x'es in the fraction for
* C_mid cancel out. Specifically, it holds for x = r:
*
* r * set_sat (C, s) = set_sat (r_c, rs)
@@ -885,8 +885,7 @@ PDF_SEPARABLE_BLEND_MODE (exclusion)
*
* a_s * a_d * B(s, d)
* = a_s * a_d * set_lum (set_sat (S/a_s, SAT (D/a_d)), LUM (D/a_d), 1)
- * = a_s * a_d * set_lum (set_sat (a_d * S, a_s * SAT (D)),
- * a_s * LUM (D), a_s * a_d)
+ * = set_lum (set_sat (a_d * S, a_s * SAT (D)), a_s * LUM (D), a_s * a_d)
*
*/