Skip to content

Commit

Permalink
[494320] Fix BezierCurve.getScaled() to not recurse.
Browse files Browse the repository at this point in the history
- Ensured all getScaled() methods in BezierCurve to not call getScaled
recursively, but instead call scale() on the created copy.
- Added as test case that confirms the correct behavior (no stack
overflow occurs).
  • Loading branch information
nyssen committed May 23, 2016
1 parent e8948f3 commit 8de300c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ public void test_getParameterAt() {
assertTrue(thrown);
}

@Test
public void test_getScaled() {
BezierCurve c0 = new BezierCurve(1, 1, 1, 10, 10, 1, 10, 10);
BezierCurve s0 = c0.getScaled(2, 0, 0);
assertEquals(new BezierCurve(2, 2, 2, 20, 20, 2, 20, 20), s0);
}

@Test
public void test_getTranslated() {
BezierCurve c0 = new BezierCurve(1, 1, 1, 10, 10, 1, 10, 10);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2090,32 +2090,32 @@ public BezierCurve getRotatedCW(Angle angle, Point center) {

@Override
public BezierCurve getScaled(double factor) {
return getCopy().getScaled(factor);
return getCopy().scale(factor);
}

@Override
public BezierCurve getScaled(double fx, double fy) {
return getCopy().getScaled(fx, fy);
return getCopy().scale(fx, fy);
}

@Override
public BezierCurve getScaled(double factor, double cx, double cy) {
return getCopy().getScaled(factor, cx, cy);
return getCopy().scale(factor, cx, cy);
}

@Override
public BezierCurve getScaled(double fx, double fy, double cx, double cy) {
return getCopy().getScaled(fx, fy, cx, cy);
return getCopy().scale(fx, fy, cx, cy);
}

@Override
public BezierCurve getScaled(double fx, double fy, Point center) {
return getCopy().getScaled(fx, fy, center);
return getCopy().scale(fx, fy, center);
}

@Override
public BezierCurve getScaled(double factor, Point center) {
return getCopy().getScaled(factor, center);
return getCopy().scale(factor, center);
}

/**
Expand Down Expand Up @@ -2668,4 +2668,4 @@ public BezierCurve translate(Point d) {
return translate(d.x, d.y);
}

}
}

0 comments on commit 8de300c

Please sign in to comment.