From d4144060731a94a5b057dfad407e6e3c294435cf Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 31 May 2012 15:29:44 +0000 Subject: Windows compiler complaint cleanup http://codereview.appspot.com/6262047/ git-svn-id: http://skia.googlecode.com/svn/trunk@4098 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkScalar.h | 2 +- include/utils/SkCamera.h | 2 +- src/effects/SkGroupShape.cpp | 2 +- tests/PathTest.cpp | 1 - 4 files changed, 3 insertions(+), 4 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) {} diff --git a/src/effects/SkGroupShape.cpp b/src/effects/SkGroupShape.cpp index 8ec87c4f29..0468d5b087 100644 --- a/src/effects/SkGroupShape.cpp +++ b/src/effects/SkGroupShape.cpp @@ -92,7 +92,7 @@ void SkGroupShape::flatten(SkFlattenableWriteBuffer& buffer) const { const Rec* stop = fList.end(); while (rec < stop) { buffer.writeFlattenable(rec->fShape); - buffer.writeBool(rec->fMatrixRef); + buffer.writeBool(NULL != rec->fMatrixRef); if (rec->fMatrixRef) { buffer.writeMatrix(*rec->fMatrixRef); } diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 7b8f869afe..73bdef0802 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -27,7 +27,6 @@ static void test_poly(skiatest::Reporter* reporter, const SkPath& path, const SkPoint srcPts[], int count, bool expectClose) { SkPath::RawIter iter(path); SkPoint pts[4]; - SkPath::Verb verb; bool firstTime = true; bool foundClose = false; -- cgit v1.2.3