fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcfreetype.c |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 9c64ea36f576c3526c5e6fee33417c3662d97957
Merge: 2bc5dfa e29d5a7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 13 12:15:58 2025 +0000

    Merge branch 'issues/479' into 'main'
    
    Do not fallback decoding with UTF-16BE if no iconv support
    
    Closes #479
    
    See merge request fontconfig/fontconfig!429

commit e29d5a7ab2f9880f90b093b217241b4696d56f49
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 13 18:03:54 2025 +0900

    Do not fallback decoding with UTF-16BE if no iconv support
    
    This fallback was added to decode a string in a font that doesn't have
    correct encoding ID in the name table for some reasons though,
    it doesn't work effectively without iconv support.  Even if it has
    correct sequences for a certain encoding, incorrect string is decoded
    because of missing correct decoder.  So let's drop this fallback if
    iconv support is disabled.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/479
    
    Changelog: changed

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 8f474a5..05ee100 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -845,13 +845,6 @@ retry:
 	*outbuf = '\0';
 	goto done;
     }
-#else
-    if (!redecoded) {
-	/* Regard the encoding as UTF-16BE and try again. */
-	redecoded = FcTrue;
-	fromcode = "UTF-16BE";
-	goto retry;
-    }
 #endif
     return 0;
 done: