Index: src/codec/SkBmpStandardCodec.cpp |
diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp |
index a509c75b6da8206bc42726bcc53b3b1cf69d2bdc..51fd4e1bed8f31fe28a06c97e0cc4dd9f0a38eb7 100644 |
--- a/src/codec/SkBmpStandardCodec.cpp |
+++ b/src/codec/SkBmpStandardCodec.cpp |
@@ -153,40 +153,11 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo, |
} |
void SkBmpStandardCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts) { |
- // Get swizzler configuration |
- SkSwizzler::SrcConfig config = SkSwizzler::kUnknown; |
- switch (this->bitsPerPixel()) { |
- case 1: |
- config = SkSwizzler::kIndex1; |
- break; |
- case 2: |
- config = SkSwizzler::kIndex2; |
- break; |
- case 4: |
- config = SkSwizzler::kIndex4; |
- break; |
- case 8: |
- config = SkSwizzler::kIndex; |
- break; |
- case 24: |
- config = SkSwizzler::kBGR; |
- break; |
- case 32: |
- if (fIsOpaque) { |
- config = SkSwizzler::kBGRX; |
- } else { |
- config = SkSwizzler::kBGRA; |
- } |
- break; |
- default: |
- SkASSERT(false); |
- } |
- |
// Get a pointer to the color table if it exists |
const SkPMColor* colorPtr = get_color_ptr(fColorTable.get()); |
// Create swizzler |
- fSwizzler.reset(SkSwizzler::CreateSwizzler(config, colorPtr, dstInfo, opts)); |
+ fSwizzler.reset(SkSwizzler::CreateSwizzler(this->getEncodedInfo(), colorPtr, dstInfo, opts)); |
SkASSERT(fSwizzler); |
} |