commit 0ec4ff329741848cf967e5d66bd042c3eb1e52bd
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 27 14:47:30 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 27 14:47:30 2013 +0000
tree 685bdf1be79de8cc4e0a765048d9ee76427f7eee
parent 70e1478a6b453d32f1cfdff41c31be39b997e39e

fix 8->1 bugs shown by removal of A1 config

BUG=

Review URL: https://codereview.chromium.org/91563003

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

core/SkScalerContext.cpp

diff --git a/core/SkScalerContext.cpp b/core/SkScalerContext.cpp
index f4f2391..d4f23ae 100644
--- a/core/SkScalerContext.cpp
+++ b/core/SkScalerContext.cpp
@@ -531,8 +531,8 @@
 static uint8_t pack_8_to_1(const uint8_t alpha[8]) {
     unsigned bits = 0;
     for (int i = 0; i < 8; ++i) {
-        bits |= convert_8_to_1(alpha[i]);
         bits <<= 1;
+        bits |= convert_8_to_1(alpha[i]);
     }
     return SkToU8(bits);
 }
@@ -544,7 +544,7 @@
     const int leftOverBits = width & 7;
 
     uint8_t* dst = mask.fImage;
-    const int dstPad = mask.fRowBytes - SkAlign8(width);
+    const int dstPad = mask.fRowBytes - SkAlign8(width)/8;
     SkASSERT(dstPad >= 0);
 
     const int srcPad = srcRB - width;