Remove uses of SkImageDecoder from gms

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.
  */
 
 #include "SkTypes.h"
 
@@ skipping 386 matching lines @@
         hr = piBitmapFrameEncode->Initialize(piPropertybag.get());
     }
 
     //Set the size of the frame.
     const UINT width = bitmap->width();
     const UINT height = bitmap->height();
     if (SUCCEEDED(hr)) {
         hr = piBitmapFrameEncode->SetSize(width, height);
     }
 
-    //Set the pixel format of the frame.
+    //Set the pixel format of the frame.  If native encoded format cannot match BGRA,
+    //it will choose the closest pixel format that it supports.
     const WICPixelFormatGUID formatDesired = GUID_WICPixelFormat32bppBGRA;
     WICPixelFormatGUID formatGUID = formatDesired;
     if (SUCCEEDED(hr)) {
         hr = piBitmapFrameEncode->SetPixelFormat(&formatGUID);
     }
-    if (SUCCEEDED(hr)) {

[msarett, 2016/03/18 16:41:32]

This code block causes the WIC encoder to fail for all Jpeg encodes.

Since Jpegs are opaque, it indicates that it supports BGR (not BGRA).  None of
this really matters, since we just want the encoded data (which is YUV anyway).

-        //Be sure the image format is the one requested.
-        hr = IsEqualGUID(formatGUID, formatDesired) ? S_OK : E_FAIL;
-    }
 
     //Write the pixels into the frame.
     if (SUCCEEDED(hr)) {
         SkAutoLockPixels alp(*bitmap);
         const UINT stride = (UINT) bitmap->rowBytes();
         hr = piBitmapFrameEncode->WritePixels(
             height
             , stride
             , stride * height
             , reinterpret_cast<BYTE*>(bitmap->getPixels()));
     }
 
     if (SUCCEEDED(hr)) {
         hr = piBitmapFrameEncode->Commit();
     }
 
     if (SUCCEEDED(hr)) {
         hr = piEncoder->Commit();
     }
 
     return SUCCEEDED(hr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-
+/*

[scroggo, 2016/03/18 17:23:12]

This will disable the encoders on Windows. Is that your intention? It seems odd
that you changed onEncode if it was just going to be disabled here.

 static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
     switch (t) {
         case SkImageEncoder::kBMP_Type:
         case SkImageEncoder::kICO_Type:
         case SkImageEncoder::kJPEG_Type:
         case SkImageEncoder::kPNG_Type:
             break;
         default:
             return nullptr;
     }
     return new SkImageEncoder_WIC(t);
 }
 
-static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
+static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);*/
 
 static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
     SkImageDecoder::Format format;
     SkImageDecoder_WIC codec;
     if (!codec.decodeStream(stream, nullptr, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
         format = SkImageDecoder::kUnknown_Format;
     }
     return format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_wic);
 
 #endif // defined(SK_BUILD_FOR_WIN32)