| Index: src/gpu/SkGr.cpp
|
| diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
|
| index a3848c77e01de508f9c22a96e8c4b2d0f69d8454..4106d494b1f07d9f0cebc716d03dcefaef302daf 100644
|
| --- a/src/gpu/SkGr.cpp
|
| +++ b/src/gpu/SkGr.cpp
|
| @@ -370,12 +370,13 @@ GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProf
|
| case kARGB_4444_SkColorType:
|
| return kRGBA_4444_GrPixelConfig;
|
| case kRGBA_8888_SkColorType:
|
| - //if (kSRGB_SkColorProfileType == pt) {
|
| - // return kSRGBA_8888_GrPixelConfig;
|
| - //}
|
| - return kRGBA_8888_GrPixelConfig;
|
| + return (kSRGB_SkColorProfileType == pt)
|
| + ? kSRGBA_8888_GrPixelConfig
|
| + : kRGBA_8888_GrPixelConfig;
|
| case kBGRA_8888_SkColorType:
|
| - return kBGRA_8888_GrPixelConfig;
|
| + return (kSRGB_SkColorProfileType == pt)
|
| + ? kSRGBA_8888_GrPixelConfig // Does not preserve byte order!
|
| + : kBGRA_8888_GrPixelConfig;
|
| case kIndex_8_SkColorType:
|
| return kIndex_8_GrPixelConfig;
|
| case kGray_8_SkColorType:
|
|
|