AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@7567 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-02-05 07:02:01 +00:00
parent 1c295e422b
commit 0c38ed3b1d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/StrokeBench.cpp
View File

@ -68,7 +68,7 @@ public:
fJoin = j;
fProc = proc;
fName.printf("draw_stroke_%s_%s", proc(NULL, 0), gJoinName[j]);
SkRect r = { 20, 20, 40, 40 };
SkScalar rad = 4;
fRec.fRRect.setRectXY(r, rad, rad);

6
experimental/Intersection/CubicIntersection.cpp
View File

@ -312,7 +312,7 @@ static void doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e,
}
Intersections xlocals;
intersectWithOrder(s1a, o1a, s2a, o2a, xlocals);
}
}
#endif
intersectWithOrder(s1a, o1a, s2a, o2a, locals);
for (int tIdx = 0; tIdx < locals.used(); ++tIdx) {
@ -325,7 +325,7 @@ static void doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e,
#if 0 && SK_DEBUG
SkDebugf("to1=%1.9g p1=(%1.9g,%1.9g) to2=%1.9g p2=(%1.9g,%1.9g) d=%1.9g\n",
to1, p1.x, p1.y, to2, p2.x, p2.y, p1.distance(p2));
#endif
if (p1.approximatelyEqual(p2)) {
i.insert(i.swapped() ? to2 : to1, i.swapped() ? to1 : to2);
@ -373,7 +373,7 @@ static bool intersect2(const Cubic& cubic1, double t1s, double t1e, const Cubic&
int o2 = quadPart(cubic2, t2Start, t2, s2);
Intersections locals;
intersectWithOrder(s1, o1, s2, o2, locals);
for (int tIdx = 0; tIdx < locals.used(); ++tIdx) {
double to1 = t1Start + (t1 - t1Start) * locals.fT[0][tIdx];
double to2 = t2Start + (t2 - t2Start) * locals.fT[1][tIdx];

2
experimental/Intersection/CubicIntersection_Test.cpp
View File

@ -458,6 +458,6 @@ void CubicIntersection_IntersectionFinder() {
void CubicIntersection_CoincidentTest() {
Cubic cubic1 = {{0, 1}, {0, 2}, {1, 0}, {1, 0}};
Cubic cubic2 = {{0, 1}, {0, 2}, {1, 0}, {6, 1}};
}
#endif

2
experimental/Intersection/DataTypes.h
View File

@ -199,7 +199,7 @@ struct _Point {
return AlmostEqualUlps((float) x, (float) a.x)
&& AlmostEqualUlps((float) y, (float) a.y);
}
bool approximatelyZero() const {
return approximately_zero(x) && approximately_zero(y);
}

2
experimental/Intersection/Intersection_Tests.cpp
View File

@ -13,7 +13,7 @@ void cubecode_test(int test);
void Intersection_Tests() {
int testsRun = 0;
CubicIntersection_IntersectionFinder();
CubicIntersection_OneOffTest();
SimplifyNew_Test();

2
experimental/Intersection/Intersections.h
View File

@ -58,7 +58,7 @@ public:
int coincidentUsed() const {
return fCoincidentUsed;
}
#if SK_DEBUG
int depth() const {
return fDepth;