[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: stencil-integral.cc: use extent if stencil is delayed; issue 3337 (i
From: |
k-ohara5a5a |
Subject: |
Re: stencil-integral.cc: use extent if stencil is delayed; issue 3337 (issue 9039051) |
Date: |
Wed, 08 May 2013 19:24:57 +0000 |
Reviewers: janek,
Message:
Maybe a comment on why we don't simply use the default case for delayed
stencils.
https://codereview.appspot.com/9039051/diff/1/lily/stencil-integral.cc
File lily/stencil-integral.cc (right):
https://codereview.appspot.com/9039051/diff/1/lily/stencil-integral.cc#newcode949
lily/stencil-integral.cc:949: else if (scm_car (expr) == ly_symbol2scm
("delay-stencil-evaluation"))
\\ should not draw an explicitly delayed stencil, but no need for
warning
Description:
stencil-integral.cc: use extent if stencil is delayed; issue 3337
Please review this at https://codereview.appspot.com/9039051/
Affected files:
M lily/stencil-integral.cc
Index: lily/stencil-integral.cc
diff --git a/lily/stencil-integral.cc b/lily/stencil-integral.cc
index
0f1f14ff50485e09ff3933cc6db261ec6a7ab17e..30b667d9314c6d23617ce3f509d9c1057e953e92
100644
--- a/lily/stencil-integral.cc
+++ b/lily/stencil-integral.cc
@@ -289,7 +289,7 @@ make_partial_ellipse_boxes (vector<Box> &boxes,
vector<Drul_array<Offset> > &bui
int quantization = max (1, (int) (((x_rad * trans.xx) + (y_rad *
trans.yy)) * M_PI / QUANTIZATION_UNIT));
do
{
- for (vsize i = 0; i < 1 + quantization; i++)
+ for (vsize i = 0; i < 1 + (vsize) quantization; i++)
{
Real ang = linear_map (start, end, 0, quantization, i);
complex<Real> coord = polar (1.0, ang);
@@ -452,7 +452,7 @@ make_draw_bezier_boxes (vector<Box> &boxes,
vector<Drul_array<Offset> > &buildin
Offset first = get_point_in_y_direction (curve.control_[0],
perpendicular_slope (curve.slope_at_point (0.0)), th / 2, d);
pango_matrix_transform_point (&trans, &first[X_AXIS],
&first[Y_AXIS]);
points[d].push_back (first);
- for (vsize i = 1; i < quantization; i++)
+ for (vsize i = 1; i < (vsize) quantization; i++)
{
Real pt = (i * 1.0) / quantization;
Offset inter = get_point_in_y_direction (curve.curve_point (pt),
perpendicular_slope (curve.slope_at_point (pt)), th / 2, d);
@@ -947,7 +947,7 @@ stencil_traverser (PangoMatrix trans, SCM expr)
return stencil_traverser (trans, scm_caddr (expr));
}
else if (scm_car (expr) == ly_symbol2scm ("delay-stencil-evaluation"))
- return stencil_traverser (trans, scm_force (scm_cadr (expr)));
+ return vector<Transform_matrix_and_expression> ();
else if (scm_car (expr) == ly_symbol2scm ("grob-cause"))
return stencil_traverser (trans, scm_caddr (expr));
else if (scm_car (expr) == ly_symbol2scm ("color"))