diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-03 07:01:45 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-03 07:01:45 +0000 |
commit | 862020763d9d2fb1900b2c84e55dadf46482246d (patch) | |
tree | f8540f23605d1dd83d8c9cf900f22a8c6d9b7a64 | |
parent | 04018f37af9d1b231111dc557fa281689b8a4616 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12875 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | src/core/SkPictureFlat.cpp | 1 | ||||
-rw-r--r-- | tests/ImageDecodingTest.cpp | 3 | ||||
-rw-r--r-- | tests/MallocPixelRefTest.cpp | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/core/SkPictureFlat.cpp b/src/core/SkPictureFlat.cpp index e75023e0f6..e3a6f1325a 100644 --- a/src/core/SkPictureFlat.cpp +++ b/src/core/SkPictureFlat.cpp @@ -89,4 +89,3 @@ SkNamedFactorySet* SkFlatController::setNamedFactorySet(SkNamedFactorySet* set) SkRefCnt_SafeAssign(fFactorySet, set); return set; } - diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp index d39a51a134..c74bb35ccf 100644 --- a/tests/ImageDecodingTest.cpp +++ b/tests/ImageDecodingTest.cpp @@ -311,7 +311,7 @@ DEF_TEST(WebP, reporter) { } SkAutoLockPixels alp(bm); - bool rightSize = ((kExpectedWidth == bm.width()) + bool rightSize = ((kExpectedWidth == bm.width()) && (kExpectedHeight == bm.height())); REPORTER_ASSERT(reporter, rightSize); if (rightSize) { @@ -578,4 +578,3 @@ DEF_TEST(ImageDecoderOptions, reporter) { } } //////////////////////////////////////////////////////////////////////////////// - diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp index 8fcdc86f93..e169763dad 100644 --- a/tests/MallocPixelRefTest.cpp +++ b/tests/MallocPixelRefTest.cpp @@ -113,4 +113,3 @@ DEF_TEST(MallocPixelRef, reporter) { static_cast<const void*>(dataPtr->bytes() + 4) == pr->pixels()); } } - |