SkStream/Priv cleanups

src/images/SkImageDecoder_libbmp.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "bmpdecoderhelper.h"
 #include "SkColorPriv.h"
+#include "SkData.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTDArray.h"
 
 class SkBMPImageDecoder : public SkImageDecoder {
 public:
     SkBMPImageDecoder() {}
 
@@ skipping 67 matching lines @@
     SkTDArray<uint8_t> fRGB;
     int fWidth;
     int fHeight;
     bool fJustBounds;
 };
 
 SkImageDecoder::Result SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // First read the entire stream, so that all of the data can be passed to
     // the BmpDecoderHelper.
 
-    // Allocated space used to hold the data.
-    SkAutoMalloc storage;
+    SkAutoTUnref<SkData> data(SkCopyStreamToData(stream));
+    if (!data) {
+        return kFailure;
+    }
+
     // Byte length of all of the data.
-    const size_t length = SkCopyStreamToStorage(&storage, stream);
+    const size_t length = data->size();
     if (0 == length) {
         return kFailure;
     }
 
     const bool justBounds = SkImageDecoder::kDecodeBounds_Mode == mode;
     SkBmpDecoderCallback callback(justBounds);
 
     // Now decode the BMP into callback's rgb() array [r,g,b, r,g,b, ...]
     {
         image_codec::BmpDecoderHelper helper;
         const int max_pixels = 16383*16383; // max width*height
-        if (!helper.DecodeImage((const char*)storage.get(), length,
+        if (!helper.DecodeImage((const char*) data->data(), length,
                                 max_pixels, &callback)) {
             return kFailure;
         }
     }
 
     // we don't need this anymore, so free it now (before we try to allocate
     // the bitmap's pixels) rather than waiting for its destructor
-    storage.free();
+    data.reset(nullptr);
 
     int width = callback.width();
     int height = callback.height();
     SkColorType colorType = this->getPrefColorType(k32Bit_SrcDepth, false);
 
     // only accept prefConfig if it makes sense for us
     if (kARGB_4444_SkColorType != colorType && kRGB_565_SkColorType != colorType) {
         colorType = kN32_SkColorType;
     }
 
@@ skipping 20 matching lines @@
     const int dstHeight = sampler.scaledHeight();
     const uint8_t* srcRow = callback.rgb();
 
     srcRow += sampler.srcY0() * srcRowBytes;
     for (int y = 0; y < dstHeight; y++) {
         sampler.next(srcRow);
         srcRow += sampler.srcDY() * srcRowBytes;
     }
     return kSuccess;
 }