Commit e28db5bc authored by Adrian Robert's avatar Adrian Robert
Browse files

* nsfont.m (ns_char_width): Replace deprecated call (suggested by

	Erik Charlebois).
	(ns_findfonts, nsfont_list_family): Use long format in printf, and
	cast argument.
	(nsfont_open): Use ns_char_width() everywhere.
	(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where
	appropriate.
parent f3f08c28
......@@ -244,7 +244,11 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
return w;
}
#endif
w = [sfont widthOfString: cstr];
{
NSDictionary *attrsDictionary =
[NSDictionary dictionaryWithObject: sfont forKey: NSFontAttributeName];
w = [cstr sizeWithAttributes: attrsDictionary].width;
}
return max (w, 2.0);
}
......@@ -543,7 +547,8 @@ but also for ascii (which causes unnecessary font substitution). */
return ns_fallback_entity ();
if (NSFONT_TRACE)
fprintf (stderr, " Returning %d entities.\n", XINT (Flength (list)));
fprintf (stderr, " Returning %ld entities.\n",
(long)XINT (Flength (list)));
return list;
}
......@@ -649,8 +654,8 @@ Properties to be considered are same as for list(). */
/* FIXME: escape the name? */
if (NSFONT_TRACE)
fprintf (stderr, "nsfont: list families returning %d entries\n",
XINT (Flength (list)));
fprintf (stderr, "nsfont: list families returning %ld entries\n",
(long)XINT (Flength (list)));
return list;
}
......@@ -876,7 +881,7 @@ when setting family in ns_spec_to_descriptor(). */
/* set up metrics portion of font struct */
font->ascent = [sfont ascender];
font->descent = -[sfont descender];
font->min_width = [sfont widthOfString: @"|"]; /* FIXME */
font->min_width = ns_char_width(sfont, '|');
font->space_width = lrint (ns_char_width (sfont, ' '));
font->average_width = lrint (font_info->width);
font->max_width = lrint (font_info->max_bounds.width);
......@@ -1332,7 +1337,7 @@ WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars). */
NSGlyphGenerator *glyphGenerator = [NSGlyphGenerator sharedGlyphGenerator];
/*NSCharacterSet *coveredChars = [nsfont coveredCharacterSet]; */
unsigned int numGlyphs = [font_info->nsfont numberOfGlyphs];
unsigned int gInd =0, cInd =0;
NSUInteger gInd =0, cInd =0;
[glyphStorage setString: allChars font: font_info->nsfont];
[glyphGenerator generateGlyphsForGlyphStorage: glyphStorage
......@@ -1454,7 +1459,7 @@ - (void) setString: (NSString *)str font: (NSFont *)font
}
/* NSGlyphStorage protocol */
- (unsigned int)layoutOptions
- (NSUInteger)layoutOptions
{
return 0;
}
......@@ -1464,9 +1469,9 @@ - (NSAttributedString *)attributedString
return attrStr;
}
- (void)insertGlyphs: (const NSGlyph *)glyphs length: (unsigned int)length
forStartingGlyphAtIndex: (unsigned int)glyphIndex
characterIndex: (unsigned int)charIndex
- (void)insertGlyphs: (const NSGlyph *)glyphs length: (NSUInteger)length
forStartingGlyphAtIndex: (NSUInteger)glyphIndex
characterIndex: (NSUInteger)charIndex
{
len = glyphIndex+length;
for (i =glyphIndex; i<len; i++)
......@@ -1475,8 +1480,8 @@ - (void)insertGlyphs: (const NSGlyph *)glyphs length: (unsigned int)length
maxGlyph = len;
}
- (void)setIntAttribute: (int)attributeTag value: (int)val
forGlyphAtIndex: (unsigned)glyphIndex
- (void)setIntAttribute: (NSInteger)attributeTag value: (NSInteger)val
forGlyphAtIndex: (NSUInteger)glyphIndex
{
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment