commit 54b6cee88c4044a086e44906e9925583cebf63c4
author Brian Osman <brianosman@google.com> Fri Sep 07 10:30:19 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 07 14:35:18 2018 +0000
tree 558bc2fdd67643e2ffd3a56c82caff53dec5d78b
parent da4870efd7b777f51335c6baae1eef7a22e9e46b

Set alpha to 1 when loading gray

Bug: skia:
Change-Id: I74359ecd4fa0dabdb13aa478ae72d5ebd1714966
Reviewed-on: https://skia-review.googlesource.com/152641
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/Transform_inl.h

diff --git a/src/Transform_inl.h b/src/Transform_inl.h
index 6a79843..f89c312 100644
--- a/src/Transform_inl.h
+++ b/src/Transform_inl.h
@@ -587,7 +587,7 @@
 
 static void exec_ops(const Op* ops, const void** args,
                      const char* src, char* dst, int i) {
-    F r = F0, g = F0, b = F0, a = F0;
+    F r = F0, g = F0, b = F0, a = F1;
     while (true) {
         switch (*ops++) {
             case Op_noop: break;
@@ -615,7 +615,6 @@
                 r = cast<F>(rgb & (uint16_t)(31<< 0)) * (1.0f / (31<< 0));
                 g = cast<F>(rgb & (uint16_t)(63<< 5)) * (1.0f / (63<< 5));
                 b = cast<F>(rgb & (uint16_t)(31<<11)) * (1.0f / (31<<11));
-                a = F1;
             } break;
 
             case Op_load_888:{
@@ -641,7 +640,6 @@
                 g = cast<F>(load_3<U32>(rgb+1) ) * (1/255.0f);
                 b = cast<F>(load_3<U32>(rgb+2) ) * (1/255.0f);
             #endif
-                a = F1;
             } break;
 
             case Op_load_8888:{
@@ -680,7 +678,6 @@
                 g = cast<F>((G & 0x00ff)<<8 | (G & 0xff00)>>8) * (1/65535.0f);
                 b = cast<F>((B & 0x00ff)<<8 | (B & 0xff00)>>8) * (1/65535.0f);
             #endif
-                a = F1;
             } break;
 
             case Op_load_16161616:{
@@ -720,7 +717,6 @@
                 r = F_from_Half(R);
                 g = F_from_Half(G);
                 b = F_from_Half(B);
-                a = F1;
             } break;
 
             case Op_load_hhhh:{
@@ -760,7 +756,6 @@
                 g = load_3<F>(rgb+1);
                 b = load_3<F>(rgb+2);
             #endif
-                a = F1;
             } break;
 
             case Op_load_ffff:{