aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-27 15:41:12 +0000
committerGravatar sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-27 15:41:12 +0000
commit0f0d9b720e1afef91d30c83b379725b8a53fafc8 (patch)
tree17bf264d98af8938394d147ce66a11719c67f466
parent5661c5ba0da6ce7ac3b10dc7c35231bce6dd9b0d (diff)
GM : Unused parameters cleanup
I removed unused parameters in the gms wherever it was trivial to do so. I'm trying to get the easy ones out of the way before we get into more involved discussions around this. Review URL: https://codereview.appspot.com/7398056 git-svn-id: http://skia.googlecode.com/svn/trunk@7881 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gm/gm.h2
-rw-r--r--gm/gradients.cpp2
-rw-r--r--gm/rrect.cpp6
-rw-r--r--gm/shadertext.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/gm/gm.h b/gm/gm.h
index 6ffb0298e7..17541e4038 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -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));