diff options
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/Intersection/DataTypes.h | 2 | ||||
-rw-r--r-- | experimental/Intersection/EdgeWalker_TestUtility.cpp | 8 | ||||
-rw-r--r-- | experimental/Intersection/Simplify.cpp | 4 | ||||
-rw-r--r-- | experimental/Intersection/SimplifyNew_Test.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/experimental/Intersection/DataTypes.h b/experimental/Intersection/DataTypes.h index f36de9e45d..f4ef1ab8f9 100644 --- a/experimental/Intersection/DataTypes.h +++ b/experimental/Intersection/DataTypes.h @@ -70,7 +70,7 @@ inline bool approximately_zero(double x) { } inline bool approximately_zero(float x) { - + return fabs(x) < FLT_EPSILON; } diff --git a/experimental/Intersection/EdgeWalker_TestUtility.cpp b/experimental/Intersection/EdgeWalker_TestUtility.cpp index 2f67abd56b..fa590c318a 100644 --- a/experimental/Intersection/EdgeWalker_TestUtility.cpp +++ b/experimental/Intersection/EdgeWalker_TestUtility.cpp @@ -207,7 +207,7 @@ int comparePaths(const SkPath& one, const SkPath& two, SkBitmap& bitmap, } const int MAX_ERRORS = 5; if (errors2x2 > MAX_ERRORS && gComparePathsAssert) { - SkDebugf("%s errors=%d\n", __FUNCTION__, errors); + SkDebugf("%s errors=%d\n", __FUNCTION__, errors); showPath(one); showPath(two, "simplified:"); SkASSERT(0); @@ -396,7 +396,7 @@ void initializeTests(const char* test, size_t testNameSize) { size_t inLen = inData.count(); inFile.read(inData.begin(), inLen); inFile.setPath(NULL); - char* insert = strstr(inData.begin(), marker); + char* insert = strstr(inData.begin(), marker); if (insert) { insert += sizeof(marker) - 1; const char* numLoc = insert + 4 /* indent spaces */ + testNameSize - 1; @@ -454,12 +454,12 @@ void outputToStream(const State4& state, const char* pathStr, SkPath::FillType p } outFile.writeText(pathStr); outFile.writeText("</div>\n\n"); - + outFile.writeText(marker); outFile.writeText(" "); writeTestName(pathFillType, outFile); outFile.writeText(",\n\n\n"); - + outFile.writeText("static void "); writeTestName(pathFillType, outFile); outFile.writeText("() {\n SkPath path;\n"); diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index cea2f69da4..3c626c84b8 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -549,7 +549,7 @@ public: bool isHorizontal() const { return fDy == 0 && fDDy == 0 && fDDDy == 0; } - + // high precision version #if HIGH_DEF_ANGLES void set(const SkPoint* orig, SkPath::Verb verb, const Segment* segment, @@ -575,7 +575,7 @@ public: fDDDy = approximately_pin(pts[3].y + 3 * (pts[1].y - pts[2].y) - pts[0].y); } -#else +#else // since all angles share a point, this needs to know which point // is the common origin, i.e., whether the center is at pts[0] or pts[verb] // practically, this should only be called by addAngle diff --git a/experimental/Intersection/SimplifyNew_Test.cpp b/experimental/Intersection/SimplifyNew_Test.cpp index 53839ae8c9..c5f2198280 100644 --- a/experimental/Intersection/SimplifyNew_Test.cpp +++ b/experimental/Intersection/SimplifyNew_Test.cpp @@ -513,7 +513,7 @@ static void testLine19x() { SkPath path; path.setFillType(SkPath::kEvenOdd_FillType); path.addRect(0, 0, 12, 12, (SkPath::Direction) 0); - path.addRect(12, 16, 21, 21, (SkPath::Direction) 0); + path.addRect(12, 16, 21, 21, (SkPath::Direction) 0); testSimplifyx(path); } |