diff options
| author |  Mike Reed <reed@google.com> | 2017-10-02 13:44:11 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 13:44:18 +0000 |
| commit | 5a2e50edc51006ce91366e177a9d21a16775d7fd (patch) | |
| tree | 6301e052ffd179fc8c61681c0f8a0d7b175d4401 /bench | |
| parent | cd284c532376d16fcc4ed75baf3da65c3e4a2e95 (diff) | |
Revert "Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"""
This reverts commit cd284c532376d16fcc4ed75baf3da65c3e4a2e95.
Reason for revert:
assert fired in SkMallocPixelRef.cpp:61: fatal error: "assert(info.computeByteSize(rowBytes) == info.getSafeSize(rowBytes))"
google3 thinks it was from surface_rowbytes
Original change's description:
> Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
>
> This reverts commit 809cbedd4b252be221b2ac3b4269d312fd8f53a0.
>
> Bug: skia:
> Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
> Reviewed-on: https://skia-review.googlesource.com/52665
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: I41e3f7a3f791cc8183291847e783ed8a53bc91d2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/53802
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@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 886e875c6d..d9abac63d8 100644 --- a/bench/AndroidCodecBench.cpp +++ b/bench/AndroidCodecBench.cpp @@ -38,7 +38,7 @@ void AndroidCodecBench::onDelayedSetup() { fInfo = fInfo.makeAlphaType(kPremul_SkAlphaType); } - fPixelStorage.reset(fInfo.computeMinByteSize()); + fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); } void AndroidCodecBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index 708ab60870..29443746f7 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -43,7 +43,7 @@ void CodecBench::onDelayedSetup() { .makeAlphaType(fAlphaType) .makeColorSpace(nullptr); - fPixelStorage.reset(fInfo.computeMinByteSize()); + fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); } void CodecBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index 1239e1d4fe..680c1d916f 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.computeMinByteSize()); + fDst.reset(fDstInfo.getSafeSize(fDstInfo.minRowBytes())); if (FLAGS_xform_only) { - fSrc.reset(fSrcInfo.computeMinByteSize()); + fSrc.reset(fSrcInfo.getSafeSize(fSrcInfo.minRowBytes())); fSrcSpace = codec->getInfo().refColorSpace(); codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes()); } diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 2dc41bb8c0..04583309ce 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.computeByteSize(rowBytes)); + SkAutoMalloc storage(info.getSafeSize(rowBytes)); const SkCodec::Result result = codec->getPixels( info, storage.get(), rowBytes); |