X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=8b1229fe90917bc3f508fb6f20ad1b8372f16b67;hb=24a22b6937e74c52e14849225e53bf3160b9218a;hp=32bd597df273883916b4becbaa52cc887dec3a84;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 32bd597df2..8b1229fe90 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "open-type-font.hh"
@@ -30,11 +30,11 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
     {
       FT_Byte *buffer = (FT_Byte *) malloc (*length);
       if (buffer == NULL)
-	error (_f ("can't allocate %d bytes", *length));
+	error (_f ("cannot allocate %lu bytes", *length));
 
       error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length);
       if (error_code)
-	error (_f ("can't load font table: %s", tag_str));
+	error (_f ("cannot load font table: %s", tag_str));
 
       return buffer;
     }
@@ -68,18 +68,6 @@ load_scheme_table (char const *tag_str, FT_Face face)
   return tab;
 }
 
-Index_to_charcode_map
-make_index_to_charcode_map (FT_Face face)
-{
-  Index_to_charcode_map m;
-  FT_ULong charcode;
-  FT_UInt gindex;
-
-  for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
-       charcode = FT_Get_Next_Char (face, charcode, &gindex))
-    m[gindex] = charcode;
-  return m;
-}
 
 Open_type_font::~Open_type_font ()
 {
@@ -94,8 +82,10 @@ get_otf_table (FT_Face face, string tag)
 {
   FT_ULong len;
   FT_Byte *tab = load_table (tag.c_str (), face, &len);
+  string ret ((char const*) tab, len);
+  free (tab);
 
-  return string ((char const*) tab, len);
+  return ret;
 }
 
 FT_Face
@@ -163,7 +153,7 @@ Open_type_font::attachment_point (string glyph_name) const
 }
 
 Box
-Open_type_font::get_indexed_char (vsize signed_idx) const
+Open_type_font::get_indexed_char (size_t signed_idx) const
 {
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {
@@ -176,11 +166,11 @@ Open_type_font::get_indexed_char (vsize signed_idx) const
 
   if (SCM_HASHTABLE_P (lily_character_table_))
     {
-      const vsize len = 256;
+      const size_t len = 256;
       char name[len];
-      vsize code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
+      size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
       if (code)
-	warning (_f ("FT_Get_Glyph_Name() returned error: %d", code));
+	warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
 
       SCM sym = ly_symbol2scm (name);
       SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
@@ -223,22 +213,23 @@ Open_type_font::get_indexed_char (vsize signed_idx) const
   return b;
 }
 
-vsize
+size_t
 Open_type_font::name_to_index (string nm) const
 {
   char *nm_str = (char *) nm.c_str ();
-  if (vsize idx = FT_Get_Name_Index (face_, nm_str))
+  if (size_t idx = FT_Get_Name_Index (face_, nm_str))
     return idx;
-  return VPOS;
+  
+  return (size_t) -1;
 }
 
-vsize
-Open_type_font::index_to_charcode (vsize i) const
+size_t
+Open_type_font::index_to_charcode (size_t i) const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_[i];
 }
 
-vsize
+size_t
 Open_type_font::count () const
 {
   return ((Open_type_font *) this)->index_to_charcode_map_.size ();
@@ -299,13 +290,13 @@ Open_type_font::glyph_list () const
   
   for (int i = 0; i < face_->num_glyphs; i++)
     {
-      const vsize len = 256;
+      const size_t len = 256;
       char name[len];
-      vsize code = FT_Get_Glyph_Name (face_, i, name, len);
+      size_t code = FT_Get_Glyph_Name (face_, i, name, len);
       if (code)
-	warning (_f ("FT_Get_Glyph_Name() returned error: %d", code));
+	warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
 
-      *tail = scm_cons (scm_makfrom0str (name), SCM_EOL);
+      *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }