diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-08-17 15:13:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-18 14:40:29 +0000 |
| commit | 04be2b54ba07a076d59bea7dcbd063641010d77d (patch) | |
| tree | 0b06118f8d83cc15dce38d97576b8bf8b7399f34 /src/codec/SkAndroidCodec.cpp | |
| parent | 20af6d12eefd8d937bc13bdb7fa0a9ac86b699af (diff) | |
Reland "skia: add heif decoding support"
This reverts commit db68a426b6ba3a0fa1cace25ac306037eb7413a6.
Fixes errors in Android and Google3
Bug: b/64077740
Change-Id: I3d2bb1223e4d8ba912ea2b88144aeecc487fce1a
Reviewed-on: https://skia-review.googlesource.com/35701
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Chong Zhang <chz@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'src/codec/SkAndroidCodec.cpp')
| -rw-r--r-- | src/codec/SkAndroidCodec.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index d004eb8326..f5c93f2445 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -89,6 +89,9 @@ std::unique_ptr<SkAndroidCodec> SkAndroidCodec::MakeFromStream(std::unique_ptr<S case SkEncodedImageFormat::kGIF: case SkEncodedImageFormat::kBMP: case SkEncodedImageFormat::kWBMP: +#ifdef SK_HAS_HEIF_LIBRARY + case SkEncodedImageFormat::kHEIF: +#endif return skstd::make_unique<SkSampledCodec>(codec.release()); #ifdef SK_HAS_WEBP_LIBRARY case SkEncodedImageFormat::kWEBP: |