fontconfig: Branch 'main' - 2 commits

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

 src/fcdefault.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 211cc5f2ea5523f9dc2430de4fd8e5b423465e86
Merge: 5e05803 084752e
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Oct 2 08:47:16 2024 +0000

    Merge branch 'issues/427' into 'main'
    
    Accept integer for pixelsize
    
    Closes #427
    
    See merge request fontconfig/fontconfig!332

commit 084752e737a12c99800b2a35ea80eab11a12eabe
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Wed Oct 2 17:32:04 2024 +0900

    Accept integer for pixelsize
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/427

diff --git a/src/fcdefault.c b/src/fcdefault.c
index d00c494..87249f0 100644
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -338,7 +338,10 @@ FcDefaultSubstitute (FcPattern *pattern)
     else
     {
 	FcPatternIterGetValue(pattern, &iter, 0, &v, NULL);
-	size = v.u.d;
+	if (v.type == FcTypeInteger)
+	    size = (double)v.u.i;
+	else
+	    size = v.u.d;
 	size = size / dpi * 72.0 / scale;
     }
     (void) FcPatternObjectDel (pattern, FC_SIZE_OBJECT);