AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "remove #if guards in SkAndroidCodec.cpp"

Browse Source 
This reverts commit 8ae07c319d.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> remove #if guards in SkAndroidCodec.cpp
> 
> I'm not sure I entirely understand what's going on here, but it looks
> like these removed guards aren't needed?  Can you walk me through what
> they're for?  I think they're getting in the way of runtime registered
> codecs working with SkAndroidCodec.
> 
> Change-Id: I078bfb77797b4a3419f02a20d77d0aa8d7bce09d
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213876
> Commit-Queue: Mike Klein <mtklein@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>

TBR=mtklein@google.com,scroggo@google.com

Change-Id: I92883e0e8e334766b6004faf0801689d6f4cde9d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214106
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-05-15 22:02:05 +00:00
parent c9deffaed2
commit 0af9929416
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/codec/SkAndroidCodec.cpp
View File

@ -98,13 +98,18 @@ std::unique_ptr<SkAndroidCodec> SkAndroidCodec::MakeFromCodec(std::unique_ptr<Sk
case SkEncodedImageFormat::kWBMP:
case SkEncodedImageFormat::kHEIF:
return skstd::make_unique<SkSampledCodec>(codec.release(), orientationBehavior);
#ifdef SK_HAS_WUFFS_LIBRARY
case SkEncodedImageFormat::kGIF:
#endif
#ifdef SK_HAS_WEBP_LIBRARY
case SkEncodedImageFormat::kWEBP:
#endif
#ifdef SK_CODEC_DECODES_RAW
case SkEncodedImageFormat::kDNG:
#endif
#if defined(SK_HAS_WEBP_LIBRARY) || defined(SK_CODEC_DECODES_RAW) || defined(SK_HAS_WUFFS_LIBRARY)
return skstd::make_unique<SkAndroidCodecAdapter>(codec.release(), orientationBehavior);
#endif
default:
return nullptr;