diff options
| -rw-r--r-- | tools/get_images_from_skps.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index da66e58bdc..35624348ff 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -125,24 +125,16 @@ struct Sniffer { }; static bool get_images_from_file(const SkString& file) { + Sniffer sniff(file.c_str()); auto stream = SkStream::MakeFromFile(file.c_str()); - sk_sp<SkPicture> picture(SkPicture::MakeFromStream(stream.get())); - if (!picture) { - return false; - } - SkDynamicMemoryWStream scratch; - Sniffer sniff(file.c_str()); - SkSerialProcs procs; - procs.fImageProc = [](SkImage* image, void* ctx) { - if (auto data = image->refEncodedData()) { - ((Sniffer*)ctx)->sniff(data->data(), data->size()); - } - return SkData::MakeEmpty(); + SkDeserialProcs procs; + procs.fImageProc = [](const void* data, size_t size, void* ctx) -> sk_sp<SkImage> { + ((Sniffer*)ctx)->sniff(data, size); + return nullptr; }; procs.fImageCtx = &sniff; - picture->serialize(&procs); - return true; + return SkPicture::MakeFromStream(stream.get(), &procs) != nullptr; } int main(int argc, char** argv) { |