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 /dm | |
| 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 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -1128,9 +1128,9 @@ struct Task { SkBitmap swizzle; SkAssertResult(sk_tool_utils::copy_to(&swizzle, kRGBA_8888_SkColorType, bitmap)); - hash.write(swizzle.getPixels(), swizzle.getSize()); + hash.write(swizzle.getPixels(), swizzle.computeByteSize()); } else { - hash.write(bitmap.getPixels(), bitmap.getSize()); + hash.write(bitmap.getPixels(), bitmap.computeByteSize()); } } SkMD5::Digest digest; diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 2a0b59841c..0968aca705 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -454,7 +454,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { const int bpp = SkColorTypeBytesPerPixel(decodeInfo.colorType()); const size_t rowBytes = size.width() * bpp; - const size_t safeSize = decodeInfo.getSafeSize(rowBytes); + const size_t safeSize = decodeInfo.computeByteSize(rowBytes); SkAutoMalloc pixels(safeSize); SkCodec::Options options; @@ -1468,12 +1468,12 @@ static bool encode_png_base64(const SkBitmap& bitmap, SkString* dst) { static Error compare_bitmaps(const SkBitmap& reference, const SkBitmap& bitmap) { // The dimensions are a property of the Src only, and so should be identical. - SkASSERT(reference.getSize() == bitmap.getSize()); - if (reference.getSize() != bitmap.getSize()) { + SkASSERT(reference.computeByteSize() == bitmap.computeByteSize()); + if (reference.computeByteSize() != bitmap.computeByteSize()) { return "Dimensions don't match reference"; } // All SkBitmaps in DM are tight, so this comparison is easy. - if (0 != memcmp(reference.getPixels(), bitmap.getPixels(), reference.getSize())) { + if (0 != memcmp(reference.getPixels(), bitmap.getPixels(), reference.computeByteSize())) { SkString encoded; SkString errString("Pixels don't match reference"); if (encode_png_base64(reference, &encoded)) { |