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

fix line intersection

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@12197 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
caryclark@google.com 2013-11-08 18:00:01 +00:00
parent b95d9f566b
commit 1510726d60
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pathops/SkDLineIntersection.cpp
View File

@ -228,7 +228,9 @@ int SkIntersections::horizontal(const SkDLine& line, double left, double right,
fT[1][index] = 1 - fT[1][index];
}
}
computePoints(line, result);
fPt[0].fX = xIntercept;
fPt[0].fY = y;
fUsed = 1;
}
}
if (fAllowNear || result == 2) {
@ -314,7 +316,9 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
fT[1][index] = 1 - fT[1][index];
}
}
computePoints(line, result);
fPt[0].fX = x;
fPt[0].fY = yIntercept;
fUsed = 1;
}
}
if (fAllowNear || result == 2) {

2
tests/PathOpsLineIntersectionTest.cpp
View File

@ -11,6 +11,8 @@
// FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
static const SkDLine tests[][2] = {
{{{{30,20}, {30,50}}}, {{{24,30}, {36,30}}}},
{{{{323,193}, {-317,193}}}, {{{0,994}, {0,0}}}},
{{{{90,230}, {160,60}}}, {{{60,120}, {260,120}}}},
{{{{90,230}, {160,60}}}, {{{181.176468,120}, {135.294128,120}}}},
{{{{181.1764678955078125f, 120}, {186.3661956787109375f, 134.7042236328125f}}},

49
tests/PathOpsSkpTest.cpp
View File

@ -1549,10 +1549,59 @@ static void skpgithub_io_26(skiatest::Reporter* reporter) {
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpskpicture14(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 994);
path.lineTo(0, 0);
path.lineTo(512, 0);
path.lineTo(512, 994);
path.lineTo(0, 994);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(-317, 168);
pathB.quadTo(-317, 166.757385f, -316.121338f, 165.878662f);
pathB.quadTo(-315.242645f, 165, -314, 165);
pathB.lineTo(320, 165);
pathB.quadTo(321.242615f, 165, 322.121338f, 165.878662f);
pathB.quadTo(323, 166.757385f, 323, 168);
pathB.lineTo(323, 193);
pathB.lineTo(-317, 193);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpskpicture15(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 193);
path.lineTo(323, 193);
path.lineTo(323, 168);
path.quadTo(323, 166.757385f, 322.121338f, 165.878662f);
path.quadTo(321.242615f, 165, 320, 165);
path.lineTo(0, 165);
path.lineTo(0, 193);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(-314, 165);
pathB.lineTo(320, 165);
pathB.cubicTo(321.65686f, 165, 323, 166.34314f, 323, 168);
pathB.lineTo(323, 192);
pathB.lineTo(-317, 192);
pathB.lineTo(-317, 168);
pathB.cubicTo(-317, 166.34314f, -315.65686f, 165, -314, 165);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void (*firstTest)(skiatest::Reporter* ) = 0;
static struct TestDesc tests[] = {
TEST(skpskpicture14),
#if TRY_SEPT_BROKEN_TESTS
TEST(skpskpicture15),
TEST(skpwww_meb_gov_tr_6),
TEST(skpwww_sciality_com_101),
TEST(skpwww_booking_com_68), // similar to lavoixdunord