SkStream/Priv cleanups

src/images/SkImageDecoder_astc.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkData.h"
 #include "SkEndian.h"
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTypes.h"
 
 #include "SkTextureCompressor.h"
 
@@ skipping 18 matching lines @@
 
 static inline int read_24bit(const uint8_t* buf) {
     // Assume everything is little endian...
     return
         static_cast<int>(buf[0]) |
         (static_cast<int>(buf[1]) << 8) |
         (static_cast<int>(buf[2]) << 16);
 }
 
 SkImageDecoder::Result SkASTCImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
-    SkAutoMalloc autoMal;
-    const size_t length = SkCopyStreamToStorage(&autoMal, stream);
-    if (0 == length) {
+    SkAutoTUnref<SkData> data(SkCopyStreamToData(stream));
+    if (!data || !data->size()) {
         return kFailure;
     }
 
-    unsigned char* buf = (unsigned char*)autoMal.get();
+    unsigned char* buf = (unsigned char*) data->data();
 
     // Make sure that the magic header is there...
     SkASSERT(SkEndian_SwapLE32(*(reinterpret_cast<uint32_t*>(buf))) == kASTCMagicNumber);
 
     // Advance past the magic header
     buf += 4;
 
     const int blockDimX = buf[0];
     const int blockDimY = buf[1];
     const int blockDimZ = buf[2];
@@ skipping 131 matching lines @@
 static SkImageDecoder_DecodeReg gReg(sk_libastc_dfactory);
 
 static SkImageDecoder::Format get_format_astc(SkStreamRewindable* stream) {
     if (is_astc(stream)) {
         return SkImageDecoder::kASTC_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_astc);