147775 2015-08-07 02:15:29 -0700 Allow FontCustomPlatformData to consult with FontDescription 2015-08-07 10:49:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147722 1 mmaxfield mmaxfield dbates dino jonlee simon.fraser thorton oldest_to_newest 1115693 0 mmaxfield 2015-08-07 02:15:29 -0700 Allow FontCustomPlatformData to consult with FontDescription 1115695 1 258471 mmaxfield 2015-08-07 02:18:14 -0700 Created attachment 258471 Patch 1115699 2 258473 mmaxfield 2015-08-07 02:28:34 -0700 Created attachment 258473 Patch 1115782 3 258473 zalan 2015-08-07 10:04:26 -0700 Comment on attachment 258473 Patch rs=me 1115785 4 mmaxfield 2015-08-07 10:06:41 -0700 Committed r188130: <http://trac.webkit.org/changeset/188130> 1115801 5 dbates 2015-08-07 10:49:47 -0700 (In reply to comment #4) > Committed r188130: <http://trac.webkit.org/changeset/188130> This broke the Windows build. Committed build fix in <http://trac.webkit.org/changeset/188137>. 258471 2015-08-07 02:18:14 -0700 2015-08-07 02:28:32 -0700 Patch bug-147775-20150807021803.patch text/plain 17103 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJlZjQ1M2JlZjM2YzNm ZWU2NGM5NDIwM2M5MmRlOTQzNDk4ZTM4YS4uZmY0YjU1OTEzMzAyNWQzZWQ1MjY2MmIxMjk4YTE5 OTA5YjA1MzBmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA4LTA3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgRm9u dEN1c3RvbVBsYXRmb3JtRGF0YSB0byBjb25zdWx0IHdpdGggRm9udERlc2NyaXB0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc3NzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBvcmRlciB0byBp bXBsZW1lbnQgZm9udC1mZWF0dXJlLXNldHRpbmdzLCB3ZWIgZm9udHMgbmVlZCB0byBiZQorICAg ICAgICBhYmxlIHRvIGNvbnN1bHQgd2l0aCB0aGUgc2V0IG9mIGFjdGl2ZSBmb250IGZlYXR1cmVz LiBSYXRoZXIgdGhhbgorICAgICAgICBhZGQgeWV0IGFub3RoZXIgYXJndW1lbnQgdG8gYWxsIHRo ZSBmdW5jdGlvbnMgaW4gdGhpcyBmbG93LCB0aGlzCisgICAgICAgIHBhdGNoIHBhc3NlcyBhcm91 bmQgYSByZWZlcmVuY2UgdG8gdGhlIEZvbnREZXNjcmlwdGlvbiBpdHNlbGYgaW5zdGVhZAorICAg ICAgICBvZiBjb3BpZXMgb2YgY29uc3RpdHVlbnQgbWVtYmVycyBvZiBpdC4KKworICAgICAgICBO byBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAg ICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9u dEZhY2VTb3VyY2U6OmZvbnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmNyZWF0ZUZvbnQpOgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEpOgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFNWR0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkU1ZHRm9udDo6cGxhdGZv cm1EYXRhRnJvbUN1c3RvbURhdGEpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRTVkdG b250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udEN1c3RvbVBsYXRm b3JtRGF0YS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0 b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q3VzdG9t UGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udDo6cGxhdGZvcm1DcmVhdGVTY2FsZWRGb250KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDdXN0b21QbGF0Zm9ybURhdGE6OmZvbnRQbGF0 Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxh dGZvcm1EYXRhLmg6CisKIDIwMTUtMDgtMDYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5z ZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggR1RLIGNsZWFuIGJ1aWxkIGFmdGVyIHIxODc5 OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCmluZGV4IDc1YmZkODFk OTlkZWJhY2M1NzVkY2Y2NzZiMjI3YmYzNWI1NjZkYWMuLjBiY2EyYTdmMDYxZjVlNTlmZGY0ZTMw ZGJiYWU0YmYyYmU5YTg5NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250 RmFjZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNl LmNwcApAQCAtMTUxLDcgKzE1MSw3IEBAIFJlZlB0cjxGb250PiBDU1NGb250RmFjZVNvdXJjZTo6 Zm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgYm9vCiAgICAgICAg ICAgICAgICAgaWYgKCFtX2dlbmVyYXRlZE9URkJ1ZmZlcikKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0 b21QbGF0Zm9ybURhdGE+IGN1c3RvbVBsYXRmb3JtRGF0YSA9IGNyZWF0ZUZvbnRDdXN0b21QbGF0 Zm9ybURhdGEoKm1fZ2VuZXJhdGVkT1RGQnVmZmVyKTsKLSAgICAgICAgICAgICAgICBmb250ID0g Rm9udDo6Y3JlYXRlKGN1c3RvbVBsYXRmb3JtRGF0YS0+Zm9udFBsYXRmb3JtRGF0YShzdGF0aWNf Y2FzdDxpbnQ+KGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpKSwgc3ludGhldGlj Qm9sZCwgc3ludGhldGljSXRhbGljLCBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwgZm9u dERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBmb250RGVzY3JpcHRpb24ucmVuZGVyaW5nTW9k ZSgpKSwgdHJ1ZSwgZmFsc2UpOworICAgICAgICAgICAgICAgIGZvbnQgPSBGb250OjpjcmVhdGUo Y3VzdG9tUGxhdGZvcm1EYXRhLT5mb250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbiwgc3lu dGhldGljQm9sZCwgc3ludGhldGljSXRhbGljKSwgdHJ1ZSwgZmFsc2UpOwogI2Vsc2UKICAgICAg ICAgICAgICAgICBmb250ID0gRm9udDo6Y3JlYXRlKHN0ZDo6bWFrZV91bmlxdWU8U1ZHRm9udERh dGE+KG1fc3ZnRm9udEZhY2VFbGVtZW50LmdldCgpKSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVk UGl4ZWxTaXplKCksIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYyk7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcAppbmRleCA4ZjNlODg4M2Y3 NWU2NTliZDFjNWY3N2I5Mzc3YTZhNzZkNTQxYzk3Li4xNjA0ZTM5ZDc2ZDdhNTgxYjRiNTQ4ZDY0 NTNmNzg4OGIzMzE4YTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkRm9udC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZv bnQuY3BwCkBAIC0xMjMsMTQgKzEyMywxMyBAQCBib29sIENhY2hlZEZvbnQ6OmVuc3VyZUN1c3Rv bUZvbnREYXRhKFNoYXJlZEJ1ZmZlciogZGF0YSkKIAogUmVmUHRyPEZvbnQ+IENhY2hlZEZvbnQ6 OmNyZWF0ZUZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0 IEF0b21pY1N0cmluZyYsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMs IGJvb2wpCiB7Ci0gICAgcmV0dXJuIEZvbnQ6OmNyZWF0ZShwbGF0Zm9ybURhdGFGcm9tQ3VzdG9t RGF0YShmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhldGljQm9sZCwg c3ludGhldGljSXRhbGljLAotICAgICAgICBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwg Zm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBmb250RGVzY3JpcHRpb24ucmVuZGVyaW5n TW9kZSgpKSwgdHJ1ZSwgZmFsc2UpOworICAgIHJldHVybiBGb250OjpjcmVhdGUocGxhdGZvcm1E YXRhRnJvbUN1c3RvbURhdGEoZm9udERlc2NyaXB0aW9uLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0 aWNJdGFsaWMpLCB0cnVlLCBmYWxzZSk7CiB9CiAKLUZvbnRQbGF0Zm9ybURhdGEgQ2FjaGVkRm9u dDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoZmxvYXQgc2l6ZSwgYm9vbCBib2xkLCBib29s IGl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBGb250V2lkdGhWYXJpYW50IHdp ZHRoVmFyaWFudCwgRm9udFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9kZSkKK0ZvbnRQbGF0Zm9y bURhdGEgQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoY29uc3QgRm9udERl c2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpCiB7CiAg ICAgQVNTRVJUKG1fZm9udEN1c3RvbVBsYXRmb3JtRGF0YSk7Ci0gICAgcmV0dXJuIG1fZm9udEN1 c3RvbVBsYXRmb3JtRGF0YS0+Zm9udFBsYXRmb3JtRGF0YShzdGF0aWNfY2FzdDxpbnQ+KHNpemUp LCBib2xkLCBpdGFsaWMsIG9yaWVudGF0aW9uLCB3aWR0aFZhcmlhbnQsIHJlbmRlcmluZ01vZGUp OworICAgIHJldHVybiBtX2ZvbnRDdXN0b21QbGF0Zm9ybURhdGEtPmZvbnRQbGF0Zm9ybURhdGEo Zm9udERlc2NyaXB0aW9uLCBib2xkLCBpdGFsaWMpOwogfQogCiB2b2lkIENhY2hlZEZvbnQ6OmFs bENsaWVudHNSZW1vdmVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRGb250LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5o CmluZGV4IGM1MGFlNDRhOWU4ZWQxMjU2OTcwNjhjNzFjNzQ5Yzc1ZTU2ZjQ1NWUuLjhmMjhkNTdh YTYzODRiNmQ4MGQ4MjJmM2VjNzI4YTkwNzNjMzc0NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZEZvbnQuaApAQCAtNTMsNyArNTMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBSZWZQdHI8Rm9udD4gY3JlYXRlRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBB dG9taWNTdHJpbmcmIHJlbW90ZVVSSSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRp Y0l0YWxpYywgYm9vbCBleHRlcm5hbFNWRyk7CiAKIHByb3RlY3RlZDoKLSAgICBGb250UGxhdGZv cm1EYXRhIHBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKGZsb2F0IHNpemUsIGJvb2wgYm9sZCwg Ym9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiA9IEhvcml6b250YWwsIEZvbnRXaWR0aFZhcmlh bnQgPSBSZWd1bGFyV2lkdGgsIEZvbnRSZW5kZXJpbmdNb2RlID0gTm9ybWFsUmVuZGVyaW5nTW9k ZSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBwbGF0Zm9ybURhdGFGcm9tQ3VzdG9tRGF0YShjb25z dCBGb250RGVzY3JpcHRpb24mLCBib29sIGJvbGQsIGJvb2wgaXRhbGljKTsKIAogICAgIGJvb2wg ZW5zdXJlQ3VzdG9tRm9udERhdGEoU2hhcmVkQnVmZmVyKiBkYXRhKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0ZvbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0ZvbnQuY3BwCmluZGV4IDUxZTc4MDg0N2Q1ZDU1 ZWQyMzZiOTY5NzcyYjNhNWJiNTY3ODllNjcuLjRkNDU5ZmFjYmIwNjFjNGJkNDY1NjUwM2NmZDVi MzVkZmU4NGZiOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRTVkdGb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZH Rm9udC5jcHAKQEAgLTY2LDExICs2NiwxMSBAQCBSZWZQdHI8Rm9udD4gQ2FjaGVkU1ZHRm9udDo6 Y3JlYXRlRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgYwogICAg IHJldHVybiBudWxscHRyOwogfQogCi1Gb250UGxhdGZvcm1EYXRhIENhY2hlZFNWR0ZvbnQ6OnBs YXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFs aWMsIEZvbnRPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgRm9udFdpZHRoVmFyaWFudCB3aWR0aFZh cmlhbnQsIEZvbnRSZW5kZXJpbmdNb2RlIHJlbmRlcmluZ01vZGUpCitGb250UGxhdGZvcm1EYXRh IENhY2hlZFNWR0ZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKGNvbnN0IEZvbnREZXNj cmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBib29sIGJvbGQsIGJvb2wgaXRhbGljKQogewogICAg IGlmIChtX2V4dGVybmFsU1ZHRG9jdW1lbnQpCi0gICAgICAgIHJldHVybiBGb250UGxhdGZvcm1E YXRhKHNpemUsIGJvbGQsIGl0YWxpYyk7Ci0gICAgcmV0dXJuIENhY2hlZEZvbnQ6OnBsYXRmb3Jt RGF0YUZyb21DdXN0b21EYXRhKHNpemUsIGJvbGQsIGl0YWxpYywgb3JpZW50YXRpb24sIHdpZHRo VmFyaWFudCwgcmVuZGVyaW5nTW9kZSk7CisgICAgICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRh KGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpLCBib2xkLCBpdGFsaWMpOworICAg IHJldHVybiBDYWNoZWRGb250OjpwbGF0Zm9ybURhdGFGcm9tQ3VzdG9tRGF0YShmb250RGVzY3Jp cHRpb24sIGJvbGQsIGl0YWxpYyk7CiB9CiAKIGJvb2wgQ2FjaGVkU1ZHRm9udDo6ZW5zdXJlQ3Vz dG9tRm9udERhdGEoYm9vbCBleHRlcm5hbFNWRywgY29uc3QgQXRvbWljU3RyaW5nJiByZW1vdGVV UkkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRm9u dC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0ZvbnQuaAppbmRleCAw YTRiNjUxZDBmYzQwOTgwMjJjYWRhZDhhMWZlMjNmMzA2MTBmODJiLi41ZTM3M2I0MTZkYjAwYjgz M2VhOGI1NDUyMDFjYzQwYjU2NTIyY2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkU1ZHRm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRTVkdGb250LmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg UmVmUHRyPEZvbnQ+IGNyZWF0ZUZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgQXRv bWljU3RyaW5nJiByZW1vdGVVUkksIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJ dGFsaWMsIGJvb2wgZXh0ZXJuYWxTVkcpIG92ZXJyaWRlOwogCiBwcml2YXRlOgotICAgIEZvbnRQ bGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoZmxvYXQgc2l6ZSwgYm9vbCBi b2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwgRm9udFdpZHRo VmFyaWFudCA9IFJlZ3VsYXJXaWR0aCwgRm9udFJlbmRlcmluZ01vZGUgPSBOb3JtYWxSZW5kZXJp bmdNb2RlKTsKKyAgICBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpOwogCiAgICAg U1ZHRm9udEVsZW1lbnQqIGdldFNWR0ZvbnRCeUlkKGNvbnN0IFN0cmluZyYpIGNvbnN0OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q3Vz dG9tUGxhdGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWly by9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKaW5kZXggMThmZTgwZGYzNmM2YTBiYjUzNDBiNjQ1 YjI1MDU4OTNkZDRmZGViYy4uYzk1ZWY5YjViOTA4MjU4YWYzYWI5OTRkMzNmMjQxOTI1ZGIzMjEx ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9u dEN1c3RvbVBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaApAQCAtMzMsNiArMzMsNyBAQCB0eXBl ZGVmIHN0cnVjdCBfY2Fpcm9fZm9udF9mYWNlIGNhaXJvX2ZvbnRfZmFjZV90OwogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZvbnREZXNjcmlwdGlvbjsKIGNsYXNzIEZvbnRQbGF0Zm9y bURhdGE7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiAKQEAgLTQxLDcgKzQyLDcgQEAgc3RydWN0IEZv bnRDdXN0b21QbGF0Zm9ybURhdGEgewogcHVibGljOgogICAgIEZvbnRDdXN0b21QbGF0Zm9ybURh dGEoRlRfRmFjZSwgU2hhcmVkQnVmZmVyJik7CiAgICAgfkZvbnRDdXN0b21QbGF0Zm9ybURhdGEo KTsKLSAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoaW50IHNpemUsIGJvb2wg Ym9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiA9IEhvcml6b250YWwsIEZvbnRXaWR0 aFZhcmlhbnQgPSBSZWd1bGFyV2lkdGgsIEZvbnRSZW5kZXJpbmdNb2RlID0gTm9ybWFsUmVuZGVy aW5nTW9kZSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBmb250UGxhdGZvcm1EYXRhKGNvbnN0IEZv bnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpOwogICAgIHN0YXRpYyBib29s IHN1cHBvcnRzRm9ybWF0KGNvbnN0IFN0cmluZyYpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udEN1c3RvbVBsYXRm b3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKaW5kZXggMzBhZjI4YzY5 ZGY0YTY4MDM0MTAzODM0ZWQ3MDBmNDVjNmYwOTZmNC4uNDZkOTQ3MWQ2MThmNzNlMWE2YzRiMzY1 MTEwYTYzNTc0ZDNkYjgxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udEN1c3RvbVBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q3VzdG9tUGxhdGZv cm1EYXRhRnJlZVR5cGUuY3BwCkBAIC02OCw5ICs2OCw5IEBAIEZvbnRDdXN0b21QbGF0Zm9ybURh dGE6On5Gb250Q3VzdG9tUGxhdGZvcm1EYXRhKCkKICAgICBjYWlyb19mb250X2ZhY2VfZGVzdHJv eShtX2ZvbnRGYWNlKTsKIH0KIAotRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1E YXRhOjpmb250UGxhdGZvcm1EYXRhKGludCBzaXplLCBib29sIGJvbGQsIGJvb2wgaXRhbGljLCBG b250T3JpZW50YXRpb24gb3JpZW50YXRpb24sIEZvbnRXaWR0aFZhcmlhbnQsIEZvbnRSZW5kZXJp bmdNb2RlKQorRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxh dGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24sIGJvb2wgYm9sZCwg Ym9vbCBpdGFsaWMpCiB7Ci0gICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGEobV9mb250RmFjZSwg c2l6ZSwgYm9sZCwgaXRhbGljLCBvcmllbnRhdGlvbik7CisgICAgcmV0dXJuIEZvbnRQbGF0Zm9y bURhdGEobV9mb250RmFjZSwgZGVzY3JpcHRpb24sIGJvbGQsIGl0YWxpYyk7CiB9CiAKIHN0ZDo6 dW5pcXVlX3B0cjxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPiBjcmVhdGVGb250Q3VzdG9tUGxhdGZv cm1EYXRhKFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YS5oCmluZGV4 IDM5M2Q1OTRhZWJiMDdkMzEyZGQxMjliNmQyMjZiOGFkMzM5NjFiMDYuLjEyOGVmNTdhZDg0MWM5 OTk3YzdmMzQ2Yjc0ZTQ2OWU0MzMwY2Q0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGEuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhLmgKQEAg LTYzLDcgKzYzLDcgQEAgcHVibGljOgogICAgICAgICB7IH0KIAogICAgIEZvbnRQbGF0Zm9ybURh dGEoRmNQYXR0ZXJuKiwgY29uc3QgRm9udERlc2NyaXB0aW9uJik7Ci0gICAgRm9udFBsYXRmb3Jt RGF0YShjYWlyb19mb250X2ZhY2VfdCosIGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFs aWMsIEZvbnRPcmllbnRhdGlvbik7CisgICAgRm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2Zh Y2VfdCosIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpOwog ICAgIEZvbnRQbGF0Zm9ybURhdGEoZmxvYXQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYyk7 CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJik7CiAgICAgRm9u dFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJiwgZmxvYXQgc2l6ZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxh dGZvcm1EYXRhRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAppbmRleCBmNzIyNmI1ODhkOTMy ZThiOTBiMzRhMmYzMjdkYzIwNTE1YmY0YTFiLi5iZDNiYzQ0YTE2NzQwNDAzN2Q0MDZhM2ViZGJh ZjZjZGRkNWFmNjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5j cHAKQEAgLTE4NywxNCArMTg3LDE0IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURh dGEoZmxvYXQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYykKICAgICAvLyBXZSBjYW5ub3Qg Y3JlYXRlIGEgc2NhbGVkIGZvbnQgaGVyZS4KIH0KIAotRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBs YXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCogZm9udEZhY2UsIGZsb2F0IHNpemUsIGJvb2wg Ym9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiBvcmllbnRhdGlvbikKK0ZvbnRQbGF0 Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY2Fpcm9fZm9udF9mYWNlX3QqIGZvbnRGYWNlLCBj b25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBib29sIGJvbGQsIGJvb2wgaXRhbGlj KQogICAgIDogbV9mYWxsYmFja3MobnVsbHB0cikKLSAgICAsIG1fc2l6ZShzaXplKQorICAgICwg bV9zaXplKGRlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCkpCiAgICAgLCBtX3N5bnRoZXRp Y0JvbGQoYm9sZCkKICAgICAsIG1fc3ludGhldGljT2JsaXF1ZShpdGFsaWMpCiAgICAgLCBtX2Zp eGVkV2lkdGgoZmFsc2UpCiAgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKLSAgICAsIG1fb3Jp ZW50YXRpb24ob3JpZW50YXRpb24pCisgICAgLCBtX29yaWVudGF0aW9uKGRlc2NyaXB0aW9uLm9y aWVudGF0aW9uKCkpCiB7CiAgICAgYnVpbGRTY2FsZWRGb250KGZvbnRGYWNlKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9u dERhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVl dHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAppbmRleCBmYzQzYzYxYjJlOWEyMGFiODQ1 MWQ2ZDUyN2E1MTQwOWVhMTliOGVjLi41NWUzNDg4ZjA1Y2I3NDg2ZGIzZTMwMWMxYmFiYjkyM2E3 YWM5NDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVl dHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcApAQCAtMTAz LDExICsxMDMsMTIgQEAgdm9pZCBGb250OjpwbGF0Zm9ybUNoYXJXaWR0aEluaXQoKQogUGFzc1Jl ZlB0cjxGb250PiBGb250OjpwbGF0Zm9ybUNyZWF0ZVNjYWxlZEZvbnQoY29uc3QgRm9udERlc2Ny aXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFjdG9yKSBjb25zdAogewogICAg IEFTU0VSVChtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpOworICAgIEZvbnREZXNjcmlwdGlv biBzY2FsZWRGb250RGVzY3JpcHRpb24gPSBmb250RGVzY3JpcHRpb247CisgICAgc2NhbGVkRm9u dERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShzY2FsZUZhY3RvciAqIGZvbnREZXNjcmlwdGlv bi5jb21wdXRlZFNpemUoKSk7CiAgICAgcmV0dXJuIEZvbnQ6OmNyZWF0ZShGb250UGxhdGZvcm1E YXRhKGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X2ZhY2UobV9wbGF0Zm9ybURhdGEuc2NhbGVk Rm9udCgpKSwKLSAgICAgICAgc2NhbGVGYWN0b3IgKiBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRT aXplKCksCisgICAgICAgIHNjYWxlZEZvbnREZXNjcmlwdGlvbiwKICAgICAgICAgbV9wbGF0Zm9y bURhdGEuc3ludGhldGljQm9sZCgpLAotICAgICAgICBtX3BsYXRmb3JtRGF0YS5zeW50aGV0aWNP YmxpcXVlKCksCi0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpKSwKKyAgICAg ICAgbV9wbGF0Zm9ybURhdGEuc3ludGhldGljT2JsaXF1ZSgpKSwKICAgICAgICAgaXNDdXN0b21G b250KCksIGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCmluZGV4IDZk MjYwNzNiNDEzMjUwYzEyNzRjYzAyMmVjYTBiZDEzNjUyMzQ5OGYuLjBjN2ZjNTc4YzI1OTk5ODhl MThiMWQ0MzQ5ZjJjZDNhNjY4MGYzZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAK QEAgLTMyLDggKzMyLDExIEBAIEZvbnRDdXN0b21QbGF0Zm9ybURhdGE6On5Gb250Q3VzdG9tUGxh dGZvcm1EYXRhKCkKIHsKIH0KIAotRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1E YXRhOjpmb250UGxhdGZvcm1EYXRhKGludCBzaXplLCBib29sIGJvbGQsIGJvb2wgaXRhbGljLCBG b250T3JpZW50YXRpb24gb3JpZW50YXRpb24sIEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50 LCBGb250UmVuZGVyaW5nTW9kZSkKK0ZvbnRQbGF0Zm9ybURhdGEgRm9udEN1c3RvbVBsYXRmb3Jt RGF0YTo6Zm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlw dGlvbiwgYm9vbCBib2xkLCBib29sIGl0YWxpYykKIHsKKyAgICBpbnQgc2l6ZSA9IGZvbnREZXNj cmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpOworICAgIEZvbnRPcmllbnRhdGlvbiBvcmllbnRh dGlvbiA9IGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpOworICAgIEZvbnRXaWR0aFZhcmlh bnQgd2lkdGhWYXJpYW50ID0gZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpOwogI2lmIENP UkVURVhUX1dFQl9GT05UUwogICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRhKGFkb3B0Q0YoQ1RG b250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKG1fZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUs IG51bGxwdHIpKS5nZXQoKSwgc2l6ZSwgYm9sZCwgaXRhbGljLCBvcmllbnRhdGlvbiwgd2lkdGhW YXJpYW50KTsKICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaAppbmRleCAwM2Y3YTg3MGVk NTQxMWNjZjc4MTVmMTk3OGVkMjk3MTYzNWRkMDZlLi45OGFlNDRjYzlkM2QzMGI3MjA3OWYyZTI4 ZTM4ZjRmNmI5MzI5OWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKQEAgLTMyLDYgKzMy LDcgQEAgdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19DVEZvbnREZXNjcmlwdG9yKiBDVEZvbnREZXNj cmlwdG9yUmVmOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZvbnREZXNjcmlwdGlv bjsKIGNsYXNzIEZvbnRQbGF0Zm9ybURhdGE7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiAKQEAgLTUw LDcgKzUxLDcgQEAgcHVibGljOgogCiAgICAgfkZvbnRDdXN0b21QbGF0Zm9ybURhdGEoKTsKIAot ICAgIEZvbnRQbGF0Zm9ybURhdGEgZm9udFBsYXRmb3JtRGF0YShpbnQgc2l6ZSwgYm9vbCBib2xk LCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwgRm9udFdpZHRoVmFy aWFudCA9IFJlZ3VsYXJXaWR0aCwgRm9udFJlbmRlcmluZ01vZGUgPSBOb3JtYWxSZW5kZXJpbmdN b2RlKTsKKyAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERl c2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYyk7CiAKICAgICBzdGF0aWMgYm9vbCBz dXBwb3J0c0Zvcm1hdChjb25zdCBTdHJpbmcmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEu Y3BwCmluZGV4IDA5OGUwOWIzMzhkYzhhNjUyNWQ1YmNkZTgwNjViYzM3YTY3NWE4OTcuLjU1YTdi ZTU3Yzk4Mjg1ZTk3M2NmYjMxNDgyNjBjNmU1ZTc0YzRlNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRm b3JtRGF0YS5jcHAKQEAgLTQwLDggKzQwLDExIEBAIEZvbnRDdXN0b21QbGF0Zm9ybURhdGE6On5G b250Q3VzdG9tUGxhdGZvcm1EYXRhKCkKICAgICAgICAgICAgIFJlbW92ZUZvbnRNZW1SZXNvdXJj ZUV4KG1fZm9udFJlZmVyZW5jZSk7CiB9CiAKLUZvbnRQbGF0Zm9ybURhdGEgRm9udEN1c3RvbVBs YXRmb3JtRGF0YTo6Zm9udFBsYXRmb3JtRGF0YShpbnQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0 YWxpYywgRm9udE9yaWVudGF0aW9uLCBGb250V2lkdGhWYXJpYW50LCBGb250UmVuZGVyaW5nTW9k ZSByZW5kZXJpbmdNb2RlKQorRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1EYXRh Ojpmb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9u LCBib29sIGJvbGQsIGJvb2wgaXRhbGljKQogeworICAgIGludCBzaXplID0gZm9udERlc2NyaXB0 aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCk7CisgICAgRm9udFJlbmRlcmluZ01vZGUgcmVuZGVyaW5n TW9kZSA9IGZvbnREZXNjcmlwdGlvbi5yZW5kZXJpbmdNb2RlKCk7CisKICAgICBBU1NFUlQobV9m b250UmVmZXJlbmNlKTsKIAogICAgIExPR0ZPTlQmIGxvZ0ZvbnQgPSAqc3RhdGljX2Nhc3Q8TE9H Rk9OVCo+KG1hbGxvYyhzaXplb2YoTE9HRk9OVCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5o CmluZGV4IGE3ZDY2MjE1NjBkN2M1OThmMGNiMjUxZTBlMWUwZjk1NWU5ZjEzZmUuLjZiOTE5ZGEw YzQ5YzcxODU0MWMyNjNjNWEwNzdiM2ZlZmNlYWZjOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURh dGEuaApAQCAtMzEsNiArMzEsNyBAQCB0eXBlZGVmIHN0cnVjdCBDR0ZvbnQqIENHRm9udFJlZjsK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBGb250RGVzY3JpcHRpb247CiBjbGFzcyBG b250UGxhdGZvcm1EYXRhOwogY2xhc3MgU2hhcmVkQnVmZmVyOwogCkBAIC00NSw4ICs0Niw3IEBA IHB1YmxpYzoKIAogICAgIH5Gb250Q3VzdG9tUGxhdGZvcm1EYXRhKCk7CiAKLSAgICBGb250UGxh dGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoaW50IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFs aWMsIEZvbnRPcmllbnRhdGlvbiA9IEhvcml6b250YWwsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEZvbnRXaWR0aFZhcmlhbnQgPSBSZWd1bGFyV2lkdGgsIEZvbnRSZW5k ZXJpbmdNb2RlID0gTm9ybWFsUmVuZGVyaW5nTW9kZSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBm b250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBp dGFsaWMpOwogCiAgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNGb3JtYXQoY29uc3QgU3RyaW5nJik7 CiAK 258473 2015-08-07 02:28:34 -0700 2015-08-07 10:04:26 -0700 Patch bug-147775-20150807022824.patch text/plain 17324 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWEyYTdiODFiZGFlOWJj MjcwN2YwODk5NTQ3YzE2ZWI3NWUwOTNkMC4uMWNmMWVlMjk1MjI5MzgyODUxOGUwZWNhYmNmYWJj MTRjMDE3ZGE5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA4LTA3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgRm9u dEN1c3RvbVBsYXRmb3JtRGF0YSB0byBjb25zdWx0IHdpdGggRm9udERlc2NyaXB0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc3NzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBvcmRlciB0byBp bXBsZW1lbnQgZm9udC1mZWF0dXJlLXNldHRpbmdzLCB3ZWIgZm9udHMgbmVlZCB0byBiZQorICAg ICAgICBhYmxlIHRvIGNvbnN1bHQgd2l0aCB0aGUgc2V0IG9mIGFjdGl2ZSBmb250IGZlYXR1cmVz LiBSYXRoZXIgdGhhbgorICAgICAgICBhZGQgeWV0IGFub3RoZXIgYXJndW1lbnQgdG8gYWxsIHRo ZSBmdW5jdGlvbnMgaW4gdGhpcyBmbG93LCB0aGlzCisgICAgICAgIHBhdGNoIHBhc3NlcyBhcm91 bmQgYSByZWZlcmVuY2UgdG8gdGhlIEZvbnREZXNjcmlwdGlvbiBpdHNlbGYgaW5zdGVhZAorICAg ICAgICBvZiBjb3BpZXMgb2YgY29uc3RpdHVlbnQgbWVtYmVycyBvZiBpdC4KKworICAgICAgICBO byBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAg ICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9u dEZhY2VTb3VyY2U6OmZvbnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmNyZWF0ZUZvbnQpOgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEpOgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFNWR0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkU1ZHRm9udDo6cGxhdGZv cm1EYXRhRnJvbUN1c3RvbURhdGEpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRTVkdG b250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udEN1c3RvbVBsYXRm b3JtRGF0YS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0 b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q3VzdG9t UGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udDo6cGxhdGZvcm1DcmVhdGVTY2FsZWRGb250KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDdXN0b21QbGF0Zm9ybURhdGE6OmZvbnRQbGF0 Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxh dGZvcm1EYXRhLmg6CisKIDIwMTUtMDgtMDcgIERvdWcgUnVzc2VsbCAgPGRfcnVzc2VsbEBhcHBs ZS5jb20+CiAKICAgICAgICAgQVg6IEJ1ZyAxNDc3MzcgaXMgY2F1c2luZyB0ZXN0IGZhaWx1cmVz IGluIE1hdmVyaWNrcyBXSzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250 RmFjZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3Bw CmluZGV4IDc1YmZkODFkOTlkZWJhY2M1NzVkY2Y2NzZiMjI3YmYzNWI1NjZkYWMuLjBiY2EyYTdm MDYxZjVlNTlmZGY0ZTMwZGJiYWU0YmYyYmU5YTg5NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0ZvbnRGYWNlU291cmNlLmNwcApAQCAtMTUxLDcgKzE1MSw3IEBAIFJlZlB0cjxGb250PiBDU1NG b250RmFjZVNvdXJjZTo6Zm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlv biwgYm9vCiAgICAgICAgICAgICAgICAgaWYgKCFtX2dlbmVyYXRlZE9URkJ1ZmZlcikKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICAgICAgc3RkOjp1bmlx dWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IGN1c3RvbVBsYXRmb3JtRGF0YSA9IGNyZWF0 ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEoKm1fZ2VuZXJhdGVkT1RGQnVmZmVyKTsKLSAgICAgICAg ICAgICAgICBmb250ID0gRm9udDo6Y3JlYXRlKGN1c3RvbVBsYXRmb3JtRGF0YS0+Zm9udFBsYXRm b3JtRGF0YShzdGF0aWNfY2FzdDxpbnQ+KGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6 ZSgpKSwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljLCBmb250RGVzY3JpcHRpb24ub3Jp ZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBmb250RGVzY3JpcHRp b24ucmVuZGVyaW5nTW9kZSgpKSwgdHJ1ZSwgZmFsc2UpOworICAgICAgICAgICAgICAgIGZvbnQg PSBGb250OjpjcmVhdGUoY3VzdG9tUGxhdGZvcm1EYXRhLT5mb250UGxhdGZvcm1EYXRhKGZvbnRE ZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljKSwgdHJ1ZSwgZmFsc2Up OwogI2Vsc2UKICAgICAgICAgICAgICAgICBmb250ID0gRm9udDo6Y3JlYXRlKHN0ZDo6bWFrZV91 bmlxdWU8U1ZHRm9udERhdGE+KG1fc3ZnRm9udEZhY2VFbGVtZW50LmdldCgpKSwgZm9udERlc2Ny aXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxp Yyk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRGb250LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcApp bmRleCA4ZjNlODg4M2Y3NWU2NTliZDFjNWY3N2I5Mzc3YTZhNzZkNTQxYzk3Li4xNjA0ZTM5ZDc2 ZDdhNTgxYjRiNTQ4ZDY0NTNmNzg4OGIzMzE4YTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZEZvbnQuY3BwCkBAIC0xMjMsMTQgKzEyMywxMyBAQCBib29sIENhY2hlZEZv bnQ6OmVuc3VyZUN1c3RvbUZvbnREYXRhKFNoYXJlZEJ1ZmZlciogZGF0YSkKIAogUmVmUHRyPEZv bnQ+IENhY2hlZEZvbnQ6OmNyZWF0ZUZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVz Y3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBz eW50aGV0aWNJdGFsaWMsIGJvb2wpCiB7Ci0gICAgcmV0dXJuIEZvbnQ6OmNyZWF0ZShwbGF0Zm9y bURhdGFGcm9tQ3VzdG9tRGF0YShmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwg c3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljLAotICAgICAgICBmb250RGVzY3JpcHRpb24u b3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpLCBmb250RGVzY3Jp cHRpb24ucmVuZGVyaW5nTW9kZSgpKSwgdHJ1ZSwgZmFsc2UpOworICAgIHJldHVybiBGb250Ojpj cmVhdGUocGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoZm9udERlc2NyaXB0aW9uLCBzeW50aGV0 aWNCb2xkLCBzeW50aGV0aWNJdGFsaWMpLCB0cnVlLCBmYWxzZSk7CiB9CiAKLUZvbnRQbGF0Zm9y bURhdGEgQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoZmxvYXQgc2l6ZSwg Ym9vbCBib2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBGb250 V2lkdGhWYXJpYW50IHdpZHRoVmFyaWFudCwgRm9udFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9k ZSkKK0ZvbnRQbGF0Zm9ybURhdGEgQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3RvbURh dGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGJvb2wgYm9sZCwgYm9v bCBpdGFsaWMpCiB7CiAgICAgQVNTRVJUKG1fZm9udEN1c3RvbVBsYXRmb3JtRGF0YSk7Ci0gICAg cmV0dXJuIG1fZm9udEN1c3RvbVBsYXRmb3JtRGF0YS0+Zm9udFBsYXRmb3JtRGF0YShzdGF0aWNf Y2FzdDxpbnQ+KHNpemUpLCBib2xkLCBpdGFsaWMsIG9yaWVudGF0aW9uLCB3aWR0aFZhcmlhbnQs IHJlbmRlcmluZ01vZGUpOworICAgIHJldHVybiBtX2ZvbnRDdXN0b21QbGF0Zm9ybURhdGEtPmZv bnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBib2xkLCBpdGFsaWMpOwogfQogCiB2b2lk IENhY2hlZEZvbnQ6OmFsbENsaWVudHNSZW1vdmVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkRm9udC5oCmluZGV4IGM1MGFlNDRhOWU4ZWQxMjU2OTcwNjhjNzFjNzQ5Yzc1ZTU2 ZjQ1NWUuLjhmMjhkNTdhYTYzODRiNmQ4MGQ4MjJmM2VjNzI4YTkwNzNjMzc0NDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaApAQCAtNTMsNyArNTMsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBSZWZQdHI8Rm9udD4gY3JlYXRlRm9udChjb25zdCBGb250RGVzY3Jp cHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmIHJlbW90ZVVSSSwgYm9vbCBzeW50aGV0aWNCb2xk LCBib29sIHN5bnRoZXRpY0l0YWxpYywgYm9vbCBleHRlcm5hbFNWRyk7CiAKIHByb3RlY3RlZDoK LSAgICBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKGZsb2F0IHNp emUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiA9IEhvcml6b250YWws IEZvbnRXaWR0aFZhcmlhbnQgPSBSZWd1bGFyV2lkdGgsIEZvbnRSZW5kZXJpbmdNb2RlID0gTm9y bWFsUmVuZGVyaW5nTW9kZSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBwbGF0Zm9ybURhdGFGcm9t Q3VzdG9tRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBib29sIGJvbGQsIGJvb2wgaXRhbGlj KTsKIAogICAgIGJvb2wgZW5zdXJlQ3VzdG9tRm9udERhdGEoU2hhcmVkQnVmZmVyKiBkYXRhKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0ZvbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNWR0ZvbnQuY3BwCmluZGV4 IDUxZTc4MDg0N2Q1ZDU1ZWQyMzZiOTY5NzcyYjNhNWJiNTY3ODllNjcuLjRkNDU5ZmFjYmIwNjFj NGJkNDY1NjUwM2NmZDViMzVkZmU4NGZiOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRTVkdGb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkU1ZHRm9udC5jcHAKQEAgLTY2LDExICs2NiwxMSBAQCBSZWZQdHI8Rm9udD4g Q2FjaGVkU1ZHRm9udDo6Y3JlYXRlRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNj cmlwdGlvbiwgYwogICAgIHJldHVybiBudWxscHRyOwogfQogCi1Gb250UGxhdGZvcm1EYXRhIENh Y2hlZFNWR0ZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKGZsb2F0IHNpemUsIGJvb2wg Ym9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgRm9udFdpZHRo VmFyaWFudCB3aWR0aFZhcmlhbnQsIEZvbnRSZW5kZXJpbmdNb2RlIHJlbmRlcmluZ01vZGUpCitG b250UGxhdGZvcm1EYXRhIENhY2hlZFNWR0ZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBib29sIGJvbGQsIGJvb2wg aXRhbGljKQogewogICAgIGlmIChtX2V4dGVybmFsU1ZHRG9jdW1lbnQpCi0gICAgICAgIHJldHVy biBGb250UGxhdGZvcm1EYXRhKHNpemUsIGJvbGQsIGl0YWxpYyk7Ci0gICAgcmV0dXJuIENhY2hl ZEZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKHNpemUsIGJvbGQsIGl0YWxpYywgb3Jp ZW50YXRpb24sIHdpZHRoVmFyaWFudCwgcmVuZGVyaW5nTW9kZSk7CisgICAgICAgIHJldHVybiBG b250UGxhdGZvcm1EYXRhKGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpLCBib2xk LCBpdGFsaWMpOworICAgIHJldHVybiBDYWNoZWRGb250OjpwbGF0Zm9ybURhdGFGcm9tQ3VzdG9t RGF0YShmb250RGVzY3JpcHRpb24sIGJvbGQsIGl0YWxpYyk7CiB9CiAKIGJvb2wgQ2FjaGVkU1ZH Rm9udDo6ZW5zdXJlQ3VzdG9tRm9udERhdGEoYm9vbCBleHRlcm5hbFNWRywgY29uc3QgQXRvbWlj U3RyaW5nJiByZW1vdGVVUkkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkU1ZHRm9udC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNW R0ZvbnQuaAppbmRleCAwYTRiNjUxZDBmYzQwOTgwMjJjYWRhZDhhMWZlMjNmMzA2MTBmODJiLi41 ZTM3M2I0MTZkYjAwYjgzM2VhOGI1NDUyMDFjYzQwYjU2NTIyY2UyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkU1ZHRm9udC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTVkdGb250LmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgUmVmUHRyPEZvbnQ+IGNyZWF0ZUZvbnQoY29uc3QgRm9udERlc2NyaXB0 aW9uJiwgY29uc3QgQXRvbWljU3RyaW5nJiByZW1vdGVVUkksIGJvb2wgc3ludGhldGljQm9sZCwg Ym9vbCBzeW50aGV0aWNJdGFsaWMsIGJvb2wgZXh0ZXJuYWxTVkcpIG92ZXJyaWRlOwogCiBwcml2 YXRlOgotICAgIEZvbnRQbGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhRnJvbUN1c3RvbURhdGEoZmxv YXQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uID0gSG9yaXpv bnRhbCwgRm9udFdpZHRoVmFyaWFudCA9IFJlZ3VsYXJXaWR0aCwgRm9udFJlbmRlcmluZ01vZGUg PSBOb3JtYWxSZW5kZXJpbmdNb2RlKTsKKyAgICBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0 YUZyb21DdXN0b21EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBp dGFsaWMpOwogCiAgICAgU1ZHRm9udEVsZW1lbnQqIGdldFNWR0ZvbnRCeUlkKGNvbnN0IFN0cmlu ZyYpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYWlyby9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKaW5kZXggMThmZTgwZGYz NmM2YTBiYjUzNDBiNjQ1YjI1MDU4OTNkZDRmZGViYy4uYzk1ZWY5YjViOTA4MjU4YWYzYWI5OTRk MzNmMjQxOTI1ZGIzMjExZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaApAQCAtMzMs NiArMzMsNyBAQCB0eXBlZGVmIHN0cnVjdCBfY2Fpcm9fZm9udF9mYWNlIGNhaXJvX2ZvbnRfZmFj ZV90OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZvbnREZXNjcmlwdGlvbjsKIGNs YXNzIEZvbnRQbGF0Zm9ybURhdGE7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiAKQEAgLTQxLDcgKzQy LDcgQEAgc3RydWN0IEZvbnRDdXN0b21QbGF0Zm9ybURhdGEgewogcHVibGljOgogICAgIEZvbnRD dXN0b21QbGF0Zm9ybURhdGEoRlRfRmFjZSwgU2hhcmVkQnVmZmVyJik7CiAgICAgfkZvbnRDdXN0 b21QbGF0Zm9ybURhdGEoKTsKLSAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEo aW50IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiA9IEhvcml6 b250YWwsIEZvbnRXaWR0aFZhcmlhbnQgPSBSZWd1bGFyV2lkdGgsIEZvbnRSZW5kZXJpbmdNb2Rl ID0gTm9ybWFsUmVuZGVyaW5nTW9kZSk7CisgICAgRm9udFBsYXRmb3JtRGF0YSBmb250UGxhdGZv cm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpOwog ICAgIHN0YXRpYyBib29sIHN1cHBvcnRzRm9ybWF0KGNvbnN0IFN0cmluZyYpOwogCiBwcml2YXRl OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUv Rm9udEN1c3RvbVBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAK aW5kZXggMzBhZjI4YzY5ZGY0YTY4MDM0MTAzODM0ZWQ3MDBmNDVjNmYwOTZmNC4uNDZkOTQ3MWQ2 MThmNzNlMWE2YzRiMzY1MTEwYTYzNTc0ZDNkYjgxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udEN1c3RvbVBsYXRmb3JtRGF0YUZyZWVU eXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9G b250Q3VzdG9tUGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCkBAIC02OCw5ICs2OCw5IEBAIEZvbnRD dXN0b21QbGF0Zm9ybURhdGE6On5Gb250Q3VzdG9tUGxhdGZvcm1EYXRhKCkKICAgICBjYWlyb19m b250X2ZhY2VfZGVzdHJveShtX2ZvbnRGYWNlKTsKIH0KIAotRm9udFBsYXRmb3JtRGF0YSBGb250 Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKGludCBzaXplLCBib29sIGJvbGQs IGJvb2wgaXRhbGljLCBGb250T3JpZW50YXRpb24gb3JpZW50YXRpb24sIEZvbnRXaWR0aFZhcmlh bnQsIEZvbnRSZW5kZXJpbmdNb2RlKQorRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZv cm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpcHRp b24sIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpCiB7Ci0gICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURh dGEobV9mb250RmFjZSwgc2l6ZSwgYm9sZCwgaXRhbGljLCBvcmllbnRhdGlvbik7CisgICAgcmV0 dXJuIEZvbnRQbGF0Zm9ybURhdGEobV9mb250RmFjZSwgZGVzY3JpcHRpb24sIGJvbGQsIGl0YWxp Yyk7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPiBjcmVhdGVG b250Q3VzdG9tUGxhdGZvcm1EYXRhKFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0 YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRm b3JtRGF0YS5oCmluZGV4IDM5M2Q1OTRhZWJiMDdkMzEyZGQxMjliNmQyMjZiOGFkMzM5NjFiMDYu LjEyOGVmNTdhZDg0MWM5OTk3YzdmMzQ2Yjc0ZTQ2OWU0MzMwY2Q0ZmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGEu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxh dGZvcm1EYXRhLmgKQEAgLTYzLDcgKzYzLDcgQEAgcHVibGljOgogICAgICAgICB7IH0KIAogICAg IEZvbnRQbGF0Zm9ybURhdGEoRmNQYXR0ZXJuKiwgY29uc3QgRm9udERlc2NyaXB0aW9uJik7Ci0g ICAgRm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCosIGZsb2F0IHNpemUsIGJvb2wg Ym9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbik7CisgICAgRm9udFBsYXRmb3JtRGF0 YShjYWlyb19mb250X2ZhY2VfdCosIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGJvb2wgYm9sZCwg Ym9vbCBpdGFsaWMpOwogICAgIEZvbnRQbGF0Zm9ybURhdGEoZmxvYXQgc2l6ZSwgYm9vbCBib2xk LCBib29sIGl0YWxpYyk7CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1E YXRhJik7CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJiwgZmxv YXQgc2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m cmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAppbmRl eCBmNzIyNmI1ODhkOTMyZThiOTBiMzRhMmYzMjdkYzIwNTE1YmY0YTFiLi5iZDNiYzQ0YTE2NzQw NDAzN2Q0MDZhM2ViZGJhZjZjZGRkNWFmNjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9y bURhdGFGcmVlVHlwZS5jcHAKQEAgLTE4NywxNCArMTg3LDE0IEBAIEZvbnRQbGF0Zm9ybURhdGE6 OkZvbnRQbGF0Zm9ybURhdGEoZmxvYXQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYykKICAg ICAvLyBXZSBjYW5ub3QgY3JlYXRlIGEgc2NhbGVkIGZvbnQgaGVyZS4KIH0KIAotRm9udFBsYXRm b3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCogZm9udEZhY2UsIGZs b2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiBvcmllbnRh dGlvbikKK0ZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY2Fpcm9fZm9udF9mYWNl X3QqIGZvbnRGYWNlLCBjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBib29sIGJv bGQsIGJvb2wgaXRhbGljKQogICAgIDogbV9mYWxsYmFja3MobnVsbHB0cikKLSAgICAsIG1fc2l6 ZShzaXplKQorICAgICwgbV9zaXplKGRlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCkpCiAg ICAgLCBtX3N5bnRoZXRpY0JvbGQoYm9sZCkKICAgICAsIG1fc3ludGhldGljT2JsaXF1ZShpdGFs aWMpCiAgICAgLCBtX2ZpeGVkV2lkdGgoZmFsc2UpCiAgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0 cikKLSAgICAsIG1fb3JpZW50YXRpb24ob3JpZW50YXRpb24pCisgICAgLCBtX29yaWVudGF0aW9u KGRlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCkpCiB7CiAgICAgYnVpbGRTY2FsZWRGb250KGZvbnRG YWNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJl ZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAppbmRleCBmYzQz YzYxYjJlOWEyMGFiODQ1MWQ2ZDUyN2E1MTQwOWVhMTliOGVjLi41NWUzNDg4ZjA1Y2I3NDg2ZGIz ZTMwMWMxYmFiYjkyM2E3YWM5NDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVU eXBlLmNwcApAQCAtMTAzLDExICsxMDMsMTIgQEAgdm9pZCBGb250OjpwbGF0Zm9ybUNoYXJXaWR0 aEluaXQoKQogUGFzc1JlZlB0cjxGb250PiBGb250OjpwbGF0Zm9ybUNyZWF0ZVNjYWxlZEZvbnQo Y29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFjdG9y KSBjb25zdAogewogICAgIEFTU0VSVChtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpOworICAg IEZvbnREZXNjcmlwdGlvbiBzY2FsZWRGb250RGVzY3JpcHRpb24gPSBmb250RGVzY3JpcHRpb247 CisgICAgc2NhbGVkRm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShzY2FsZUZhY3RvciAq IGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFNpemUoKSk7CiAgICAgcmV0dXJuIEZvbnQ6OmNyZWF0 ZShGb250UGxhdGZvcm1EYXRhKGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X2ZhY2UobV9wbGF0 Zm9ybURhdGEuc2NhbGVkRm9udCgpKSwKLSAgICAgICAgc2NhbGVGYWN0b3IgKiBmb250RGVzY3Jp cHRpb24uY29tcHV0ZWRTaXplKCksCisgICAgICAgIHNjYWxlZEZvbnREZXNjcmlwdGlvbiwKICAg ICAgICAgbV9wbGF0Zm9ybURhdGEuc3ludGhldGljQm9sZCgpLAotICAgICAgICBtX3BsYXRmb3Jt RGF0YS5zeW50aGV0aWNPYmxpcXVlKCksCi0gICAgICAgIGZvbnREZXNjcmlwdGlvbi5vcmllbnRh dGlvbigpKSwKKyAgICAgICAgbV9wbGF0Zm9ybURhdGEuc3ludGhldGljT2JsaXF1ZSgpKSwKICAg ICAgICAgaXNDdXN0b21Gb250KCksIGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURh dGEuY3BwCmluZGV4IDZkMjYwNzNiNDEzMjUwYzEyNzRjYzAyMmVjYTBiZDEzNjUyMzQ5OGYuLjJk MDQ2MjJkOGIyY2U0MzBkNTJjOWJmMzgzYzI3ZDU2MDZmNmQwZjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBs YXRmb3JtRGF0YS5jcHAKQEAgLTIxLDYgKzIxLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJGb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgiCiAKKyNpbmNsdWRlICJGb250RGVzY3Jp cHRpb24uaCIKICNpbmNsdWRlICJGb250UGxhdGZvcm1EYXRhLmgiCiAjaW5jbHVkZSAiU2hhcmVk QnVmZmVyLmgiCiAjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0NvcmVHcmFwaGljcy5oPgpAQCAtMzIs OCArMzMsMTEgQEAgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6fkZvbnRDdXN0b21QbGF0Zm9ybURh dGEoKQogewogfQogCi1Gb250UGxhdGZvcm1EYXRhIEZvbnRDdXN0b21QbGF0Zm9ybURhdGE6OmZv bnRQbGF0Zm9ybURhdGEoaW50IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmll bnRhdGlvbiBvcmllbnRhdGlvbiwgRm9udFdpZHRoVmFyaWFudCB3aWR0aFZhcmlhbnQsIEZvbnRS ZW5kZXJpbmdNb2RlKQorRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpm b250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBi b29sIGJvbGQsIGJvb2wgaXRhbGljKQogeworICAgIGludCBzaXplID0gZm9udERlc2NyaXB0aW9u LmNvbXB1dGVkUGl4ZWxTaXplKCk7CisgICAgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0g Zm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCk7CisgICAgRm9udFdpZHRoVmFyaWFudCB3aWR0 aFZhcmlhbnQgPSBmb250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCk7CiAjaWYgQ09SRVRFWFRf V0VCX0ZPTlRTCiAgICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGEoYWRvcHRDRihDVEZvbnRDcmVh dGVXaXRoRm9udERlc2NyaXB0b3IobV9mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0 cikpLmdldCgpLCBzaXplLCBib2xkLCBpdGFsaWMsIG9yaWVudGF0aW9uLCB3aWR0aFZhcmlhbnQp OwogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCmluZGV4IDAzZjdhODcwZWQ1NDExY2Nm NzgxNWYxOTc4ZWQyOTcxNjM1ZGQwNmUuLjk4YWU0NGNjOWQzZDMwYjcyMDc5ZjJlMjhlMzhmNGY2 YjkzMjk5YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaApAQCAtMzIsNiArMzIsNyBAQCB0 eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NURm9udERlc2NyaXB0b3IqIENURm9udERlc2NyaXB0b3JS ZWY7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRm9udERlc2NyaXB0aW9uOwogY2xh c3MgRm9udFBsYXRmb3JtRGF0YTsKIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIApAQCAtNTAsNyArNTEs NyBAQCBwdWJsaWM6CiAKICAgICB+Rm9udEN1c3RvbVBsYXRmb3JtRGF0YSgpOwogCi0gICAgRm9u dFBsYXRmb3JtRGF0YSBmb250UGxhdGZvcm1EYXRhKGludCBzaXplLCBib29sIGJvbGQsIGJvb2wg aXRhbGljLCBGb250T3JpZW50YXRpb24gPSBIb3Jpem9udGFsLCBGb250V2lkdGhWYXJpYW50ID0g UmVndWxhcldpZHRoLCBGb250UmVuZGVyaW5nTW9kZSA9IE5vcm1hbFJlbmRlcmluZ01vZGUpOwor ICAgIEZvbnRQbGF0Zm9ybURhdGEgZm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRp b24mLCBib29sIGJvbGQsIGJvb2wgaXRhbGljKTsKIAogICAgIHN0YXRpYyBib29sIHN1cHBvcnRz Rm9ybWF0KGNvbnN0IFN0cmluZyYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKaW5k ZXggMDk4ZTA5YjMzOGRjOGE2NTI1ZDViY2RlODA2NWJjMzdhNjc1YTg5Ny4uNTVhN2JlNTdjOTgy ODVlOTczY2ZiMzE0ODI2MGM2ZTVlNzRjNGU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRh LmNwcApAQCAtNDAsOCArNDAsMTEgQEAgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6fkZvbnRDdXN0 b21QbGF0Zm9ybURhdGEoKQogICAgICAgICAgICAgUmVtb3ZlRm9udE1lbVJlc291cmNlRXgobV9m b250UmVmZXJlbmNlKTsKIH0KIAotRm9udFBsYXRmb3JtRGF0YSBGb250Q3VzdG9tUGxhdGZvcm1E YXRhOjpmb250UGxhdGZvcm1EYXRhKGludCBzaXplLCBib29sIGJvbGQsIGJvb2wgaXRhbGljLCBG b250T3JpZW50YXRpb24sIEZvbnRXaWR0aFZhcmlhbnQsIEZvbnRSZW5kZXJpbmdNb2RlIHJlbmRl cmluZ01vZGUpCitGb250UGxhdGZvcm1EYXRhIEZvbnRDdXN0b21QbGF0Zm9ybURhdGE6OmZvbnRQ bGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGJvb2wg Ym9sZCwgYm9vbCBpdGFsaWMpCiB7CisgICAgaW50IHNpemUgPSBmb250RGVzY3JpcHRpb24uY29t cHV0ZWRQaXhlbFNpemUoKTsKKyAgICBGb250UmVuZGVyaW5nTW9kZSByZW5kZXJpbmdNb2RlID0g Zm9udERlc2NyaXB0aW9uLnJlbmRlcmluZ01vZGUoKTsKKwogICAgIEFTU0VSVChtX2ZvbnRSZWZl cmVuY2UpOwogCiAgICAgTE9HRk9OVCYgbG9nRm9udCA9ICpzdGF0aWNfY2FzdDxMT0dGT05UKj4o bWFsbG9jKHNpemVvZihMT0dGT05UKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKaW5kZXgg YTdkNjYyMTU2MGQ3YzU5OGYwY2IyNTFlMGUxZTBmOTU1ZTlmMTNmZS4uNmI5MTlkYTBjNDljNzE4 NTQxYzI2M2M1YTA3N2IzZmVmY2VhZmM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCkBA IC0zMSw2ICszMSw3IEBAIHR5cGVkZWYgc3RydWN0IENHRm9udCogQ0dGb250UmVmOwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZvbnREZXNjcmlwdGlvbjsKIGNsYXNzIEZvbnRQbGF0 Zm9ybURhdGE7CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiAKQEAgLTQ1LDggKzQ2LDcgQEAgcHVibGlj OgogCiAgICAgfkZvbnRDdXN0b21QbGF0Zm9ybURhdGEoKTsKIAotICAgIEZvbnRQbGF0Zm9ybURh dGEgZm9udFBsYXRmb3JtRGF0YShpbnQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgRm9u dE9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgRm9udFdpZHRoVmFyaWFudCA9IFJlZ3VsYXJXaWR0aCwgRm9udFJlbmRlcmluZ01v ZGUgPSBOb3JtYWxSZW5kZXJpbmdNb2RlKTsKKyAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0 Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYyk7 CiAKICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c0Zvcm1hdChjb25zdCBTdHJpbmcmKTsKIAo=