Switch SkAutoMalloc to SkAutoTMalloc to avoid cast
Make SkAutoTMalloc's interface look more like SkAutoMalloc:
- add free(), which does what you expect
- make reset() return a pointer fPtr
No public API changes (SkAutoTMalloc is in include/private)
BUG=skia:2148
Review URL: https://codereview.chromium.org/1516833003
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index 5849d73..39ae79c 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -144,16 +144,13 @@
static void testWritePad(skiatest::Reporter* reporter, SkWriter32* writer) {
// Create some random data to write.
- const size_t dataSize = 10<<2;
- SkASSERT(SkIsAlign4(dataSize));
+ const size_t dataSize = 10;
- SkAutoMalloc originalData(dataSize);
+ SkAutoTMalloc<uint32_t> originalData(dataSize);
{
SkRandom rand(0);
- uint32_t* ptr = static_cast<uint32_t*>(originalData.get());
- uint32_t* stop = ptr + (dataSize>>2);
- while (ptr < stop) {
- *ptr++ = rand.nextU();
+ for (size_t i = 0; i < dataSize; i++) {
+ originalData[(int) i] = rand.nextU();
}
// Write the random data to the writer at different lengths for