backport line fix.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/evas-1.7@77929 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 030de50..c1b8ac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1020,3 +1020,7 @@
 
        * Fix font sizing issues when size scaling happens to down down
        when it should round up. happens in rare sizing situations and fonts.
+
+2012-10-11  Carsten Haitzler (The Rasterman)
+
+       * Fix C code fallback line rendering path in software

diff --git a/NEWS b/NEWS
index 96e96d2..993f110 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,12 @@ Changes since Evas 1.7.0:
 -------------------------
 
 Fixes:
-
    * Fix EGL/GLES dest alpha rendering bug (no rendering).
    * Fix evas_object_image_alpha_set when image data not loaded yet.
    * Fix map surface leak.
    * Fix native surface set to null crash bug in gl engine.
    * Fix font sizing issue with some rare sizes and fonts when rounding wrong.
+   * Fix software line drawing c fallback code.
 
 Evas 1.7.0
 

diff --git a/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c b/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c
index 12a0a75..76f6370 100644 (file)
--- a/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c
+++ b/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c
@@ -77,7 +77,7 @@ init_blend_mask_color_span_funcs_c(void)
 static void
 _op_blend_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
    s = MUL_SYM(m, c);
-   m = 256 - (s >> 24);
+   m = 255 - (s >> 24);
    *d = s + MUL_256(m, *d);
 }