fontconfig: Branch 'main' - 3 commits

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

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

New commits:
commit 4238402f1cfee3946a4090cea7ff31d46ceb2c11
Author: Akira TAGOH <tagoh@xxxxxxxxxx>
Date:   Thu Dec 9 20:29:06 2021 +0900

    Initialize variable

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 409c9a1..cf923f2 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1682,7 +1682,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face  face,
     /* Add the fullname into the cache */
     if (!variable && !nfullname)
     {
-	FcChar8 *family, *style, *lang;
+	FcChar8 *family, *style, *lang = NULL;
 	int n = 0;
 	size_t len, i;
 	FcStrBuf sbuf;
commit 3196e1815eb4c35447329026ca38c245420af1cd
Author: Akira TAGOH <tagoh@xxxxxxxxxx>
Date:   Thu Dec 9 20:28:16 2021 +0900

    Apply the change made by 23e46d1 again
    
    Regression by d62d984e2bfe5b9c7767e8ad657ec93652d52bbd

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index e7a359f..409c9a1 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1701,7 +1701,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face  face,
 	len = strlen ((const char *) family);
 	for (i = len; i > 0; i--)
 	{
-	    if (!isspace (family[i]))
+	    if (!isspace (family[i-1]))
 		break;
 	}
 	family[i] = 0;
commit 92fbf14b0d7c4737ffe1e8326b7ab8ffae5548c3
Author: Akira TAGOH <tagoh@xxxxxxxxxx>
Date:   Thu Dec 9 20:26:10 2021 +0900

    Fix the issue fail to obtain the style name
    
    The number of a couple of 'family' and 'familylang' and 'style' and 'stylelang'
    is different. need to reset the counter to get the property regarding to regarding to the lang.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/303

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index b6bfaca..e7a359f 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1705,6 +1705,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face  face,
 		break;
 	}
 	family[i] = 0;
+	n = 0;
 	while (FcPatternObjectGetString (pat, FC_STYLELANG_OBJECT, n, &lang) == FcResultMatch)
 	{
 	    if (FcStrCmp (lang, (const FcChar8 *) "en") == 0)