shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7758 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/CubicToQuadratics.cpp b/experimental/Intersection/CubicToQuadratics.cpp
index dc4b51b..707cfd1 100644
--- a/experimental/Intersection/CubicToQuadratics.cpp
+++ b/experimental/Intersection/CubicToQuadratics.cpp
@@ -102,7 +102,7 @@
Quadratic q1;
demote_cubic_to_quad(part, q1);
Quadratic s1;
- int o1 = reduceOrder(q1, s1);
+ int o1 = reduceOrder(q1, s1, kReduceOrder_TreatAsFill);
if (order < o1) {
order = o1;
}
@@ -142,7 +142,8 @@
// it would still take the prechopped cubic for reduce order and find cubic inflections
void cubic_to_quadratics(const Cubic& cubic, double precision, SkTDArray<double>& ts) {
Cubic reduced;
- int order = reduceOrder(cubic, reduced, kReduceOrder_QuadraticsAllowed);
+ int order = reduceOrder(cubic, reduced, kReduceOrder_QuadraticsAllowed,
+ kReduceOrder_TreatAsFill);
if (order < 3) {
return;
}
@@ -152,11 +153,13 @@
CubicPair pair;
if (inflections == 1) {
chop_at(cubic, pair, inflectT[0]);
- int orderP1 = reduceOrder(pair.first(), reduced, kReduceOrder_NoQuadraticsAllowed);
+ int orderP1 = reduceOrder(pair.first(), reduced, kReduceOrder_NoQuadraticsAllowed,
+ kReduceOrder_TreatAsFill);
if (orderP1 < 2) {
--inflections;
} else {
- int orderP2 = reduceOrder(pair.second(), reduced, kReduceOrder_NoQuadraticsAllowed);
+ int orderP2 = reduceOrder(pair.second(), reduced, kReduceOrder_NoQuadraticsAllowed,
+ kReduceOrder_TreatAsFill);
if (orderP2 < 2) {
--inflections;
}