fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcfreetype.c |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

New commits:
commit b677ebc0d4acf2ff875daf5fd99353674a5f167d
Merge: ef4c5c0 aae5ff1
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Nov 13 11:34:51 2024 +0000

    Merge branch 'noDoubleLeafAssignment' into 'main'
    
    Remove redundant leaf assignment in fcfreetype.c
    
    Closes #428
    
    See merge request fontconfig/fontconfig!342

commit aae5ff1f2e1be978272c41bf809d15b6e47b1e2c
Author: Dominik Röttsches <drott at chromium.org>
Date:   Tue Nov 12 17:02:04 2024 +0200

    Remove redundant leaf assignment in fcfreetype.c
    
    Fixes #428

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 50f382f..be41ea1 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2619,15 +2619,12 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks FC_UNUSED)
 #endif
     for (o = 0; o < NUM_DECODE; o++)
     {
-	FcChar32        page, off, ucs4;
-	FcCharLeaf      *leaf;
+	FcChar32        ucs4;
 	FT_UInt	 	glyph;
 
 	if (FT_Select_Charmap (face, fcFontEncodings[o]) != 0)
 	    continue;
 
-	page = ~0;
-	leaf = NULL;
 	ucs4 = FT_Get_First_Char (face, &glyph);
 	while (glyph != 0)
 	{
@@ -2643,19 +2640,8 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks FC_UNUSED)
 		    good = FcFalse;
 	    }
 
-	    if (good)
-	    {
-		FcCharSetAddChar (fcs, ucs4);
-		if ((ucs4 >> 8) != page)
-		{
-		    page = (ucs4 >> 8);
-		    leaf = FcCharSetFindLeafCreate (fcs, ucs4);
-		    if (!leaf)
-			goto bail;
-		}
-		off = ucs4 & 0xff;
-		leaf->map[off >> 5] |= (1U << (off & 0x1f));
-	    }
+        if (good)
+            FcCharSetAddChar (fcs, ucs4);
 
 	    ucs4 = FT_Get_Next_Char (face, ucs4, &glyph);
 	}