diff options
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); |