Use the FT_Error type when appropriate.

[lilypond.git] / lily / open-type-font.cc

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 2e72d57af35ada1833d95f5c60807358b9ef606c..6cf74243ebd2fa1de4a691524ecde7f24561c1b9 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -1,9 +1,20 @@
 /*
-  open-type-font.cc -- implement Open_type_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "open-type-font.hh"
@@ -25,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);
@@ -91,25 +102,24 @@ get_otf_table (FT_Face face, string tag)
 }
 
 FT_Face
-open_ft_face (string str)
+open_ft_face (string str, FT_Long idx)
 {
   FT_Face face;
-  int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &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 ()));
   else if (error_code)
     error (_f ("error reading font file %s: %s", 
               str.c_str (),
-              freetype_error_string (error_code).c_str ()
-              ));
+              freetype_error_string (error_code).c_str ()));
   return face;
 }
 
 SCM
 Open_type_font::make_otf (string str)
 {
-  FT_Face face = open_ft_face (str);
+  FT_Face face = open_ft_face (str, 0 /* index */);
   Open_type_font *otf = new Open_type_font (face);
 
   return otf->self_scm ();
@@ -157,7 +167,7 @@ Open_type_font::attachment_point (string glyph_name) const
 }
 
 Box
-Open_type_font::get_indexed_char (size_t signed_idx) const
+Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const
 {
   if (SCM_HASHTABLE_P (lily_index_to_bbox_table_))
     {
@@ -172,9 +182,9 @@ Open_type_font::get_indexed_char (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_, signed_idx, name, len);
       if (code)
-       warning (_f ("FT_Get_Glyph_Name() Freetype error: %s",
+       warning (_f ("FT_Get_Glyph_Name () Freetype error: %s",
                     freetype_error_string (code)));
 
       SCM sym = ly_symbol2scm (name);
@@ -231,13 +241,22 @@ Open_type_font::name_to_index (string nm) const
 size_t
 Open_type_font::index_to_charcode (size_t i) const
 {
-  return ((Open_type_font *) this)->index_to_charcode_map_[i];
+  map<FT_UInt, FT_ULong>::const_iterator iter;
+  iter = index_to_charcode_map_.find (i);
+
+  if (iter != index_to_charcode_map_.end ())
+    return (size_t) iter->second;
+  else
+    {
+      programming_error (_ ("Invalid index for character"));
+      return 0;
+    }
 }
 
 size_t
 Open_type_font::count () const
 {
-  return ((Open_type_font *) this)->index_to_charcode_map_.size ();
+  return index_to_charcode_map_.size ();
 }
 
 Real
@@ -286,7 +305,6 @@ Open_type_font::font_name () const
   return FT_Get_Postscript_Name (face_);
 }
 
-
 SCM
 Open_type_font::glyph_list () const
 {
@@ -297,9 +315,9 @@ 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",
+       warning (_f ("FT_Get_Glyph_Name () error: %s",
                     freetype_error_string (code).c_str ()));
 
       *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);