Change SkImageDecoders to take an SkStreamRewindable.

src/images/SkImageDecoder_wbmp.cpp

 
 /*
  * Copyright 2006 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 "SkImageDecoder.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMath.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 
 class SkWBMPImageDecoder : public SkImageDecoder {
 public:
     virtual Format getFormat() const SK_OVERRIDE {
         return kWBMP_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    virtual bool onDecode(SkStreamRewindable* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
-static bool read_byte(SkStream* stream, uint8_t* data)
+static bool read_byte(SkStreamRewindable* stream, uint8_t* data)
 {
     return stream->read(data, 1) == 1;
 }
 
-static bool read_mbf(SkStream* stream, int* value)
+static bool read_mbf(SkStreamRewindable* stream, int* value)
 {
     int n = 0;
     uint8_t data;
     do {
         if (!read_byte(stream, &data)) {
             return false;
         }
         n = (n << 7) | (data & 0x7F);
     } while (data & 0x80);
 
     *value = n;
     return true;
 }
 
 struct wbmp_head {
     int fWidth;
     int fHeight;
 
-    bool init(SkStream* stream)
+    bool init(SkStreamRewindable* stream)
     {
         uint8_t data;
 
         if (!read_byte(stream, &data) || data != 0) { // unknown type
             return false;
         }
         if (!read_byte(stream, &data) || (data & 0x9F)) { // skip fixed header
             return false;
         }
         if (!read_mbf(stream, &fWidth) || (unsigned)fWidth > 0xFFFF) {
@@ skipping 26 matching lines @@
     bits &= 7;
     if (bits > 0) {
         unsigned mask = *src;
         do {
             *dst++ = (mask >> 7) & 1;;
             mask <<= 1;
         } while (--bits != 0);
     }
 }
 
-bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
+bool SkWBMPImageDecoder::onDecode(SkStreamRewindable* stream, SkBitmap* decodedBitmap,
                                   Mode mode)
 {
     wbmp_head   head;
 
     if (!head.init(stream)) {
         return false;
     }
 
     int width = head.fWidth;
     int height = head.fHeight;
@@ skipping 34 matching lines @@
 
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 DEFINE_DECODER_CREATOR(WBMPImageDecoder);
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTRegistry.h"
 
-static SkImageDecoder* sk_wbmp_dfactory(SkStream* stream) {
+static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) {
     wbmp_head   head;
 
     if (head.init(stream)) {
         return SkNEW(SkWBMPImageDecoder);
     }
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_wbmp(SkStream* stream) {
+static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) {
     wbmp_head head;
     if (head.init(stream)) {
         return SkImageDecoder::kWBMP_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
-static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_wbmp_dfactory);
-static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_wbmp);
+static SkTRegistry<SkImageDecoder*, SkStreamRewindable*> gReg(sk_wbmp_dfactory);
+static SkTRegistry<SkImageDecoder::Format, SkStreamRewindable*> gFormatReg(get_format_wbmp);