Index: src/core/SkGeometry.h |
diff --git a/src/core/SkGeometry.h b/src/core/SkGeometry.h |
index 0b236857a57d62febd91f2eb84d57a5b13b77dac..4da74f247598c36a62f10caba6e609f442732cb5 100644 |
--- a/src/core/SkGeometry.h |
+++ b/src/core/SkGeometry.h |
@@ -10,21 +10,6 @@ |
#include "SkMatrix.h" |
-/** An XRay is a half-line that runs from the specific point/origin to |
- +infinity in the X direction. e.g. XRay(3,5) is the half-line |
- (3,5)....(infinity, 5) |
- */ |
-typedef SkPoint SkXRay; |
- |
-/** Given a line segment from pts[0] to pts[1], and an xray, return true if |
- they intersect. Optional outgoing "ambiguous" argument indicates |
- whether the answer is ambiguous because the query occurred exactly at |
- one of the endpoints' y coordinates, indicating that another query y |
- coordinate is preferred for robustness. |
-*/ |
-bool SkXRayCrossesLine(const SkXRay& pt, const SkPoint pts[2], |
- bool* ambiguous = NULL); |
- |
/** Given a quadratic equation Ax^2 + Bx + C = 0, return 0, 1, 2 roots for the |
equation. |
*/ |
@@ -159,36 +144,6 @@ int SkFindCubicMaxCurvature(const SkPoint src[4], SkScalar tValues[3]); |
int SkChopCubicAtMaxCurvature(const SkPoint src[4], SkPoint dst[13], |
SkScalar tValues[3] = NULL); |
-/** Given a monotonic cubic bezier, determine whether an xray intersects the |
- cubic. |
- By definition the cubic is open at the starting point; in other |
- words, if pt.fY is equivalent to cubic[0].fY, and pt.fX is to the |
- left of the curve, the line is not considered to cross the curve, |
- but if it is equal to cubic[3].fY then it is considered to |
- cross. |
- Optional outgoing "ambiguous" argument indicates whether the answer is |
- ambiguous because the query occurred exactly at one of the endpoints' y |
- coordinates, indicating that another query y coordinate is preferred |
- for robustness. |
- */ |
-bool SkXRayCrossesMonotonicCubic(const SkXRay& pt, const SkPoint cubic[4], |
- bool* ambiguous = NULL); |
- |
-/** Given an arbitrary cubic bezier, return the number of times an xray crosses |
- the cubic. Valid return values are [0..3] |
- By definition the cubic is open at the starting point; in other |
- words, if pt.fY is equivalent to cubic[0].fY, and pt.fX is to the |
- left of the curve, the line is not considered to cross the curve, |
- but if it is equal to cubic[3].fY then it is considered to |
- cross. |
- Optional outgoing "ambiguous" argument indicates whether the answer is |
- ambiguous because the query occurred exactly at one of the endpoints' y |
- coordinates or at a tangent point, indicating that another query y |
- coordinate is preferred for robustness. |
- */ |
-int SkNumXRayCrossingsForCubic(const SkXRay& pt, const SkPoint cubic[4], |
- bool* ambiguous = NULL); |
- |
enum SkCubicType { |
kSerpentine_SkCubicType, |
kCusp_SkCubicType, |