Updates to skimage tool to use it for testing.

include/images/SkImageDecoder.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkImageDecoder_DEFINED
@@ skipping 23 matching lines @@
         kICO_Format,
         kJPEG_Format,
         kPNG_Format,
         kWBMP_Format,
         kWEBP_Format,
 
         kLastKnownFormat = kWEBP_Format
     };
 
     /** Return the format of image this decoder can decode. If this decoder can decode multiple
-        formats, kUnknown_Format will be returned.
+        formats, returns the format of the data that was most recently decoded successfully. Can

[epoger, 2013/04/19 21:35:16]

This time-dependent, stateful behavior (return format of most recently decoded
image) seems like it could bite us later.  I would rather the behavior be more
predictable.

[scroggo, 2013/04/19 22:12:01]

That seems reasonable to me. I used this behavior to figure out the Format of an
SkStream. I'll look for another way.

[scroggo, 2013/04/22 22:10:15]

Removed. Instead of this behavior, I've retained the old behavior, and added
getFormat(SkStream*)

+        return kUnknown_Format.
     */
     virtual Format getFormat() const;
 
     /** Return a readable string of the value returned by getFormat().
     */
     const char* getFormatName() const;
 
     /** Returns true if the decoder should try to dither the resulting image.
         The default setting is true.
     */
@@ skipping 413 matching lines @@
 // not all of these will be available
 DECLARE_DECODER_CREATOR(BMPImageDecoder);
 DECLARE_DECODER_CREATOR(GIFImageDecoder);
 DECLARE_DECODER_CREATOR(ICOImageDecoder);
 DECLARE_DECODER_CREATOR(JPEGImageDecoder);
 DECLARE_DECODER_CREATOR(PNGImageDecoder);
 DECLARE_DECODER_CREATOR(WBMPImageDecoder);
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 
 #endif