partial: 0.0.39-1.jcn

[lilypond.git] / src / dimen.cc

diff --git a/src/dimen.cc b/src/dimen.cc
index eb53756b45201a60689f3cbb1cda4045edf4d2a5..9489ae9a1eef6d7f1e66275776037c1badf93d24 100644 (file)
--- a/src/dimen.cc
+++ b/src/dimen.cc
@@ -6,16 +6,15 @@
 Real
 parse_dimen(String dim)
 {
-    int i=dim.len()-1;
+    int i=dim.length_i()-1;
     const char *s = dim;
     while  (i > 0 && (isspace(s[i]) || isalpha(s[i])) ){
        i--;
     }
     String unit(s + i+1);
-    return convert_dimen(dim.fvalue(), unit); 
+    return convert_dimen(dim.value_f(), unit); 
 }
 
-const Real CM_TO_PT=72/2.54;
 
 Real
 convert_dimen(Real quant, String unit)
@@ -27,7 +26,7 @@ convert_dimen(Real quant, String unit)
     if (unit == "mm")
        return quant*CM_TO_PT/10;
     if (unit == "in")
-       return quant * 72;
+       return quant * INCH_TO_PT;
     error ("unknown length unit: `" + unit+"'");
 }