commit a2406f9218a3b6f2d87ca5a7dc01e46ed3518fd6
author Robert Phillips <robertphillips@google.com> Tue Feb 04 09:47:39 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 04 16:10:20 2020 +0000
tree 6f6a788144afe3bc4c770fbd9eb03381e509536e
parent 2aee7d24da8f53d5c493c86a62fe7d5bda0ed2a2

Fix BC1 SW decompression on platforms with RGBA PM color order

Bug: skia:9680
Change-Id: Ibe802ea574d749ebd601118d0e6da32b2a18fab2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268619
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/core/SkCompressedDataUtils.cpp

diff --git a/src/core/SkCompressedDataUtils.cpp b/src/core/SkCompressedDataUtils.cpp
index 5c9d14a..3f7dc58 100644
--- a/src/core/SkCompressedDataUtils.cpp
+++ b/src/core/SkCompressedDataUtils.cpp
@@ -190,7 +190,7 @@
 
             colors[0] = from565(curBlock->fColor0);
             colors[1] = from565(curBlock->fColor1);
-            if (colors[0] <= colors[1]) {                 // signal for a transparent block
+            if (curBlock->fColor0 <= curBlock->fColor1) {        // signal for a transparent block
                 colors[2] = SkPackARGB32(
                     0xFF,
                     (SkGetPackedR32(colors[0]) + SkGetPackedR32(colors[1])) >> 1,