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 --- bench/nanobench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 04583309ce..2dc41bb8c0 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -887,7 +887,7 @@ public: SkImageInfo info = codec->getInfo().makeColorType(colorType).makeAlphaType(alphaType); const size_t rowBytes = info.minRowBytes(); - SkAutoMalloc storage(info.getSafeSize(rowBytes)); + SkAutoMalloc storage(info.computeByteSize(rowBytes)); const SkCodec::Result result = codec->getPixels( info, storage.get(), rowBytes); -- cgit v1.2.3