mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we are using the faster(?) character size functions in all 

applicable places.

svn path=/trunk/netsurf/; revision=13901
This commit is contained in:
Chris Young 2012-05-02 18:29:59 +00:00
parent a44ead03cf
commit a4ff885365
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
amiga/font.c
View File

@ -724,12 +724,21 @@ ULONG ami_unicode_text(struct RastPort *rp,const char *string,ULONG length,const
utf16charsc = ami_font_translate_smallcaps(*utf16);
utf16nextsc = ami_font_translate_smallcaps(utf16next);
tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth);
if(rp) {
tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth);
} else {
tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth);
}
}
else tempx = 0;
if(tempx == 0)
tempx = ami_font_plot_glyph(ofont, rp, *utf16, utf16next, dx + x, dy, emwidth);
if(tempx == 0) {
if(rp) {
tempx = ami_font_plot_glyph(ofont, rp, *utf16, utf16next, dx + x, dy, emwidth);
} else {
tempx = ami_font_width_glyph(ofont, *utf16, utf16next, emwidth);
}
}
if(tempx == 0)
{
@ -740,14 +749,22 @@ ULONG ami_unicode_text(struct RastPort *rp,const char *string,ULONG length,const
if(ufont)
{
tempx = ami_font_plot_glyph(ufont, rp, *utf16, utf16next,
dx + x, dy, emwidth);
if(rp) {
tempx = ami_font_plot_glyph(ufont, rp, *utf16, utf16next,
dx + x, dy, emwidth);
} else {
tempx = ami_font_width_glyph(ufont, *utf16, utf16next, emwidth);
}
}
/*
if(tempx == 0)
{
tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next,
dx + x, dy, emwidth);
if(rp) {
tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next,
dx + x, dy, emwidth);
} else {
tempx = ami_font_width_glyph(ofont, 0xfffd, utf16next, emwidth);
}
}
*/
}