diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 13:08:56 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-26 13:08:56 +0000 |
| commit | 373ebc634573364c27b1ebd35bb537ef1285cba4 (patch) | |
| tree | de677b3d81e81875c85dee3c838959425057a9f7 /src/utils/SkCamera.cpp | |
| parent | 5c83dcc371b68e4cda2d533e247684ea1a32d1bc (diff) | |
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
Diffstat (limited to 'src/utils/SkCamera.cpp')
| -rw-r--r-- | src/utils/SkCamera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp index 7d6963ce9a..11e10f6dc2 100644 --- a/src/utils/SkCamera.cpp +++ b/src/utils/SkCamera.cpp @@ -269,13 +269,13 @@ void SkCamera3D::doUpdate() const { 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 @@ void SkCamera3D::patchToMatrix(const SkPatch3D& quilt, SkMatrix* matrix) const { 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)); |