From 3a0bd1fd02ae5efac4023449bcb464f0769832de Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Tue, 30 Apr 2013 23:41:50 -0700 Subject: [PATCH] stencil-integral.cc: use extent if stencil is delayed; issue 3337 --- lily/stencil-integral.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lily/stencil-integral.cc b/lily/stencil-integral.cc index 0f1f14ff50..654ecdd5ab 100644 --- a/lily/stencil-integral.cc +++ b/lily/stencil-integral.cc @@ -289,7 +289,7 @@ make_partial_ellipse_boxes (vector &boxes, vector > &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 coord = polar (1.0, ang); @@ -452,7 +452,7 @@ make_draw_bezier_boxes (vector &boxes, vector > &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,8 @@ 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))); + // should not use the place-holder text, but no need for the warning below + return vector (); else if (scm_car (expr) == ly_symbol2scm ("grob-cause")) return stencil_traverser (trans, scm_caddr (expr)); else if (scm_car (expr) == ly_symbol2scm ("color")) -- 2.39.5