diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-09 18:39:59 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-09 18:39:59 +0000 |
| commit | 235002fb127fc5b7564910434faed84337c08238 (patch) | |
| tree | 1ac1e5a6cf2cf34d044263d1f30fc3c5de32b1ae | |
| parent | c9542ca3d00878a18a57af80037060d6374d5650 (diff) | |
low hanging calloc fruit
BUG=
R=reed@google.com, robertphillips@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/24267014
git-svn-id: http://skia.googlecode.com/svn/trunk@11683 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkBitmap.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkTDynamicHash.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 128726cb63..04a58583a1 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1631,8 +1631,7 @@ void SkBitmap::unflatten(SkFlattenableReadBuffer& buffer) { SkBitmap::RLEPixels::RLEPixels(int width, int height) { fHeight = height; - fYPtrs = (uint8_t**)sk_malloc_throw(height * sizeof(uint8_t*)); - sk_bzero(fYPtrs, height * sizeof(uint8_t*)); + fYPtrs = (uint8_t**)sk_calloc_throw(height * sizeof(uint8_t*)); } SkBitmap::RLEPixels::~RLEPixels() { diff --git a/src/core/SkTDynamicHash.h b/src/core/SkTDynamicHash.h index 47412c34b1..4cb44204c8 100644 --- a/src/core/SkTDynamicHash.h +++ b/src/core/SkTDynamicHash.h @@ -92,9 +92,7 @@ private: static T* Deleted() { return reinterpret_cast<T*>(1); } // Also an invalid pointer. static T** AllocArray(int capacity) { - T** array = (T**)sk_malloc_throw(sizeof(T*) * capacity); - sk_bzero(array, sizeof(T*) * capacity); // All cells == Empty(). - return array; + return (T**)sk_calloc_throw(sizeof(T*) * capacity); // All cells == Empty(). } void reset(int capacity) { |