diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2018-06-25 14:01:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-26 17:30:52 +0000 |
| commit | a57488a1f5c14c2114c57880b85c1bbc90024973 (patch) | |
| tree | 7e811b7928e098560b8a8ebab12c3da960b5efc6 /dm | |
| parent | 6a284b771632f547b8a2d31115d3df4601c53228 (diff) | |
Expose public factories for platform decoders
Bug: skia:8076
Move SkImageGeneratorCG and SkImageGeneratorWIC to include/ports/,
and make them SK_API.
Remove SkImageGeneratorCG::NewFromEncodedCG. No known clients are using
it, and it was a private API in src/. There is already a
MakeFromEncodedCG to replace it.
Similarly, switch WIC from New to Make.
Add a compile test for using them with
SetImageGeneratorFromEncodedDataFactory.
Change-Id: I897eb7a887b3736a6c614a68e38f38b6a1942cf1
Reviewed-on: https://skia-review.googlesource.com/137387
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMSrcSink.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index baa98a0784..9a16e89b07 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -954,9 +954,8 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const { #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) gen = SkImageGeneratorCG::MakeFromEncodedCG(encoded); #elif defined(SK_BUILD_FOR_WIN) - gen.reset(SkImageGeneratorWIC::NewFromEncodedWIC(encoded.get())); + gen = SkImageGeneratorWIC::MakeFromEncodedWIC(encoded); #endif - if (!gen) { return "Could not create platform image generator."; } |