2008/11/5 John Mandereau <[EMAIL PROTECTED]>: > > See also the other attached patch. >
+#define EPSNULL 1e-12 static void print_buildings (list<Building> const &b) @@ -215,6 +216,9 @@ Skyline::internal_merge_skyline (list<Building> *s1, list<Building> *s2, if (end >= s1->front ().end_) s1->pop_front (); + if (abs (end - x) < EPSNULL) + break; + this looks fishy. Why another EPS value? Joe? if (ties_conf && ties_conf->size () == 1) + do { this looks like a serious bug, if we forgot the do for the while(); Can you check if you can make a regtest case? + if ((where + && current_reps == SCM_EOL) || scm_is_pair (current_reps)) { current_reps = scm_cons (what, current_reps); where->set_property (reps, current_reps); this is wrong. In your version, where can be NULL if current_reps is a pair, which lead to a crash. Please double check all of the changes that may seem cosmetic. -- Han-Wen Nienhuys - [EMAIL PROTECTED] - http://www.xs4all.nl/~hanwen _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel