(calc_control_points): handle suicide

[lilypond.git] / lily / ttf.cc

diff --git a/lily/ttf.cc b/lily/ttf.cc
index a3f85297672cebd36c8faceb32f93341df363ee2..8fc2c148bd70124ccf2414451ddacbb06cab6fbd 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -24,11 +24,14 @@ make_index_to_charcode_map (FT_Face face)
   Index_to_charcode_map m;
   FT_ULong charcode;
   FT_UInt gindex;
-  
+
+  FT_CharMap current_cmap = face->charmap;
   FT_Select_Charmap(face, FT_ENCODING_UNICODE);
   for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
        charcode = FT_Get_Next_Char (face, charcode, &gindex))
     m[gindex] = charcode;
+  FT_Set_Charmap (face, current_cmap);
+  
   return m;
 }