commit 373ebc634573364c27b1ebd35bb537ef1285cba4
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 26 13:08:56 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 26 13:08:56 2012 +0000
tree de677b3d81e81875c85dee3c838959425057a9f7
parent 5c83dcc371b68e4cda2d533e247684ea1a32d1bc

Suppress some warnings on linux.

R=reed@google.com
Review URL: https://codereview.appspot.com/6572046

git-svn-id: http://skia.googlecode.com/svn/trunk@5687 2bbb7eff-a529-9590-31e7-b0007b416f81

src/utils/SkCamera.cpp

diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp
index 7d6963c..11e10f6 100644
--- a/src/utils/SkCamera.cpp
+++ b/src/utils/SkCamera.cpp
@@ -269,13 +269,13 @@
     fAxis.normalize(&axis);
 
     {
-        SkScalar dot = SkUnit3D::Dot(*(const SkUnit3D*)(const void*)&fZenith, axis);
+        SkScalar dot = SkUnit3D::Dot(*SkTCast<const SkUnit3D*>(&fZenith), axis);
 
         zenith.fX = fZenith.fX - SkUnitScalarMul(dot, axis.fX);
         zenith.fY = fZenith.fY - SkUnitScalarMul(dot, axis.fY);
         zenith.fZ = fZenith.fZ - SkUnitScalarMul(dot, axis.fZ);
 
-        (void)((SkPoint3D*)(void*)&zenith)->normalize(&zenith);
+        SkTCast<SkPoint3D*>(&zenith)->normalize(&zenith);
     }
 
     SkUnit3D::Cross(axis, zenith, &cross);
@@ -313,8 +313,8 @@
     diff.fY = quilt.fOrigin.fY - fLocation.fY;
     diff.fZ = quilt.fOrigin.fZ - fLocation.fZ;
 
-    dot = SkUnit3D::Dot(*(const SkUnit3D*)(const void*)&diff,
-                        *(const SkUnit3D*)(((const SkScalar*)(const void*)&fOrientation) + 6));
+    dot = SkUnit3D::Dot(*SkTCast<const SkUnit3D*>(&diff),
+                        *SkTCast<const SkUnit3D*>(SkTCast<const SkScalar*>(&fOrientation) + 6));
 
     patchPtr = (const SkScalar*)&quilt;
     matrix->set(SkMatrix::kMScaleX, SkScalarDotDiv(3, patchPtr, 1, mapPtr, 1, dot));

src/views/animated/SkStaticTextView.cpp

diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index 8ab1183..199b2fe 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -154,25 +154,29 @@
     this->INHERITED::onInflate(dom, node);
 
     int    index;
-    if ((index = dom.findList(node, "mode", "fixed,auto-width,auto-height")) >= 0)
+    if ((index = dom.findList(node, "mode", "fixed,auto-width,auto-height")) >= 0) {
         this->setMode((Mode)index);
-    else
+    } else {
         assert_no_attr(dom, node, "mode");
+    }
 
-    if ((index = dom.findList(node, "spacing-align", "start,center,end")) >= 0)
+    if ((index = dom.findList(node, "spacing-align", "start,center,end")) >= 0) {
         this->setSpacingAlign((SkTextBox::SpacingAlign)index);
-    else
+    } else {
         assert_no_attr(dom, node, "spacing-align");
+    }
 
     SkScalar s[2];
-    if (dom.findScalars(node, "margin", s, 2))
+    if (dom.findScalars(node, "margin", s, 2)) {
         this->setMargin(s[0], s[1]);
-    else
+    } else {
         assert_no_attr(dom, node, "margin");
+    }
 
     const char* text = dom.findAttr(node, "text");
-    if (text)
+    if (text) {
         this->setText(text);
+    }
 
     if ((node = dom.getFirstChild(node, "paint")) != NULL &&
         (node = dom.getFirstChild(node, "screenplay")) != NULL)