diff options
| -rw-r--r-- | experimental/Intersection/CubicIntersection_Test.cpp | 2 | ||||
| -rw-r--r-- | experimental/Intersection/Simplify.cpp | 4 | ||||
| -rw-r--r-- | gm/tilemodes.cpp | 1 | ||||
| -rw-r--r-- | include/ports/SkAshmemImageCache.h | 1 | ||||
| -rw-r--r-- | src/lazy/SkLruImageCache.cpp | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp index b81abbb301..53d33cf504 100644 --- a/experimental/Intersection/CubicIntersection_Test.cpp +++ b/experimental/Intersection/CubicIntersection_Test.cpp @@ -654,7 +654,7 @@ void CubicIntersection_SelfTest() { const Cubic selfSet[] = { {{3.34,8.98}, {1.95,10.27}, {3.76,7.65}, {4.96,10.64}}, {{3.13,2.74}, {1.08,4.62}, {3.71,0.94}, {2.01,3.81}}, - {{6.71,3.14}, {7.99,2.75}, {8.27,1.96}, {6.35,3.57}}, + {{6.71,3.14}, {7.99,2.75}, {8.27,1.96}, {6.35,3.57}}, {{12.81,7.27}, {7.22,6.98}, {12.49,8.97}, {11.42,6.18}}, }; size_t selfSetCount = sizeof(selfSet) / sizeof(selfSet[0]); diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index dfb36ff791..f4d8875794 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -3696,7 +3696,7 @@ the same winding is shared by both. #endif return result; } - + void subDivide(int start, int end, SkPoint edge[4]) const { edge[0] = fTs[start].fPt; edge[fVerb] = fTs[end].fPt; @@ -4401,7 +4401,7 @@ public: setBounds(); fContainsIntercepts = false; } - + bool containsCubics() const { return fContainsCubics; } diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp index 63ffd0af30..d5501b0dfb 100644 --- a/gm/tilemodes.cpp +++ b/gm/tilemodes.cpp @@ -252,4 +252,3 @@ private: DEF_GM( return new TilingGM; ) DEF_GM( return new Tiling2GM(make_bm, "bitmap"); ) DEF_GM( return new Tiling2GM(make_grad, "gradient"); ) - diff --git a/include/ports/SkAshmemImageCache.h b/include/ports/SkAshmemImageCache.h index d89c3df3e7..817e702490 100644 --- a/include/ports/SkAshmemImageCache.h +++ b/include/ports/SkAshmemImageCache.h @@ -70,4 +70,3 @@ private: void removeRec(AshmemRec*); }; #endif // SkAshmemImageCache_DEFINED - diff --git a/src/lazy/SkLruImageCache.cpp b/src/lazy/SkLruImageCache.cpp index e8a3ed0a3d..0f047161ba 100644 --- a/src/lazy/SkLruImageCache.cpp +++ b/src/lazy/SkLruImageCache.cpp @@ -186,4 +186,3 @@ void SkLruImageCache::purgeTilAtOrBelow(size_t limit) { } } } - |