20830 2008-09-13 09:50:01 -0700 [GTK] Don't use deprecated pango API 2008-09-18 04:50:43 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 jonathon webkit-unassigned alp oldest_to_newest 91073 0 jonathon 2008-09-13 09:50:01 -0700 the pango font backend currently uses some deprecated API which means that it will not compile with -DPANGO_DISABLE_DEPRECATED defined. 91076 1 23397 jonathon 2008-09-13 11:41:29 -0700 Created attachment 23397 don't use deprecated API Notice that this requires a fairly new version of pango. I suppose we could alternately use an #ifdef around the deprecated API to check for the pango version... 91084 2 23397 alp 2008-09-13 17:48:19 -0700 Comment on attachment 23397 don't use deprecated API Yep, 1.22 is just too recent to depend on. Change is fine if you wrap with PANGO_VERSION_CHECK() though (as we already do in another place in that file). 91087 3 23399 jonathon 2008-09-13 20:22:22 -0700 Created attachment 23399 Updated patch with PANGO_VERSION_CHECK guards Wow, sorry about that. I didn't even bother to check what the current version of pango is, and 1.22 isn't even released yet. Oops. So this patch should definitely be more appropriate. 91095 4 23399 alp 2008-09-13 22:13:16 -0700 Comment on attachment 23399 Updated patch with PANGO_VERSION_CHECK guards Our convention with version check macros is to put the success case first for consistency. Please update the patch or fix when landing, r=me otherwise 91132 5 23415 jonathon 2008-09-14 12:22:31 -0700 Created attachment 23415 Last patch with success case first I also added your name as the reviewer to the changelog. I don't have commit access, so I can't land the patch. 91625 6 alp 2008-09-18 04:50:43 -0700 Landed in r36614. 23397 2008-09-13 11:41:29 -0700 2008-09-13 20:22:22 -0700 don't use deprecated API 0001-Don-t-use-deprecated-pango-API.patch text/plain 3090 jonathon RnJvbSBkNGQwMDVkZDJkMjAwNjcxNTE5NTZkYmQ0OTk2ZmJhMTUyMTA2NzE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqam9uZ3NtYUBnbm9tZS5vcmc+ CkRhdGU6IFNhdCwgMTMgU2VwIDIwMDggMTM6Mzc6NDcgLTA1MDAKU3ViamVjdDogW1BBVENIXSBE b24ndCB1c2UgZGVwcmVjYXRlZCBwYW5nbyBBUEkKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcCAgICAgICAgICB8ICAgIDIgKy0KIC4u Li9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YVBhbmdvLmNwcCAgICAgICAgIHwgICAgMiAr LQogY29uZmlndXJlLmFjICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg ICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5YzYzODk5Li5lMWYyN2Q2IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA4LTA5LTEzICBKb25hdGhvbiBK b25nc21hICA8am9uYXRob25AcXVvdGlkaWFuLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworCQkqIGNvbmZpZ3VyZS5hYzogYnVtcCBwYW5nbyByZXF1aXJlbWVu dAorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdldERlZmF1bHRQYW5nb0xheW91dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG b250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKTogcmVwbGFjZSBkZXByZWNhdGVkIHBh bmdvCisgICAgICAgIGZ1bmN0aW9ucyB3aXRoIG5vbi1kZXByZWNhdGVkIG9uZXMKKwogMjAwOC0w OS0xMiAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBNYWMgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9G b250R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRHdGsuY3BwCmlu ZGV4IGM0ZmYwYWIuLmEwZmFhYzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL0ZvbnRHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0Zv bnRHdGsuY3BwCkBAIC0yNzMsNyArMjczLDcgQEAgdm9pZCBGb250OjpkcmF3Q29tcGxleFRleHQo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEYKIHN0 YXRpYyBQYW5nb0xheW91dCogZ2V0RGVmYXVsdFBhbmdvTGF5b3V0KGNvbnN0IFRleHRSdW4mIHJ1 bikKIHsKICAgICBzdGF0aWMgUGFuZ29Gb250TWFwKiBtYXAgPSBwYW5nb19jYWlyb19mb250X21h cF9nZXRfZGVmYXVsdCgpOwotICAgIHN0YXRpYyBQYW5nb0NvbnRleHQqIHBhbmdvQ29udGV4dCA9 IHBhbmdvX2NhaXJvX2ZvbnRfbWFwX2NyZWF0ZV9jb250ZXh0KFBBTkdPX0NBSVJPX0ZPTlRfTUFQ KG1hcCkpOworICAgIHN0YXRpYyBQYW5nb0NvbnRleHQqIHBhbmdvQ29udGV4dCA9IHBhbmdvX2Zv bnRfbWFwX2NyZWF0ZV9jb250ZXh0KG1hcCk7CiAgICAgUGFuZ29MYXlvdXQqIGxheW91dCA9IHBh bmdvX2xheW91dF9uZXcocGFuZ29Db250ZXh0KTsKIAogICAgIHJldHVybiBsYXlvdXQ7CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZvcm1EYXRhUGFu Z28uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YVBh bmdvLmNwcAppbmRleCA0NmY2ZGM5Li45Y2IyYmQyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZvcm1EYXRhUGFuZ28uY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHAKQEAgLTg3LDcg Kzg3LDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QKICAgICBpZiAoZm9udERlc2NyaXB0aW9u Lml0YWxpYygpKQogICAgICAgICBwYW5nb19mb250X2Rlc2NyaXB0aW9uX3NldF9zdHlsZShkZXNj cmlwdGlvbiwgUEFOR09fU1RZTEVfSVRBTElDKTsKIAotICAgIG1fY29udGV4dCA9IHBhbmdvX2Nh aXJvX2ZvbnRfbWFwX2NyZWF0ZV9jb250ZXh0KFBBTkdPX0NBSVJPX0ZPTlRfTUFQKG1fZm9udE1h cCkpOworICAgIG1fY29udGV4dCA9IHBhbmdvX2ZvbnRfbWFwX2NyZWF0ZV9jb250ZXh0KG1fZm9u dE1hcCk7CiAgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7ICFtX2ZvbnQgJiYgaSA8IEdfTl9F TEVNRU5UUyhmYW1pbGllcyk7IGkrKykgewogICAgICAgICBwYW5nb19mb250X2Rlc2NyaXB0aW9u X3NldF9mYW1pbHkoZGVzY3JpcHRpb24sIGZhbWlsaWVzW2ldKTsKICAgICAgICAgcGFuZ29fY29u dGV4dF9zZXRfZm9udF9kZXNjcmlwdGlvbihtX2NvbnRleHQsIGRlc2NyaXB0aW9uKTsKZGlmZiAt LWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5hYwppbmRleCA1Nzk4OTFjLi5lNTZhOWU1 IDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC0yNjIsNyAr MjYyLDcgQEAgTElCWE1MX1JFUVVJUkVEX1ZFUlNJT049Mi42CiBHTElCX1JFUVVJUkVEX1ZFUlNJ T049Mi4wCiBHT0JKRUNUX1JFUVVJUkVEX1ZFUlNJT049Mi4wCiBHVEhSRUFEX1JFUVVJUkVEX1ZF UlNJT049Mi4wCi1QQU5HT19SRVFVSVJFRF9WRVJTSU9OPTEuMAorUEFOR09fUkVRVUlSRURfVkVS U0lPTj0xLjIyCiBHVEtfUkVRVUlSRURfVkVSU0lPTj0yLjgKIAogIyBvcHRpb25hbCBtb2R1bGVz Ci0tIAoxLjUuNQoK 23399 2008-09-13 20:22:22 -0700 2008-09-14 12:22:31 -0700 Updated patch with PANGO_VERSION_CHECK guards 0001-Replace-deprecated-pango-functions-with-non-deprecat.patch text/plain 2886 jonathon RnJvbSA2NmEwZWM2ZTU3MzExMDAwYmQzYjU1MjllYThkZjYxODU5YzQwNmJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqam9uZ3NtYUBnbm9tZS5vcmc+ CkRhdGU6IFNhdCwgMTMgU2VwIDIwMDggMjI6MDY6MTggLTA1MDAKU3ViamVjdDogW1BBVENIXSBS ZXBsYWNlIGRlcHJlY2F0ZWQgcGFuZ28gZnVuY3Rpb25zIHdpdGggbm9uLWRlcHJlY2F0ZWQgb25l cyBmb3IgbmV3ZXIgdmVyc2lvbnMgb2YgcGFuZ28KCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHAgICAgICAgICAgfCAgICA0ICsrKysK IC4uLi9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YVBhbmdvLmNwcCAgICAgICAgIHwgICAg NCArKysrCiAzIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5YzYzODk5Li42ODgzZjNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDA4LTA5LTEzICBKb25hdGhvbiBK b25nc21hICA8am9uYXRob25AcXVvdGlkaWFuLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGRlcHJlY2F0ZWQgcGFuZ28gZnVuY3Rp b25zIHdpdGggbm9uLWRlcHJlY2F0ZWQgb25lcyBmb3IgbmV3ZXIKKyAgICAgICAgdmVyc2lvbnMg b2YgcGFuZ28KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmdldERlZmF1bHRQYW5nb0xheW91dCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToKKwogMjAwOC0wOS0x MiAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBN YWMgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250 R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRHdGsuY3BwCmluZGV4 IGM0ZmYwYWIuLjg3YWViMGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3RrL0ZvbnRHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRH dGsuY3BwCkBAIC0yNzMsNyArMjczLDExIEBAIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGCiBzdGF0 aWMgUGFuZ29MYXlvdXQqIGdldERlZmF1bHRQYW5nb0xheW91dChjb25zdCBUZXh0UnVuJiBydW4p CiB7CiAgICAgc3RhdGljIFBhbmdvRm9udE1hcCogbWFwID0gcGFuZ29fY2Fpcm9fZm9udF9tYXBf Z2V0X2RlZmF1bHQoKTsKKyNpZiAhUEFOR09fVkVSU0lPTl9DSEVDSygxLDIxLDUpCiAgICAgc3Rh dGljIFBhbmdvQ29udGV4dCogcGFuZ29Db250ZXh0ID0gcGFuZ29fY2Fpcm9fZm9udF9tYXBfY3Jl YXRlX2NvbnRleHQoUEFOR09fQ0FJUk9fRk9OVF9NQVAobWFwKSk7CisjZWxzZSAgIC8vIGRlcHJl Y2F0ZWQgaW4gMS4yMQorICAgIHN0YXRpYyBQYW5nb0NvbnRleHQqIHBhbmdvQ29udGV4dCA9IHBh bmdvX2ZvbnRfbWFwX2NyZWF0ZV9jb250ZXh0KG1hcCk7CisjZW5kaWYKICAgICBQYW5nb0xheW91 dCogbGF5b3V0ID0gcGFuZ29fbGF5b3V0X25ldyhwYW5nb0NvbnRleHQpOwogCiAgICAgcmV0dXJu IGxheW91dDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQ bGF0Zm9ybURhdGFQYW5nby5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250 UGxhdGZvcm1EYXRhUGFuZ28uY3BwCmluZGV4IDQ2ZjZkYzkuLmFhYzJkNTkgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHAK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YVBhbmdv LmNwcApAQCAtODcsNyArODcsMTEgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QKICAgICBpZiAo Zm9udERlc2NyaXB0aW9uLml0YWxpYygpKQogICAgICAgICBwYW5nb19mb250X2Rlc2NyaXB0aW9u X3NldF9zdHlsZShkZXNjcmlwdGlvbiwgUEFOR09fU1RZTEVfSVRBTElDKTsKIAorI2lmICFQQU5H T19WRVJTSU9OX0NIRUNLKDEsMjEsNSkKICAgICBtX2NvbnRleHQgPSBwYW5nb19jYWlyb19mb250 X21hcF9jcmVhdGVfY29udGV4dChQQU5HT19DQUlST19GT05UX01BUChtX2ZvbnRNYXApKTsKKyNl bHNlICAgLy8gZGVwcmVjYXRlZCBpbiAxLjIxCisgICAgbV9jb250ZXh0ID0gcGFuZ29fZm9udF9t YXBfY3JlYXRlX2NvbnRleHQobV9mb250TWFwKTsKKyNlbmRpZgogICAgIGZvciAodW5zaWduZWQg aW50IGkgPSAwOyAhbV9mb250ICYmIGkgPCBHX05fRUxFTUVOVFMoZmFtaWxpZXMpOyBpKyspIHsK ICAgICAgICAgcGFuZ29fZm9udF9kZXNjcmlwdGlvbl9zZXRfZmFtaWx5KGRlc2NyaXB0aW9uLCBm YW1pbGllc1tpXSk7CiAgICAgICAgIHBhbmdvX2NvbnRleHRfc2V0X2ZvbnRfZGVzY3JpcHRpb24o bV9jb250ZXh0LCBkZXNjcmlwdGlvbik7Ci0tIAoxLjUuNQoK 23415 2008-09-14 12:22:31 -0700 2008-09-15 16:49:16 -0700 Last patch with success case first 0001-Don-t-use-deprecated-pango-functions-for-newer-versi.patch text/plain 2855 jonathon RnJvbSAwY2JkMDE2YTIyZTY1ODEyNDllNzI5MzNkZmU0M2RkNTg2MWRkMmIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhvbiBKb25nc21hIDxqam9uZ3NtYUBnbm9tZS5vcmc+ CkRhdGU6IFN1biwgMTQgU2VwIDIwMDggMTQ6MDY6MjIgLTA1MDAKU3ViamVjdDogW1BBVENIXSBE b24ndCB1c2UgZGVwcmVjYXRlZCBwYW5nbyBmdW5jdGlvbnMgZm9yIG5ld2VyIHZlcnNpb25zIG9m IHBhbmdvCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAxMiArKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L0ZvbnRHdGsuY3BwICAgICAgICAgIHwgICAgNCArKysrCiAuLi4vZ3JhcGhpY3MvZ3RrL0ZvbnRQ bGF0Zm9ybURhdGFQYW5nby5jcHAgICAgICAgICB8ICAgIDQgKysrKwogMyBmaWxlcyBjaGFuZ2Vk LCAyMCBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM2Mzg5OS4uYzE1NWIyNCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAwOC0wOS0xMyAgSm9uYXRob24gSm9uZ3NtYSAgPGpvbmF0aG9uQHF1b3Rp ZGlhbi5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxwIFRva2VyCisKKyAgICAgICAgUmVw bGFjZSBkZXByZWNhdGVkIHBhbmdvIGZ1bmN0aW9ucyB3aXRoIG5vbi1kZXByZWNhdGVkIG9uZXMg Zm9yIG5ld2VyCisgICAgICAgIHZlcnNpb25zIG9mIHBhbmdvCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXREZWZhdWx0 UGFuZ29MYXlvdXQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZv cm1EYXRhUGFuZ28uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9u dFBsYXRmb3JtRGF0YSk6CisKIDIwMDgtMDktMTIgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2Vu QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggTWFjIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2d0ay9Gb250R3RrLmNwcAppbmRleCBjNGZmMGFiLi44YjY2MDE4IDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcApAQCAtMjczLDcgKzI3MywxMSBAQCB2 b2lkIEZvbnQ6OmRyYXdDb21wbGV4VGV4dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IFRleHRSdW4mIHJ1biwgY29uc3QgRgogc3RhdGljIFBhbmdvTGF5b3V0KiBnZXREZWZhdWx0UGFu Z29MYXlvdXQoY29uc3QgVGV4dFJ1biYgcnVuKQogewogICAgIHN0YXRpYyBQYW5nb0ZvbnRNYXAq IG1hcCA9IHBhbmdvX2NhaXJvX2ZvbnRfbWFwX2dldF9kZWZhdWx0KCk7CisjaWYgUEFOR09fVkVS U0lPTl9DSEVDSygxLDIxLDUpICAgLy8gZGVwcmVjYXRlZCBpbiAxLjIxCisgICAgc3RhdGljIFBh bmdvQ29udGV4dCogcGFuZ29Db250ZXh0ID0gcGFuZ29fZm9udF9tYXBfY3JlYXRlX2NvbnRleHQo bWFwKTsKKyNlbHNlCiAgICAgc3RhdGljIFBhbmdvQ29udGV4dCogcGFuZ29Db250ZXh0ID0gcGFu Z29fY2Fpcm9fZm9udF9tYXBfY3JlYXRlX2NvbnRleHQoUEFOR09fQ0FJUk9fRk9OVF9NQVAobWFw KSk7CisjZW5kaWYKICAgICBQYW5nb0xheW91dCogbGF5b3V0ID0gcGFuZ29fbGF5b3V0X25ldyhw YW5nb0NvbnRleHQpOwogCiAgICAgcmV0dXJuIGxheW91dDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZvcm1EYXRhUGFuZ28uY3BwCmluZGV4IDQ2 ZjZkYzkuLjg2MmYwOWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvRm9udFBsYXRmb3JtRGF0YVBhbmdvLmNwcApAQCAtODcsNyArODcsMTEgQEAgRm9udFBs YXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnRE ZXNjcmlwdGlvbiwgY29uc3QKICAgICBpZiAoZm9udERlc2NyaXB0aW9uLml0YWxpYygpKQogICAg ICAgICBwYW5nb19mb250X2Rlc2NyaXB0aW9uX3NldF9zdHlsZShkZXNjcmlwdGlvbiwgUEFOR09f U1RZTEVfSVRBTElDKTsKIAorI2lmIFBBTkdPX1ZFUlNJT05fQ0hFQ0soMSwyMSw1KSAgIC8vIGRl cHJlY2F0ZWQgaW4gMS4yMQorICAgIG1fY29udGV4dCA9IHBhbmdvX2ZvbnRfbWFwX2NyZWF0ZV9j b250ZXh0KG1fZm9udE1hcCk7CisjZWxzZQogICAgIG1fY29udGV4dCA9IHBhbmdvX2NhaXJvX2Zv bnRfbWFwX2NyZWF0ZV9jb250ZXh0KFBBTkdPX0NBSVJPX0ZPTlRfTUFQKG1fZm9udE1hcCkpOwor I2VuZGlmCiAgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7ICFtX2ZvbnQgJiYgaSA8IEdfTl9F TEVNRU5UUyhmYW1pbGllcyk7IGkrKykgewogICAgICAgICBwYW5nb19mb250X2Rlc2NyaXB0aW9u X3NldF9mYW1pbHkoZGVzY3JpcHRpb24sIGZhbWlsaWVzW2ldKTsKICAgICAgICAgcGFuZ29fY29u dGV4dF9zZXRfZm9udF9kZXNjcmlwdGlvbihtX2NvbnRleHQsIGRlc2NyaXB0aW9uKTsKLS0gCjEu NS41Cgo=