AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@2266 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2011-09-14 14:01:31 +00:00
parent 49313f6b43
commit 5c6ae60a71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkTArray.h
View File

@ -85,7 +85,7 @@ public:
fCount = array.count(); fCount = array.count();
fReserveCount = gMIN_ALLOC_COUNT; fReserveCount = gMIN_ALLOC_COUNT;
fAllocCount = SkMax32(fReserveCount, fCount); fAllocCount = SkMax32(fReserveCount, fCount);
fMemArray = sk_malloc(sizeof(T) * fAllocCount); fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount);
fPreAllocMemArray = NULL; fPreAllocMemArray = NULL;
if (DATA_TYPE) { if (DATA_TYPE) {
@ -107,7 +107,7 @@ public:
fCount = count; fCount = count;
fReserveCount = gMIN_ALLOC_COUNT; fReserveCount = gMIN_ALLOC_COUNT;
fAllocCount = SkMax32(fReserveCount, fCount); fAllocCount = SkMax32(fReserveCount, fCount);
fMemArray = sk_malloc(sizeof(T) * fAllocCount); fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount);
fPreAllocMemArray = NULL; fPreAllocMemArray = NULL;
if (DATA_TYPE) { if (DATA_TYPE) {
memcpy(fMemArray, array, sizeof(T) * fCount); memcpy(fMemArray, array, sizeof(T) * fCount);