CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/09/08 21:31:20
Modified files:
. : ChangeLog
flower/include : real.hh
lily : tie.cc
Log message:
* lily/tie.cc (get_configuration): don't crash if left_dot is NULL.
* flower/include/real.hh: std::fabs too.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4119&tr2=1.4120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/real.hh.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie.cc.diff?tr1=1.156&tr2=1.157&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4119 lilypond/ChangeLog:1.4120
--- lilypond/ChangeLog:1.4119 Thu Sep 8 06:54:45 2005
+++ lilypond/ChangeLog Thu Sep 8 21:31:18 2005
@@ -1,3 +1,9 @@
+2005-09-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/tie.cc (get_configuration): don't crash if left_dot is NULL.
+
+ * flower/include/real.hh: std::fabs too.
+
2005-09-08 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* Documentation/user/instrument-notation.itely (Entering lyrics):
Index: lilypond/flower/include/real.hh
diff -u lilypond/flower/include/real.hh:1.22
lilypond/flower/include/real.hh:1.23
--- lilypond/flower/include/real.hh:1.22 Tue Sep 6 15:48:23 2005
+++ lilypond/flower/include/real.hh Thu Sep 8 21:31:19 2005
@@ -18,6 +18,7 @@
using namespace std;
using std::isnan;
using std::isinf;
+using std::fabs;
template<class T> inline T abs (T x)
{
Index: lilypond/lily/tie.cc
diff -u lilypond/lily/tie.cc:1.156 lilypond/lily/tie.cc:1.157
--- lilypond/lily/tie.cc:1.156 Wed Sep 7 23:28:34 2005
+++ lilypond/lily/tie.cc Thu Sep 8 21:31:19 2005
@@ -261,7 +261,9 @@
Avoid dot
*/
Grob *left_dot = unsmob_grob (me->get_bound (LEFT)->get_object ("dot"));
- int dot_pos = int (Staff_symbol_referencer::get_position (left_dot));
+ int dot_pos = dot_pos
+ ? int (Staff_symbol_referencer::get_position (left_dot))
+ : 0;
if (left_dot
&& (staff_position == dot_pos
|| staff_position + dir == dot_pos))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
