diff options
| author |  Mike Reed <reed@google.com> | 2017-07-23 15:30:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-25 15:35:23 +0000 |
| commit | ede7bac43fbc69b9fdf1c178890ba6353f5bb140 (patch) | |
| tree | dccdba46e7abf125e2f90e6dc08eca00ad9cb09b /gm | |
| parent | fa3ed03720b5083afd3620c9239863f05f2eedbd (diff) | |
use unique_ptr for codec factories
Will need guards for android (at least)
Bug: skia:
Change-Id: I2bb8e656997984489ef1f2e41cd3d301c4e7b947
Reviewed-on: https://skia-review.googlesource.com/26040
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/animatedGif.cpp | 2 | ||||
| -rw-r--r-- | gm/bitmapimage.cpp | 2 | ||||
| -rw-r--r-- | gm/encode-srgb.cpp | 2 | ||||
| -rw-r--r-- | gm/makecolorspace.cpp | 2 | ||||
| -rw-r--r-- | gm/readpixels.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gm/animatedGif.cpp b/gm/animatedGif.cpp index fc5217fa8d..5686193971 100644 --- a/gm/animatedGif.cpp +++ b/gm/animatedGif.cpp @@ -123,7 +123,7 @@ private: return false; } - fCodec.reset(SkCodec::NewFromStream(stream.release())); + fCodec = SkCodec::MakeFromStream(std::move(stream)); if (!fCodec) { SkDebugf("Could create codec from %s", FLAGS_animatedGif[0]); return false; diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp index 9832041132..ccd34875e0 100644 --- a/gm/bitmapimage.cpp +++ b/gm/bitmapimage.cpp @@ -36,7 +36,7 @@ protected: } // Create matching bitmap. - std::unique_ptr<SkCodec> codec(SkCodec::NewFromStream(GetResourceAsStream(path).release())); + std::unique_ptr<SkCodec> codec(SkCodec::MakeFromStream(GetResourceAsStream(path))); SkBitmap bitmap; bitmap.allocPixels(codec->getInfo()); codec->getPixels(codec->getInfo(), bitmap.getPixels(), bitmap.rowBytes()); diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index bffe19606f..be3cd62f8b 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -56,7 +56,7 @@ static void make(SkBitmap* bitmap, SkColorType colorType, SkAlphaType alphaType, } sk_sp<SkData> data = GetResourceAsData(resource); - std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(data)); + std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(data); SkImageInfo dstInfo = codec->getInfo().makeColorType(colorType) .makeAlphaType(alphaType) .makeColorSpace(fix_for_colortype(colorSpace, colorType)); diff --git a/gm/makecolorspace.cpp b/gm/makecolorspace.cpp index b3b937ec40..0ea3d40746 100644 --- a/gm/makecolorspace.cpp +++ b/gm/makecolorspace.cpp @@ -15,7 +15,7 @@ sk_sp<SkImage> make_raster_image(const char* path, SkTransferFunctionBehavior behavior) { SkString resourcePath = GetResourcePath(path); sk_sp<SkData> resourceData = SkData::MakeFromFileName(resourcePath.c_str()); - std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(resourceData)); + std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(resourceData); SkBitmap bitmap; bitmap.allocPixels(codec->getInfo()); diff --git a/gm/readpixels.cpp b/gm/readpixels.cpp index 69d22bb7f2..bd2fe9bcc3 100644 --- a/gm/readpixels.cpp +++ b/gm/readpixels.cpp @@ -52,7 +52,7 @@ static const int kHeight = 64; static sk_sp<SkImage> make_raster_image(SkColorType colorType) { std::unique_ptr<SkStream> stream(GetResourceAsStream("google_chrome.ico")); - std::unique_ptr<SkCodec> codec(SkCodec::NewFromStream(stream.release())); + std::unique_ptr<SkCodec> codec = SkCodec::MakeFromStream(std::move(stream)); SkBitmap bitmap; SkImageInfo info = codec->getInfo().makeWH(kWidth, kHeight) |