| Index: include/core/SkTArray.h
|
| diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
|
| index 6c76c78094bf417a48f80b3a7cfb52fe1a96ccc8..06a85bc439595b0fe8cb081c085a68761cfda16f 100644
|
| --- a/include/core/SkTArray.h
|
| +++ b/include/core/SkTArray.h
|
| @@ -384,7 +384,7 @@ protected:
|
| gMIN_ALLOC_COUNT;
|
| fPreAllocMemArray = preAllocStorage;
|
| if (fReserveCount >= fCount &&
|
| - NULL != preAllocStorage) {
|
| + preAllocStorage) {
|
| fAllocCount = fReserveCount;
|
| fMemArray = preAllocStorage;
|
| } else {
|
| @@ -427,7 +427,7 @@ private:
|
| fAllocCount = newAllocCount;
|
| char* newMemArray;
|
|
|
| - if (fAllocCount == fReserveCount && NULL != fPreAllocMemArray) {
|
| + if (fAllocCount == fReserveCount && fPreAllocMemArray) {
|
| newMemArray = (char*) fPreAllocMemArray;
|
| } else {
|
| newMemArray = (char*) sk_malloc_throw(fAllocCount*sizeof(T));
|
|
|