commit 0e330ae5f90ef8a4a864329b9a634644a05bf124
author mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun Aug 12 19:08:41 2012 +0000
committer mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun Aug 12 19:08:41 2012 +0000
tree 9bde04de3b9bcac97197b85910ee1135ab227b65
parent d51ea26ea17e88e2ab1bd6eb5672d59b63892346

revert arith change, until I can rebaseline all the images (and check chrome)



git-svn-id: http://skia.googlecode.com/svn/trunk@5044 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkArithmeticMode.cpp

diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
index cd3c31d..c999ce0 100644
--- a/src/effects/SkArithmeticMode.cpp
+++ b/src/effects/SkArithmeticMode.cpp
@@ -107,7 +107,14 @@
                 b = blend(b, SkGetPackedB32(sc), scale);
             }
 
-            dst[i] = SkPremultiplyARGBInline(a, r, g, b);
+            // turn the result back into premul
+            if (0xFF != a) {
+                int scale = a + (a >> 7);
+                r = SkAlphaMul(r, scale);
+                g = SkAlphaMul(g, scale);
+                b = SkAlphaMul(b, scale);
+            }
+            dst[i] = SkPackARGB32(a, r, g, b);
         }
     }
 }