aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DM.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-09-26 12:47:08 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-26 17:07:16 +0000
commit98a6216b18b57c2f7a0d58f542c60503686aed69 (patch)
tree646c987b18faa16aba1db40ea3f98684ad5946d6 /dm/DM.cpp
parent106b5c4917636d3df70ee6f59661ac5fa506d087 (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 'dm/DM.cpp')
-rw-r--r--dm/DM.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 777a59345d..ea8ec2742e 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -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;