From fde05114e6c4107b36e1aa571c64d31def40f613 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 11 Mar 2016 13:02:28 -0800 Subject: Make sp variants for SkData Review URL: https://codereview.chromium.org/1779263003 --- src/images/SkImageDecoder_astc.cpp | 2 +- src/images/SkImageDecoder_ktx.cpp | 4 ++-- src/images/SkImageDecoder_libbmp.cpp | 2 +- src/images/SkImageDecoder_libico.cpp | 5 ++--- src/images/SkImageDecoder_pkm.cpp | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/images') diff --git a/src/images/SkImageDecoder_astc.cpp b/src/images/SkImageDecoder_astc.cpp index 8989464f3b..30d65f1f0f 100644 --- a/src/images/SkImageDecoder_astc.cpp +++ b/src/images/SkImageDecoder_astc.cpp @@ -44,7 +44,7 @@ static inline int read_24bit(const uint8_t* buf) { } SkImageDecoder::Result SkASTCImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { - SkAutoTUnref data(SkCopyStreamToData(stream)); + auto data = SkCopyStreamToData(stream); if (!data || !data->size()) { return kFailure; } diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp index 539795ad9b..156674565c 100644 --- a/src/images/SkImageDecoder_ktx.cpp +++ b/src/images/SkImageDecoder_ktx.cpp @@ -50,12 +50,12 @@ private: SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { // TODO: Implement SkStream::copyToData() that's cheap for memory and file streams - SkAutoDataUnref data(SkCopyStreamToData(stream)); + auto data = SkCopyStreamToData(stream); if (nullptr == data) { return kFailure; } - SkKTXFile ktxFile(data); + SkKTXFile ktxFile(data.get()); if (!ktxFile.valid()) { return kFailure; } diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp index 4a6f71c82d..b9359bea7a 100644 --- a/src/images/SkImageDecoder_libbmp.cpp +++ b/src/images/SkImageDecoder_libbmp.cpp @@ -97,7 +97,7 @@ SkImageDecoder::Result SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* b // First read the entire stream, so that all of the data can be passed to // the BmpDecoderHelper. - SkAutoTUnref data(SkCopyStreamToData(stream)); + auto data = SkCopyStreamToData(stream); if (!data) { return kFailure; } diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp index 93a875d4cb..ff04d74d06 100644 --- a/src/images/SkImageDecoder_libico.cpp +++ b/src/images/SkImageDecoder_libico.cpp @@ -73,9 +73,8 @@ static int calculateRowBytesFor8888(int w, int bitCount) return 0; } -SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) -{ - SkAutoTUnref data(SkCopyStreamToData(stream)); +SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { + auto data = SkCopyStreamToData(stream); if (!data) { return kFailure; } diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp index 098a4ee0ae..af68f20d97 100644 --- a/src/images/SkImageDecoder_pkm.cpp +++ b/src/images/SkImageDecoder_pkm.cpp @@ -34,7 +34,7 @@ private: ///////////////////////////////////////////////////////////////////////////////////////// SkImageDecoder::Result SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { - SkAutoTUnref data(SkCopyStreamToData(stream)); + sk_sp data(SkCopyStreamToData(stream)); if (!data || !data->size()) { return kFailure; } -- cgit v1.2.3