From a57488a1f5c14c2114c57880b85c1bbc90024973 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 25 Jun 2018 14:01:29 -0400 Subject: 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 Reviewed-by: Mike Klein Commit-Queue: Leon Scroggins --- dm/DMSrcSink.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dm') 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."; } -- cgit v1.2.3