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/Float16Test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Float16Test.cpp') diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp index 64873c3fc8..e67d8f1e79 100644 --- a/tests/Float16Test.cpp +++ b/tests/Float16Test.cpp @@ -43,7 +43,7 @@ DEF_TEST(color_half_float, reporter) { SkAutoPixmapStorage pm; pm.alloc(info); - REPORTER_ASSERT(reporter, pm.getSafeSize() == SkToSizeT(w * h * sizeof(uint64_t))); + REPORTER_ASSERT(reporter, pm.computeByteSize() == SkToSizeT(w * h * sizeof(uint64_t))); SkColor4f c4 { 1, 0.5f, 0.25f, 0.5f }; pm.erase(c4); -- cgit v1.2.3