aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-31 15:29:44 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-31 15:29:44 +0000
commitd4144060731a94a5b057dfad407e6e3c294435cf (patch)
tree209efefbee68d2c3c477c955798e958ad9c93d07 /include
parentbe6188d64721850723c19d5a7a4f007a675300f4 (diff)
Windows compiler complaint cleanup
Diffstat (limited to 'include')
-rw-r--r--include/core/SkScalar.h2
-rw-r--r--include/utils/SkCamera.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index a5bd711691..0744079f11 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -84,7 +84,7 @@
static inline float SkIntToScalar(unsigned long param) {
return (float)param;
}
- static inline float SkIntToScalar(float param) {
+ static inline float SkIntToScalar(float /* param */) {
/* If the parameter passed into SkIntToScalar is a float,
* one of two things has happened:
* 1. the parameter was an SkScalar (which is typedef'd to float)
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
index 1c4c1fbd7e..d3bddaa2af 100644
--- a/include/utils/SkCamera.h
+++ b/include/utils/SkCamera.h
@@ -105,7 +105,7 @@ public:
return this->dotWith(v.fX, v.fY, v.fZ);
}
- // depreicated, but still here for animator (for now)
+ // deprecated, but still here for animator (for now)
void rotate(SkScalar x, SkScalar y, SkScalar z) {}
void rotateDegrees(SkScalar x, SkScalar y, SkScalar z) {}