commit 722b3a7d2f6b5d98fe1661736e254ab26fc89761
author Chong Zhang <chz@google.com> Wed Aug 23 11:17:36 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 23 19:44:56 2017 +0000
tree ed65f7bfb46902c0e22fc4208e5a57aba6ff15e7
parent 38db79f7ba6fdcd29c3032bf8c4e1eb6f895065a

Initialize the swizzler if there is a subset

Bug: b/64077740

Change-Id: Ic6bef3f63bcda24fc3d88ce0cdcf1216441faa40
Reviewed-on: https://skia-review.googlesource.com/37680
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>

src/codec/SkHeifCodec.cpp

diff --git a/src/codec/SkHeifCodec.cpp b/src/codec/SkHeifCodec.cpp
index 008c129..1067511 100644
--- a/src/codec/SkHeifCodec.cpp
+++ b/src/codec/SkHeifCodec.cpp
@@ -279,6 +279,7 @@
         return kInvalidInput;
     }
 
+    fSwizzler.reset(nullptr);
     this->allocateStorage(dstInfo);
 
     int rows = this->readRows(dstInfo, dst, dstRowBytes, dstInfo.height(), options);
@@ -355,6 +356,12 @@
         return kInvalidInput;
     }
 
+    if (options.fSubset) {
+        this->initializeSwizzler(dstInfo, options);
+    } else {
+        fSwizzler.reset(nullptr);
+    }
+
     this->allocateStorage(dstInfo);
 
     return kSuccess;