diff options
Diffstat (limited to 'src')
-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) { |