From 98a6216b18b57c2f7a0d58f542c60503686aed69 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 26 Sep 2017 12:47:08 -0400 Subject: guard old apis for querying byte-size of a bitmap/imageinfo/pixmap Previously we had size_t and uint64_t variations. The new (simpler) API always.. - returns size_t, or 0 if the calculation overflowed - returns the trimmed size (does not include rowBytes padding for the last row) Bug: skia: Change-Id: I05173e877918327c7b207d2f7f1ab0db36892e2e Reviewed-on: https://skia-review.googlesource.com/50980 Commit-Queue: Mike Reed Reviewed-by: Florin Malita Reviewed-by: Leon Scroggins --- tests/WritePixelsTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/WritePixelsTest.cpp') diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 81dcbe7f6d..7ea0aad12f 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -394,7 +394,7 @@ DEF_TEST(WritePixels, reporter) { const SkImageInfo info = SkImageInfo::MakeN32Premul(DEV_W, DEV_H); for (auto& tightRowBytes : { true, false }) { const size_t rowBytes = tightRowBytes ? info.minRowBytes() : 4 * DEV_W + 100; - const size_t size = info.getSafeSize(rowBytes); + const size_t size = info.computeByteSize(rowBytes); void* pixels = sk_malloc_throw(size); // if rowBytes isn't tight then set the padding to a known value if (!tightRowBytes) { -- cgit v1.2.3