< prev index next >
src/java.desktop/share/classes/sun/java2d/marlin/Helpers.java
Print this page
*** 249,259 ****
{
final float x12 = pts[2] - pts[0];
final float y12 = pts[3] - pts[1];
// if the curve is already parallel to either axis we gain nothing
// from rotating it.
! if ((y12 != 0.0f && x12 != 0.0f)) {
// we rotate it so that the first vector in the control polygon is
// parallel to the x-axis. This will ensure that rotated quarter
// circles won't be subdivided.
final float hypot = (float)Math.sqrt(x12 * x12 + y12 * y12);
final float cos = x12 / hypot;
--- 249,259 ----
{
final float x12 = pts[2] - pts[0];
final float y12 = pts[3] - pts[1];
// if the curve is already parallel to either axis we gain nothing
// from rotating it.
! if ((y12 != 0.0f) && (x12 != 0.0f)) {
// we rotate it so that the first vector in the control polygon is
// parallel to the x-axis. This will ensure that rotated quarter
// circles won't be subdivided.
final float hypot = (float)Math.sqrt(x12 * x12 + y12 * y12);
final float cos = x12 / hypot;
*** 770,790 ****
switch(_curveTypes[i]) {
case TYPE_LINETO:
io.lineTo(_curves[e], _curves[e+1]);
e += 2;
continue;
- case TYPE_QUADTO:
- io.quadTo(_curves[e], _curves[e+1],
- _curves[e+2], _curves[e+3]);
- e += 4;
- continue;
case TYPE_CUBICTO:
io.curveTo(_curves[e], _curves[e+1],
_curves[e+2], _curves[e+3],
_curves[e+4], _curves[e+5]);
e += 6;
continue;
default:
}
}
numCurves = 0;
end = 0;
--- 770,790 ----
switch(_curveTypes[i]) {
case TYPE_LINETO:
io.lineTo(_curves[e], _curves[e+1]);
e += 2;
continue;
case TYPE_CUBICTO:
io.curveTo(_curves[e], _curves[e+1],
_curves[e+2], _curves[e+3],
_curves[e+4], _curves[e+5]);
e += 6;
continue;
+ case TYPE_QUADTO:
+ io.quadTo(_curves[e], _curves[e+1],
+ _curves[e+2], _curves[e+3]);
+ e += 4;
+ continue;
default:
}
}
numCurves = 0;
end = 0;
*** 812,832 ****
switch(_curveTypes[--nc]) {
case TYPE_LINETO:
e -= 2;
io.lineTo(_curves[e], _curves[e+1]);
continue;
- case TYPE_QUADTO:
- e -= 4;
- io.quadTo(_curves[e], _curves[e+1],
- _curves[e+2], _curves[e+3]);
- continue;
case TYPE_CUBICTO:
e -= 6;
io.curveTo(_curves[e], _curves[e+1],
_curves[e+2], _curves[e+3],
_curves[e+4], _curves[e+5]);
continue;
default:
}
}
numCurves = 0;
end = 0;
--- 812,832 ----
switch(_curveTypes[--nc]) {
case TYPE_LINETO:
e -= 2;
io.lineTo(_curves[e], _curves[e+1]);
continue;
case TYPE_CUBICTO:
e -= 6;
io.curveTo(_curves[e], _curves[e+1],
_curves[e+2], _curves[e+3],
_curves[e+4], _curves[e+5]);
continue;
+ case TYPE_QUADTO:
+ e -= 4;
+ io.quadTo(_curves[e], _curves[e+1],
+ _curves[e+2], _curves[e+3]);
+ continue;
default:
}
}
numCurves = 0;
end = 0;
< prev index next >