diff options
| author |  Mike Reed <reed@google.com> | 2017-04-17 10:53:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 15:22:42 +0000 |
| commit | 12e946b4bfdf598bffb276776ea6e25439e25265 (patch) | |
| tree | 3431130a5008af573c497da13243da360d147918 /tools/skiaserve | |
| parent | 81340c65e0e507ca544e32c0fa0c6880f371eaff (diff) | |
deprecate odd variants of SkCanvas::readPixels
Bug: skia:6513
Change-Id: I51179a85f0912d3f899c368c30a943d346dd1d05
Reviewed-on: https://skia-review.googlesource.com/13589
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Request.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index 7c2b893ef2..12f3596817 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -46,9 +46,9 @@ Request::~Request() { SkBitmap* Request::getBitmapFromCanvas(SkCanvas* canvas) { SkBitmap* bmp = new SkBitmap(); - bmp->setInfo(canvas->imageInfo()); - if (!canvas->readPixels(bmp, 0, 0)) { + if (!bmp->tryAllocPixels(canvas->imageInfo()) || !canvas->readPixels(*bmp, 0, 0)) { fprintf(stderr, "Can't read pixels\n"); + delete bmp; return nullptr; } return bmp; |