diff options
| -rwxr-xr-x | src/core/SkDistanceFieldGen.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/core/SkDistanceFieldGen.cpp b/src/core/SkDistanceFieldGen.cpp index 30354e09f8..4f4de56a46 100755 --- a/src/core/SkDistanceFieldGen.cpp +++ b/src/core/SkDistanceFieldGen.cpp @@ -343,15 +343,10 @@ static bool generate_distance_field_from_image(unsigned char* distanceField, int dataWidth = width + 2*pad; int dataHeight = height + 2*pad; - // create temp data - size_t dataSize = dataWidth*dataHeight*sizeof(DFData); - SkAutoSMalloc<1024> dfStorage(dataSize); - DFData* dataPtr = (DFData*) dfStorage.get(); - sk_bzero(dataPtr, dataSize); - - SkAutoSMalloc<1024> edgeStorage(dataWidth*dataHeight*sizeof(char)); - unsigned char* edgePtr = (unsigned char*) edgeStorage.get(); - sk_bzero(edgePtr, dataWidth*dataHeight*sizeof(char)); + // create zeroed temp edge+DFData storage + SkAutoFree storage(sk_calloc_throw(dataWidth*dataHeight*(1 + sizeof(DFData)))); + unsigned char* edgePtr = (unsigned char*)storage.get(); + DFData* dataPtr = (DFData*)(edgePtr + dataWidth*dataHeight); // copy glyph into distance field storage init_glyph_data(dataPtr, edgePtr, copyPtr, |