X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=50c89a40650c67e164f61b5d68f9fb1314bb181d;hb=b01ca49c05566b73d690ae84fda6040b24fcf73f;hp=48529ef269859dc9b39a0eea9902872a04873056;hpb=0950de32403b199efc8454ca527f1201ee458417;p=lilypond.git

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 48529ef269..50c89a4065 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
   *length = 0;
   FT_ULong tag = FT_MAKE_TAG (tag_str[0], tag_str[1], tag_str[2], tag_str[3]);
 
-  int error_code = FT_Load_Sfnt_Table (face, tag, 0, NULL, length);
+  FT_Error error_code = FT_Load_Sfnt_Table (face, tag, 0, NULL, length);
   if (!error_code)
     {
       FT_Byte *buffer = (FT_Byte *) malloc (*length);
@@ -50,7 +50,7 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length)
       return buffer;
     }
   else
-    programming_error (_f ("Free type error: %s",
+    programming_error (_f ("FreeType error: %s",
 			   freetype_error_string (error_code).c_str ()
 			   ));
 
@@ -105,7 +105,7 @@ FT_Face
 open_ft_face (string str, FT_Long idx)
 {
   FT_Face face;
-  int error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face);
+  FT_Error error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face);
 
   if (error_code == FT_Err_Unknown_File_Format)
     error (_f ("unsupported font format: %s", str.c_str ()));
@@ -172,7 +172,7 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {
       SCM box = scm_hashq_ref (lily_index_to_bbox_table_,
-			       scm_from_unsigned (signed_idx), SCM_BOOL_F);
+			       scm_from_unsigned_integer (signed_idx), SCM_BOOL_F);
       Box *box_ptr = Box::unsmob (box);
       if (box_ptr)
 	return *box_ptr;
@@ -182,7 +182,8 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
     {
       const size_t len = 256;
       char name[len];
-      size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
+      FT_Error code = FT_Get_Glyph_Name (face_, FT_UInt (signed_idx),
+					 name, FT_UInt (len));
       if (code)
 	warning (_f ("FT_Get_Glyph_Name () Freetype error: %s",
 		     freetype_error_string (code)));
@@ -207,22 +208,20 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
 	  b.scale (point_constant);
 
 	  scm_hashq_set_x (lily_index_to_bbox_table_,
-			   scm_from_unsigned (signed_idx),
+			   scm_from_unsigned_integer (signed_idx),
 			   b.smobbed_copy ());
 	  return b;
 	}
     }
 
-  FT_UInt idx = signed_idx;
-  FT_Load_Glyph (face_,
-		 idx,
-		 FT_LOAD_NO_SCALE);
+  FT_UInt idx = FT_UInt (signed_idx);
+  FT_Load_Glyph (face_, idx, FT_LOAD_NO_SCALE);
 
   FT_Glyph_Metrics m = face_->glyph->metrics;
-  int hb = m.horiBearingX;
-  int vb = m.horiBearingY;
-  Box b (Interval (-hb, m.width - hb),
-	 Interval (-vb, m.height - vb));
+  FT_Pos hb = m.horiBearingX;
+  FT_Pos vb = m.horiBearingY;
+  Box b (Interval (Real (-hb), Real (m.width - hb)),
+	 Interval (Real (-vb), Real (m.height - vb)));
 
   b.scale (design_size () / Real (face_->units_per_EM));
   return b;
@@ -232,8 +231,8 @@ size_t
 Open_type_font::name_to_index (string nm) const
 {
   char *nm_str = (char *) nm.c_str ();
-  if (size_t idx = FT_Get_Name_Index (face_, nm_str))
-    return idx;
+  if (FT_UInt idx = FT_Get_Name_Index (face_, nm_str))
+    return (size_t) idx;
   
   return (size_t) -1;
 }
@@ -241,7 +240,16 @@ Open_type_font::name_to_index (string nm) const
 size_t
 Open_type_font::index_to_charcode (size_t i) const
 {
-  return index_to_charcode_map_.at(i);
+  map<FT_UInt, FT_ULong>::const_iterator iter;
+  iter = index_to_charcode_map_.find (FT_UInt (i));
+
+  if (iter != index_to_charcode_map_.end ())
+    return (size_t) iter->second;
+  else
+    {
+      programming_error ("Invalid index for character");
+      return 0;
+    }
 }
 
 size_t
@@ -262,7 +270,7 @@ Open_type_font::design_size () const
 			       which will trip errors more
 			       quickly. --hwn.
 			     */
-			     scm_from_unsigned (1));
+			     scm_from_unsigned_integer (1));
   return scm_to_double (entry) * Real (point_constant);
 }
 
@@ -296,7 +304,6 @@ Open_type_font::font_name () const
   return FT_Get_Postscript_Name (face_);
 }
 
-
 SCM
 Open_type_font::glyph_list () const
 {
@@ -307,7 +314,7 @@ Open_type_font::glyph_list () const
     {
       const size_t len = 256;
       char name[len];
-      size_t code = FT_Get_Glyph_Name (face_, i, name, len);
+      FT_Error code = FT_Get_Glyph_Name (face_, i, name, len);
       if (code)
 	warning (_f ("FT_Get_Glyph_Name () error: %s",
 		     freetype_error_string (code).c_str ()));