| Index: src/images/SkDecodingImageGenerator.cpp
|
| diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
|
| index 2493d89b3848ddafad9f7582700ac2b9775a1da1..88cdef9a321f8a8875589aa7461e5a40611df57a 100644
|
| --- a/src/images/SkDecodingImageGenerator.cpp
|
| +++ b/src/images/SkDecodingImageGenerator.cpp
|
| @@ -173,9 +173,7 @@ bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info,
|
| SkBitmap bitmap;
|
| TargetAllocator allocator(fInfo, pixels, rowBytes);
|
| decoder->setAllocator(&allocator);
|
| - // TODO: need to be able to pass colortype directly to decoder
|
| - SkBitmap::Config legacyConfig = SkColorTypeToBitmapConfig(info.colorType());
|
| - bool success = decoder->decode(fStream, &bitmap, legacyConfig,
|
| + bool success = decoder->decode(fStream, &bitmap, info.colorType(),
|
| SkImageDecoder::kDecodePixels_Mode);
|
| decoder->setAllocator(NULL);
|
| if (!success) {
|
|
|