| Index: src/codec/SkBmpStandardCodec.cpp | 
| diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp | 
| index 651ff83b8a6450712219d41f43cba712698ad480..089e3105c2ce369e35f15c46c642f964b4f0714b 100644 | 
| --- a/src/codec/SkBmpStandardCodec.cpp | 
| +++ b/src/codec/SkBmpStandardCodec.cpp | 
| @@ -48,7 +48,7 @@ SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo, | 
| SkCodecPrintf("Error: scaling not supported.\n"); | 
| return kInvalidScale; | 
| } | 
| -    if (!conversion_possible(dstInfo, this->getInfo())) { | 
| +    if (!conversion_possible_ignore_color_space(dstInfo, this->getInfo())) { | 
| SkCodecPrintf("Error: cannot convert input type to output type.\n"); | 
| return kInvalidConversion; | 
| } | 
|  |