From c92545145d41a2497ae909401862c4f6f75c244c Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 4 May 2011 14:43:40 +0000 Subject: [PATCH] fix precendence error (== binds tighter than &) add new samples to solution git-svn-id: http://skia.googlecode.com/svn/trunk@1240 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkWriter32.cpp | 2 +- vs/SampleApp/SampleApp.vcxproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp index 9a05df911..141f75198 100644 --- a/src/core/SkWriter32.cpp +++ b/src/core/SkWriter32.cpp @@ -55,7 +55,7 @@ void SkWriter32::reset() { void SkWriter32::reset(void* block, size_t size) { this->reset(); - SkASSERT(0 == (fSingleBlock - (char*)0) & 3); // need 4-byte alignment + SkASSERT(0 == ((fSingleBlock - (char*)0) & 3)); // need 4-byte alignment fSingleBlock = (char*)block; fSingleBlockSize = (size & ~3); } diff --git a/vs/SampleApp/SampleApp.vcxproj b/vs/SampleApp/SampleApp.vcxproj index 35f49cf10..9632d44b2 100644 --- a/vs/SampleApp/SampleApp.vcxproj +++ b/vs/SampleApp/SampleApp.vcxproj @@ -261,8 +261,10 @@ + +