From 5c6ae60a713a2befec9c26c4058640320ac0d85e Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 14 Sep 2011 14:01:31 +0000 Subject: [PATCH] Fix compilation error related to using nonexistent sk_malloc instead of sk_malloc_throw. VC++ lazy template code compilation let this work on windows since the wrong function name was only in currently unused templated functions. git-svn-id: http://skia.googlecode.com/svn/trunk@2266 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkTArray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h index 7d74b6ae31..975aeed639 100644 --- a/include/core/SkTArray.h +++ b/include/core/SkTArray.h @@ -85,7 +85,7 @@ public: fCount = array.count(); fReserveCount = gMIN_ALLOC_COUNT; fAllocCount = SkMax32(fReserveCount, fCount); - fMemArray = sk_malloc(sizeof(T) * fAllocCount); + fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount); fPreAllocMemArray = NULL; if (DATA_TYPE) { @@ -107,7 +107,7 @@ public: fCount = count; fReserveCount = gMIN_ALLOC_COUNT; fAllocCount = SkMax32(fReserveCount, fCount); - fMemArray = sk_malloc(sizeof(T) * fAllocCount); + fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount); fPreAllocMemArray = NULL; if (DATA_TYPE) { memcpy(fMemArray, array, sizeof(T) * fCount);