diff options
| -rw-r--r-- | gm/gm.h | 2 | ||||
| -rw-r--r-- | gm/gradients.cpp | 2 | ||||
| -rw-r--r-- | gm/rrect.cpp | 6 | ||||
| -rw-r--r-- | gm/shadertext.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -17,7 +17,7 @@ #include "SkTRegistry.h" #define DEF_GM(code) \ - static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void* p) { code; } \ + static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void*) { code; } \ static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_)); namespace skiagm { diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 004d99109c..97f8fdaca8 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -49,7 +49,7 @@ static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, } static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { + SkShader::TileMode, SkUnitMapper* mapper) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); diff --git a/gm/rrect.cpp b/gm/rrect.cpp index 29d03005fe..c13f1456c7 100644 --- a/gm/rrect.cpp +++ b/gm/rrect.cpp @@ -72,7 +72,7 @@ static void inset2(const SkRRect& src, SkScalar dx, SkScalar dy, SkRRect* dst) { dst->setRectRadii(r, radii); } -static SkScalar prop(SkScalar radius, SkScalar delta, SkScalar newSize, SkScalar oldSize) { +static SkScalar prop(SkScalar radius, SkScalar newSize, SkScalar oldSize) { return newSize * radius / oldSize; } @@ -90,8 +90,8 @@ static void inset3(const SkRRect& src, SkScalar dx, SkScalar dy, SkRRect* dst) { radii[i] = src.radii((SkRRect::Corner)i); } for (int i = 0; i < 4; ++i) { - radii[i].fX = prop(radii[i].fX, dx, r.width(), src.rect().width()); - radii[i].fY = prop(radii[i].fY, dy, r.height(), src.rect().height()); + radii[i].fX = prop(radii[i].fX, r.width(), src.rect().width()); + radii[i].fY = prop(radii[i].fY, r.height(), src.rect().height()); } dst->setRectRadii(r, radii); } diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 0e092dc6d9..adcb25e65a 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -78,7 +78,7 @@ static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, } static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { + SkShader::TileMode, SkUnitMapper* mapper) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); |