shape ops work in progress
add quartic solution for intersecting quadratics
git-svn-id: http://skia.googlecode.com/svn/trunk@5541 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/QuadraticParameterization_TestUtility.cpp b/experimental/Intersection/QuadraticParameterization_TestUtility.cpp
index 08a562b..7c91eb5 100644
--- a/experimental/Intersection/QuadraticParameterization_TestUtility.cpp
+++ b/experimental/Intersection/QuadraticParameterization_TestUtility.cpp
@@ -4,14 +4,13 @@
#include "Parameterization_Test.h"
bool point_on_parameterized_curve(const Quadratic& quad, const _Point& point) {
- double coeffs[coeff_count];
- implicit_coefficients(quad, coeffs);
- double xx = coeffs[ xx_coeff] * point.x * point.x;
- double xy = coeffs[ xy_coeff] * point.x * point.y;
- double yy = coeffs[ yy_coeff] * point.y * point.y;
- double x = coeffs[ x_coeff] * point.x;
- double y = coeffs[ y_coeff] * point.y;
- double c = coeffs[ c_coeff];
+ QuadImplicitForm q(quad);
+ double xx = q.x2() * point.x * point.x;
+ double xy = q.xy() * point.x * point.y;
+ double yy = q.y2() * point.y * point.y;
+ double x = q.x() * point.x;
+ double y = q.y() * point.y;
+ double c = q.c();
double sum = xx + xy + yy + x + y + c;
return approximately_zero(sum);
}