diff options
author | Mike Reed <reed@google.com> | 2017-09-29 15:22:56 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 12:55:37 +0000 |
commit | cd284c532376d16fcc4ed75baf3da65c3e4a2e95 (patch) | |
tree | 5c7e34122e72cef44f279b1aa32638d765d3c639 /src/core/SkBitmap.cpp | |
parent | 3c83668862521b3bbbd628a522c05688348d6e7f (diff) |
Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
This reverts commit 809cbedd4b252be221b2ac3b4269d312fd8f53a0.
Bug: skia:
Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
Reviewed-on: https://skia-review.googlesource.com/52665
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkBitmap.cpp')
-rw-r--r-- | src/core/SkBitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 9de2261a9a..4c4f76ae95 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -678,7 +678,7 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) { } // write_raw_pixels() always writes snug buffers with rowBytes == minRowBytes(). - size_t bytes = info.getSafeSize(info.minRowBytes()); + size_t bytes = info.computeMinByteSize(); if (!buffer->validate(bytes != 0)) { return false; } |