| Index: src/codec/SkBmpStandardCodec.cpp | 
| diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp | 
| index 70535a72ace74dbf7172f5095ca250644e9986ee..2baadb6c58ab972e6fc4cf0c89222f192b3f6ec9 100644 | 
| --- a/src/codec/SkBmpStandardCodec.cpp | 
| +++ b/src/codec/SkBmpStandardCodec.cpp | 
| @@ -12,35 +12,6 @@ | 
| #include "SkStream.h" | 
|  | 
| /* | 
| - * Checks if the conversion between the input image and the requested output | 
| - * image has been implemented | 
| - */ | 
| -static bool conversion_possible(const SkImageInfo& dst, | 
| -                                const SkImageInfo& src) { | 
| -    // Ensure that the profile type is unchanged | 
| -    if (dst.profileType() != src.profileType()) { | 
| -        return false; | 
| -    } | 
| - | 
| -    // Ensure the alpha type is valid | 
| -    if (!valid_alpha(dst.alphaType(), src.alphaType())) { | 
| -        return false; | 
| -    } | 
| - | 
| -    // Check for supported color types | 
| -    switch (dst.colorType()) { | 
| -        // Allow output to kN32 from any type of input | 
| -        case kN32_SkColorType: | 
| -            return true; | 
| -        // Allow output to kIndex_8 from compatible inputs | 
| -        case kIndex_8_SkColorType: | 
| -            return kIndex_8_SkColorType == src.colorType(); | 
| -        default: | 
| -            return false; | 
| -    } | 
| -} | 
| - | 
| -/* | 
| * Creates an instance of the decoder | 
| * Called only by NewFromStream | 
| */ | 
|  |