diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 21:24:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 21:24:22 +0000 |
| commit | 80894678ca7b54413ba50de4355b7816d5bc0e10 (patch) | |
| tree | 9d0bbe9fa719929d5b0e83bafc28c2c9eb3d4b03 /gm/gradients_2pt_conical.cpp | |
| parent | 9004192101f071429d0c7ea2f4eac273bc6ed433 (diff) | |
Fix double to SkScalar issues in SkTwoPointConicalGradient_gpu.cpp
NOTREECHECKS=True
NOTRY=True
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/247833003
git-svn-id: http://skia.googlecode.com/svn/trunk@14318 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gradients_2pt_conical.cpp')
| -rw-r--r-- | gm/gradients_2pt_conical.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp index 969d2908a4..e6976064c3 100644 --- a/gm/gradients_2pt_conical.cpp +++ b/gm/gradients_2pt_conical.cpp @@ -110,7 +110,7 @@ static SkShader* Make2ConicalZeroRad(const SkPoint pts[2], const GradData& data, center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); return SkGradientShader::CreateTwoPointConical( - center1, 0.0, + center1, 0.f, center0, (pts[1].fX - pts[0].fX) / 2, data.fColors, data.fPos, data.fCount, tm, mapper); } @@ -124,7 +124,7 @@ static SkShader* Make2ConicalZeroRadFlip(const SkPoint pts[2], const GradData& d SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); return SkGradientShader::CreateTwoPointConical( center1, (pts[1].fX - pts[0].fX) / 2, - center0, 0.0, + center0, 0.f, data.fColors, data.fPos, data.fCount, tm, mapper); } @@ -136,7 +136,7 @@ static SkShader* Make2ConicalZeroRadCenter(const SkPoint pts[2], const GradData& center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); return SkGradientShader::CreateTwoPointConical( - center0, 0.0, + center0, 0.f, center0, (pts[1].fX - pts[0].fX) / 2, data.fColors, data.fPos, data.fCount, tm, mapper); } @@ -144,7 +144,7 @@ static SkShader* Make2ConicalZeroRadCenter(const SkPoint pts[2], const GradData& static SkShader* Make2ConicalZeroRadOutside(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, SkUnitMapper* mapper) { SkPoint center0, center1; - SkScalar radius0 = 0.0; + SkScalar radius0 = 0.f; SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); @@ -157,7 +157,7 @@ static SkShader* Make2ConicalZeroRadOutside(const SkPoint pts[2], const GradData static SkShader* Make2ConicalZeroRadFlipOutside(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, SkUnitMapper* mapper) { SkPoint center0, center1; - SkScalar radius0 = 0.0; + SkScalar radius0 = 0.f; SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center0.set(pts[0].fX + radius0, pts[0].fY + radius0); center1.set(pts[1].fX - radius1, pts[1].fY - radius1); @@ -197,7 +197,7 @@ static SkShader* Make2ConicalEdgeY(const SkPoint pts[2], const GradData& data, static SkShader* Make2ConicalZeroRadEdgeX(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, SkUnitMapper* mapper) { SkPoint center0, center1; - SkScalar radius0 = 0.0; + SkScalar radius0 = 0.f; SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); @@ -211,7 +211,7 @@ static SkShader* Make2ConicalZeroRadEdgeX(const SkPoint pts[2], const GradData& static SkShader* Make2ConicalZeroRadEdgeY(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm, SkUnitMapper* mapper) { SkPoint center0, center1; - SkScalar radius0 = 0.0; + SkScalar radius0 = 0.f; SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3); center1.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); @@ -258,7 +258,7 @@ static SkShader* Make2ConicalInsideSmallRad(const SkPoint pts[2], const GradData center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); return SkGradientShader::CreateTwoPointConical( - center0, 0.0000000000000000001, + center0, 0.0000000000000000001f, center0, (pts[1].fX - pts[0].fX) / 2, data.fColors, data.fPos, data.fCount, tm, mapper); } |