| Index: include/gpu/SkGr.h
|
| diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
|
| index 7aacea4059f29a1c99c040c2228c385a59e88cb3..06239e65680a2cbbc81b923eaf335d8bd9da1a66 100644
|
| --- a/include/gpu/SkGr.h
|
| +++ b/include/gpu/SkGr.h
|
| @@ -44,13 +44,13 @@ GR_STATIC_ASSERT((int)kIDA_GrBlendCoeff == (int)SkXfermode::kIDA_Coeff);
|
|
|
| #include "SkColorPriv.h"
|
|
|
| -GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType);
|
| +GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType);
|
|
|
| static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) {
|
| - return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType());
|
| + return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType());
|
| }
|
|
|
| -bool GrPixelConfig2ColorType(GrPixelConfig, SkColorType*);
|
| +bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*);
|
|
|
| static inline GrColor SkColor2GrColor(SkColor c) {
|
| SkPMColor pm = SkPreMultiplyColor(c);
|
|
|