diff options
Diffstat (limited to 'gs/base/gxpflat.c')
| -rw-r--r-- | gs/base/gxpflat.c | 473 |
1 files changed, 235 insertions, 238 deletions
diff --git a/gs/base/gxpflat.c b/gs/base/gxpflat.c index fa106d467..c69db8adb 100644 --- a/gs/base/gxpflat.c +++ b/gs/base/gxpflat.c @@ -1,6 +1,6 @@ /* Copyright (C) 2001-2006 Artifex Software, Inc. All Rights Reserved. - + This software is provided AS-IS with no warranty, either express or implied. @@ -46,50 +46,50 @@ */ int gx_curve_log2_samples(fixed x0, fixed y0, const curve_segment * pc, - fixed fixed_flat) + fixed fixed_flat) { fixed - x03 = pc->pt.x - x0, - y03 = pc->pt.y - y0; + x03 = pc->pt.x - x0, + y03 = pc->pt.y - y0; int k; if (x03 < 0) - x03 = -x03; + x03 = -x03; if (y03 < 0) - y03 = -y03; + y03 = -y03; if ((x03 | y03) < int2fixed(16)) - fixed_flat >>= 1; + fixed_flat >>= 1; if (fixed_flat == 0) { /* Use the conservative method. */ - fixed m = max(x03, y03); + fixed m = max(x03, y03); - for (k = 1; m > fixed_1;) - k++, m >>= 1; + for (k = 1; m > fixed_1;) + k++, m >>= 1; } else { - const fixed - x12 = pc->p1.x - pc->p2.x, y12 = pc->p1.y - pc->p2.y, - dx0 = x0 - pc->p1.x - x12, dy0 = y0 - pc->p1.y - y12, - dx1 = x12 - pc->p2.x + pc->pt.x, dy1 = y12 - pc->p2.y + pc->pt.y, - adx0 = any_abs(dx0), ady0 = any_abs(dy0), - adx1 = any_abs(dx1), ady1 = any_abs(dy1); - fixed - d = max(adx0, adx1) + max(ady0, ady1); - /* - * The following statement is split up to work around a - * bug in the gcc 2.7.2 optimizer on H-P RISC systems. - */ - uint qtmp = d - (d >> 2) /* 3/4 * D */ +fixed_flat - 1; - uint q = qtmp / fixed_flat; - - if_debug6('2', "[2]d01=%g,%g d12=%g,%g d23=%g,%g\n", - fixed2float(pc->p1.x - x0), fixed2float(pc->p1.y - y0), - fixed2float(-x12), fixed2float(-y12), - fixed2float(pc->pt.x - pc->p2.x), fixed2float(pc->pt.y - pc->p2.y)); - if_debug2('2', " D=%f, flat=%f,", - fixed2float(d), fixed2float(fixed_flat)); - /* Now we want to set k = ceiling(log2(q) / 2). */ - for (k = 0; q > 1;) - k++, q = (q + 3) >> 2; - if_debug1('2', " k=%d\n", k); + const fixed + x12 = pc->p1.x - pc->p2.x, y12 = pc->p1.y - pc->p2.y, + dx0 = x0 - pc->p1.x - x12, dy0 = y0 - pc->p1.y - y12, + dx1 = x12 - pc->p2.x + pc->pt.x, dy1 = y12 - pc->p2.y + pc->pt.y, + adx0 = any_abs(dx0), ady0 = any_abs(dy0), + adx1 = any_abs(dx1), ady1 = any_abs(dy1); + fixed + d = max(adx0, adx1) + max(ady0, ady1); + /* + * The following statement is split up to work around a + * bug in the gcc 2.7.2 optimizer on H-P RISC systems. + */ + uint qtmp = d - (d >> 2) /* 3/4 * D */ +fixed_flat - 1; + uint q = qtmp / fixed_flat; + + if_debug6('2', "[2]d01=%g,%g d12=%g,%g d23=%g,%g\n", + fixed2float(pc->p1.x - x0), fixed2float(pc->p1.y - y0), + fixed2float(-x12), fixed2float(-y12), + fixed2float(pc->pt.x - pc->p2.x), fixed2float(pc->pt.y - pc->p2.y)); + if_debug2('2', " D=%f, flat=%f,", + fixed2float(d), fixed2float(fixed_flat)); + /* Now we want to set k = ceiling(log2(q) / 2). */ + for (k = 0; q > 1;) + k++, q = (q + 3) >> 2; + if_debug1('2', " k=%d\n", k); } return k; } @@ -102,12 +102,12 @@ gx_curve_log2_samples(fixed x0, fixed y0, const curve_segment * pc, */ static void split_curve_midpoint(fixed x0, fixed y0, const curve_segment * pc, - curve_segment * pc1, curve_segment * pc2) + curve_segment * pc1, curve_segment * pc2) { /* - * We have to define midpoint carefully to avoid overflow. - * (If it overflows, something really pathological is going - * on, but we could get infinite recursion that way....) - */ + * We have to define midpoint carefully to avoid overflow. + * (If it overflows, something really pathological is going + * on, but we could get infinite recursion that way....) + */ #define midpoint(a,b)\ (arith_rshift_1(a) + arith_rshift_1(b) + (((a) | (b)) & 1)) fixed x12 = midpoint(pc->p1.x, pc->p2.x); @@ -126,8 +126,8 @@ split_curve_midpoint(fixed x0, fixed y0, const curve_segment * pc, pc2->p1.x = midpoint(x12, pc2->p2.x); pc2->p1.y = midpoint(y12, pc2->p2.y); if (pc2 != pc) - pc2->pt.x = pc->pt.x, - pc2->pt.y = pc->pt.y; + pc2->pt.x = pc->pt.x, + pc2->pt.y = pc->pt.y; pc1->pt.x = midpoint(pc1->p2.x, pc2->p1.x); pc1->pt.y = midpoint(pc1->p2.y, pc2->p1.y); #undef midpoint @@ -136,51 +136,50 @@ split_curve_midpoint(fixed x0, fixed y0, const curve_segment * pc, static inline void print_points(const gs_fixed_point *points, int count) { -#ifdef DEBUG +#ifdef DEBUG int i; if (!gs_debug_c('3')) - return; + return; for (i = 0; i < count; i++) - if_debug2('3', "[3]out x=%ld y=%ld\n", points[i].x, points[i].y); + if_debug2('3', "[3]out x=%ld y=%ld\n", points[i].x, points[i].y); #endif } - bool -curve_coeffs_ranged(fixed x0, fixed x1, fixed x2, fixed x3, - fixed y0, fixed y1, fixed y2, fixed y3, - fixed *ax, fixed *bx, fixed *cx, - fixed *ay, fixed *by, fixed *cy, - int k) +curve_coeffs_ranged(fixed x0, fixed x1, fixed x2, fixed x3, + fixed y0, fixed y1, fixed y2, fixed y3, + fixed *ax, fixed *bx, fixed *cx, + fixed *ay, fixed *by, fixed *cy, + int k) { fixed x01, x12, y01, y12; - curve_points_to_coefficients(x0, x1, x2, x3, - *ax, *bx, *cx, x01, x12); - curve_points_to_coefficients(y0, y1, y2, y3, - *ay, *by, *cy, y01, y12); + curve_points_to_coefficients(x0, x1, x2, x3, + *ax, *bx, *cx, x01, x12); + curve_points_to_coefficients(y0, y1, y2, y3, + *ay, *by, *cy, y01, y12); # define max_fast (max_fixed / 6) # define min_fast (-max_fast) # define in_range(v) (v < max_fast && v > min_fast) if (k > k_sample_max || - !in_range(*ax) || !in_range(*ay) || - !in_range(*bx) || !in_range(*by) || - !in_range(*cx) || !in_range(*cy) - ) - return false; + !in_range(*ax) || !in_range(*ay) || + !in_range(*bx) || !in_range(*by) || + !in_range(*cx) || !in_range(*cy) + ) + return false; #undef max_fast #undef min_fast #undef in_range return true; } -/* Initialize the iterator. +/* Initialize the iterator. Momotonic curves with non-zero length are only allowed. */ bool -gx_flattened_iterator__init(gx_flattened_iterator *this, - fixed x0, fixed y0, const curve_segment *pc, int k) +gx_flattened_iterator__init(gx_flattened_iterator *this, + fixed x0, fixed y0, const curve_segment *pc, int k) { /* Note : Immediately after the ininialization it keeps an invalid (zero length) segment. */ fixed x1, y1, x2, y2; @@ -196,35 +195,35 @@ gx_flattened_iterator__init(gx_flattened_iterator *this, this->x3 = pc->pt.x; this->y3 = pc->pt.y; if (!curve_coeffs_ranged(this->x0, x1, x2, this->x3, - this->y0, y1, y2, this->y3, - &this->ax, &this->bx, &this->cx, - &this->ay, &this->by, &this->cy, k)) - return false; + this->y0, y1, y2, this->y3, + &this->ax, &this->bx, &this->cx, + &this->ay, &this->by, &this->cy, k)) + return false; this->curve = true; vd_curve(this->x0, this->y0, x1, y1, x2, y2, this->x3, this->y3, 0, RGB(255, 255, 255)); this->k = k; # ifdef DEBUG - if (gs_debug_c('3')) { - dlprintf4("[3]x0=%f y0=%f x1=%f y1=%f\n", - fixed2float(this->x0), fixed2float(this->y0), - fixed2float(x1), fixed2float(y1)); - dlprintf5(" x2=%f y2=%f x3=%f y3=%f k=%d\n", - fixed2float(x2), fixed2float(y2), - fixed2float(this->x3), fixed2float(this->y3), this->k); - } + if (gs_debug_c('3')) { + dlprintf4("[3]x0=%f y0=%f x1=%f y1=%f\n", + fixed2float(this->x0), fixed2float(this->y0), + fixed2float(x1), fixed2float(y1)); + dlprintf5(" x2=%f y2=%f x3=%f y3=%f k=%d\n", + fixed2float(x2), fixed2float(y2), + fixed2float(this->x3), fixed2float(this->y3), this->k); + } # endif if (k == -1) { - /* A special hook for gx_subdivide_curve_rec. - Only checked the range. - Returning with no initialization. */ - return true; + /* A special hook for gx_subdivide_curve_rec. + Only checked the range. + Returning with no initialization. */ + return true; } this->rmask = (1 << k3) - 1; this->i = (1 << k); this->rx = this->ry = 0; if_debug6('3', "[3]ax=%f bx=%f cx=%f\n ay=%f by=%f cy=%f\n", - fixed2float(this->ax), fixed2float(this->bx), fixed2float(this->cx), - fixed2float(this->ay), fixed2float(this->by), fixed2float(this->cy)); + fixed2float(this->ax), fixed2float(this->bx), fixed2float(this->cx), + fixed2float(this->ay), fixed2float(this->by), fixed2float(this->cy)); bx2 = this->bx << 1; by2 = this->by << 1; ax6 = ((this->ax << 1) + this->ax) << 1; @@ -265,15 +264,15 @@ gx_flattened_iterator__init(gx_flattened_iterator *this, return true; } -static inline bool +static inline bool check_diff_overflow(fixed v0, fixed v1) { if (v0 < v1) { - if (v1 - v0 < 0) - return true; + if (v1 - v0 < 0) + return true; } else { - if (v0 - v1 < 0) - return true; + if (v0 - v1 < 0) + return true; } return false; } @@ -294,8 +293,8 @@ gx_check_fixed_sum_overflow(fixed v0, fixed v1) /* Initialize the iterator with a line. */ bool -gx_flattened_iterator__init_line(gx_flattened_iterator *this, - fixed x0, fixed y0, fixed x1, fixed y1) +gx_flattened_iterator__init_line(gx_flattened_iterator *this, + fixed x0, fixed y0, fixed x1, fixed y1) { bool ox = check_diff_overflow(x0, x1); bool oy = check_diff_overflow(y0, y1); @@ -305,30 +304,30 @@ gx_flattened_iterator__init_line(gx_flattened_iterator *this, this->x3 = x1; this->y3 = y1; if (ox || oy) { - /* Subdivide a long line into 4 segments, because the filling algorithm - and the stroking algorithm need to compute differences - of coordinates of end points. - We can't use 2 segments, because gx_flattened_iterator__next - implements a special code for that case, - which requires differences of coordinates as well. - */ - /* Note : the result of subdivision may be not strongly colinear. */ - this->ax = this->bx = 0; - this->ay = this->by = 0; - this->cx = ((ox ? (x1 >> 1) - (x0 >> 1) : (x1 - x0) >> 1) + 1) >> 1; - this->cy = ((oy ? (y1 >> 1) - (y0 >> 1) : (y1 - y0) >> 1) + 1) >> 1; - this->rd3x = this->rd3y = this->id3x = this->id3y = 0; - this->rd2x = this->rd2y = this->id2x = this->id2y = 0; - this->idx = this->cx; - this->idy = this->cy; - this->rdx = this->rdy = 0; - this->rx = this->ry = 0; - this->rmask = 0; - this->k = 2; - this->i = 4; + /* Subdivide a long line into 4 segments, because the filling algorithm + and the stroking algorithm need to compute differences + of coordinates of end points. + We can't use 2 segments, because gx_flattened_iterator__next + implements a special code for that case, + which requires differences of coordinates as well. + */ + /* Note : the result of subdivision may be not strongly colinear. */ + this->ax = this->bx = 0; + this->ay = this->by = 0; + this->cx = ((ox ? (x1 >> 1) - (x0 >> 1) : (x1 - x0) >> 1) + 1) >> 1; + this->cy = ((oy ? (y1 >> 1) - (y0 >> 1) : (y1 - y0) >> 1) + 1) >> 1; + this->rd3x = this->rd3y = this->id3x = this->id3y = 0; + this->rd2x = this->rd2y = this->id2x = this->id2y = 0; + this->idx = this->cx; + this->idy = this->cy; + this->rdx = this->rdy = 0; + this->rx = this->ry = 0; + this->rmask = 0; + this->k = 2; + this->i = 4; } else { - this->k = 0; - this->i = 1; + this->k = 0; + this->i = 1; } this->curve = false; return true; @@ -339,16 +338,16 @@ static inline void gx_flattened_iterator__print_state(gx_flattened_iterator *this) { if (!gs_debug_c('3')) - return; + return; dlprintf4("[3]dx=%f+%d, dy=%f+%d\n", - fixed2float(this->idx), this->rdx, - fixed2float(this->idy), this->rdy); + fixed2float(this->idx), this->rdx, + fixed2float(this->idy), this->rdy); dlprintf4(" d2x=%f+%d, d2y=%f+%d\n", - fixed2float(this->id2x), this->rd2x, - fixed2float(this->id2y), this->rd2y); + fixed2float(this->id2x), this->rd2x, + fixed2float(this->id2y), this->rd2y); dlprintf4(" d3x=%f+%d, d3y=%f+%d\n", - fixed2float(this->id3x), this->rd3x, - fixed2float(this->id3y), this->rd3y); + fixed2float(this->id3x), this->rd3x, + fixed2float(this->id3y), this->rd3y); } #endif @@ -395,58 +394,58 @@ gx_flattened_iterator__next(gx_flattened_iterator *this) fixed x = this->lx1, y = this->ly1; if (this->i <= 0) - return_error(gs_error_unregistered); /* Must not happen. */ + return_error(gs_error_unregistered); /* Must not happen. */ this->lx0 = this->lx1; this->ly0 = this->ly1; /* Fast check for N == 3, a common special case for small characters. */ if (this->k <= 1) { - --this->i; - if (this->i == 0) - goto last; + --this->i; + if (this->i == 0) + goto last; # define poly2(a,b,c) arith_rshift_1(arith_rshift_1(arith_rshift_1(a) + b) + c) - x += poly2(this->ax, this->bx, this->cx); - y += poly2(this->ay, this->by, this->cy); + x += poly2(this->ax, this->bx, this->cx); + y += poly2(this->ay, this->by, this->cy); # undef poly2 - if_debug2('3', "[3]dx=%f, dy=%f\n", - fixed2float(x - this->x0), fixed2float(y - this->y0)); - if_debug5('3', "[3]%s x=%g, y=%g x=%ld y=%ld\n", - (((x ^ this->x0) | (y ^ this->y0)) & float2fixed(-0.5) ? - "add" : "skip"), - fixed2float(x), fixed2float(y), x, y); - this->lx1 = x, this->ly1 = y; - vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 255, 0)); - return true; + if_debug2('3', "[3]dx=%f, dy=%f\n", + fixed2float(x - this->x0), fixed2float(y - this->y0)); + if_debug5('3', "[3]%s x=%g, y=%g x=%ld y=%ld\n", + (((x ^ this->x0) | (y ^ this->y0)) & float2fixed(-0.5) ? + "add" : "skip"), + fixed2float(x), fixed2float(y), x, y); + this->lx1 = x, this->ly1 = y; + vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 255, 0)); + return true; } else { - --this->i; - if (this->i == 0) - goto last; /* don't bother with last accum */ + --this->i; + if (this->i == 0) + goto last; /* don't bother with last accum */ # ifdef DEBUG - gx_flattened_iterator__print_state(this); + gx_flattened_iterator__print_state(this); # endif # define accum(i, r, di, dr, rmask)\ - if ( (r += dr) > rmask ) r &= rmask, i += di + 1;\ - else i += di - accum(x, this->rx, this->idx, this->rdx, this->rmask); - accum(y, this->ry, this->idy, this->rdy, this->rmask); - accum(this->idx, this->rdx, this->id2x, this->rd2x, this->rmask); - accum(this->idy, this->rdy, this->id2y, this->rd2y, this->rmask); - accum(this->id2x, this->rd2x, this->id3x, this->rd3x, this->rmask); - accum(this->id2y, this->rd2y, this->id3y, this->rd3y, this->rmask); - if_debug5('3', "[3]%s x=%g, y=%g x=%ld y=%ld\n", - (((x ^ this->lx0) | (y ^ this->ly0)) & float2fixed(-0.5) ? - "add" : "skip"), - fixed2float(x), fixed2float(y), x, y); + if ( (r += dr) > rmask ) r &= rmask, i += di + 1;\ + else i += di + accum(x, this->rx, this->idx, this->rdx, this->rmask); + accum(y, this->ry, this->idy, this->rdy, this->rmask); + accum(this->idx, this->rdx, this->id2x, this->rd2x, this->rmask); + accum(this->idy, this->rdy, this->id2y, this->rd2y, this->rmask); + accum(this->id2x, this->rd2x, this->id3x, this->rd3x, this->rmask); + accum(this->id2y, this->rd2y, this->id3y, this->rd3y, this->rmask); + if_debug5('3', "[3]%s x=%g, y=%g x=%ld y=%ld\n", + (((x ^ this->lx0) | (y ^ this->ly0)) & float2fixed(-0.5) ? + "add" : "skip"), + fixed2float(x), fixed2float(y), x, y); # undef accum - this->lx1 = this->x = x; - this->ly1 = this->y = y; - vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 255, 0)); - return true; + this->lx1 = this->x = x; + this->ly1 = this->y = y; + vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 255, 0)); + return true; } last: this->lx1 = this->x3; this->ly1 = this->y3; if_debug4('3', "[3]last x=%g, y=%g x=%ld y=%ld\n", - fixed2float(this->lx1), fixed2float(this->ly1), this->lx1, this->ly1); + fixed2float(this->lx1), fixed2float(this->ly1), this->lx1, this->ly1); vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 255, 0)); return false; } @@ -455,8 +454,8 @@ static inline void gx_flattened_iterator__unaccum(gx_flattened_iterator *this) { # define unaccum(i, r, di, dr, rmask)\ - if ( r < dr ) r += rmask + 1 - dr, i -= di + 1;\ - else r -= dr, i -= di + if ( r < dr ) r += rmask + 1 - dr, i -= di + 1;\ + else r -= dr, i -= di unaccum(this->id2x, this->rd2x, this->id3x, this->rd3x, this->rmask); unaccum(this->id2y, this->rd2y, this->id3y, this->rd3y, this->rmask); unaccum(this->idx, this->rdx, this->id2x, this->rd2x, this->rmask); @@ -476,29 +475,29 @@ gx_flattened_iterator__prev(gx_flattened_iterator *this) bool last; /* i.e. the first one in the forth order. */ if (this->i >= 1 << this->k) - return_error(gs_error_unregistered); /* Must not happen. */ + return_error(gs_error_unregistered); /* Must not happen. */ this->lx1 = this->lx0; this->ly1 = this->ly0; if (this->k <= 1) { - /* If k==0, we have a single segment, return it. - If k==1 && i < 2, return the last segment. - Otherwise must not pass here. - We caould allow to pass here with this->i == 1 << this->k, - but we want to check the assertion about the last segment below. - */ - this->i++; - this->lx0 = this->x0; - this->ly0 = this->y0; - vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 0, 255)); - return false; + /* If k==0, we have a single segment, return it. + If k==1 && i < 2, return the last segment. + Otherwise must not pass here. + We caould allow to pass here with this->i == 1 << this->k, + but we want to check the assertion about the last segment below. + */ + this->i++; + this->lx0 = this->x0; + this->ly0 = this->y0; + vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 0, 255)); + return false; } gx_flattened_iterator__unaccum(this); this->i++; # ifdef DEBUG if_debug5('3', "[3]%s x=%g, y=%g x=%ld y=%ld\n", - (((this->x ^ this->lx1) | (this->y ^ this->ly1)) & float2fixed(-0.5) ? - "add" : "skip"), - fixed2float(this->x), fixed2float(this->y), this->x, this->y); + (((this->x ^ this->lx1) | (this->y ^ this->ly1)) & float2fixed(-0.5) ? + "add" : "skip"), + fixed2float(this->x), fixed2float(this->y), this->x, this->y); gx_flattened_iterator__print_state(this); # endif last = (this->i == (1 << this->k) - 1); @@ -506,8 +505,8 @@ gx_flattened_iterator__prev(gx_flattened_iterator *this) this->ly0 = this->y; vd_bar(this->lx0, this->ly0, this->lx1, this->ly1, 1, RGB(0, 0, 255)); if (last) - if (this->lx0 != this->x0 || this->ly0 != this->y0) - return_error(gs_error_unregistered); /* Must not happen. */ + if (this->lx0 != this->x0 || this->ly0 != this->y0) + return_error(gs_error_unregistered); /* Must not happen. */ return !last; } @@ -516,90 +515,90 @@ void gx_flattened_iterator__switch_to_backscan(gx_flattened_iterator *this, bool not_first) { /* When scanning forth, the accumulator stands on the end of a segment, - except for the last segment. - When scanning back, the accumulator should stand on the beginning of a segment. - Assuming at least one forward step is done. + except for the last segment. + When scanning back, the accumulator should stand on the beginning of a segment. + Assuming at least one forward step is done. */ if (not_first) - if (this->i > 0 && this->k != 1 /* This case doesn't use the accumulator. */) - gx_flattened_iterator__unaccum(this); + if (this->i > 0 && this->k != 1 /* This case doesn't use the accumulator. */) + gx_flattened_iterator__unaccum(this); } #define max_points 50 /* arbitrary */ static int -generate_segments(gx_path * ppath, const gs_fixed_point *points, - int count, segment_notes notes) +generate_segments(gx_path * ppath, const gs_fixed_point *points, + int count, segment_notes notes) { /* vd_moveto(ppath->position.x, ppath->position.y); */ if (notes & sn_not_first) { - /* vd_lineto_multi(points, count); */ - print_points(points, count); - return gx_path_add_lines_notes(ppath, points, count, notes); + /* vd_lineto_multi(points, count); */ + print_points(points, count); + return gx_path_add_lines_notes(ppath, points, count, notes); } else { - int code; - - /* vd_lineto(points[0].x, points[0].y); */ - print_points(points, 1); - code = gx_path_add_line_notes(ppath, points[0].x, points[0].y, notes); - if (code < 0) - return code; - /* vd_lineto_multi(points + 1, count - 1); */ - print_points(points + 1, count - 1); - return gx_path_add_lines_notes(ppath, points + 1, count - 1, notes | sn_not_first); + int code; + + /* vd_lineto(points[0].x, points[0].y); */ + print_points(points, 1); + code = gx_path_add_line_notes(ppath, points[0].x, points[0].y, notes); + if (code < 0) + return code; + /* vd_lineto_multi(points + 1, count - 1); */ + print_points(points + 1, count - 1); + return gx_path_add_lines_notes(ppath, points + 1, count - 1, notes | sn_not_first); } } static int -gx_subdivide_curve_rec(gx_flattened_iterator *this, - gx_path * ppath, int k, curve_segment * pc, - segment_notes notes, gs_fixed_point *points) +gx_subdivide_curve_rec(gx_flattened_iterator *this, + gx_path * ppath, int k, curve_segment * pc, + segment_notes notes, gs_fixed_point *points) { int code; top : - if (!gx_flattened_iterator__init(this, - ppath->position.x, ppath->position.y, pc, k)) { - /* Curve is too long. Break into two pieces and recur. */ - curve_segment cseg; - - k--; - split_curve_midpoint(ppath->position.x, ppath->position.y, pc, &cseg, pc); - code = gx_subdivide_curve_rec(this, ppath, k, &cseg, notes, points); - if (code < 0) - return code; - notes |= sn_not_first; - goto top; + if (!gx_flattened_iterator__init(this, + ppath->position.x, ppath->position.y, pc, k)) { + /* Curve is too long. Break into two pieces and recur. */ + curve_segment cseg; + + k--; + split_curve_midpoint(ppath->position.x, ppath->position.y, pc, &cseg, pc); + code = gx_subdivide_curve_rec(this, ppath, k, &cseg, notes, points); + if (code < 0) + return code; + notes |= sn_not_first; + goto top; } else if (k == -1) { - /* fixme : Don't need to init the iterator. Just wanted to check in_range. */ - return gx_path_add_curve_notes(ppath, pc->p1.x, pc->p1.y, pc->p2.x, pc->p2.y, - pc->pt.x, pc->pt.y, notes); + /* fixme : Don't need to init the iterator. Just wanted to check in_range. */ + return gx_path_add_curve_notes(ppath, pc->p1.x, pc->p1.y, pc->p2.x, pc->p2.y, + pc->pt.x, pc->pt.y, notes); } else { - gs_fixed_point *ppt = points; - bool more; - - for(;;) { - code = gx_flattened_iterator__next(this); - - if (code < 0) - return code; - more = code; - ppt->x = this->lx1; - ppt->y = this->ly1; - ppt++; - if (ppt == &points[max_points] || !more) { - gs_fixed_point *pe = (more ? ppt - 2 : ppt); - - code = generate_segments(ppath, points, pe - points, notes); - if (code < 0) - return code; - if (!more) - return 0; - notes |= sn_not_first; - memcpy(points, pe, (char *)ppt - (char *)pe); - ppt = points + (ppt - pe); - } - } + gs_fixed_point *ppt = points; + bool more; + + for(;;) { + code = gx_flattened_iterator__next(this); + + if (code < 0) + return code; + more = code; + ppt->x = this->lx1; + ppt->y = this->ly1; + ppt++; + if (ppt == &points[max_points] || !more) { + gs_fixed_point *pe = (more ? ppt - 2 : ppt); + + code = generate_segments(ppath, points, pe - points, notes); + if (code < 0) + return code; + if (!more) + return 0; + notes |= sn_not_first; + memcpy(points, pe, (char *)ppt - (char *)pe); + ppt = points + (ppt - pe); + } + } } } @@ -623,5 +622,3 @@ gx_subdivide_curve(gx_path * ppath, int k, curve_segment * pc, segment_notes not } #undef max_points - - |