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 /src/android/SkBitmapRegionDecoder.cpp | |
| 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 'src/android/SkBitmapRegionDecoder.cpp')
| -rw-r--r-- | src/android/SkBitmapRegionDecoder.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index 8298fb5298..a6e3ac6d94 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -22,11 +22,10 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( std::unique_ptr<SkStreamRewindable> streamDeleter(stream); switch (strategy) { case kAndroidCodec_Strategy: { - std::unique_ptr<SkAndroidCodec> codec( - SkAndroidCodec::NewFromStream(streamDeleter.release())); + auto codec = SkAndroidCodec::MakeFromStream(std::move(streamDeleter)); if (nullptr == codec) { SkCodecPrintf("Error: Failed to create codec.\n"); - return NULL; + return nullptr; } switch ((SkEncodedImageFormat)codec->getEncodedFormat()) { |