diff --git a/include/unix/guts.h b/include/unix/guts.h index 3929b30a..8255b982 100644 --- a/include/unix/guts.h +++ b/include/unix/guts.h @@ -1896,7 +1896,7 @@ extern int prima_fq_get_text_width( Handle self, const char * text, int len, int flags, Point * overhangs); extern int -prima_fq_get_glyphs_width( Handle self, PGlyphsOutRec t, Point * overhangs, int flags); +prima_fq_get_glyphs_width( Handle self, PGlyphsOutRec t, int flags, Point * overhangs); extern Point * prima_fq_get_text_box( Handle self, const char * text, int len, int flags); diff --git a/unix/xft.c b/unix/xft.c index 07af18d9..0d1a74b3 100644 --- a/unix/xft.c +++ b/unix/xft.c @@ -1204,8 +1204,6 @@ prima_xft_glyphs_out( Handle self, PGlyphsOutRec t, int x, int y) int rop = XX-> rop; Point baseline; - t-> flags |= toAddOverhangs; /* for overstriking etc */ - if ( t->len == 0) return true; t->len = check_width( XX->font, t->len ); rop = filter_unsupported_rops( XX, rop, &xftcolor ); @@ -1250,7 +1248,6 @@ prima_xft_glyphs_out( Handle self, PGlyphsOutRec t, int x, int y) if ( PDrawable( self)-> font. style & (fsUnderlined|fsStruckOut)) { int l; Point ovx; - t-> flags |= toAddOverhangs; l = prima_xft_get_glyphs_width( self, XX-> font, t, toAddOverhangs, &ovx); overstrike(self, x, y, &ovx, l - ovx.x - ovx.y - 1); }