diff options
author | 2017-09-26 17:46:02 -0400 | |
---|---|---|
committer | 2017-09-27 14:36:07 +0000 | |
commit | 88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch) | |
tree | a07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /src/image/SkImage.cpp | |
parent | fa7ee2447e6227e7f441d32e570489130c0932bb (diff) |
guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Now with legacy behavior for allocpixels
This was reverted, so the current CL is a "fix" on top of ...
https://skia-review.googlesource.com/c/skia/+/50980
Related update to Chrome (in preparation for this change)
https://chromium-review.googlesource.com/c/chromium/src/+/685719
Bug: skia:
Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
Reviewed-on: https://skia-review.googlesource.com/51341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image/SkImage.cpp')
-rw-r--r-- | src/image/SkImage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 3ac8ba80ca..705efaec30 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -422,7 +422,10 @@ sk_sp<SkImage> SkImageMakeRasterCopyAndAssignColorSpace(const SkImage* src, } size_t rowBytes = info.minRowBytes(); - size_t size = info.getSafeSize(rowBytes); + size_t size = info.computeByteSize(rowBytes); + if (size == 0) { + return nullptr; + } auto data = SkData::MakeUninitialized(size); if (!data) { return nullptr; |