#include <freetype/tttables.h>
#include "dimensions.hh"
+#include "international.hh"
#include "modified-font-metric.hh"
#include "warn.hh"
{
FT_Byte *buffer = (FT_Byte *) malloc (*length);
if (buffer == NULL)
- error (_f ("can't allocate %d bytes", *length));
+ error (_f ("can't allocate %lu bytes", *length));
error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length);
if (error_code)
return 0;
}
-String
-Open_type_font::get_otf_table (String tag) const
+string
+Open_type_font::get_otf_table (string tag) const
{
return ::get_otf_table (face_, tag);
}
SCM tab = SCM_EOL;
if (buffer)
{
- String contents ((Byte const *)buffer, length);
+ string contents ((char const*)buffer, length);
contents = "(quote (" + contents + "))";
tab = scm_c_eval_string (contents.c_str ());
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 ()
{
/*
UGH fix naming
*/
-String
-get_otf_table (FT_Face face, String tag)
+string
+get_otf_table (FT_Face face, string tag)
{
FT_ULong len;
FT_Byte *tab = load_table (tag.c_str (), face, &len);
- return String (tab, len);
+ return string ((char const*) tab, len);
}
FT_Face
-open_ft_face (String str)
+open_ft_face (string str)
{
FT_Face face;
int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face);
}
SCM
-Open_type_font::make_otf (String str)
+Open_type_font::make_otf (string str)
{
FT_Face face = open_ft_face (str);
Open_type_font *otf = new Open_type_font (face);
}
Offset
-Open_type_font::attachment_point (String glyph_name) const
+Open_type_font::attachment_point (string glyph_name) const
{
SCM sym = ly_symbol2scm (glyph_name.c_str ());
SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
}
Box
-Open_type_font::get_indexed_char (int signed_idx) const
+Open_type_font::get_indexed_char (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_int (signed_idx), SCM_BOOL_F);
+ SCM box = scm_hashq_ref (lily_index_to_bbox_table_,
+ scm_from_unsigned (signed_idx), SCM_BOOL_F);
Box *box_ptr = Box::unsmob (box);
if (box_ptr)
return *box_ptr;
if (SCM_HASHTABLE_P (lily_character_table_))
{
- const int len = 256;
+ const size_t len = 256;
char name[len];
- int 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));
b.scale (point_constant);
scm_hashq_set_x (lily_index_to_bbox_table_,
- scm_from_int (signed_idx),
+ scm_from_unsigned (signed_idx),
b.smobbed_copy ());
return b;
}
return b;
}
-int
-Open_type_font::name_to_index (String nm) const
+size_t
+Open_type_font::name_to_index (string nm) const
{
char *nm_str = (char *) nm.c_str ();
- if (int idx = FT_Get_Name_Index (face_, nm_str))
+ if (size_t idx = FT_Get_Name_Index (face_, nm_str))
return idx;
- return -1;
+
+ return (size_t) -1;
}
-unsigned
-Open_type_font::index_to_charcode (int i) const
+size_t
+Open_type_font::index_to_charcode (size_t i) const
{
return ((Open_type_font *) this)->index_to_charcode_map_[i];
}
-int
+size_t
Open_type_font::count () const
{
return ((Open_type_font *) this)->index_to_charcode_map_.size ();
which will trip errors more
quickly. --hwn.
*/
- scm_from_int (1));
+ scm_from_unsigned (1));
return scm_to_double (entry) * Real (point_constant);
}
return lily_global_table_;
}
-String
+string
Open_type_font::font_name () const
{
return FT_Get_Postscript_Name (face_);
for (int i = 0; i < face_->num_glyphs; i++)
{
- const int len = 256;
+ const size_t len = 256;
char name[len];
- int 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));