Attachment 49753 Details for Bug 23336 – Avoid blank glyphs interfere with sfnt bitmap font

[patch] Avoid blank glyphs interfere with sfnt bitmap font

ttf_sfnt_bitmap-2.diff (text/plain), 1.68 KB, created by Bug Fly on 2011-07-30 20:09:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bug Fly

Created: 2011-07-30 20:09:10 UTC

Size: 1.68 KB

patch

obsolete

>diff --git a/src/fcfreetype.c b/src/fcfreetype.c
>index d37af2d..4220afd 100644
>--- a/src/fcfreetype.c
>+++ b/src/fcfreetype.c
>@@ -2773,31 +2773,27 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
> {
>     FcCharSet	*cs;
> 
>-    cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, -1);
>     /*
>      * Check for bitmap-only ttf fonts that are missing the glyf table.
>      * In that case, pick a size and look for glyphs in that size instead
>      */
>-    if (FcCharSetCount (cs) == 0)
>+    if (!(face->face_flags & FT_FACE_FLAG_SCALABLE) &&
>+	face->num_fixed_sizes > 0 &&
>+	FT_Get_Sfnt_Table (face, ft_sfnt_head))
>     {
>-	/* Check for non-scalable TT fonts */
>-	if (!(face->face_flags & FT_FACE_FLAG_SCALABLE) &&
>-	    face->num_fixed_sizes > 0 &&
>-	    FT_Get_Sfnt_Table (face, ft_sfnt_head))
>-	{
>-	    FT_Int  strike_index = 0;
>-	    int	    i;
>-
>-	    /* Select the face closest to 16 pixels tall */
>-	    for (i = 1; i < face->num_fixed_sizes; i++) {
>-		if (abs (face->available_sizes[i].height - 16) <
>-		    abs (face->available_sizes[strike_index].height - 16))
>-		    strike_index = i;
>-	    }
>-	    FcCharSetDestroy (cs);
>-	    cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, strike_index);
>+	FT_Int  strike_index = 0;
>+	int	    i;
>+
>+	/* Select the face closest to 16 pixels tall */
>+	for (i = 1; i < face->num_fixed_sizes; i++) {
>+	    if (abs (face->available_sizes[i].height - 16) <
>+		abs (face->available_sizes[strike_index].height - 16))
>+		strike_index = i;
> 	}
>+	cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, strike_index);
>     }
>+    else
>+	cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, -1);
>     return cs;
> }
>

Actions: View | Splinter Review

Attachments on bug 23336: 32612 | 49753

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.