Add BGRA as input format to SkColorSpaceXform

src/codec/SkPngCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 254 matching lines @@
     }
 
     // If we are not decoding to F16, we can color xform now and store the results
     // in the color table.
     if (fColorXform && kRGBA_F16_SkColorType != dstInfo.colorType()) {
         SkColorSpaceXform::ColorFormat xformColorFormat = is_rgba(dstInfo.colorType()) ?
                 SkColorSpaceXform::kRGBA_8888_ColorFormat :
                 SkColorSpaceXform::kBGRA_8888_ColorFormat;
         SkAlphaType xformAlphaType = select_xform_alpha(dstInfo.alphaType(),
                                                         this->getInfo().alphaType());
-        fColorXform->apply(colorTable, colorTable, numColors, xformColorFormat, xformAlphaType);
+        fColorXform->apply(colorTable, colorTable, numColors, xformColorFormat,
+                           SkColorSpaceXform::kRGBA_8888_ColorFormat, xformAlphaType);
     }
 
     // Pad the color table with the last color in the table (or black) in the case that
     // invalid pixel indices exceed the number of colors in the table.
     const int maxColors = 1 << fBitDepth;
     if (numColors < maxColors) {
         SkPMColor lastColor = numColors > 0 ? colorTable[numColors - 1] : SK_ColorBLACK;
         sk_memset32(colorTable + numColors, lastColor, maxColors - numColors);
     }
 
@@ skipping 200 matching lines @@
         case kSwizzleColor_XformMode: {
             const size_t colorXformBytes = dstInfo.width() * sizeof(uint32_t);
             fStorage.reset(colorXformBytes);
             fColorXformSrcRow = (uint32_t*) fStorage.get();
             break;
         }
     }
 }
 
 void SkPngCodec::applyXformRow(void* dst, const void* src) {
+    const SkColorSpaceXform::ColorFormat srcColorFormat = SkColorSpaceXform::kRGBA_8888_ColorFormat;
     switch (fXformMode) {
         case kSwizzleOnly_XformMode:
             fSwizzler->swizzle(dst, (const uint8_t*) src);
             break;
         case kColorOnly_XformMode:
             fColorXform->apply(dst, (const uint32_t*) src, fXformWidth, fXformColorFormat,
-                               fXformAlphaType);
+                               srcColorFormat, fXformAlphaType);
             break;
         case kSwizzleColor_XformMode:
             fSwizzler->swizzle(fColorXformSrcRow, (const uint8_t*) src);
             fColorXform->apply(dst, fColorXformSrcRow, fXformWidth, fXformColorFormat,
-                               fXformAlphaType);
+                               srcColorFormat, fXformAlphaType);
             break;
     }
 }
 
 class SkPngNormalDecoder : public SkPngCodec {
 public:
     SkPngNormalDecoder(const SkEncodedInfo& info, const SkImageInfo& imageInfo, SkStream* stream,
             SkPngChunkReader* reader, png_structp png_ptr, png_infop info_ptr, int bitDepth)
         : INHERITED(info, imageInfo, stream, reader, png_ptr, info_ptr, bitDepth)
         , fLinesDecoded(0)
@@ skipping 780 matching lines @@
     SkCodec* outCodec = nullptr;
     if (read_header(streamDeleter.get(), chunkReader, &outCodec, nullptr, nullptr)) {
         // Codec has taken ownership of the stream.
         SkASSERT(outCodec);
         streamDeleter.release();
         return outCodec;
     }
 
     return nullptr;
 }