diff options
| author |  Mike Reed <reed@google.com> | 2017-02-15 15:14:16 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-15 20:51:28 +0000 |
| commit | 185130c643f0f6b20dcf14c200074748be282a7e (patch) | |
| tree | 049a9162c7ed7c298a4966000b9aa805f75282ad /gm/pictureimagegenerator.cpp | |
| parent | eb62829a83a0a4f4fdd1230a3c08140e38052602 (diff) | |
return and take SkImageGenerator as unique_ptr
BUG=skia:
Change-Id: I4bc11042dd1dbf1eabd40af206027bc65acc3186
Reviewed-on: https://skia-review.googlesource.com/8444
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/pictureimagegenerator.cpp')
| -rw-r--r-- | gm/pictureimagegenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp index 3f8553c559..1cf34268ac 100644 --- a/gm/pictureimagegenerator.cpp +++ b/gm/pictureimagegenerator.cpp @@ -153,10 +153,10 @@ protected: if (configs[i].scaleY < 0) { m.postTranslate(0, SkIntToScalar(configs[i].size.height())); } - std::unique_ptr<SkImageGenerator> gen( - SkImageGenerator::NewFromPicture(configs[i].size, fPicture.get(), &m, + std::unique_ptr<SkImageGenerator> gen = + SkImageGenerator::MakeFromPicture(configs[i].size, fPicture, &m, p.getAlpha() != 255 ? &p : nullptr, - SkImage::BitDepth::kU8, srgbColorSpace)); + SkImage::BitDepth::kU8, srgbColorSpace); SkImageInfo bmInfo = gen->getInfo().makeColorSpace(canvas->imageInfo().refColorSpace()); |