fontconfig: Branch 'master'
[email protected] (GitLab Mirror) Wed, 6 Nov 2019 09:21:52 +0000 (UTC)
| Newsgroups | gmane.comp.fonts.fontconfig |
|---|---|
| Message-ID | <[email protected]> |
IHNyYy9mY2NhY2hlLmMgfCAgICAyICsKIHNyYy9mY2NmZy5jICAgfCAgMTA1ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgOTAgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpOZXcgY29tbWl0czoK Y29tbWl0IGFhOGM4Y2ZhOWZiMjU2MzQ4MjMzNjI0OWUzZjU2NDU5MDk5ZmNmNmUKQXV0aG9yOiBB a2lyYSBUQUdPSCA8YWtpcmFAdGFnb2gub3JnPgpEYXRlOiAgIFNhdCBOb3YgMiAwMDoxNDo0OCAy MDE5ICswOTAwCgogICAgRml4IHBvdGVudGlhbCByYWNlIGNvbmRpdGlvbiBpbiBGY0NvbmZpZ1Nl dEN1cnJlbnQgYW5kIEZjQ29uZmlnUmVmZXJlbmNlCgpkaWZmIC0tZ2l0IGEvc3JjL2ZjY2FjaGUu YyBiL3NyYy9mY2NhY2hlLmMKaW5kZXggZDhmMWRhYi4uNDc0NGE4NCAxMDA2NDQKLS0tIGEvc3Jj L2ZjY2FjaGUuYworKysgYi9zcmMvZmNjYWNoZS5jCkBAIC0xMDg1LDYgKzEwODUsOCBAQCBGY0Rp ckNhY2hlTG9hZEZpbGUgKGNvbnN0IEZjQ2hhcjggKmNhY2hlX2ZpbGUsIHN0cnVjdCBzdGF0ICpm aWxlX3N0YXQpCiAgICAgaWYgKGZkIDwgMCkKIAlyZXR1cm4gTlVMTDsKICAgICBjb25maWcgPSBG Y0NvbmZpZ1JlZmVyZW5jZSAoTlVMTCk7CisgICAgaWYgKCFjb25maWcpCisJcmV0dXJuIE5VTEw7 CiAgICAgY2FjaGUgPSBGY0RpckNhY2hlTWFwRmQgKGNvbmZpZywgZmQsIGZpbGVfc3RhdCwgTlVM TCk7CiAgICAgRmNDb25maWdEZXN0cm95IChjb25maWcpOwogICAgIGNsb3NlIChmZCk7CmRpZmYg LS1naXQgYS9zcmMvZmNjZmcuYyBiL3NyYy9mY2NmZy5jCmluZGV4IDExZGM4NzYuLjMwZjM3YWYg MTAwNjQ0Ci0tLSBhL3NyYy9mY2NmZy5jCisrKyBiL3NyYy9mY2NmZy5jCkBAIC0zMyw2ICszMyw0 OSBAQAogI2VuZGlmCiAKIHN0YXRpYyBGY0NvbmZpZyAgICAqX2ZjQ29uZmlnOyAvKiBNVC1zYWZl ICovCitzdGF0aWMgRmNNdXRleAkgICAqX2xvY2s7CisKK3N0YXRpYyB2b2lkCitsb2NrX2NvbmZp ZyAodm9pZCkKK3sKKyAgICBGY011dGV4ICpsb2NrOworcmV0cnk6CisgICAgbG9jayA9IGZjX2F0 b21pY19wdHJfZ2V0ICgmX2xvY2spOworICAgIGlmICghbG9jaykKKyAgICB7CisJbG9jayA9IChG Y011dGV4ICopIG1hbGxvYyAoc2l6ZW9mIChGY011dGV4KSk7CisJRmNNdXRleEluaXQgKGxvY2sp OworCWlmICghZmNfYXRvbWljX3B0cl9jbXBleGNoICgmX2xvY2ssIE5VTEwsIGxvY2spKQorCXsK KwkgICAgRmNNdXRleEZpbmlzaCAobG9jayk7CisJICAgIGdvdG8gcmV0cnk7CisJfQorCUZjTXV0 ZXhMb2NrIChsb2NrKTsKKwkvKiBJbml0aWFsaXplIHJhbmRvbSBzdGF0ZSAqLworCUZjUmFuZG9t ICgpOworCXJldHVybjsKKyAgICB9CisgICAgRmNNdXRleExvY2sgKGxvY2spOworfQorCitzdGF0 aWMgdm9pZAordW5sb2NrX2NvbmZpZyAodm9pZCkKK3sKKyAgICBGY011dGV4VW5sb2NrIChfbG9j ayk7Cit9CisKK3N0YXRpYyB2b2lkCitmcmVlX2xvY2sgKHZvaWQpCit7CisgICAgRmNNdXRleCAq bG9jazsKKworICAgIGxvY2sgPSBmY19hdG9taWNfcHRyX2dldCAoJl9sb2NrKTsKKyAgICBpZiAo bG9jayAmJiBmY19hdG9taWNfcHRyX2NtcGV4Y2ggKCZfbG9jaywgbG9jaywgTlVMTCkpCisgICAg eworCUZjTXV0ZXhGaW5pc2ggKGxvY2spOworCWZyZWUgKGxvY2spOworICAgIH0KK30KIAogc3Rh dGljIEZjQ29uZmlnICoKIEZjQ29uZmlnRW5zdXJlICh2b2lkKQpAQCAtNDQsOCArODcsOSBAQCBy ZXRyeToKICAgICB7CiAJY29uZmlnID0gRmNJbml0TG9hZENvbmZpZ0FuZEZvbnRzICgpOwogCi0J aWYgKCFmY19hdG9taWNfcHRyX2NtcGV4Y2ggKCZfZmNDb25maWcsIE5VTEwsIGNvbmZpZykpIHsK LQkgICAgRmNDb25maWdEZXN0cm95IChjb25maWcpOworCWlmICghY29uZmlnIHx8ICFmY19hdG9t aWNfcHRyX2NtcGV4Y2ggKCZfZmNDb25maWcsIE5VTEwsIGNvbmZpZykpIHsKKwkgICAgaWYgKGNv bmZpZykKKwkJRmNDb25maWdEZXN0cm95IChjb25maWcpOwogCSAgICBnb3RvIHJldHJ5OwogCX0K ICAgICB9CkBAIC03Niw2ICsxMjAsNyBAQCBGY0NvbmZpZ0ZpbmkgKHZvaWQpCiAgICAgRmNDb25m aWcgKmNmZyA9IGZjX2F0b21pY19wdHJfZ2V0ICgmX2ZjQ29uZmlnKTsKICAgICBpZiAoY2ZnICYm IGZjX2F0b21pY19wdHJfY21wZXhjaCAoJl9mY0NvbmZpZywgY2ZnLCBOVUxMKSkKIAlGY0NvbmZp Z0Rlc3Ryb3kgKGNmZyk7CisgICAgZnJlZV9sb2NrICgpOwogfQogCiBzdGF0aWMgRmNDaGFyOCAq CkBAIC0yOTcsMjcgKzM0MiwzMSBAQCBGY0NvbmZpZ1JlZmVyZW5jZSAoRmNDb25maWcgKmNvbmZp ZykKIHsKICAgICBpZiAoIWNvbmZpZykKICAgICB7Ci0JLyogRG8gbm90IHVzZSBGY0NvbmZpZ0dl dEN1cnJlbnQgKCkgZm9yIHRoZSBwdXJwb3NlIG9mIG9idGFpbmluZyBjdXJyZW50IEZjQ29uZmln IGhlcmUuCi0JICogYmVjYXVzZSB0aGUgcmVmZXJlbmNlIGNvdW50ZXIgbXVzdCBiZSBpbmNyZWFz ZWQgYmVmb3JlIHNldHRpbmcgaXQgdG8gX2ZjQ29uZmlnLgorCS8qIGxvY2sgZHVyaW5nIG9idGFp bmluZyB0aGUgdmFsdWUgZnJvbSBfZmNDb25maWcgYW5kIGNvdW50IHVwIHJlZmNvdW50IHRoZXJl LAorCSAqIHRoZXJlIGFyZSB0aGUgcmFjZSBiZXR3ZWVuIHRoZW0uCiAJICovCisJbG9ja19jb25m aWcgKCk7CiAgICAgcmV0cnk6CiAJY29uZmlnID0gZmNfYXRvbWljX3B0cl9nZXQgKCZfZmNDb25m aWcpOwogCWlmICghY29uZmlnKQogCXsKLQkgICAgY29uZmlnID0gRmNDb25maWdDcmVhdGUgKCk7 Ci0JICAgIEZjUmVmSW5jICgmY29uZmlnLT5yZWYpOworCSAgICB1bmxvY2tfY29uZmlnICgpOwog Ci0JICAgIGNvbmZpZyA9IEZjSW5pdExvYWRPd25Db25maWdBbmRGb250cyAoY29uZmlnKTsKKwkg ICAgY29uZmlnID0gRmNJbml0TG9hZENvbmZpZ0FuZEZvbnRzICgpOworCSAgICBpZiAoIWNvbmZp ZykKKwkJZ290byByZXRyeTsKKwkgICAgbG9ja19jb25maWcgKCk7CiAJICAgIGlmICghZmNfYXRv bWljX3B0cl9jbXBleGNoICgmX2ZjQ29uZmlnLCBOVUxMLCBjb25maWcpKQogCSAgICB7Ci0JCUZj Q29uZmlnRGVzdHJveSAoY29uZmlnKTsgLyogVG8gZGVjcmVhc2UgdGhlIHJlZmNvdW50IGZvciB0 aGUgYWJvdmUgb25lLiAqLwotCQlGY0NvbmZpZ0Rlc3Ryb3kgKGNvbmZpZyk7IC8qIFRvIGRlc3Ry b3kgaXQgYWN0dWFseSAqLworCQlGY0NvbmZpZ0Rlc3Ryb3kgKGNvbmZpZyk7CiAJCWdvdG8gcmV0 cnk7CiAJICAgIH0KLQkgICAgcmV0dXJuIGNvbmZpZzsKIAl9CisJRmNSZWZJbmMgKCZjb25maWct PnJlZik7CisJdW5sb2NrX2NvbmZpZyAoKTsKICAgICB9Ci0gICAgRmNSZWZJbmMgKCZjb25maWct PnJlZik7CisgICAgZWxzZQorCUZjUmVmSW5jICgmY29uZmlnLT5yZWYpOwogCiAgICAgcmV0dXJu IGNvbmZpZzsKIH0KQEAgLTUyOSwyMCArNTc4LDI5IEBAIEZjQ29uZmlnU2V0Q3VycmVudCAoRmND b25maWcgKmNvbmZpZykKIHsKICAgICBGY0NvbmZpZyAqY2ZnOwogCisgICAgaWYgKGNvbmZpZykK KyAgICB7CisJaWYgKCFjb25maWctPmZvbnRzW0ZjU2V0U3lzdGVtXSkKKwkgICAgaWYgKCFGY0Nv bmZpZ0J1aWxkRm9udHMgKGNvbmZpZykpCisJCXJldHVybiBGY0ZhbHNlOworCUZjUmVmSW5jICgm Y29uZmlnLT5yZWYpOworICAgIH0KKworICAgIGxvY2tfY29uZmlnICgpOwogcmV0cnk6CiAgICAg Y2ZnID0gZmNfYXRvbWljX3B0cl9nZXQgKCZfZmNDb25maWcpOwogCiAgICAgaWYgKGNvbmZpZyA9 PSBjZmcpCisgICAgeworCXVubG9ja19jb25maWcgKCk7CisJaWYgKGNvbmZpZykKKwkgICAgRmND b25maWdEZXN0cm95IChjb25maWcpOwogCXJldHVybiBGY1RydWU7Ci0KLSAgICBpZiAoY29uZmln ICYmICFjb25maWctPmZvbnRzW0ZjU2V0U3lzdGVtXSkKLQlpZiAoIUZjQ29uZmlnQnVpbGRGb250 cyAoY29uZmlnKSkKLQkgICAgcmV0dXJuIEZjRmFsc2U7CisgICAgfQogCiAgICAgaWYgKCFmY19h dG9taWNfcHRyX2NtcGV4Y2ggKCZfZmNDb25maWcsIGNmZywgY29uZmlnKSkKIAlnb3RvIHJldHJ5 OwotCi0gICAgRmNDb25maWdSZWZlcmVuY2UgKGNvbmZpZyk7CisgICAgdW5sb2NrX2NvbmZpZyAo KTsKICAgICBpZiAoY2ZnKQogCUZjQ29uZmlnRGVzdHJveSAoY2ZnKTsKIApAQCAtMjY0OSw3ICsy NzA3LDkgQEAgRmNDb25maWdTZXRTeXNSb290IChGY0NvbmZpZyAgICAgICpjb25maWcsCiB7CiAg ICAgRmNDaGFyOCAqcyA9IE5VTEw7CiAgICAgRmNCb29sIGluaXQgPSBGY0ZhbHNlOworICAgIGlu dCBucmV0cnkgPSAzOwogCityZXRyeToKICAgICBpZiAoIWNvbmZpZykKICAgICB7CiAJLyogV2Ug Y2FuJ3QgdXNlIEZjQ29uZmlnR2V0Q3VycmVudCgpIGhlcmUgdG8gZW5zdXJlCkBAIC0yNjgxLDYg KzI3NDEsMTcgQEAgRmNDb25maWdTZXRTeXNSb290IChGY0NvbmZpZyAgICAgICpjb25maWcsCiAg ICAgaWYgKGluaXQpCiAgICAgewogCWNvbmZpZyA9IEZjSW5pdExvYWRPd25Db25maWdBbmRGb250 cyAoY29uZmlnKTsKKwlpZiAoIWNvbmZpZykKKwl7CisJICAgIC8qIFNvbWV0aGluZyBmYWlsZWQu IHRoaXMgaXMgdXN1YWxseSB1bmxpa2VseS4gc28gcmV0cnlpbmcgKi8KKwkgICAgaW5pdCA9IEZj RmFsc2U7CisJICAgIGlmICgtLW5yZXRyeSA9PSAwKQorCSAgICB7CisJCWZwcmludGYgKHN0ZGVy ciwgIkZvbnRjb25maWcgd2FybmluZzogVW5hYmxlIHRvIGluaXRpYWxpemUgY29uZmlnIGFuZCBy ZXRyeSBsaW1pdCBleGNlZWRlZC4gc3lzcm9vdCBmdW5jdGlvbmFsaXR5IG1heSBub3Qgd29yayBh cyBleHBlY3RlZC5cbiIpOworCQlyZXR1cm47CisJICAgIH0KKwkgICAgZ290byByZXRyeTsKKwl9 CiAJRmNDb25maWdTZXRDdXJyZW50IChjb25maWcpOwogCS8qIEZjQ29uZmlnU2V0Q3VycmVudCgp IGluY3JlYXNlcyB0aGUgcmVmY291bnQuCiAJICogZGVjcmVhc2UgaXQgaGVyZSB0byBhdm9pZCB0 aGUgbWVtb3J5IGxlYWsuCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkZvbnRjb25maWcgbWFpbGluZyBsaXN0CkZvbnRjb25maWdAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZm9u dGNvbmZpZw==