[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 src/fcmatch.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 97d541855429629f40a0accdd2b06b7dce7ba2db
Author: Ben Wagner <bungeman at chromium.org>
Date:   Fri Dec 4 15:42:28 2020 -0500

    Remove abort from FcCompareSize.
    
    There doesn't appear to be a good reason to abort when 'v1' has type
    FcTypeRange. If there does turn out to be a good reason for this then it
    should be better documented and the code for handling this case removed.
    At worst it seems -1 should be returned as it is for other unknown
    types. It is possible this is left over debug code from the initial
    implementation.

diff --git a/src/fcmatch.c b/src/fcmatch.c
index df6db71..53c3b0e 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -235,7 +235,6 @@ FcCompareSize (const FcValue *v1, const FcValue *v2, FcValue *bestValue)
         b1 = e1 = value1.u.d;
 	break;
     case FcTypeRange:
-	abort();
 	b1 = value1.u.r->begin;
 	e1 = value1.u.r->end;
 	break;