diff options
author | Mike Reed <reed@google.com> | 2017-09-26 12:47:08 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-26 17:07:16 +0000 |
commit | 98a6216b18b57c2f7a0d58f542c60503686aed69 (patch) | |
tree | 646c987b18faa16aba1db40ea3f98684ad5946d6 /bench | |
parent | 106b5c4917636d3df70ee6f59661ac5fa506d087 (diff) |
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 <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'bench')
-rw-r--r-- | bench/AndroidCodecBench.cpp | 2 | ||||
-rw-r--r-- | bench/CodecBench.cpp | 2 | ||||
-rw-r--r-- | bench/ColorCodecBench.cpp | 4 | ||||
-rw-r--r-- | bench/nanobench.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bench/AndroidCodecBench.cpp b/bench/AndroidCodecBench.cpp index d9abac63d8..886e875c6d 100644 --- a/bench/AndroidCodecBench.cpp +++ b/bench/AndroidCodecBench.cpp @@ -38,7 +38,7 @@ void AndroidCodecBench::onDelayedSetup() { fInfo = fInfo.makeAlphaType(kPremul_SkAlphaType); } - fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); + fPixelStorage.reset(fInfo.computeMinByteSize()); } void AndroidCodecBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index 29443746f7..708ab60870 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -43,7 +43,7 @@ void CodecBench::onDelayedSetup() { .makeAlphaType(fAlphaType) .makeColorSpace(nullptr); - fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); + fPixelStorage.reset(fInfo.computeMinByteSize()); } void CodecBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index 680c1d916f..1239e1d4fe 100644 --- a/bench/ColorCodecBench.cpp +++ b/bench/ColorCodecBench.cpp @@ -88,10 +88,10 @@ void ColorCodecBench::onDelayedSetup() { fDstSpace = static_cast<SkColorSpace_XYZ*>(fDstSpace.get())->makeLinearGamma(); } - fDst.reset(fDstInfo.getSafeSize(fDstInfo.minRowBytes())); + fDst.reset(fDstInfo.computeMinByteSize()); if (FLAGS_xform_only) { - fSrc.reset(fSrcInfo.getSafeSize(fSrcInfo.minRowBytes())); + fSrc.reset(fSrcInfo.computeMinByteSize()); fSrcSpace = codec->getInfo().refColorSpace(); codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes()); } 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); |