Clean up most clang warnings outside animator/
http://codereview.appspot.com/6464058/
git-svn-id: http://skia.googlecode.com/svn/trunk@5079 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 2e15ebb..1d8e3cd 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -478,7 +478,7 @@
skiatest::Reporter* reporter,
CanvasTestStep* testStep) {
int baseSaveCount = canvas->getSaveCount();
- size_t n = canvas->save();
+ int n = canvas->save();
REPORTER_ASSERT_MESSAGE(reporter, baseSaveCount == n, testStep->assertMessage());
REPORTER_ASSERT_MESSAGE(reporter, baseSaveCount + 1 == canvas->getSaveCount(),
testStep->assertMessage());
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index e2e63c5..6f945dd 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -6,6 +6,7 @@
* found in the LICENSE file.
*/
#include "Test.h"
+#include "SkFloatBits.h"
#include "SkFloatingPoint.h"
#include "SkMathPriv.h"
#include "SkPoint.h"
@@ -199,7 +200,8 @@
float x, uint32_t ni, uint32_t si) {
if (!equal_float_native_skia(x, ni, si)) {
SkString desc;
- desc.printf("%s float %g bits %x native %x skia %x\n", op, x, ni, si);
+ uint32_t xi = SkFloat2Bits(x);
+ desc.printf("%s float %g bits %x native %x skia %x\n", op, x, xi, ni, si);
reporter->reportFailed(desc);
}
}