diff options
| author |  reed <reed@google.com> | 2014-10-14 08:26:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-14 08:26:33 -0700 |
| commit | b2d77e4d7458145ef4825c28323d9fbbb6b003ac (patch) | |
| tree | 6545a7a34405eadbb42aec9d2fb387cf38202a85 /src/gpu/GrDistanceFieldTextContext.cpp | |
| parent | 5940f952b2542e36233ed5527bea0342e8010e21 (diff) | |
add gamma value to deviceproperties
BUG=skia:
Review URL: https://codereview.chromium.org/652273002
Diffstat (limited to 'src/gpu/GrDistanceFieldTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrDistanceFieldTextContext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index 183b83c3e6..04ad59b2c6 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -169,8 +169,8 @@ static void setup_gamma_texture(GrContext* context, const SkGlyphCache* cache, #else SkScalar contrast = 0.5f; #endif - SkScalar paintGamma = deviceProperties.getGamma(); - SkScalar deviceGamma = deviceProperties.getGamma(); + SkScalar paintGamma = deviceProperties.gamma(); + SkScalar deviceGamma = deviceProperties.gamma(); size = SkScalerContext::GetGammaLUTSize(contrast, paintGamma, deviceGamma, &width, &height); @@ -358,7 +358,7 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo flags |= fUseLCDText ? kUseLCD_DistanceFieldEffectFlag : 0; flags |= fUseLCDText && ctm.rectStaysRect() ? kRectToRect_DistanceFieldEffectFlag : 0; - bool useBGR = SkPixelGeometryIsBGR(fDeviceProperties.fPixelGeometry); + bool useBGR = SkPixelGeometryIsBGR(fDeviceProperties.pixelGeometry()); flags |= fUseLCDText && useBGR ? kBGR_DistanceFieldEffectFlag : 0; // see if we need to create a new effect @@ -375,7 +375,7 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo flags)); } else { #ifdef SK_GAMMA_APPLY_TO_A8 - U8CPU lum = SkColorSpaceLuminance::computeLuminance(fDeviceProperties.getGamma(), + U8CPU lum = SkColorSpaceLuminance::computeLuminance(fDeviceProperties.gamma(), filteredColor); fCachedGeometryProcessor.reset(GrDistanceFieldTextureEffect::Create(fCurrTexture, params, |