aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/android
diff options
context:
space:
mode:
authorGravatar Leon Scroggins III <scroggo@google.com>2017-08-17 15:13:20 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-18 14:40:29 +0000
commit04be2b54ba07a076d59bea7dcbd063641010d77d (patch)
tree0b06118f8d83cc15dce38d97576b8bf8b7399f34 /src/android
parent20af6d12eefd8d937bc13bdb7fa0a9ac86b699af (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/android')
-rw-r--r--src/android/SkBitmapRegionDecoder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp
index a6e3ac6d94..72363f59fe 100644
--- a/src/android/SkBitmapRegionDecoder.cpp
+++ b/src/android/SkBitmapRegionDecoder.cpp
@@ -32,6 +32,7 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
case SkEncodedImageFormat::kJPEG:
case SkEncodedImageFormat::kPNG:
case SkEncodedImageFormat::kWEBP:
+ case SkEncodedImageFormat::kHEIF:
break;
default:
return nullptr;