| Index: src/gpu/effects/GrConfigConversionEffect.cpp
|
| diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| index daf51414f2943a72050bafeb9f530f03590ea6f3..9b342fb463dde2e961c693c8a35bd5520e045146 100644
|
| --- a/src/gpu/effects/GrConfigConversionEffect.cpp
|
| +++ b/src/gpu/effects/GrConfigConversionEffect.cpp
|
| @@ -154,9 +154,9 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
|
| for (int x = 0; x < 256; ++x) {
|
| uint8_t* color = reinterpret_cast<uint8_t*>(&srcData[256*y + x]);
|
| color[3] = y;
|
| - color[2] = GrMin(x, y);
|
| - color[1] = GrMin(x, y);
|
| - color[0] = GrMin(x, y);
|
| + color[2] = SkTMin(x, y);
|
| + color[1] = SkTMin(x, y);
|
| + color[0] = SkTMin(x, y);
|
| }
|
| }
|
|
|
| @@ -190,7 +190,7 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
|
|
|
| bool failed = true;
|
|
|
| - for (size_t i = 0; i < GR_ARRAY_COUNT(kConversionRules) && failed; ++i) {
|
| + for (size_t i = 0; i < SK_ARRAY_COUNT(kConversionRules) && failed; ++i) {
|
| *pmToUPMRule = kConversionRules[i][0];
|
| *upmToPMRule = kConversionRules[i][1];
|
|
|
|
|