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/SwizzlerTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/SwizzlerTest.cpp') diff --git a/tests/SwizzlerTest.cpp b/tests/SwizzlerTest.cpp index 655c97eadd..8950efb153 100644 --- a/tests/SwizzlerTest.cpp +++ b/tests/SwizzlerTest.cpp @@ -28,7 +28,7 @@ static void check_fill(skiatest::Reporter* r, // to test on different memory alignments. If offset is nonzero, we need to increase the // size of the memory we allocate in order to make sure that we have enough. We are // still allocating the smallest possible size. - const size_t totalBytes = imageInfo.getSafeSize(rowBytes) + offset; + const size_t totalBytes = imageInfo.computeByteSize(rowBytes) + offset; // Create fake image data where every byte has a value of 0 std::unique_ptr storage(new uint8_t[totalBytes]); -- cgit v1.2.3