Commite0dfd27

committed

Make path clipping a bit safer

... by avoiding double pointers.

1 parent8736a98 commite0dfd27Copy full SHA for e0dfd27

File tree

-8

lines changed

-8

lines changed

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -524,12 +524,11 @@ struct bisectx`
`524`	`524`	`{`
`525`	`525`	`}`
`526`	`526`
`527`		`-inlinevoidbisect(double sx,double sy,double px,double py,double bx,double by)const`
	`527`	`+inlineautobisect(double sx,double sy,double px,double py)const`
`528`	`528`	`{`
`529`		`- *bx = m_x;`
`530`	`529`	`double dx = px - sx;`
`531`	`530`	`double dy = py - sy;`
`532`		`-by = sy + dy ((m_x - sx) / dx);`
	`531`	`+returnstd::tuple(m_x, sy + dy * ((m_x - sx) / dx));`
`533`	`532`	`}`
`534`	`533`	`};`
`535`	`534`
`@@ -565,12 +564,11 @@ struct bisecty`
`565`	`564`	`{`
`566`	`565`	`}`
`567`	`566`
`568`		`-inlinevoidbisect(double sx,double sy,double px,double py,double bx,double by)const`
	`567`	`+inlineautobisect(double sx,double sy,double px,double py)const`
`569`	`568`	`{`
`570`		`- *by = m_y;`
`571`	`569`	`double dx = px - sx;`
`572`	`570`	`double dy = py - sy;`
`573`		`-bx =sx + dx ((m_y - sy) / dy);`
	`571`	`+returnstd::tuple(sx + dx * ((m_y - sy) / dy), m_y);`
`574`	`572`	`}`
`575`	`573`	`};`
`576`	`574`
`@@ -615,8 +613,7 @@ inline void clip_to_rect_one_step(const Polygon &polygon, Polygon &result, const`
`615`	`613`	`pinside = filter.is_inside(px, py);`
`616`	`614`
`617`	`615`	`if (sinside ^ pinside) {`
`618`		`-double bx, by;`
`619`		`- filter.bisect(sx, sy, px, py, &bx, &by);`
	`616`	`+auto [bx, by] = filter.bisect(sx, sy, px, py);`
`620`	`617`	`result.emplace_back(bx, by);`
`621`	`618`	`}`
`622`	`619`

Comments

(0)