fontconfig: Branch 'master' - 3 commits
[email protected] (GitLab Mirror) Tue, 9 Jul 2019 06:46:51 +0000 (UTC)
| Newsgroups | gmane.comp.fonts.fontconfig |
|---|---|
| Message-ID | <[email protected]> |
IHNyYy9mY2ZyZWV0eXBlLmMgfCAgIDY2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCsp LCAyMSBkZWxldGlvbnMoLSkKCk5ldyBjb21taXRzOgpjb21taXQgMjk2MDM5MTY5OWFiM2I0MTdh MTdhMGEyYWMyOWU5N2U5YzNkM2M5OQpBdXRob3I6IEFraXJhIFRBR09IIDxha2lyYUB0YWdvaC5v cmc+CkRhdGU6ICAgVHVlIEp1bCA5IDA2OjIyOjQzIDIwMTkgKzAwMDAKCiAgICBBZGQgRW5nbGlz aCBuYW1lIGZpcnN0IGludG8gYSBjYWNoZQogICAgCiAgICBJbiBzb21lIGNhc2VzLCBub24tRW5n bGlzaCBsYW5ndWFnZXMgbWlnaHQgYXBwZWFycyBmaXJzdCBpbiBjdXJyZW50IG9yZGVyLgogICAg YW5kIHdoZW4gaGF2aW5nIEVuZ2xpc2ggbmFtZSB3aXRoIG5vbi1FbmdsaXNoIGxhbmd1YWdlIElE IGxpa2UgR29vZ2xlIE5vdG8gQ0pLIFRDLAogICAgRW5nbGlzaCBuYW1lIHdpdGggRW5nbGlzaCBs YW5ndWFnZSBJRCB3aWxsIGJlIGRyb3BwZWQgZHVlIHRvIGR1cGxpY2F0ZS4KICAgIAogICAgVGhp cyBmaXhlcyB0aGF0IGlzc3VlLgoKZGlmZiAtLWdpdCBhL3NyYy9mY2ZyZWV0eXBlLmMgYi9zcmMv ZmNmcmVldHlwZS5jCmluZGV4IDk2NGY3YTguLmJjMWFiM2YgMTAwNjQ0Ci0tLSBhL3NyYy9mY2Zy ZWV0eXBlLmMKKysrIGIvc3JjL2ZjZnJlZXR5cGUuYwpAQCAtMTE1Miw2ICsxMTUyLDIzIEBAIHR5 cGVkZWYgc3RydWN0CiAgIHVuc2lnbmVkIGludCBpZHg7CiB9IEZjTmFtZU1hcHBpbmc7CiAKK3N0 YXRpYyBGY0Jvb2wKK19pc19lbmdsaXNoKGludCBwbGF0Zm9ybSwgaW50IGxhbmd1YWdlKQorewor ICAgIEZjQm9vbCByZXQgPSBGY0ZhbHNlOworCisgICAgc3dpdGNoIChwbGF0Zm9ybSkKKyAgICB7 CisgICAgY2FzZSBUVF9QTEFURk9STV9NQUNJTlRPU0g6CisJcmV0ID0gbGFuZ3VhZ2UgPT0gVFRf TUFDX0xBTkdJRF9FTkdMSVNIOworCWJyZWFrOworICAgIGNhc2UgVFRfUExBVEZPUk1fTUlDUk9T T0ZUOgorCXJldCA9IGxhbmd1YWdlID09IFRUX01TX0xBTkdJRF9FTkdMSVNIX1VOSVRFRF9TVEFU RVM7CisJYnJlYWs7CisgICAgfQorICAgIHJldHVybiByZXQ7Cit9CisKIHN0YXRpYyBpbnQKIG5h bWVfbWFwcGluZ19jbXAgKGNvbnN0IHZvaWQgKnBhLCBjb25zdCB2b2lkICpwYikKIHsKQEAgLTEx NjEsNyArMTE3OCw3IEBAIG5hbWVfbWFwcGluZ19jbXAgKGNvbnN0IHZvaWQgKnBhLCBjb25zdCB2 b2lkICpwYikKICAgaWYgKGEtPnBsYXRmb3JtX2lkICE9IGItPnBsYXRmb3JtX2lkKSByZXR1cm4g KGludCkgYS0+cGxhdGZvcm1faWQgLSAoaW50KSBiLT5wbGF0Zm9ybV9pZDsKICAgaWYgKGEtPm5h bWVfaWQgIT0gYi0+bmFtZV9pZCkgcmV0dXJuIChpbnQpIGEtPm5hbWVfaWQgLSAoaW50KSBiLT5u YW1lX2lkOwogICBpZiAoYS0+ZW5jb2RpbmdfaWQgIT0gYi0+ZW5jb2RpbmdfaWQpIHJldHVybiAo aW50KSBhLT5lbmNvZGluZ19pZCAtIChpbnQpIGItPmVuY29kaW5nX2lkOwotICBpZiAoYS0+bGFu Z3VhZ2VfaWQgIT0gYi0+bGFuZ3VhZ2VfaWQpIHJldHVybiAoaW50KSBhLT5sYW5ndWFnZV9pZCAt IChpbnQpIGItPmxhbmd1YWdlX2lkOworICBpZiAoYS0+bGFuZ3VhZ2VfaWQgIT0gYi0+bGFuZ3Vh Z2VfaWQpIHJldHVybiBfaXNfZW5nbGlzaChhLT5wbGF0Zm9ybV9pZCwgYS0+bGFuZ3VhZ2VfaWQp ID8gLTEgOiBfaXNfZW5nbGlzaChiLT5wbGF0Zm9ybV9pZCwgYi0+bGFuZ3VhZ2VfaWQpID8gMSA6 IChpbnQpIGEtPmxhbmd1YWdlX2lkIC0gKGludCkgYi0+bGFuZ3VhZ2VfaWQ7CiAgIGlmIChhLT5p ZHggIT0gYi0+aWR4KSByZXR1cm4gKGludCkgYS0+aWR4IC0gKGludCkgYi0+aWR4OwogCiAgIHJl dHVybiAwOwpjb21taXQgYTU3ZjIyYmY2ZDkzYWQ0MDc5YTZhZTAxZmEwMDQ1NjkyMWRjNzNlMQpB dXRob3I6IEFraXJhIFRBR09IIDxha2lyYUB0YWdvaC5vcmc+CkRhdGU6ICAgVHVlIEp1bCA5IDA1 OjU0OjMyIDIwMTkgKzAwMDAKCiAgICBGaXggYSB0eXBvCgpkaWZmIC0tZ2l0IGEvc3JjL2ZjZnJl ZXR5cGUuYyBiL3NyYy9mY2ZyZWV0eXBlLmMKaW5kZXggMDBkNjhmZS4uOTY0ZjdhOCAxMDA2NDQK LS0tIGEvc3JjL2ZjZnJlZXR5cGUuYworKysgYi9zcmMvZmNmcmVldHlwZS5jCkBAIC0xNjEzLDcg KzE2MTMsNyBAQCBGY0ZyZWVUeXBlUXVlcnlGYWNlSW50ZXJuYWwgKGNvbnN0IEZUX0ZhY2UgIGZh Y2UsCiAJICAgIHByaW50ZiAoInVzaW5nIEZyZWVUeXBlIGZhbWlseSBcIiVzXCJcbiIsIGZhY2Ut PmZhbWlseV9uYW1lKTsKIAlpZiAoIUZjUGF0dGVybkFkZFN0cmluZyAocGF0LCBGQ19GQU1JTFks IChGY0NoYXI4ICopIGZhY2UtPmZhbWlseV9uYW1lKSkKIAkgICAgZ290byBiYWlsMTsKLQlpZiAo IUZjUGF0dGVybkFkZFN0cmluZyAocGF0LCBGQ19TVFlMRUxBTkcsIChGY0NoYXI4ICopICJlbiIp KQorCWlmICghRmNQYXR0ZXJuQWRkU3RyaW5nIChwYXQsIEZDX0ZBTUlMWUxBTkcsIChGY0NoYXI4 ICopICJlbiIpKQogCSAgICBnb3RvIGJhaWwxOwogCSsrbmZhbWlseTsKICAgICB9CmNvbW1pdCBj YjNlNmZmNGQ3NjI4YjZlYjFkZDhmNzg3MzdkZTVjMzg3YWFmMmUxCkF1dGhvcjogQWtpcmEgVEFH T0ggPGFraXJhQHRhZ29oLm9yZz4KRGF0ZTogICBNb24gSnVsIDggMTM6MjY6NDkgMjAxOSArMDAw MAoKICAgIEltcHJvdmUgdGhlIHBlcmZvcm1hbmNlIGEgYml0CgpkaWZmIC0tZ2l0IGEvc3JjL2Zj ZnJlZXR5cGUuYyBiL3NyYy9mY2ZyZWV0eXBlLmMKaW5kZXggMmY4NmQ4YS4uMDBkNjhmZSAxMDA2 NDQKLS0tIGEvc3JjL2ZjZnJlZXR5cGUuYworKysgYi9zcmMvZmNmcmVldHlwZS5jCkBAIC0xMTAx LDE1ICsxMTAxLDIyIEBAIEZjR2V0UGl4ZWxTaXplIChGVF9GYWNlIGZhY2UsIGludCBpKQogfQog CiBzdGF0aWMgRmNCb29sCi1GY1N0cmluZ0luUGF0dGVybkVsZW1lbnQgKEZjUGF0dGVybiAqcGF0 LCBjb25zdCBjaGFyICplbHQsIEZjQ2hhcjggKnN0cmluZykKK0ZjU3RyaW5nSW5QYXR0ZXJuRWxl bWVudCAoRmNQYXR0ZXJuICpwYXQsIEZjT2JqZWN0IG9iaiwgY29uc3QgRmNDaGFyOCAqc3RyaW5n KQogewotICAgIGludAkgICAgZTsKLSAgICBGY0NoYXI4ICpvbGQ7Ci0gICAgZm9yIChlID0gMDsg RmNQYXR0ZXJuR2V0U3RyaW5nIChwYXQsIGVsdCwgZSwgJm9sZCkgPT0gRmNSZXN1bHRNYXRjaDsg ZSsrKQotCWlmICghRmNTdHJDbXBJZ25vcmVCbGFua3NBbmRDYXNlIChvbGQsIHN0cmluZykpCi0J eworICAgIEZjUGF0dGVybkl0ZXIgaXRlcjsKKyAgICBGY1ZhbHVlTGlzdFB0ciBsOworCisgICAg RmNQYXR0ZXJuSXRlclN0YXJ0IChwYXQsICZpdGVyKTsKKyAgICBpZiAoIUZjUGF0dGVybkZpbmRP YmplY3RJdGVyIChwYXQsICZpdGVyLCBvYmopKQorCXJldHVybiBGY0ZhbHNlOworICAgIGZvciAo bCA9IEZjUGF0dGVybkl0ZXJHZXRWYWx1ZXMgKHBhdCwgJml0ZXIpOyBsOyBsID0gRmNWYWx1ZUxp c3ROZXh0IChsKSkKKyAgICB7CisJRmNWYWx1ZSB2ID0gRmNWYWx1ZUNhbm9uaWNhbGl6ZSAoJmwt PnZhbHVlKTsKKwlpZiAodi50eXBlICE9IEZjVHlwZVN0cmluZykKKwkgICAgYnJlYWs7CisJaWYg KCFGY1N0ckNtcElnbm9yZUJsYW5rc0FuZENhc2UgKHYudS5zLCBzdHJpbmcpKQogCSAgICByZXR1 cm4gRmNUcnVlOwotCX0KKyAgICB9CiAgICAgcmV0dXJuIEZjRmFsc2U7CiB9CiAKQEAgLTE0NTUs MTAgKzE0NjIsMTAgQEAgRmNGcmVlVHlwZVF1ZXJ5RmFjZUludGVybmFsIChjb25zdCBGVF9GYWNl ICBmYWNlLAogCSAgICBGVF9TZm50TmFtZSBzbmFtZTsKIAkgICAgaW50IG5hbWVpZHg7CiAJICAg IGNvbnN0IEZjQ2hhcjgJKmxhbmc7Ci0JICAgIGNvbnN0IGNoYXIJKmVsdCA9IDAsICplbHRsYW5n ID0gMDsKIAkgICAgaW50CQkqbnAgPSAwLCAqbmxhbmdwID0gMDsKIAkgICAgc2l6ZV90CQlsZW47 CiAJICAgIGludCBuYW1laWQsIGxvb2t1cGlkOworCSAgICBGY09iamVjdCBvYmogPSBGQ19JTlZB TElEX09CSkVDVCwgb2JqbGFuZyA9IEZDX0lOVkFMSURfT0JKRUNUOwogCiAJICAgIG5hbWVpZCA9 IGxvb2t1cGlkID0gbmFtZWlkX29yZGVyW25dOwogCkBAIC0xNDk0LDggKzE1MDEsOCBAQCBGY0Zy ZWVUeXBlUXVlcnlGYWNlSW50ZXJuYWwgKGNvbnN0IEZUX0ZhY2UgIGZhY2UsCiAJCQkJc25hbWUu bmFtZV9pZCwgc25hbWUucGxhdGZvcm1faWQsCiAJCQkJc25hbWUuZW5jb2RpbmdfaWQsIHNuYW1l Lmxhbmd1YWdlX2lkKTsKIAotCQkgICAgZWx0ID0gRkNfRkFNSUxZOwotCQkgICAgZWx0bGFuZyA9 IEZDX0ZBTUlMWUxBTkc7CisJCSAgICBvYmogPSBGQ19GQU1JTFlfT0JKRUNUOworCQkgICAgb2Jq bGFuZyA9IEZDX0ZBTUlMWUxBTkdfT0JKRUNUOwogCQkgICAgbnAgPSAmbmZhbWlseTsKIAkJICAg IG5sYW5ncCA9ICZuZmFtaWx5X2xhbmc7CiAJCSAgICBicmVhazsKQEAgLTE1MDYsOCArMTUxMyw4 IEBAIEZjRnJlZVR5cGVRdWVyeUZhY2VJbnRlcm5hbCAoY29uc3QgRlRfRmFjZSAgZmFjZSwKIAkJ CQlzbmFtZS5uYW1lX2lkLCBzbmFtZS5wbGF0Zm9ybV9pZCwKIAkJCQlzbmFtZS5lbmNvZGluZ19p ZCwgc25hbWUubGFuZ3VhZ2VfaWQpOwogCi0JCSAgICBlbHQgPSBGQ19GVUxMTkFNRTsKLQkJICAg IGVsdGxhbmcgPSBGQ19GVUxMTkFNRUxBTkc7CisJCSAgICBvYmogPSBGQ19GVUxMTkFNRV9PQkpF Q1Q7CisJCSAgICBvYmpsYW5nID0gRkNfRlVMTE5BTUVMQU5HX09CSkVDVDsKIAkJICAgIG5wID0g Jm5mdWxsbmFtZTsKIAkJICAgIG5sYW5ncCA9ICZuZnVsbG5hbWVfbGFuZzsKIAkJICAgIGJyZWFr OwpAQCAtMTUyMSw4ICsxNTI4LDggQEAgRmNGcmVlVHlwZVF1ZXJ5RmFjZUludGVybmFsIChjb25z dCBGVF9GYWNlICBmYWNlLAogCQkJCXNuYW1lLm5hbWVfaWQsIHNuYW1lLnBsYXRmb3JtX2lkLAog CQkJCXNuYW1lLmVuY29kaW5nX2lkLCBzbmFtZS5sYW5ndWFnZV9pZCk7CiAKLQkJICAgIGVsdCA9 IEZDX1NUWUxFOwotCQkgICAgZWx0bGFuZyA9IEZDX1NUWUxFTEFORzsKKwkJICAgIG9iaiA9IEZD X1NUWUxFX09CSkVDVDsKKwkJICAgIG9iamxhbmcgPSBGQ19TVFlMRUxBTkdfT0JKRUNUOwogCQkg ICAgbnAgPSAmbnN0eWxlOwogCQkgICAgbmxhbmdwID0gJm5zdHlsZV9sYW5nOwogCQkgICAgYnJl YWs7CkBAIC0xNTM4LDcgKzE1NDUsNyBAQCBGY0ZyZWVUeXBlUXVlcnlGYWNlSW50ZXJuYWwgKGNv bnN0IEZUX0ZhY2UgIGZhY2UsCiAJCSAgICB9CiAJCSAgICBicmVhazsKIAkJfQotCQlpZiAoZWx0 KQorCQlpZiAob2JqICE9IEZDX0lOVkFMSURfT0JKRUNUKQogCQl7CiAJCSAgICBGY0NoYXI4CQkq dXRmOCwgKnBwOwogCkBAIC0xNTYyLDE0ICsxNTY5LDE0IEBAIEZjRnJlZVR5cGVRdWVyeUZhY2VJ bnRlcm5hbCAoY29uc3QgRlRfRmFjZSAgZmFjZSwKIAkJCXBwLS07CiAJCSAgICAqcHAgPSAwOwog Ci0JCSAgICBpZiAoRmNTdHJpbmdJblBhdHRlcm5FbGVtZW50IChwYXQsIGVsdCwgdXRmOCkpCisJ CSAgICBpZiAoRmNTdHJpbmdJblBhdHRlcm5FbGVtZW50IChwYXQsIG9iaiwgdXRmOCkpCiAJCSAg ICB7CiAJCQlmcmVlICh1dGY4KTsKIAkJCWNvbnRpbnVlOwogCQkgICAgfQogCiAJCSAgICAvKiBh ZGQgbmV3IGVsZW1lbnQgKi8KLQkJICAgIGlmICghRmNQYXR0ZXJuQWRkU3RyaW5nIChwYXQsIGVs dCwgdXRmOCkpCisJCSAgICBpZiAoIUZjUGF0dGVybk9iamVjdEFkZFN0cmluZyAocGF0LCBvYmos IHV0ZjgpKQogCQkgICAgewogCQkJZnJlZSAodXRmOCk7CiAJCQlnb3RvIGJhaWwxOwpAQCAtMTU4 MCwxMSArMTU4NywxMSBAQCBGY0ZyZWVUeXBlUXVlcnlGYWNlSW50ZXJuYWwgKGNvbnN0IEZUX0Zh Y2UgIGZhY2UsCiAJCQkvKiBwYWQgbGFuZyBsaXN0IHdpdGggJ3VuZCcgdG8gbGluZSB1cCB3aXRo IGVsdCAqLwogCQkJd2hpbGUgKCpubGFuZ3AgPCAqbnApCiAJCQl7Ci0JCQkgICAgaWYgKCFGY1Bh dHRlcm5BZGRTdHJpbmcgKHBhdCwgZWx0bGFuZywgKEZjQ2hhcjggKikgInVuZCIpKQorCQkJICAg IGlmICghRmNQYXR0ZXJuT2JqZWN0QWRkU3RyaW5nIChwYXQsIG9iamxhbmcsIChGY0NoYXI4ICop ICJ1bmQiKSkKIAkJCQlnb3RvIGJhaWwxOwogCQkJICAgICsrKm5sYW5ncDsKIAkJCX0KLQkJCWlm ICghRmNQYXR0ZXJuQWRkU3RyaW5nIChwYXQsIGVsdGxhbmcsIGxhbmcpKQorCQkJaWYgKCFGY1Bh dHRlcm5PYmplY3RBZGRTdHJpbmcgKHBhdCwgb2JqbGFuZywgbGFuZykpCiAJCQkgICAgZ290byBi YWlsMTsKIAkJCSsrKm5sYW5ncDsKIAkJICAgIH0KX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KRm9udGNvbmZpZyBtYWlsaW5nIGxpc3QKRm9udGNvbmZpZ0Bs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9mb250Y29uZmln