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>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/codec/SkHeifCodec.cpp b/src/codec/SkHeifCodec.cpp
index 008c12960f..10675112b7 100644
--- a/src/codec/SkHeifCodec.cpp
+++ b/src/codec/SkHeifCodec.cpp
@@ -279,6 +279,7 @@ SkCodec::Result SkHeifCodec::onGetPixels(const SkImageInfo& dstInfo,
         return kInvalidInput;
     }
 
+    fSwizzler.reset(nullptr);
     this->allocateStorage(dstInfo);
 
     int rows = this->readRows(dstInfo, dst, dstRowBytes, dstInfo.height(), options);
@@ -355,6 +356,12 @@ SkCodec::Result SkHeifCodec::onStartScanlineDecode(
         return kInvalidInput;
     }
 
+    if (options.fSubset) {
+        this->initializeSwizzler(dstInfo, options);
+    } else {
+        fSwizzler.reset(nullptr);
+    }
+
     this->allocateStorage(dstInfo);
 
     return kSuccess;