49499 2010-11-13 15:14:59 -0800 broken-ideographic-font.html fails in release builds 2010-11-13 20:04:38 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 309011 0 hyatt 2010-11-13 15:14:59 -0800 broken-ideographic-font.html fails in release builds 309012 1 73832 hyatt 2010-11-13 15:21:09 -0800 Created attachment 73832 Patch 309013 2 73832 mitz 2010-11-13 15:27:28 -0800 Comment on attachment 73832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=73832&action=review > WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp:44 > - unsigned key = typesettingFeatures + 1; > + unsigned key = 1 + ((typesettingFeatures | (orientation() == Vertical ? 4 : 0)) << 1); I don’t like this part of the change. orientation() is always the same for a SimpleFontData instance, so there’s never a need to include it in the key. 309019 3 73835 hyatt 2010-11-13 15:40:56 -0800 Created attachment 73835 Clean up small caps even more and remove the change that Dan noticed was irrelevant. 309021 4 73835 mitz 2010-11-13 15:59:41 -0800 Comment on attachment 73835 Clean up small caps even more and remove the change that Dan noticed was irrelevant. View in context: https://bugs.webkit.org/attachment.cgi?id=73835&action=review > WebCore/ChangeLog:16 > + I made sure that the hash for m_CFStringAttributes includes orientation. I don't think this is a bug > + in practice, but this way the code is future-proofed. No longer part of the change. 309037 5 hyatt 2010-11-13 20:04:38 -0800 Fixed in r71975. 73832 2010-11-13 15:21:09 -0800 2010-11-13 15:40:56 -0800 Patch patch.txt text/plain 5307 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTk3NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMTEtMTMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTQ5OQorICAgICAgICAKKyAgICAg ICAgYnJva2VuLWlkZW9ncmFwaGljLWZvbnQuaHRtbCBjYXVzZXMgbGF5b3V0IHRlc3QgZmxha2lu ZXNzIGluIHJlbGVhc2UgYnVpbGRzLiAgVGhlIHJlYXNvbiBmb3IgdGhpcyBpcworICAgICAgICB0 aGF0IHRoZSBjdXN0b20gZm9udCBkYXRhIGZvciBtX2Jyb2tlbklkZW9ncmFwaEZvbnREYXRhIHdh cyBuZXZlciBnZXR0aW5nIHBydW5lZCBvdXQgb2YgdGhlIHRyZWUuCisgICAgICAgIFRoZSBzYW1l IHByb2JsZW0gZXhpc3RzIGZvciBjdXN0b20gc21hbGwgY2FwcyBmb250cywgc28gSSBtYWRlIHN1 cmUgdGhhdCB0aGUgc21hbGwgY2FwcyBmb250cyBnZXQKKyAgICAgICAgcHJ1bmVkIGFzIHdlbGwu ICBJbiBhZGRpdGlvbiwgY3VzdG9tIHNtYWxsIGNhcHMgZm9udHMgd2VyZSBuZXZlciBnZXR0aW5n IGRlbGV0ZWQgZWl0aGVyLgorICAgICAgICAKKyAgICAgICAgSSBhbHNvIG1hZGUgYWxsb3dzTGln YXR1cmVzIGluIEZvbnRQbGF0Zm9ybURhdGEgb3JpZW50YXRpb24taW5kZXBlbmRlbnQsIGFuZCB0 aGUgY2FsbGVycyBjaGVjayBpdAorICAgICAgICBpbnN0ZWFkLgorICAgICAgICAKKyAgICAgICAg SSBtYWRlIHN1cmUgdGhhdCB0aGUgaGFzaCBmb3IgbV9DRlN0cmluZ0F0dHJpYnV0ZXMgaW5jbHVk ZXMgb3JpZW50YXRpb24uICBJIGRvbid0IHRoaW5rIHRoaXMgaXMgYSBidWcKKyAgICAgICAgaW4g cHJhY3RpY2UsIGJ1dCB0aGlzIHdheSB0aGUgY29kZSBpcyBmdXR1cmUtcHJvb2ZlZC4KKworICAg ICAgICBVbnNraXAgZmFzdC9ibG9ja2Zsb3cvYnJva2VuLWlkZW9ncmFwaGljLWZvbnQuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6On5TaW1wbGVGb250RGF0YSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgorICAgICAg ICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6YWxsb3dzTGlnYXR1cmVzKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQVRTVUkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZGlzYWJsZUxpZ2F0dXJlcyk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlRm9udERhdGE6OmdldENGU3RyaW5nQXR0cmlidXRlcyk6CisKIDIwMTAtMTEtMTMg IERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTQ5NgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAJKHJldmlzaW9uIDcxOTcyKQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE4OCw4ICsxODgsMTUgQEAgU2ltcGxlRm9udERhdGE6On5TaW1wbGVGb250RGF0YSgpCiAgICAg ICAgIGlmIChtX3NtYWxsQ2Fwc0ZvbnREYXRhKQogICAgICAgICAgICAgZm9udENhY2hlKCktPnJl bGVhc2VGb250RGF0YShtX3NtYWxsQ2Fwc0ZvbnREYXRhKTsKICAgICAgICAgR2x5cGhQYWdlVHJl ZU5vZGU6OnBydW5lVHJlZUZvbnREYXRhKHRoaXMpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlm IChtX3NtYWxsQ2Fwc0ZvbnREYXRhKSB7CisgICAgICAgICAgICBHbHlwaFBhZ2VUcmVlTm9kZTo6 cHJ1bmVUcmVlQ3VzdG9tRm9udERhdGEobV9zbWFsbENhcHNGb250RGF0YSk7CisgICAgICAgICAg ICBkZWxldGUgbV9zbWFsbENhcHNGb250RGF0YTsKKyAgICAgICAgfQorICAgICAgICBpZiAobV9i cm9rZW5JZGVvZ3JhcGhGb250RGF0YSkKKyAgICAgICAgICAgIEdseXBoUGFnZVRyZWVOb2RlOjpw cnVuZVRyZWVDdXN0b21Gb250RGF0YShtX2Jyb2tlbklkZW9ncmFwaEZvbnREYXRhKTsKICAgICB9 Ci0gICAgCisKICAgICBkZWxldGUgbV9icm9rZW5JZGVvZ3JhcGhGb250RGF0YTsKIH0KIApJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxh dGZvcm1EYXRhQ29jb2EubW0JKHJldmlzaW9uIDcxOTcyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAg LTE2Nyw3ICsxNjcsNyBAQCBib29sIEZvbnRQbGF0Zm9ybURhdGE6OnJvdW5kc0dseXBoQWR2YW5j CiAKIGJvb2wgRm9udFBsYXRmb3JtRGF0YTo6YWxsb3dzTGlnYXR1cmVzKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gbV9vcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsICYmICFbW21fZm9udCBjb3ZlcmVk Q2hhcmFjdGVyU2V0XSBjaGFyYWN0ZXJJc01lbWJlcjonYSddOworICAgIHJldHVybiAhW1ttX2Zv bnQgY292ZXJlZENoYXJhY3RlclNldF0gY2hhcmFjdGVySXNNZW1iZXI6J2EnXTsKIH0KIAogQ1RG b250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpIGNvbnN0CkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJBVFNVSS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9s bGVyQVRTVUkuY3BwCShyZXZpc2lvbiA3MTk3MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckFUU1VJLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYyLDcgKzI2Miw3IEBAIHN0YXRpYyB2b2lkIGRpc2FibGVMaWdhdHVyZXMoY29uc3QgU2ltcGwK ICAgICAvLyBEb24ndCBiZSB0b28gYWdncmVzc2l2ZTogaWYgdGhlIGZvbnQgZG9lc24ndCBjb250 YWluICdhJywgdGhlbiBhc3N1bWUgdGhhdCBhbnkgbGlnYXR1cmVzIGl0IGNvbnRhaW5zIGFyZQog ICAgIC8vIGluIGNoYXJhY3RlcnMgdGhhdCBhbHdheXMgZ28gdGhyb3VnaCBBVFNVSSwgYW5kIHRo ZXJlZm9yZSBhbGxvdyB0aGVtLiBHZWV6YSBQcm8gaXMgYW4gZXhhbXBsZS4KICAgICAvLyBTZWUg YnVnemlsbGEgNTE2Ni4KLSAgICBpZiAoKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMp IHx8IGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5hbGxvd3NMaWdhdHVyZXMoKSkKKyAgICBpZiAo KHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMpIHx8IChmb250RGF0YS0+b3JpZW50YXRp b24oKSA9PSBIb3Jpem9udGFsICYmIGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5hbGxvd3NMaWdh dHVyZXMoKSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFUU1VGb250RmVhdHVyZVR5cGUgZmVh dHVyZVR5cGVzW10gPSB7IGtMaWdhdHVyZXNUeXBlIH07CkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAko cmV2aXNpb24gNzE5NzIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVG b250RGF0YUNvcmVUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsMTMgKzQxLDEzIEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogQ0ZEaWN0aW9uYXJ5UmVmIFNpbXBsZUZvbnREYXRhOjpnZXRD RlN0cmluZ0F0dHJpYnV0ZXMoVHlwZXNldHRpbmdGZWF0dXJlcyB0eXBlc2V0dGluZ0ZlYXR1cmVz KSBjb25zdAogewotICAgIHVuc2lnbmVkIGtleSA9IHR5cGVzZXR0aW5nRmVhdHVyZXMgKyAxOwor ICAgIHVuc2lnbmVkIGtleSA9IDEgKyAoKHR5cGVzZXR0aW5nRmVhdHVyZXMgfCAob3JpZW50YXRp b24oKSA9PSBWZXJ0aWNhbCA/IDQgOiAwKSkgPDwgMSk7CiAgICAgcGFpcjxIYXNoTWFwPHVuc2ln bmVkLCBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiA+OjppdGVyYXRvciwgYm9vbD4gYWRkUmVz dWx0ID0gbV9DRlN0cmluZ0F0dHJpYnV0ZXMuYWRkKGtleSwgUmV0YWluUHRyPENGRGljdGlvbmFy eVJlZj4oKSk7CiAgICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4mIGF0dHJpYnV0ZXNEaWN0 aW9uYXJ5ID0gYWRkUmVzdWx0LmZpcnN0LT5zZWNvbmQ7CiAgICAgaWYgKCFhZGRSZXN1bHQuc2Vj b25kKQogICAgICAgICByZXR1cm4gYXR0cmlidXRlc0RpY3Rpb25hcnkuZ2V0KCk7CiAKLSAgICBi b29sIGFsbG93TGlnYXR1cmVzID0gcGxhdGZvcm1EYXRhKCkuYWxsb3dzTGlnYXR1cmVzKCkgfHwg KHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMpOworICAgIGJvb2wgYWxsb3dMaWdhdHVy ZXMgPSAob3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsICYmIHBsYXRmb3JtRGF0YSgpLmFsbG93 c0xpZ2F0dXJlcygpKSB8fCAodHlwZXNldHRpbmdGZWF0dXJlcyAmIExpZ2F0dXJlcyk7CiAKICAg ICBzdGF0aWMgY29uc3QgaW50IGxpZ2F0dXJlc05vdEFsbG93ZWRWYWx1ZSA9IDA7CiAgICAgc3Rh dGljIENGTnVtYmVyUmVmIGxpZ2F0dXJlc05vdEFsbG93ZWQgPSBDRk51bWJlckNyZWF0ZShrQ0ZB bGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJJbnRUeXBlLCAmbGlnYXR1cmVzTm90QWxsb3dlZFZh bHVlKTsK 73835 2010-11-13 15:40:56 -0800 2010-11-13 15:59:41 -0800 Clean up small caps even more and remove the change that Dan noticed was irrelevant. patch.txt text/plain 13213 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTk3NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTEgQEAKKzIwMTAtMTEtMTMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTQ5OQorICAgICAgICAKKyAgICAg ICAgYnJva2VuLWlkZW9ncmFwaGljLWZvbnQuaHRtbCBjYXVzZXMgbGF5b3V0IHRlc3QgZmxha2lu ZXNzIGluIHJlbGVhc2UgYnVpbGRzLiAgVGhlIHJlYXNvbiBmb3IgdGhpcyBpcworICAgICAgICB0 aGF0IHRoZSBjdXN0b20gZm9udCBkYXRhIGZvciBtX2Jyb2tlbklkZW9ncmFwaEZvbnREYXRhIHdh cyBuZXZlciBnZXR0aW5nIHBydW5lZCBvdXQgb2YgdGhlIHRyZWUuCisgICAgICAgIFRoZSBzYW1l IHByb2JsZW0gZXhpc3RzIGZvciBjdXN0b20gc21hbGwgY2FwcyBmb250cywgc28gSSBtYWRlIHN1 cmUgdGhhdCB0aGUgc21hbGwgY2FwcyBmb250cyBnZXQKKyAgICAgICAgcHJ1bmVkIGFzIHdlbGwu ICBJbiBhZGRpdGlvbiwgY3VzdG9tIHNtYWxsIGNhcHMgZm9udHMgd2VyZSBuZXZlciBnZXR0aW5n IGRlbGV0ZWQgZWl0aGVyLgorICAgICAgICAKKyAgICAgICAgSSBhbHNvIG1hZGUgYWxsb3dzTGln YXR1cmVzIGluIEZvbnRQbGF0Zm9ybURhdGEgb3JpZW50YXRpb24taW5kZXBlbmRlbnQsIGFuZCB0 aGUgY2FsbGVycyBjaGVjayBpdAorICAgICAgICBpbnN0ZWFkLgorICAgICAgICAKKyAgICAgICAg SSBtYWRlIHN1cmUgdGhhdCB0aGUgaGFzaCBmb3IgbV9DRlN0cmluZ0F0dHJpYnV0ZXMgaW5jbHVk ZXMgb3JpZW50YXRpb24uICBJIGRvbid0IHRoaW5rIHRoaXMgaXMgYSBidWcKKyAgICAgICAgaW4g cHJhY3RpY2UsIGJ1dCB0aGlzIHdheSB0aGUgY29kZSBpcyBmdXR1cmUtcHJvb2ZlZC4KKworICAg ICAgICBVbnNraXAgZmFzdC9ibG9ja2Zsb3cvYnJva2VuLWlkZW9ncmFwaGljLWZvbnQuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6On5TaW1wbGVGb250RGF0YSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxlRm9udERhdGFDaHJvbWl1bVdpbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KToKKyAg ICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxlRm9udERhdGFMaW51eC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KToKKyAg ICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6YWxsb3dzTGlnYXR1cmVzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3kp OgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9TaW1wbGVGb250RGF0YUhhaWt1LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3kpOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQVRTVUku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGlzYWJsZUxpZ2F0dXJlcyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhQ29yZVRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmdldENGU3RyaW5nQXR0cmlidXRlcyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tOgorICAgICAgICAo V2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3kpOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBs ZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3kpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9u dERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKToKKwogMjAxMC0xMS0xMyAgRGF2aWQgSHlhdHQgIDxo eWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ5NDk2CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZv bnREYXRhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBs ZUZvbnREYXRhLmNwcAkocmV2aXNpb24gNzE5NzIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL1NpbXBsZUZvbnREYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg0LDEyICsxODQsMTcg QEAgU2ltcGxlRm9udERhdGE6On5TaW1wbGVGb250RGF0YSgpCiAjZW5kaWYKICAgICAgICAgcGxh dGZvcm1EZXN0cm95KCk7CiAKLSAgICBpZiAoIWlzQ3VzdG9tRm9udCgpKSB7Ci0gICAgICAgIGlm IChtX3NtYWxsQ2Fwc0ZvbnREYXRhKQotICAgICAgICAgICAgZm9udENhY2hlKCktPnJlbGVhc2VG b250RGF0YShtX3NtYWxsQ2Fwc0ZvbnREYXRhKTsKKyAgICBpZiAoIWlzQ3VzdG9tRm9udCgpKQog ICAgICAgICBHbHlwaFBhZ2VUcmVlTm9kZTo6cHJ1bmVUcmVlRm9udERhdGEodGhpcyk7CisgICAg ZWxzZSB7CisgICAgICAgIGlmIChtX3NtYWxsQ2Fwc0ZvbnREYXRhKQorICAgICAgICAgICAgR2x5 cGhQYWdlVHJlZU5vZGU6OnBydW5lVHJlZUN1c3RvbUZvbnREYXRhKG1fc21hbGxDYXBzRm9udERh dGEpOworCisgICAgICAgIGlmIChtX2Jyb2tlbklkZW9ncmFwaEZvbnREYXRhKQorICAgICAgICAg ICAgR2x5cGhQYWdlVHJlZU5vZGU6OnBydW5lVHJlZUN1c3RvbUZvbnREYXRhKG1fYnJva2VuSWRl b2dyYXBoRm9udERhdGEpOwogICAgIH0KLSAgICAKKworICAgIGRlbGV0ZSBtX3NtYWxsQ2Fwc0Zv bnREYXRhOwogICAgIGRlbGV0ZSBtX2Jyb2tlbklkZW9ncmFwaEZvbnREYXRhOwogfQogCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21p dW1XaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vU2ltcGxlRm9udERhdGFDaHJvbWl1bVdpbi5jcHAJKHJldmlzaW9uIDcxOTcyKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1wbGVGb250RGF0YUNocm9taXVtV2lu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTgsOSArOTgsNiBAQCB2b2lkIFNpbXBsZUZvbnREYXRh OjpwbGF0Zm9ybUNoYXJXaWR0aEluCiAKIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVz dHJveSgpCiB7Ci0gICAgLy8gV2UgZG9uJ3QgaGFzaCB0aGlzIG9uIFdpbjMyLCBzbyBpdCdzIGVm ZmVjdGl2ZWx5IG93bmVkIGJ5IHVzLgotICAgIGRlbGV0ZSBtX3NtYWxsQ2Fwc0ZvbnREYXRhOwot ICAgIG1fc21hbGxDYXBzRm9udERhdGEgPSAwOwogfQogCiBTaW1wbGVGb250RGF0YSogU2ltcGxl Rm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERl c2NyaXB0aW9uKSBjb25zdApAQCAtMTE0LDcgKzExMSw3IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1w bGVGb250RGF0YTo6c21hbGxDYXAKICAgICAgICAgd2luRm9udC5sZkhlaWdodCA9IC1scm91bmRm KHNtYWxsQ2Fwc1NpemUpOwogICAgICAgICBIRk9OVCBoZm9udCA9IENyZWF0ZUZvbnRJbmRpcmVj dCgmd2luRm9udCk7CiAgICAgICAgIG1fc21hbGxDYXBzRm9udERhdGEgPQotICAgICAgICAgICAg bmV3IFNpbXBsZUZvbnREYXRhKEZvbnRQbGF0Zm9ybURhdGEoaGZvbnQsIHNtYWxsQ2Fwc1NpemUp KTsKKyAgICAgICAgICAgIG5ldyBTaW1wbGVGb250RGF0YShGb250UGxhdGZvcm1EYXRhKGhmb250 LCBzbWFsbENhcHNTaXplKSwgaXNDdXN0b21Gb250KCksIGZhbHNlKTsKICAgICB9CiAgICAgcmV0 dXJuIG1fc21hbGxDYXBzRm9udERhdGE7CiB9CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhTGludXguY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxlRm9udERhdGFMaW51eC5jcHAJKHJl dmlzaW9uIDcxOTcyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1w bGVGb250RGF0YUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI3LDE1ICsxMjcsMTMgQEAg dm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1DaGFyV2lkdGhJbgogCiB2b2lkIFNpbXBsZUZv bnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogewotICAgIGRlbGV0ZSBtX3NtYWxsQ2Fwc0ZvbnRE YXRhOwotICAgIG1fc21hbGxDYXBzRm9udERhdGEgPSAwOwogfQogCiBTaW1wbGVGb250RGF0YSog U2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg Zm9udERlc2NyaXB0aW9uKSBjb25zdAogewogICAgIGlmICghbV9zbWFsbENhcHNGb250RGF0YSkg ewogICAgICAgICBjb25zdCBmbG9hdCBzbWFsbENhcHNTaXplID0gbHJvdW5kZihmb250RGVzY3Jp cHRpb24uY29tcHV0ZWRTaXplKCkgKiBzbWFsbENhcHNGcmFjdGlvbik7Ci0gICAgICAgIG1fc21h bGxDYXBzRm9udERhdGEgPSBuZXcgU2ltcGxlRm9udERhdGEoRm9udFBsYXRmb3JtRGF0YShtX3Bs YXRmb3JtRGF0YSwgc21hbGxDYXBzU2l6ZSkpOworICAgICAgICBtX3NtYWxsQ2Fwc0ZvbnREYXRh ID0gbmV3IFNpbXBsZUZvbnREYXRhKEZvbnRQbGF0Zm9ybURhdGEobV9wbGF0Zm9ybURhdGEsIHNt YWxsQ2Fwc1NpemUpLCBpc0N1c3RvbUZvbnQoKSwgZmFsc2UpOwogICAgIH0KIAogICAgIHJldHVy biBtX3NtYWxsQ2Fwc0ZvbnREYXRhOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0JKHJldmlzaW9uIDcx OTcyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRh Q29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw3ICsxNjcsNyBAQCBib29sIEZvbnRQbGF0 Zm9ybURhdGE6OnJvdW5kc0dseXBoQWR2YW5jCiAKIGJvb2wgRm9udFBsYXRmb3JtRGF0YTo6YWxs b3dzTGlnYXR1cmVzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9vcmllbnRhdGlvbiA9PSBIb3Jp em9udGFsICYmICFbW21fZm9udCBjb3ZlcmVkQ2hhcmFjdGVyU2V0XSBjaGFyYWN0ZXJJc01lbWJl cjonYSddOworICAgIHJldHVybiAhW1ttX2ZvbnQgY292ZXJlZENoYXJhY3RlclNldF0gY2hhcmFj dGVySXNNZW1iZXI6J2EnXTsKIH0KIAogQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9u dCgpIGNvbnN0CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBs ZUZvbnREYXRhRnJlZVR5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAJKHJldmlzaW9uIDcxOTcy KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZy ZWVUeXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsOCArNzcsNiBAQCB2b2lkIFNpbXBsZUZv bnREYXRhOjpwbGF0Zm9ybUNoYXJXaWR0aEluCiAKIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRm b3JtRGVzdHJveSgpCiB7Ci0gICAgZGVsZXRlIG1fc21hbGxDYXBzRm9udERhdGE7Ci0gICAgbV9z bWFsbENhcHNGb250RGF0YSA9IDA7CiB9CiAKIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0 YTo6c21hbGxDYXBzRm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRp b24pIGNvbnN0CkBAIC04Nyw3ICs4NSw4IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0 YTo6c21hbGxDYXAKICAgICBpZiAoIW1fc21hbGxDYXBzRm9udERhdGEpCiAgICAgICAgIG1fc21h bGxDYXBzRm9udERhdGEgPSBuZXcgU2ltcGxlRm9udERhdGEoCiAgICAgICAgICAgICBGb250UGxh dGZvcm1EYXRhKGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X2ZhY2UobV9wbGF0Zm9ybURhdGEu c2NhbGVkRm9udCgpKSwKLSAgICAgICAgICAgIDAuNzBmICogZm9udERlc2NyaXB0aW9uLmNvbXB1 dGVkU2l6ZSgpLCBtX3BsYXRmb3JtRGF0YS5zeW50aGV0aWNCb2xkKCksIG1fcGxhdGZvcm1EYXRh LnN5bnRoZXRpY09ibGlxdWUoKSkpOworICAgICAgICAgICAgMC43MGYgKiBmb250RGVzY3JpcHRp b24uY29tcHV0ZWRTaXplKCksIG1fcGxhdGZvcm1EYXRhLnN5bnRoZXRpY0JvbGQoKSwgbV9wbGF0 Zm9ybURhdGEuc3ludGhldGljT2JsaXF1ZSgpKSwKKyAgICAgICAgICAgIGlzQ3VzdG9tRm9udCgp LCBmYWxzZSk7CiAKICAgICByZXR1cm4gbV9zbWFsbENhcHNGb250RGF0YTsKIH0KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9udERhdGFIYWlrdS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9TaW1wbGVGb250RGF0 YUhhaWt1LmNwcAkocmV2aXNpb24gNzE5NzIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2hhaWt1L1NpbXBsZUZvbnREYXRhSGFpa3UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NCw4ICs2 NCw2IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtQ2hhcldpZHRoSW4KIAogdm9pZCBT aW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKIHsKLSAgICBkZWxldGUgbV9zbWFsbENh cHNGb250RGF0YTsKLSAgICBtX3NtYWxsQ2Fwc0ZvbnREYXRhID0gMDsKIH0KIAogU2ltcGxlRm9u dERhdGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YShjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbikgY29uc3QKQEAgLTc0LDcgKzcyLDcgQEAgU2ltcGxlRm9u dERhdGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcAogICAgICAgICBGb250RGVzY3JpcHRpb24g ZGVzYyA9IEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwogICAgICAgICBkZXNjLnNl dFNwZWNpZmllZFNpemUoMC43MGYgKiBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRTaXplKCkpOwog ICAgICAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoZGVzYywgZGVzYy5mYW1p bHkoKS5mYW1pbHkoKSk7Ci0gICAgICAgIG1fc21hbGxDYXBzRm9udERhdGEgPSBuZXcgU2ltcGxl Rm9udERhdGEoZm9udFBsYXRmb3JtRGF0YSk7CisgICAgICAgIG1fc21hbGxDYXBzRm9udERhdGEg PSBuZXcgU2ltcGxlRm9udERhdGEoZm9udFBsYXRmb3JtRGF0YSwgaXNDdXN0b21Gb250KCksIGZh bHNlKTsKICAgICB9CiAgICAgcmV0dXJuIG1fc21hbGxDYXBzRm9udERhdGE7CiB9CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXJBVFNVSS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRl eHRDb250cm9sbGVyQVRTVUkuY3BwCShyZXZpc2lvbiA3MTk3MikKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckFUU1VJLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjYyLDcgKzI2Miw3IEBAIHN0YXRpYyB2b2lkIGRpc2FibGVMaWdhdHVyZXMoY29u c3QgU2ltcGwKICAgICAvLyBEb24ndCBiZSB0b28gYWdncmVzc2l2ZTogaWYgdGhlIGZvbnQgZG9l c24ndCBjb250YWluICdhJywgdGhlbiBhc3N1bWUgdGhhdCBhbnkgbGlnYXR1cmVzIGl0IGNvbnRh aW5zIGFyZQogICAgIC8vIGluIGNoYXJhY3RlcnMgdGhhdCBhbHdheXMgZ28gdGhyb3VnaCBBVFNV SSwgYW5kIHRoZXJlZm9yZSBhbGxvdyB0aGVtLiBHZWV6YSBQcm8gaXMgYW4gZXhhbXBsZS4KICAg ICAvLyBTZWUgYnVnemlsbGEgNTE2Ni4KLSAgICBpZiAoKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBM aWdhdHVyZXMpIHx8IGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5hbGxvd3NMaWdhdHVyZXMoKSkK KyAgICBpZiAoKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMpIHx8IChmb250RGF0YS0+ b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsICYmIGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5h bGxvd3NMaWdhdHVyZXMoKSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFUU1VGb250RmVhdHVy ZVR5cGUgZmVhdHVyZVR5cGVzW10gPSB7IGtMaWdhdHVyZXNUeXBlIH07CkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YUNvcmVU ZXh0LmNwcAkocmV2aXNpb24gNzE5NzIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9TaW1wbGVGb250RGF0YUNvcmVUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNyArNDcs NyBAQCBDRkRpY3Rpb25hcnlSZWYgU2ltcGxlRm9udERhdGE6OmdldENGU3RyCiAgICAgaWYgKCFh ZGRSZXN1bHQuc2Vjb25kKQogICAgICAgICByZXR1cm4gYXR0cmlidXRlc0RpY3Rpb25hcnkuZ2V0 KCk7CiAKLSAgICBib29sIGFsbG93TGlnYXR1cmVzID0gcGxhdGZvcm1EYXRhKCkuYWxsb3dzTGln YXR1cmVzKCkgfHwgKHR5cGVzZXR0aW5nRmVhdHVyZXMgJiBMaWdhdHVyZXMpOworICAgIGJvb2wg YWxsb3dMaWdhdHVyZXMgPSAob3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsICYmIHBsYXRmb3Jt RGF0YSgpLmFsbG93c0xpZ2F0dXJlcygpKSB8fCAodHlwZXNldHRpbmdGZWF0dXJlcyAmIExpZ2F0 dXJlcyk7CiAKICAgICBzdGF0aWMgY29uc3QgaW50IGxpZ2F0dXJlc05vdEFsbG93ZWRWYWx1ZSA9 IDA7CiAgICAgc3RhdGljIENGTnVtYmVyUmVmIGxpZ2F0dXJlc05vdEFsbG93ZWQgPSBDRk51bWJl ckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJJbnRUeXBlLCAmbGlnYXR1cmVz Tm90QWxsb3dlZFZhbHVlKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1Np bXBsZUZvbnREYXRhTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCShyZXZpc2lvbiA3MTk3MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0zNTcsNiArMzU3LDExIEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtQ2hhcldp ZHRoSW4KIAogdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKIHsKKyAgICBp ZiAobV9zbWFsbENhcHNGb250RGF0YSAmJiAhaXNDdXN0b21Gb250KCkpIHsKKyAgICAgICAgZm9u dENhY2hlKCktPnJlbGVhc2VGb250RGF0YShtX3NtYWxsQ2Fwc0ZvbnREYXRhKTsKKyAgICAgICAg bV9zbWFsbENhcHNGb250RGF0YSA9IDA7CisgICAgfQorCiAjaWZkZWYgQlVJTERJTkdfT05fVElH RVIKICAgICBpZiAobV9zdHlsZUdyb3VwKQogICAgICAgICB3a1JlbGVhc2VTdHlsZUdyb3VwKG1f c3R5bGVHcm91cCk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVG b250RGF0YVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwCShyZXZpc2lvbiA3MTk3MikKKysrIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcAkod29ya2luZyBjb3B5KQpA QCAtOTQsMTAgKzk0LDYgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6aW5pdEdESUZvbnQoKQogCiB2 b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogewotICAgIC8vIFdlIGRvbid0 IGhhc2ggdGhpcyBvbiBXaW4zMiwgc28gaXQncyBlZmZlY3RpdmVseSBvd25lZCBieSB1cy4KLSAg ICBkZWxldGUgbV9zbWFsbENhcHNGb250RGF0YTsKLSAgICBtX3NtYWxsQ2Fwc0ZvbnREYXRhID0g MDsKLQogICAgIFNjcmlwdEZyZWVDYWNoZSgmbV9zY3JpcHRDYWNoZSk7CiAgICAgZGVsZXRlIG1f c2NyaXB0Rm9udFByb3BlcnRpZXM7CiB9CkBAIC0xMTUsNyArMTExLDggQEAgU2ltcGxlRm9udERh dGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcAogICAgICAgICAgICAgR2V0T2JqZWN0KG1fcGxh dGZvcm1EYXRhLmhmb250KCksIHNpemVvZihMT0dGT05UKSwgJndpbmZvbnQpOwogICAgICAgICAg ICAgd2luZm9udC5sZkhlaWdodCA9IC1scm91bmRmKHNtYWxsQ2Fwc0hlaWdodCAqIChtX3BsYXRm b3JtRGF0YS51c2VHREkoKSA/IDEgOiAzMikpOwogICAgICAgICAgICAgSEZPTlQgaGZvbnQgPSBD cmVhdGVGb250SW5kaXJlY3QoJndpbmZvbnQpOwotICAgICAgICAgICAgbV9zbWFsbENhcHNGb250 RGF0YSA9IG5ldyBTaW1wbGVGb250RGF0YShGb250UGxhdGZvcm1EYXRhKGhmb250LCBzbWFsbENh cHNIZWlnaHQsIG1fcGxhdGZvcm1EYXRhLnN5bnRoZXRpY0JvbGQoKSwgbV9wbGF0Zm9ybURhdGEu c3ludGhldGljT2JsaXF1ZSgpLCBtX3BsYXRmb3JtRGF0YS51c2VHREkoKSkpOworICAgICAgICAg ICAgbV9zbWFsbENhcHNGb250RGF0YSA9IG5ldyBTaW1wbGVGb250RGF0YShGb250UGxhdGZvcm1E YXRhKGhmb250LCBzbWFsbENhcHNIZWlnaHQsIG1fcGxhdGZvcm1EYXRhLnN5bnRoZXRpY0JvbGQo KSwgbV9wbGF0Zm9ybURhdGEuc3ludGhldGljT2JsaXF1ZSgpLCBtX3BsYXRmb3JtRGF0YS51c2VH REkoKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlzQ3VzdG9tRm9udCgpLCBmYWxzZSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJu IG1fc21hbGxDYXBzRm9udERhdGE7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4 L1NpbXBsZUZvbnREYXRhV3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd3gvU2ltcGxlRm9udERhdGFXeC5jcHAJKHJldmlzaW9uIDcxOTcyKQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzksOSArNzksNiBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUNoYXJXaWR0 aEluCiAKIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCiB7Ci0gICAgZGVs ZXRlIG1fc21hbGxDYXBzRm9udERhdGE7Ci0gICAgbV9zbWFsbENhcHNGb250RGF0YSA9IDA7Ci0g ICAgCiAjaWYgT1MoV0lORE9XUykKICAgICBpZiAobV9zY3JpcHRGb250UHJvcGVydGllcykgewog ICAgICAgICBkZWxldGUgbV9zY3JpcHRGb250UHJvcGVydGllczsKQEAgLTk5LDcgKzk2LDcgQEAg U2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcAogICAgICAgICBGb250RGVz Y3JpcHRpb24gZGVzYyA9IEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwogICAgICAg ICBkZXNjLnNldFNwZWNpZmllZFNpemUoMC43MGYgKiBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRT aXplKCkpOwogICAgICAgICBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0YShkZXNjLCBkZXNj LmZhbWlseSgpLmZhbWlseSgpKTsKLSAgICAgICAgbV9zbWFsbENhcHNGb250RGF0YSA9IG5ldyBT aW1wbGVGb250RGF0YShwbGF0Zm9ybURhdGEpOworICAgICAgICBtX3NtYWxsQ2Fwc0ZvbnREYXRh ID0gbmV3IFNpbXBsZUZvbnREYXRhKHBsYXRmb3JtRGF0YSwgaXNDdXN0b21Gb250KCksIGZhbHNl KTsKICAgICB9CiAgICAgcmV0dXJuIG1fc21hbGxDYXBzRm9udERhdGE7CiB9Cg==