diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2008-12-28 01:22:40 -0500 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2008-12-28 01:22:40 -0500 |
commit | efe4d2ce99e65f9841951d3ff3e0536973bfb12c (patch) | |
tree | 7f9ff4fb56bda51087fae3dd17c4e8d651f74c1b /src/cairo-spline.c | |
parent | 8672178bf6c7f3a38e11e224f1d484b1f0c7fd7b (diff) | |
download | cairo-efe4d2ce99e65f9841951d3ff3e0536973bfb12c.tar.gz |
[spline] Simplify code
Diffstat (limited to 'src/cairo-spline.c')
-rw-r--r-- | src/cairo-spline.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/cairo-spline.c b/src/cairo-spline.c index f8c0267f6..9d8c200e2 100644 --- a/src/cairo-spline.c +++ b/src/cairo-spline.c @@ -263,24 +263,23 @@ _cairo_spline_bound (cairo_spline_add_point_func_t add_point_func, */ #define ADD(t0) \ - if (0 < (t0) && (t0) < 1) \ - t[t_num++] = (t0); + { \ + double _t0 = (t0); \ + if (0 < _t0 && _t0 < 1) \ + t[t_num++] = _t0; \ + } #define FIND_EXTREMES(a,b,c) \ { \ double delta = b * b - a * c; \ if (a == 0) { \ - double t0 = -c / (2*b); \ - ADD (t0); \ + ADD (-c / (2*b)); \ } else if (delta > 0) { \ double sqrt_delta = sqrt (delta); \ - double t1 = (-b - sqrt_delta) / a; \ - double t2 = (-b + sqrt_delta) / a; \ - ADD (t1); \ - ADD (t2); \ + ADD ((-b - sqrt_delta) / a); \ + ADD ((-b + sqrt_delta) / a); \ } else if (delta == 0) { \ - double t0 = -b / a; \ - ADD (t0); \ + ADD (-b / a); \ } \ } |