diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-22 21:29:10 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-22 21:29:10 +0000 |
| commit | 6f86c3e0a63271d42473d73175a933f632b19243 (patch) | |
| tree | 972326fa5503feb89aac19c904c5963ff7381e3a | |
| parent | 752b60e633a349c5b9f7bcc6a28b8064fc77bb41 (diff) | |
fix clang compilation warning
Submitted on behalf of Guanqun.Lu@gmail.com
Review URL: http://codereview.appspot.com/5833045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3472 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/gpu/GrDrawState.h | 4 | ||||
| -rw-r--r-- | tests/UnicodeTest.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h index 7350f0f16f..c0ff42fc69 100644 --- a/src/gpu/GrDrawState.h +++ b/src/gpu/GrDrawState.h @@ -86,8 +86,8 @@ struct GrDrawState { GrAssert(kMemsetSize + sizeof(fColor) + sizeof(fCoverage) + sizeof(fFirstCoverageStage) + sizeof(fColorFilterMode) + sizeof(fSrcBlend) + sizeof(fDstBlend) + sizeof(GrMatrix) == - reinterpret_cast<intptr_t>(&fEdgeAANumEdges) - - reinterpret_cast<intptr_t>(this)); + reinterpret_cast<uintptr_t>(&fEdgeAANumEdges) - + reinterpret_cast<uintptr_t>(this)); fEdgeAANumEdges = 0; } diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp index 04fee49608..1293fb6afb 100644 --- a/tests/UnicodeTest.cpp +++ b/tests/UnicodeTest.cpp @@ -69,9 +69,9 @@ static void test_textencodings(skiatest::Reporter* reporter) { paint.setTextEncoding(SkPaint::kUTF32_TextEncoding); int count32 = paint.textToGlyphs(text32, len32, glyphs32); - REPORTER_ASSERT(reporter, len8 == count8); - REPORTER_ASSERT(reporter, len8 == count16); - REPORTER_ASSERT(reporter, len8 == count32); + REPORTER_ASSERT(reporter, (int)len8 == count8); + REPORTER_ASSERT(reporter, (int)len8 == count16); + REPORTER_ASSERT(reporter, (int)len8 == count32); REPORTER_ASSERT(reporter, !memcmp(glyphs8, glyphs16, count8 * sizeof(uint16_t))); REPORTER_ASSERT(reporter, !memcmp(glyphs8, glyphs32, count8 * sizeof(uint16_t))); |