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"
{
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;
}
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 ()
{
{
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
char 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);
char 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);
}