From cd284c532376d16fcc4ed75baf3da65c3e4a2e95 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 29 Sep 2017 15:22:56 -0400 Subject: 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 Reviewed-by: Florin Malita --- src/android/SkBitmapRegionCodec.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/android') diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp index f77c70264f..493e4b5672 100644 --- a/src/android/SkBitmapRegionCodec.cpp +++ b/src/android/SkBitmapRegionCodec.cpp @@ -96,7 +96,7 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat if (SubsetType::kPartiallyInside_SubsetType == type && SkCodec::kNo_ZeroInitialized == zeroInit) { void* pixels = bitmap->getPixels(); - size_t bytes = outInfo.getSafeSize(bitmap->rowBytes()); + size_t bytes = outInfo.computeByteSize(bitmap->rowBytes()); memset(pixels, 0, bytes); } -- cgit v1.2.3