fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcfreetype.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c770684a898166c22f2f362efde3b21ec69ed1c
Merge: 82ca32b bc9c98f
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jun 11 02:44:59 2025 +0000

    Merge branch 'foundryOs2' into 'main'
    
    Parse foundry from OS/2 for table version 0
    
    Closes #477
    
    See merge request fontconfig/fontconfig!425

commit bc9c98f6c37597627ae40b8a5f978aadc966a9c6
Author: Dominik Röttsches <drott at chromium.org>
Date:   Tue Jun 10 18:07:19 2025 +0300

    Parse foundry from OS/2 for table version 0
    
    Version 0 does have achVendId that can be used.
    Fixes #477.
    
    Changelog: changed

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index e9df07b..97e6d3f 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1355,7 +1355,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face   face,
      * BDF properties will queried.
      */
 
-    if (os2 && os2->version >= 0x0001 && os2->version != 0xffff) {
+    if (os2 && os2->version != 0xffff) {
 	if (os2->achVendID[0] != 0) {
 	    foundry_ = (FcChar8 *)malloc (sizeof (os2->achVendID) + 1);
 	    memcpy ((void *)foundry_, os2->achVendID, sizeof (os2->achVendID));