commit b021f3e3fb47323a88c1d19a8d0669b644b2c36c
author Hal Canary <halcanary@google.com> Wed Jul 03 21:34:41 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 08 17:05:23 2019 +0000
tree 5ddf001c222bc1692aaf6231aa140e3cc5a20b40
parent b3b98b77b77fe625dc1b06f6d70301c0cd09bc5d

Sample/Filter2View: make it work without /skimages

Change-Id: I8958e026ca9e2c5a6c99a7a1cd1ec97088c25fe9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225548
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

samplecode/DecodeFile.h

diff --git a/samplecode/DecodeFile.h b/samplecode/DecodeFile.h
index a8907e7..aedc707 100644
--- a/samplecode/DecodeFile.h
+++ b/samplecode/DecodeFile.h
@@ -13,11 +13,10 @@
 #include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 
-static inline bool decode_file(const char* filename, SkBitmap* bitmap,
+static inline bool decode_file(sk_sp<SkData> data, SkBitmap* bitmap,
                                SkColorType colorType = kN32_SkColorType,
                                bool requireUnpremul = false) {
-    sk_sp<SkData> data(SkData::MakeFromFileName(filename));
-    std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(data);
+    std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(std::move(data));
     if (!codec) {
         return false;
     }
@@ -34,6 +33,12 @@
     return SkCodec::kSuccess == codec->getPixels(info, bitmap->getPixels(), bitmap->rowBytes());
 }
 
+static inline bool decode_file(const char* filename, SkBitmap* bitmap,
+                               SkColorType colorType = kN32_SkColorType,
+                               bool requireUnpremul = false) {
+    return decode_file(SkData::MakeFromFileName(filename), bitmap, colorType, requireUnpremul);
+}
+
 static inline sk_sp<SkImage> decode_file(const char filename[]) {
     sk_sp<SkData> data(SkData::MakeFromFileName(filename));
     return data ? SkImage::MakeFromEncoded(data) : nullptr;