| Index: src/codec/SkJpegDecoderMgr.h | 
| diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h | 
| index a5078bb2d3085a09134e2ac7c5221ba8cf9023dd..e1127bad347064f6d04864bdc8a81227a8b8509f 100644 | 
| --- a/src/codec/SkJpegDecoderMgr.h | 
| +++ b/src/codec/SkJpegDecoderMgr.h | 
| @@ -43,10 +43,9 @@ | 
| void  init(); | 
|  | 
| /* | 
| -     * Returns the encoded color type of the jpeg, or kUnknown if the | 
| -     * color type can't be determined | 
| +     * Recommend a color type based on the encoded format | 
| */ | 
| -    SkEncodedInfo::Color getEncodedColor(); | 
| +    SkColorType getColorType(); | 
|  | 
| /* | 
| * Free memory used by the decode manager | 
|  |