123686 2013-11-02 14:07:48 -0700 Cleanup OpenTypeUtilities 2013-11-02 20:22:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue oldest_to_newest 946294 0 paroga 2013-11-02 14:07:48 -0700 Cleanup OpenTypeUtilities 946299 1 215831 paroga 2013-11-02 14:12:36 -0700 Created attachment 215831 Patch 946367 2 215831 darin 2013-11-02 19:58:05 -0700 Comment on attachment 215831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215831&action=review Looks OK. > Source/WebCore/ChangeLog:3 > + Cleanup OpenTypeUtilities Cleanup is a noun. The verb is “clean up”. > Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp:72 > std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(const SharedBuffer* buffer) If you can assert that the buffer pointer is non-null, that’s a clue that the argument should be a reference instead of a pointer. Would be nice to change that at some point. 946377 3 215831 commit-queue 2013-11-02 20:22:56 -0700 Comment on attachment 215831 Patch Clearing flags on attachment: 215831 Committed r158519: <http://trac.webkit.org/changeset/158519> 946378 4 commit-queue 2013-11-02 20:22:57 -0700 All reviewed patches have been landed. Closing bug. 215831 2013-11-02 14:12:36 -0700 2013-11-02 20:22:56 -0700 Patch bug-123686-20131102221235.patch text/plain 10249 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZlMGUyYzJkYmFmOTRh MDNlZDMyMmY2ZDliNjRjNDExNjZkZWM0Ny4uMTc5YTA0YzUwNzhkOTViZmYzMTA3MTMzZjkxMGM2 MTdjMjVjMmRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTExLTAyICBQYXRy aWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFudXAgT3Bl blR5cGVVdGlsaXRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyMzY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1lcmdlIHRoZSBXaW5DRSBzcGVjaWZpYyBjb2RlIGludG8gdGhlIGdlbmVyYWwgV2lu ZG93cyBjb2RlIHRvCisgICAgICAgIG1ha2UgdGhlIGNvbXBpbGF0aW9uIG9mIFdpbkNFIHBvcnQg b24gV2luTlQgZWFzaWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUv T3BlblR5cGVVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVuYW1lRm9udCk6Cisg ICAgICAgIChXZWJDb3JlOjpyZW5hbWVBbmRBY3RpdmF0ZUZvbnQpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0aWVzLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Y3JlYXRlRm9udEN1c3RvbVBsYXRmb3JtRGF0YSk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFDYWlyby5jcHA6CisgICAgICAg IChXZWJDb3JlOjpjcmVhdGVGb250Q3VzdG9tUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmNyZWF0ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEpOgorCiAyMDEzLTExLTAyICBB bGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBy ZW1haW5pbmcgU0hBIHZhcmlhdGlvbnMgZm9yIFdlYkNyeXB0bwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGls aXRpZXMuY3BwCmluZGV4IDZhZmUzZDkxNDMzZTUxNDQ2YjJkNDNkMjdhODVkNDNhNjQ3N2E0OWEu LmM2NzExMGQ2MWMyMjkwODg4ZmEzMDA3ZmFjNjZkZGQyZTY3NDA3OTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0aWVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVu VHlwZVV0aWxpdGllcy5jcHAKQEAgLTM0MCwxMyArMzQwLDIwIEBAIGJvb2wgZ2V0RU9USGVhZGVy KFNoYXJlZEJ1ZmZlciogZm9udERhdGEsIEVPVEhlYWRlciYgZW90SGVhZGVyLCBzaXplX3QmIG92 ZXJsYXlECiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLS8vIGNvZGUgc2hhcmVkIGJ5IHJlbmFtZUZv bnQgYW5kIHJlbmFtZUFuZEFjdGl2YXRlRm9udAogLy8gYWRkcyBmb250TmFtZSB0byB0aGUgZm9u dCB0YWJsZSBpbiBmb250RGF0YSwgYW5kIHdyaXRlcyB0aGUgbmV3IGZvbnQgdGFibGUgdG8gcmV3 cml0dGVuRm9udFRhYmxlCiAvLyByZXR1cm5zIHRoZSBzaXplIG9mIHRoZSBuYW1lIHRhYmxlICh3 aGljaCBpcyB1c2VkIGJ5IHJlbmFtZUFuZEFjdGl2YXRlRm9udCksIG9yIDAgb24gZWFybHkgYWJv cnQKLXN0YXRpYyBzaXplX3QgcmVuYW1lRm9udEludGVybmFsKFNoYXJlZEJ1ZmZlciogZm9udERh dGEsIGNvbnN0IFN0cmluZyYgZm9udE5hbWUsIFZlY3RvcjxjaGFyPiAmcmV3cml0dGVuRm9udERh dGEpCitib29sIHJlbmFtZUZvbnQoY29uc3QgU2hhcmVkQnVmZmVyJiBmb250RGF0YSwgY29uc3Qg U3RyaW5nJiBmb250TmFtZSwgVmVjdG9yPGNoYXI+JiByZXdyaXR0ZW5Gb250RGF0YSkKIHsKLSAg ICBzaXplX3Qgb3JpZ2luYWxEYXRhU2l6ZSA9IGZvbnREYXRhLT5zaXplKCk7Ci0gICAgY29uc3Qg c2ZudEhlYWRlciogc2ZudCA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgc2ZudEhlYWRlcio+KGZv bnREYXRhLT5kYXRhKCkpOworICAgIHNpemVfdCBvcmlnaW5hbERhdGFTaXplID0gZm9udERhdGEu c2l6ZSgpOworICAgIGNvbnN0IHNmbnRIZWFkZXIqIHNmbnQgPSByZWludGVycHJldF9jYXN0PGNv bnN0IHNmbnRIZWFkZXIqPihmb250RGF0YS5kYXRhKCkpOworCisgICAgLy8gQWJvcnQgaWYgdGhl IGRhdGEgaXMgdG9vIHNtYWxsIHRvIGJlIGEgZm9udCBoZWFkZXIgd2l0aCBhICJ0YWJsZXMiIGVu dHJ5LgorICAgIGlmIChvcmlnaW5hbERhdGFTaXplIDwgb2Zmc2V0b2Yoc2ZudEhlYWRlciwgdGFi bGVzKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gQWJvcnQgaWYgdGhlIGRhdGEg aXMgdG9vIHNtYWxsIHRvIGhvbGQgYWxsIHRoZSB0YWJsZXMgc3BlY2lmaWVkIGluIHRoZSBoZWFk ZXIuCisgICAgaWYgKG9yaWdpbmFsRGF0YVNpemUgPCBvZmZzZXRvZihzZm50SGVhZGVyLCB0YWJs ZXMpICsgc2ZudC0+bnVtVGFibGVzICogc2l6ZW9mKFRhYmxlRGlyZWN0b3J5RW50cnkpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICB1bnNpZ25lZCB0OwogICAgIGZvciAodCA9IDA7IHQg PCBzZm50LT5udW1UYWJsZXM7ICsrdCkgewpAQCAtMzU0LDE2ICszNjEsMTYgQEAgc3RhdGljIHNp emVfdCByZW5hbWVGb250SW50ZXJuYWwoU2hhcmVkQnVmZmVyKiBmb250RGF0YSwgY29uc3QgU3Ry aW5nJiBmb250TmFtZSwKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBpZiAodCA9PSBz Zm50LT5udW1UYWJsZXMpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBjb25zdCBpbnQgbmFtZVJlY29yZENvdW50ID0gNTsKIAogICAgIC8vIFJvdW5kZWQg dXAgdG8gYSBtdWx0aXBsZSBvZiA0IHRvIHNpbXBsaWZ5IHRoZSBjaGVja3N1bSBjYWxjdWxhdGlv bi4KICAgICBzaXplX3QgbmFtZVRhYmxlU2l6ZSA9ICgob2Zmc2V0b2YobmFtZVRhYmxlLCBuYW1l UmVjb3JkcykgKyBuYW1lUmVjb3JkQ291bnQgKiBzaXplb2YobmFtZVJlY29yZCkgKyBmb250TmFt ZS5sZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpICYgfjMpICsgNDsKIAotICAgIHJld3JpdHRlbkZv bnREYXRhLnJlc2l6ZShmb250RGF0YS0+c2l6ZSgpICsgbmFtZVRhYmxlU2l6ZSk7CisgICAgcmV3 cml0dGVuRm9udERhdGEucmVzaXplKGZvbnREYXRhLnNpemUoKSArIG5hbWVUYWJsZVNpemUpOwog ICAgIGNoYXIqIGRhdGEgPSByZXdyaXR0ZW5Gb250RGF0YS5kYXRhKCk7Ci0gICAgbWVtY3B5KGRh dGEsIGZvbnREYXRhLT5kYXRhKCksIG9yaWdpbmFsRGF0YVNpemUpOworICAgIG1lbWNweShkYXRh LCBmb250RGF0YS5kYXRhKCksIG9yaWdpbmFsRGF0YVNpemUpOwogCiAgICAgLy8gTWFrZSB0aGUg dGFibGUgZGlyZWN0b3J5IGVudHJ5IHBvaW50IHRvIHRoZSBuZXcgJ25hbWUnIHRhYmxlLgogICAg IHNmbnRIZWFkZXIqIHJld3JpdHRlblNmbnQgPSByZWludGVycHJldF9jYXN0PHNmbnRIZWFkZXIq PihkYXRhKTsKQEAgLTM5OCw0MiArNDA1LDE5IEBAIHN0YXRpYyBzaXplX3QgcmVuYW1lRm9udElu dGVybmFsKFNoYXJlZEJ1ZmZlciogZm9udERhdGEsIGNvbnN0IFN0cmluZyYgZm9udE5hbWUsCiAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSAqIHNpemVvZihCaWdFbmRpYW5VTG9uZykgPCBuYW1l VGFibGVTaXplOyArK2kpCiAgICAgICAgIHJld3JpdHRlblNmbnQtPnRhYmxlc1t0XS5jaGVja1N1 bSA9IHJld3JpdHRlblNmbnQtPnRhYmxlc1t0XS5jaGVja1N1bSArIHJlaW50ZXJwcmV0X2Nhc3Q8 QmlnRW5kaWFuVUxvbmcqPihuYW1lKVtpXTsKIAotICAgIHJldHVybiBuYW1lVGFibGVTaXplOwot fQotCi0jaWYgT1MoV0lOQ0UpCi0vLyBBZGRGb250TWVtUmVzb3VyY2VFeCBkb2VzIG5vdCBleGlz dCBvbiBXaW5DRSwgc28gd2UgbXVzdCBoYW5kbGUgdGhlIGZvbnQgZGF0YSBtYW51YWxseQotLy8g VGhpcyBmdW5jdGlvbiBqdXN0IHJlbmFtZXMgdGhlIGZvbnQgYW5kIG92ZXJ3cml0ZXMgdGhlIG9s ZCBmb250IGRhdGEgd2l0aCB0aGUgbmV3Ci1ib29sIHJlbmFtZUZvbnQoU2hhcmVkQnVmZmVyKiBm b250RGF0YSwgY29uc3QgU3RyaW5nJiBmb250TmFtZSkKLXsKLSAgICAvLyBhYm9ydCBpZiB0aGUg ZGF0YSBpcyB0b28gc21hbGwgdG8gYmUgYSBmb250IGhlYWRlciB3aXRoIGEgInRhYmxlcyIgZW50 cnkKLSAgICBpZiAoZm9udERhdGEtPnNpemUoKSA8IG9mZnNldG9mKHNmbnRIZWFkZXIsIHRhYmxl cykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIGFib3J0IGlmIHRoZSBkYXRhIGlz IHRvbyBzbWFsbCB0byBob2xkIGFsbCB0aGUgdGFibGVzIHNwZWNpZmllZCBpbiB0aGUgaGVhZGVy Ci0gICAgY29uc3Qgc2ZudEhlYWRlciogaGVhZGVyID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBz Zm50SGVhZGVyKj4oZm9udERhdGEtPmRhdGEoKSk7Ci0gICAgaWYgKGZvbnREYXRhLT5zaXplKCkg PCBvZmZzZXRvZihzZm50SGVhZGVyLCB0YWJsZXMpICsgaGVhZGVyLT5udW1UYWJsZXMgKiBzaXpl b2YoVGFibGVEaXJlY3RvcnlFbnRyeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFZl Y3RvcjxjaGFyPiByZXdyaXR0ZW5Gb250RGF0YTsKLSAgICBpZiAoIXJlbmFtZUZvbnRJbnRlcm5h bChmb250RGF0YSwgZm9udE5hbWUsIHJld3JpdHRlbkZvbnREYXRhKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgZm9udERhdGEtPmNsZWFyKCk7Ci0gICAgZm9udERhdGEtPmFwcGVuZChy ZXdyaXR0ZW5Gb250RGF0YS5kYXRhKCksIHJld3JpdHRlbkZvbnREYXRhLnNpemUoKSk7CiAgICAg cmV0dXJuIHRydWU7CiB9Ci0jZWxzZQorCisjaWYgIU9TKFdJTkNFKQogLy8gUmVuYW1lIHRoZSBm b250IGFuZCBpbnN0YWxsIHRoZSBuZXcgZm9udCBkYXRhIGludG8gdGhlIHN5c3RlbQotSEFORExF IHJlbmFtZUFuZEFjdGl2YXRlRm9udChTaGFyZWRCdWZmZXIqIGZvbnREYXRhLCBjb25zdCBTdHJp bmcmIGZvbnROYW1lKQorSEFORExFIHJlbmFtZUFuZEFjdGl2YXRlRm9udChjb25zdCBTaGFyZWRC dWZmZXImIGZvbnREYXRhLCBjb25zdCBTdHJpbmcmIGZvbnROYW1lKQogewogICAgIFZlY3Rvcjxj aGFyPiByZXdyaXR0ZW5Gb250RGF0YTsKLSAgICBzaXplX3QgbmFtZVRhYmxlU2l6ZSA9IHJlbmFt ZUZvbnRJbnRlcm5hbChmb250RGF0YSwgZm9udE5hbWUsIHJld3JpdHRlbkZvbnREYXRhKTsKLSAg ICBpZiAoIW5hbWVUYWJsZVNpemUpCisgICAgaWYgKCFyZW5hbWVGb250KGZvbnREYXRhLCBmb250 TmFtZSwgcmV3cml0dGVuRm9udERhdGEpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIERXT1JE IG51bUZvbnRzID0gMDsKLSAgICBIQU5ETEUgZm9udEhhbmRsZSA9IEFkZEZvbnRNZW1SZXNvdXJj ZUV4KHJld3JpdHRlbkZvbnREYXRhLmRhdGEoKSwgZm9udERhdGEtPnNpemUoKSArIG5hbWVUYWJs ZVNpemUsIDAsICZudW1Gb250cyk7CisgICAgSEFORExFIGZvbnRIYW5kbGUgPSBBZGRGb250TWVt UmVzb3VyY2VFeChyZXdyaXR0ZW5Gb250RGF0YS5kYXRhKCksIHJld3JpdHRlbkZvbnREYXRhLnNp emUoKSwgMCwgJm51bUZvbnRzKTsKIAogICAgIGlmIChmb250SGFuZGxlICYmIG51bUZvbnRzIDwg MSkgewogICAgICAgICBSZW1vdmVGb250TWVtUmVzb3VyY2VFeChmb250SGFuZGxlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBl VXRpbGl0aWVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9P cGVuVHlwZVV0aWxpdGllcy5oCmluZGV4IDdiODE1NDQ4MmQ0MjQyZmM5YzVhOWU3MTM4YzIxZGFh YmJkNzU4ZDYuLjBkNDVhM2Y3MjZlMzJlYmM0NDRlZGQxMjgxYzQ0Nzg2ZmRhODllZjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBl VXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5 cGUvT3BlblR5cGVVdGlsaXRpZXMuaApAQCAtNTcsNyArNTcsOCBAQCBwcml2YXRlOgogfTsKIAog Ym9vbCBnZXRFT1RIZWFkZXIoU2hhcmVkQnVmZmVyKiBmb250RGF0YSwgRU9USGVhZGVyJiBlb3RI ZWFkZXIsIHNpemVfdCYgb3ZlcmxheURzdCwgc2l6ZV90JiBvdmVybGF5U3JjLCBzaXplX3QmIG92 ZXJsYXlMZW5ndGgpOwotSEFORExFIHJlbmFtZUFuZEFjdGl2YXRlRm9udChTaGFyZWRCdWZmZXIq LCBjb25zdCBTdHJpbmcmKTsKK2Jvb2wgcmVuYW1lRm9udChjb25zdCBTaGFyZWRCdWZmZXImLCBj b25zdCBTdHJpbmcmLCBWZWN0b3I8Y2hhcj4mKTsKK0hBTkRMRSByZW5hbWVBbmRBY3RpdmF0ZUZv bnQoY29uc3QgU2hhcmVkQnVmZmVyJiwgY29uc3QgU3RyaW5nJik7CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCmluZGV4IDQ5NzU2NDhlMzVk NjMwNjdjZTE1NWIxZTc1ODkwYzg2Y2IwNWQyZGMuLjQ2ZjAwZmJhYzFjMDk1MWE1YjBlOGQ3MWU2 YzdlNGM0YWVkZTU5NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKQEAgLTk3LDcg Kzk3LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IGNyZWF0ZUZv bnRDdXN0b21QbGF0Zm9ybURhdGEoU2hhcmVkQnVmZmUKIAogICAgIFN0cmluZyBmb250TmFtZSA9 IGNyZWF0ZVVuaXF1ZUZvbnROYW1lKCk7CiAgICAgSEFORExFIGZvbnRSZWZlcmVuY2U7Ci0gICAg Zm9udFJlZmVyZW5jZSA9IHJlbmFtZUFuZEFjdGl2YXRlRm9udChidWZmZXIsIGZvbnROYW1lKTsK KyAgICBmb250UmVmZXJlbmNlID0gcmVuYW1lQW5kQWN0aXZhdGVGb250KCpidWZmZXIsIGZvbnRO YW1lKTsKICAgICBpZiAoIWZvbnRSZWZlcmVuY2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+KGZvbnRS ZWZlcmVuY2UsIGZvbnROYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3dpbi9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhQ2Fpcm8uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFDYWlyby5j cHAKaW5kZXggN2ZjNTVmYTQwNjZjMWNlNDZlOGY3NzU3MWY5Zjk0Y2Y4MGY4ZjMxZi4uZmY4ZDQz OTQwYTcwOTY3ODFlYjdmYWVkYzdkYmUwZThlY2Y3ODJiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGFDYWlyby5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21Q bGF0Zm9ybURhdGFDYWlyby5jcHAKQEAgLTg1LDcgKzg1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEZv bnRDdXN0b21QbGF0Zm9ybURhdGE+IGNyZWF0ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEoU2hhcmVk QnVmZmUKICAgICBBU1NFUlRfQVJHKGJ1ZmZlciwgYnVmZmVyKTsKIAogICAgIFN0cmluZyBmb250 TmFtZSA9IGNyZWF0ZVVuaXF1ZUZvbnROYW1lKCk7Ci0gICAgSEFORExFIGZvbnRSZWZlcmVuY2Ug PSByZW5hbWVBbmRBY3RpdmF0ZUZvbnQoYnVmZmVyLCBmb250TmFtZSk7CisgICAgSEFORExFIGZv bnRSZWZlcmVuY2UgPSByZW5hbWVBbmRBY3RpdmF0ZUZvbnQoKmJ1ZmZlciwgZm9udE5hbWUpOwog CiAgICAgaWYgKCFmb250UmVmZXJlbmNlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRDdXN0b21Q bGF0Zm9ybURhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv Rm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKaW5kZXggOWM4OWIzYzkwMDBjZmU5YjRlNTEyM2I3 ZTY5ODc5OTc0YjFkZmQ1YS4uZmIyMWIyMTdhZWUxMzEwNWNkMjA2NTJiNzgwZDMwNWUzNjc4N2I3 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9u dEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKQEAgLTI0LDYgKzI0LDcgQEAK IAogI2luY2x1ZGUgIkNhY2hlZEZvbnQuaCIKICNpbmNsdWRlICJGb250UGxhdGZvcm1EYXRhLmgi CisjaW5jbHVkZSAiT3BlblR5cGVVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIu aCIKICNpbmNsdWRlIDx3dGYvUmFuZG9tTnVtYmVyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFz ZTY0Lmg+CkBAIC0zMiw4ICszMyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIEN1 c3RvbUZvbnRDYWNoZSogZ19jdXN0b21Gb250Q2FjaGUgPSAwOwogCi1ib29sIHJlbmFtZUZvbnQo U2hhcmVkQnVmZmVyKiBmb250RGF0YSwgY29uc3QgU3RyaW5nJiBmb250TmFtZSk7Ci0KIHZvaWQg c2V0Q3VzdG9tRm9udENhY2hlKEN1c3RvbUZvbnRDYWNoZSogY2FjaGUpCiB7CiAgICAgZ19jdXN0 b21Gb250Q2FjaGUgPSBjYWNoZTsKQEAgLTcyLDEzICs3MSwxOSBAQCBzdGF0aWMgU3RyaW5nIGNy ZWF0ZVVuaXF1ZUZvbnROYW1lKCkKIAogc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9y bURhdGE+IGNyZWF0ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEoY29uc3QgU2hhcmVkQnVmZmVyKiBi dWZmZXIpCiB7Ci0gICAgaWYgKGdfY3VzdG9tRm9udENhY2hlKSB7Ci0gICAgICAgIFN0cmluZyBm b250TmFtZSA9IGNyZWF0ZVVuaXF1ZUZvbnROYW1lKCk7Ci0gICAgICAgIFJlZlB0cjxTaGFyZWRC dWZmZXI+IGxvY2FsQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoYnVmZmVyLT5kYXRhKCks IGJ1ZmZlci0+c2l6ZSgpKTsKLSAgICAgICAgaWYgKHJlbmFtZUZvbnQobG9jYWxCdWZmZXIuZ2V0 KCksIGZvbnROYW1lKSAmJiBnX2N1c3RvbUZvbnRDYWNoZS0+cmVnaXN0ZXJGb250KGZvbnROYW1l LCBsb2NhbEJ1ZmZlci5nZXQoKSkpCi0gICAgICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1 ZTxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPihmb250TmFtZSk7Ci0gICAgfQotICAgIHJldHVybiBu dWxscHRyOworICAgIEFTU0VSVF9BUkcoYnVmZmVyLCBidWZmZXIpOworCisgICAgU3RyaW5nIGZv bnROYW1lID0gY3JlYXRlVW5pcXVlRm9udE5hbWUoKTsKKworICAgIFZlY3RvcjxjaGFyPiByZXdy aXR0ZW5Gb250RGF0YTsKKyAgICBpZiAoIXJlbmFtZUZvbnQoKmJ1ZmZlciwgZm9udE5hbWUsIHJl d3JpdHRlbkZvbnREYXRhKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBsb2NhbEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6YWRvcHRWZWN0b3IocmV3 cml0dGVuRm9udERhdGEpOworICAgIGlmICghZ19jdXN0b21Gb250Q2FjaGUgfHwgIWdfY3VzdG9t Rm9udENhY2hlLT5yZWdpc3RlckZvbnQoZm9udE5hbWUsIGxvY2FsQnVmZmVyLmdldCgpKSkKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxGb250 Q3VzdG9tUGxhdGZvcm1EYXRhPihmb250TmFtZSk7CiB9CiAKIGJvb2wgRm9udEN1c3RvbVBsYXRm b3JtRGF0YTo6c3VwcG9ydHNGb3JtYXQoY29uc3QgU3RyaW5nJiBmb3JtYXQpCg==