From 391ca66276b27464f255c371e7e95f56f9042042 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Thu, 11 Apr 2013 07:01:45 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@8608 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/PathOpsExtendedTest.cpp | 4 ++-- tests/PathOpsOpRectThreadedTest.cpp | 1 - tests/PathOpsThreadedCommon.cpp | 2 -- tests/PathTest.cpp | 14 +++++++------- tests/skia_test.cpp | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index bc3dbe2b9f..5aa1ac098c 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -160,7 +160,7 @@ static void showPath(const SkPath& path, const char* str, const SkMatrix& scale) SkPath scaled; SkMatrix inverse; bool success = scale.invert(&inverse); - if (!success) { + if (!success) { SkASSERT(0); } path.transform(inverse, &scaled); @@ -328,7 +328,7 @@ static void showPathOpPath(const SkPath& one, const SkPath& two, const SkPath& a static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const SkPath& scaledOne, const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap, - const SkPath& a, const SkPath& b, const SkPathOp shapeOp, + const SkPath& a, const SkPath& b, const SkPathOp shapeOp, const SkMatrix& scale) { int errors2x2; int errors = pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2); diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp index 8f4bd7d1e0..6ac04cd4eb 100644 --- a/tests/PathOpsOpRectThreadedTest.cpp +++ b/tests/PathOpsOpRectThreadedTest.cpp @@ -87,4 +87,3 @@ finish: #include "TestClassDef.h" DEFINE_TESTCLASS("PathOpsRectsThreaded", OpRectsThreadedTestClass, \ TestPathOpsRectsThreaded) - diff --git a/tests/PathOpsThreadedCommon.cpp b/tests/PathOpsThreadedCommon.cpp index 44e86ab50d..6d9821d491 100644 --- a/tests/PathOpsThreadedCommon.cpp +++ b/tests/PathOpsThreadedCommon.cpp @@ -25,5 +25,3 @@ void PathOpsThreadedTestRunner::render() { gDebugMaxWindValue = SK_MaxS32; #endif } - - diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index e124665026..be118467b0 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -33,20 +33,20 @@ static SkSurface* new_surface(int w, int h) { static void test_bad_cubic_crbug229478() { const SkPoint pts[] = { - { 4595.91064f, -11596.9873f }, - { 4597.2168f, -11595.9414f }, - { 4598.52344f, -11594.8955f }, - { 4599.83008f, -11593.8496f }, + { 4595.91064f, -11596.9873f }, + { 4597.2168f, -11595.9414f }, + { 4598.52344f, -11594.8955f }, + { 4599.83008f, -11593.8496f }, }; - + SkPath path; path.moveTo(pts[0]); path.cubicTo(pts[1], pts[2], pts[3]); - + SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(20); - + SkPath dst; // Before the fix, this would infinite-recurse, and run out of stack // because we would keep trying to subdivide a degenerate cubic segment. diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp index f99ae8c0a5..ee1d2de0d1 100644 --- a/tests/skia_test.cpp +++ b/tests/skia_test.cpp @@ -73,7 +73,7 @@ public: } virtual bool allowExtendedTest() const { - return fAllowExtendedTest; + return fAllowExtendedTest; } protected: