Updates to skimage tool to use it for testing.

src/ports/SkImageDecoder_WIC.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #define WIN32_LEAN_AND_MEAN
@@ skipping 11 matching lines @@
 //All Windows SDKs back to XPSP2 export the CLSID_WICImagingFactory symbol.
 //In the Windows8 SDK the CLSID_WICImagingFactory symbol is still exported
 //but CLSID_WICImagingFactory is then #defined to CLSID_WICImagingFactory2.
 //Undo this #define if it has been done so that we link against the symbols
 //we intended to link against on all SDKs.
 #if defined(CLSID_WICImagingFactory)
 #undef CLSID_WICImagingFactory
 #endif
 
 class SkImageDecoder_WIC : public SkImageDecoder {
+public:
+    SkImageDecoder_WIC()
+    : fFormat(kUnknown_Format) {}
+
 protected:
     virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode);
+
+private:
+    Format fFormat;
 };
 
+struct FormatConversion {
+    GUID                    fGuidFormat;
+    SkImageDecoder::Format  fFormat;
+};
+
+static const FormatConversion gFormatConversions[] = {
+    { GUID_ContainerFormatBmp, SkImageDecoder::kBMP_Format },
+    { GUID_ContainerFormatGif, SkImageDecoder::kGIF_Format },
+    { GUID_ContainerFormatIco, SkImageDecoder::kICO_Format },
+    { GUID_ContainerFormatJpeg, SkImageDecoder::kJPEG_Format },
+    { GUID_ContainerFormatPng, SkImageDecoder::kPNG_Format },
+};
+
+static SkImageDecoder::Format GuidContainerFormat_to_Format(REFGUID guid) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gFormatConversions); i++) {
+        if (IsEqualGUID(guid, gFormatConversions[i].fGuidFormat)) {
+            return gFormatConversions[i].fFormat;
+        }
+    }
+    return SkImageDecoder::kUnknown_Format;
+}
+
 bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     //Initialize COM.
     SkAutoCoInitialize scopedCo;
     if (!scopedCo.succeeded()) {
         return false;
     }
 
     HRESULT hr = S_OK;
 
     //Create Windows Imaging Component ImagingFactory.
@@ skipping 96 matching lines @@
             NULL,                             //Get all the pixels
             stride,
             stride * height,
             reinterpret_cast<BYTE *>(bm->getPixels())
         );
 
         // Note: we don't need to premultiply here since we specified PBGRA
         bm->computeAndSetOpaquePredicate();
     }
 
+    //Get the format
+    if (SUCCEEDED(hr)) {
+        GUID format;
+        HRESULT result = piBitmapDecoder->GetContainerFormat(&format);
+        if (SUCCEEDED(result)) {
+            fFormat = GuidContainerFormat_to_Format(format);
+        } else {
+            fFormat = kUnknown_Format;
+        }
+    }
+
     return SUCCEEDED(hr);
 }
 
 /////////////////////////////////////////////////////////////////////////
 
 extern SkImageDecoder* image_decoder_from_stream(SkStream*);
 
 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
     SkImageDecoder* decoder = image_decoder_from_stream(stream);
     if (NULL == decoder) {
@@ skipping 25 matching lines @@
 
 bool SkImageEncoder_WIC::onEncode(SkWStream* stream
                                 , const SkBitmap& bitmapOrig
                                 , int quality)
 {
     GUID type;
     switch (fType) {
         case kBMP_Type:
             type = GUID_ContainerFormatBmp;
             break;
-        case kGIF_Type:
-            type = GUID_ContainerFormatGif;
-            break;
         case kICO_Type:
             type = GUID_ContainerFormatIco;
             break;
         case kJPEG_Type:
             type = GUID_ContainerFormatJpeg;
             break;
         case kPNG_Type:
             type = GUID_ContainerFormatPng;
             break;
         default:
@@ skipping 131 matching lines @@
     return SUCCEEDED(hr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTRegistry.h"
 
 static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
     switch (t) {
         case SkImageEncoder::kBMP_Type:
-        case SkImageEncoder::kGIF_Type:
         case SkImageEncoder::kICO_Type:
         case SkImageEncoder::kJPEG_Type:
         case SkImageEncoder::kPNG_Type:
             break;
         default:
             return NULL;
     }
     return SkNEW_ARGS(SkImageEncoder_WIC, (t));
 }
 
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_imageencoder_wic_factory);