diff options
| author |  Mike Reed <reed@google.com> | 2017-10-03 14:47:21 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-03 20:03:35 +0000 |
| commit | f0ffb8943b7be477b769db23660a80013f3332eb (patch) | |
| tree | 9aa9b49cf411799b50168bd16aee922bc9b13f8e /src/codec/SkSampler.cpp | |
| parent | d140fe910e11edf2496439e39ba6ca15d5bc17db (diff) | |
Revert[4] "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"
This reverts commit 5a2e50edc51006ce91366e177a9d21a16775d7fd.
Bug: skia:
Change-Id: I8d28b5c07d90130e5a1653923740eaf189ecb954
Reviewed-on: https://skia-review.googlesource.com/53900
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/codec/SkSampler.cpp')
| -rw-r--r-- | src/codec/SkSampler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkSampler.cpp b/src/codec/SkSampler.cpp index c7d9a3ac23..d18410be3b 100644 --- a/src/codec/SkSampler.cpp +++ b/src/codec/SkSampler.cpp @@ -14,8 +14,8 @@ void SkSampler::Fill(const SkImageInfo& info, void* dst, size_t rowBytes, uint64_t colorOrIndex, SkCodec::ZeroInitialized zeroInit) { SkASSERT(dst != nullptr); - // Calculate bytes to fill. We use getSafeSize since the last row may not be padded. - const size_t bytesToFill = info.getSafeSize(rowBytes); + // Calculate bytes to fill. + const size_t bytesToFill = info.computeByteSize(rowBytes); const int width = info.width(); const int numRows = info.height(); |