aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-10 18:32:35 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-10 18:32:35 +0000
commit8637a365518a82901d313d61eecd83a0c5102fe9 (patch)
tree08a09f8709a9780aec606fa728d2e46516752940 /experimental
parentfb173424e915e696a73067d616ce4f39a407261a (diff)
Minor Windows compiler complaint fixes
Diffstat (limited to 'experimental')
-rw-r--r--experimental/SkSetPoly3To3_A.cpp4
-rw-r--r--experimental/SkSetPoly3To3_D.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/experimental/SkSetPoly3To3_A.cpp b/experimental/SkSetPoly3To3_A.cpp
index a0f955c6cb..bf41713001 100644
--- a/experimental/SkSetPoly3To3_A.cpp
+++ b/experimental/SkSetPoly3To3_A.cpp
@@ -32,7 +32,7 @@
#endif
static SkDScalar SkDScalar_setMul(SkScalar a, SkScalar b) {
- return (SkDScalar)a * b;
+ return (SkDScalar) ((SkDScalar) a * b);
}
static void computeOuterProduct(SkScalar op[4],
@@ -59,7 +59,7 @@ static SkScalar dot(SkScalar ax, SkScalar ay, SkScalar bx, SkScalar by) {
return SkDScalar_toScalar(ddot(ax, ay, bx, by));
}
-bool SkSetPoly3To3(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]) {
+bool SkSetPoly3To3_A(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]) {
const SkPoint& srcAve = src[0];
const SkPoint& dstAve = dst[0];
diff --git a/experimental/SkSetPoly3To3_D.cpp b/experimental/SkSetPoly3To3_D.cpp
index 810e6b21d0..0225581ed2 100644
--- a/experimental/SkSetPoly3To3_D.cpp
+++ b/experimental/SkSetPoly3To3_D.cpp
@@ -17,7 +17,7 @@ static SkScalar SkDScalar_toScalar(SkDScalar value) {
}
static SkDScalar SkDScalar_setMul(SkScalar a, SkScalar b) {
- return (SkDScalar)a * b;
+ return (SkDScalar) ((SkDScalar) a * b);
}
static void computeOuterProduct(SkMatrix* matrix,
@@ -48,7 +48,7 @@ static SkScalar dot(SkScalar ax, SkScalar ay, SkScalar bx, SkScalar by) {
SkDScalar_setMul(ay, by));
}
-bool SkSetPoly3To3(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]) {
+bool SkSetPoly3To3_D(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3]) {
const SkPoint& srcAve = src[0];
const SkPoint& dstAve = dst[0];