aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/Intersection/CubicReduceOrder.cpp
diff options
context:
space:
mode:
authorGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-01 17:44:28 +0000
committerGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-01 17:44:28 +0000
commita3f05facab01712a1b58e60a70b0dbdb90a39830 (patch)
tree07ed26e6e37b2b66332a7c1a4af8cbe91f4845ff /experimental/Intersection/CubicReduceOrder.cpp
parent99840553cda3184ec2e32fbb192d104741ceea86 (diff)
shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4118 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/Intersection/CubicReduceOrder.cpp')
-rw-r--r--experimental/Intersection/CubicReduceOrder.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/experimental/Intersection/CubicReduceOrder.cpp b/experimental/Intersection/CubicReduceOrder.cpp
index 19c69db944..84f2079826 100644
--- a/experimental/Intersection/CubicReduceOrder.cpp
+++ b/experimental/Intersection/CubicReduceOrder.cpp
@@ -59,8 +59,7 @@ static int horizontal_line(const Cubic& cubic, Cubic& reduction) {
}
// check to see if it is a quadratic or a line
-static int check_quadratic(const Cubic& cubic, Cubic& reduction,
- int minX, int maxX, int minY, int maxY) {
+static int check_quadratic(const Cubic& cubic, Cubic& reduction) {
double dx10 = cubic[1].x - cubic[0].x;
double dx23 = cubic[2].x - cubic[3].x;
double midX = cubic[0].x + dx10 * 3 / 2;
@@ -228,7 +227,7 @@ int reduceOrder(const Cubic& cubic, Cubic& reduction, ReduceOrder_Flags allowQua
if (result) {
return result;
}
- if (allowQuadratics && (result = check_quadratic(cubic, reduction, minX, maxX, minY, maxY))) {
+ if (allowQuadratics && (result = check_quadratic(cubic, reduction))) {
return result;
}
memcpy(reduction, cubic, sizeof(Cubic));