Updates to skimage tool to use it for testing.

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;
     }
 
+    virtual Format onGetFormat(SkStream*) const SK_OVERRIDE;
+
 protected:
     virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
 static bool read_byte(SkStream* stream, uint8_t* data)
 {
     return stream->read(data, 1) == 1;
@@ skipping 114 matching lines @@
     for (int y = 0; y < height; y++)
     {
         expand_bits_to_bytes(dst, src, width);
         dst += decodedBitmap->rowBytes();
         src += srcRB;
     }
 
     return true;
 }
 
+SkImageDecoder::Format SkWBMPImageDecoder::onGetFormat(SkStream* stream) const {
+    wbmp_head head;
+    if (head.init(stream)) {
+        return kWBMP_Format;
+    }
+    return kUnknown_Format;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 DEFINE_DECODER_CREATOR(WBMPImageDecoder);
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTRegistry.h"
 
 static SkImageDecoder* sk_wbmp_dfactory(SkStream* stream) {
     wbmp_head   head;
 
     if (head.init(stream)) {
         return SkNEW(SkWBMPImageDecoder);
     }
     return NULL;
 }
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_wbmp_dfactory);