X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;fp=lily%2Fopen-type-font.cc;h=50c89a40650c67e164f61b5d68f9fb1314bb181d;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=3d007be81130ea1bf76063ab9da61252931bcf77;hpb=5a22d6233a39d3164e1ca043244794c268be4ad0;p=lilypond.git diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 3d007be811..50c89a4065 100644 --- 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--2011 Han-Wen Nienhuys - (c) 2004--2009 Han-Wen Nienhuys + 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 . */ #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); @@ -39,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 () )); @@ -94,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 ())); @@ -156,12 +167,12 @@ 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_)) { 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; @@ -171,7 +182,8 @@ 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_, FT_UInt (signed_idx), + name, FT_UInt (len)); if (code) warning (_f ("FT_Get_Glyph_Name () Freetype error: %s", freetype_error_string (code))); @@ -196,22 +208,20 @@ Open_type_font::get_indexed_char (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; @@ -221,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; } @@ -230,13 +240,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::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 Open_type_font::count () const { - return ((Open_type_font *) this)->index_to_charcode_map_.size (); + return index_to_charcode_map_.size (); } Real @@ -251,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); } @@ -285,7 +304,6 @@ Open_type_font::font_name () const return FT_Get_Postscript_Name (face_); } - SCM Open_type_font::glyph_list () const { @@ -296,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 ()));