diff options
author | 2017-09-26 17:46:02 -0400 | |
---|---|---|
committer | 2017-09-27 14:36:07 +0000 | |
commit | 88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch) | |
tree | a07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /src/utils | |
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/utils')
-rw-r--r-- | src/utils/mac/SkCreateCGImageRef.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index fd55d91707..1514ba6e8a 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp @@ -132,7 +132,7 @@ CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm, const int w = bitmap->width(); const int h = bitmap->height(); - const size_t s = bitmap->getSize(); + const size_t s = bitmap->computeByteSize(); // our provider "owns" the bitmap*, and will take care of deleting it CGDataProviderRef dataRef = CGDataProviderCreateWithData(bitmap, bitmap->getPixels(), s, |