228536 2021-07-27 23:25:44 -0700 [Win][Uniscribe] Remove the code rounding off glyph advances and offsets for non system fonts 2024-06-20 13:06:45 -0700 1 1 1 Unclassified WebKit Text WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 228363 1 fujii fujii mmaxfield webkit-bug-importer oldest_to_newest 1779961 0 fujii 2021-07-27 23:25:44 -0700 [Win][Uniscribe] Remove the code rounding off glyph advances and offsets for system fonts ComplexTextController::collectComplexTextRunsForCharacters has the following code. > // Match AppKit's rules for the integer vs. non-integer rendering modes. > if (!font->platformData().isSystemFont()) { > advance = roundf(advance); > offsetX = roundf(offsetX); > offsetY = roundf(offsetY); > } This was added by r18359. See also: Bug#228363 Comment#2 1779962 1 fujii 2021-07-27 23:31:31 -0700 (In reply to Fujii Hironori from comment #0) > This was added by r18359. No. This code was added by r23462. 1779964 2 fujii 2021-07-27 23:36:41 -0700 (In reply to Fujii Hironori from comment #1) > No. This code was added by r23462. More precisely r23199 and r23154. 1779966 3 434405 fujii 2021-07-27 23:52:45 -0700 Created attachment 434405 WIP patch 1780219 4 fujii 2021-07-28 14:55:05 -0700 In WinCairo, this patch makes the following ref tests fail. fast/text/emoji-gender-3.html [ ImageOnlyFailure ] fast/text/emoji-gender-4.html [ ImageOnlyFailure ] fast/text/emoji-gender-5.html [ ImageOnlyFailure ] fast/text/emoji-gender-6.html [ ImageOnlyFailure ] fast/text/emoji-gender-8.html [ ImageOnlyFailure ] This is caused by the difference of how to get glyph advance between simple text code path and complex text code path. The simple text code path is using cairo_scaled_font_glyph_extents, the complex text code path is using Uniscribe to get the glyph advance. I think the simple text code path also should use Uniscribe. However, the argument of Font::platformWidthForGlyph is Glyph not UChar. Uniscribe (ScriptShape) takes a string, not glyphs. Another approach is implementing Font::applyTransforms with Uniscribe (Bug 228363). However, Font::applyTransforms is not applied to a single character. This approach needs some modification to WidthIterator. 1780274 5 fujii 2021-07-28 17:16:28 -0700 I confirmed WinCairo doesn't have the comment#4 problem if it always uses the complex text code path. In the complex text code path, it consistently uses Uniscribe. 1780316 6 434495 fujii 2021-07-28 22:48:52 -0700 Created attachment 434495 WIP patch The WinCairo problem is fixed by reimplementing Font::platformWidthForGlyph with GetCharABCWidthsI. 1781833 7 webkit-bug-importer 2021-08-03 23:26:17 -0700 <rdar://problem/81500144> 2042160 8 fujii 2024-06-19 18:27:58 -0700 *** Bug 275674 has been marked as a duplicate of this bug. *** 2042168 9 fujii 2024-06-19 22:12:54 -0700 Pull request: https://github.com/WebKit/WebKit/pull/29992 2042297 10 ews-feeder 2024-06-20 13:06:43 -0700 Committed 280214@main (7ec79836337c): <https://commits.webkit.org/280214@main> Reviewed commits have been landed. Closing PR #29992 and removing active labels. 434405 2021-07-27 23:52:45 -0700 2021-07-28 22:48:52 -0700 WIP patch a.diff text/plain 3313 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9y bURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURh dGEuaAppbmRleCAwZDExN2Q2MDZhNWMuLmIxMzhlYWJkMmZjMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtMTU3LDcg KzE1Nyw3IEBAIHB1YmxpYzoKICNlbmRpZgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShXSU4pIHx8 IFBMQVRGT1JNKENPQ09BKQorI2lmIFVTRShDRykKICAgICBib29sIGlzU3lzdGVtRm9udCgpIGNv bnN0IHsgcmV0dXJuIG1faXNTeXN0ZW1Gb250OyB9CiAjZW5kaWYKIApAQCAtMjkzLDcgKzI5Myw5 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3N5bnRoZXRpY09ibGlxdWUgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9pc0NvbG9yQml0bWFwRm9udCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzSGFzaFRh YmxlRGVsZXRlZFZhbHVlIHsgZmFsc2UgfTsKKyNpZiBVU0UoQ0cpCiAgICAgYm9vbCBtX2lzU3lz dGVtRm9udCB7IGZhbHNlIH07CisjZW5kaWYKICAgICBib29sIG1faGFzVmFyaWF0aW9ucyB7IGZh bHNlIH07CiAgICAgLy8gVGhlIHZhbHVlcyBhYm92ZSBhcmUgY29tbW9uIHRvIGFsbCBwb3J0cwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vQ29tcGxl eFRleHRDb250cm9sbGVyVW5pc2NyaWJlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9Db21wbGV4VGV4dENvbnRyb2xsZXJVbmlzY3JpYmUuY3BwCmluZGV4IDc3NGE1 MmEyODY5My4uZTFhNDQ1YWI1MjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vQ29tcGxleFRleHRDb250cm9sbGVyVW5pc2NyaWJlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vQ29tcGxleFRleHRDb250cm9sbGVy VW5pc2NyaWJlLmNwcApAQCAtMjU3LDEzICsyNTcsNiBAQCB2b2lkIENvbXBsZXhUZXh0Q29udHJv bGxlcjo6Y29sbGVjdENvbXBsZXhUZXh0UnVuc0ZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqIGNw LAogICAgICAgICAgICAgZmxvYXQgb2Zmc2V0WCA9IG9mZnNldHNba10uZHUgLyBjTG9naWNhbFNj YWxlOwogICAgICAgICAgICAgZmxvYXQgb2Zmc2V0WSA9IG9mZnNldHNba10uZHYgLyBjTG9naWNh bFNjYWxlOwogCi0gICAgICAgICAgICAvLyBNYXRjaCBBcHBLaXQncyBydWxlcyBmb3IgdGhlIGlu dGVnZXIgdnMuIG5vbi1pbnRlZ2VyIHJlbmRlcmluZyBtb2Rlcy4KLSAgICAgICAgICAgIGlmICgh Zm9udC0+cGxhdGZvcm1EYXRhKCkuaXNTeXN0ZW1Gb250KCkpIHsKLSAgICAgICAgICAgICAgICBh ZHZhbmNlID0gcm91bmRmKGFkdmFuY2UpOwotICAgICAgICAgICAgICAgIG9mZnNldFggPSByb3Vu ZGYob2Zmc2V0WCk7Ci0gICAgICAgICAgICAgICAgb2Zmc2V0WSA9IHJvdW5kZihvZmZzZXRZKTsK LSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgYmFzZUFkdmFuY2VzLnVuY2hlY2tlZEFwcGVu ZCh7IGFkdmFuY2UsIDAgfSk7CiAgICAgICAgICAgICBvcmlnaW5zLnVuY2hlY2tlZEFwcGVuZCh7 IG9mZnNldFgsIG9mZnNldFkgfSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhQ2Fpcm9XaW4uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWly b1dpbi5jcHAKaW5kZXggNTkxOTk5NDYxMjZjLi40ZDgyMmU2MDZiZjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhQ2Fpcm9X aW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxh dGZvcm1EYXRhQ2Fpcm9XaW4uY3BwCkBAIC01NSw5ICs1NSw2IEBAIHZvaWQgRm9udFBsYXRmb3Jt RGF0YTo6cGxhdGZvcm1EYXRhSW5pdChIRk9OVCBmb250LCBmbG9hdCBzaXplLCBIREMgaGRjLCBX Q0hBUioKIAogICAgIG1fc2NhbGVkRm9udCA9IGFkb3B0UmVmKGNhaXJvX3NjYWxlZF9mb250X2Ny ZWF0ZShmb250RmFjZSwgJnNpemVNYXRyaXgsICZjdG0sIGZvbnRPcHRpb25zKSk7CiAgICAgY2Fp cm9fZm9udF9mYWNlX2Rlc3Ryb3koZm9udEZhY2UpOwotCi0gICAgaWYgKCFtX3VzZUdESSAmJiBt X3NpemUpCi0gICAgICAgIG1faXNTeXN0ZW1Gb250ID0gIXdjc2NtcChmYWNlTmFtZSwgTCJMdWNp ZGEgR3JhbmRlIik7CiB9CiAKIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoR0RJ T2JqZWN0PEhGT05UPiBmb250LCBjYWlyb19mb250X2ZhY2VfdCogZm9udEZhY2UsIGZsb2F0IHNp emUsIGJvb2wgYm9sZCwgYm9vbCBvYmxpcXVlLCBDcmVhdGlvbkRhdGEqIGNyZWF0aW9uRGF0YSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxh dGZvcm1EYXRhRGlyZWN0MkQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0ZvbnRQbGF0Zm9ybURhdGFEaXJlY3QyRC5jcHAKaW5kZXggZGM1MTc0OWMxMTM2Li5jYjAy YWQyMWQwNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9Gb250UGxhdGZvcm1EYXRhRGlyZWN0MkQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhRGlyZWN0MkQuY3BwCkBAIC00OCw5ICs0 OCw2IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6cGxhdGZvcm1EYXRhSW5pdChIRk9OVCBmb250 LCBmbG9hdCBzaXplLCBIREMgaGRjLCBXQ0hBUioKIAogICAgIGhyID0gbV9kd0ZvbnQtPkNyZWF0 ZUZvbnRGYWNlKCZtX2R3Rm9udEZhY2UpOwogICAgIFJFTEVBU0VfQVNTRVJUKFNVQ0NFRURFRCho cikpOwotCi0gICAgaWYgKCFtX3VzZUdESSkKLSAgICAgICAgbV9pc1N5c3RlbUZvbnQgPSAhd2Nz Y21wKGZhY2VOYW1lLCBMIkx1Y2lkYSBHcmFuZGUiKTsKIH0KIAogRm9udFBsYXRmb3JtRGF0YTo6 Rm9udFBsYXRmb3JtRGF0YShHRElPYmplY3Q8SEZPTlQ+JiYgaGZvbnQsIENPTVB0cjxJRFdyaXRl Rm9udD4mJiBmb250LCBmbG9hdCBzaXplLCBib29sIGJvbGQsIGJvb2wgb2JsaXF1ZSwgYm9vbCB1 c2VHREkpCg== 434495 2021-07-28 22:48:52 -0700 2021-07-28 22:48:52 -0700 WIP patch a.diff text/plain 4898 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9y bURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURh dGEuaAppbmRleCAwZDExN2Q2MDZhNWMuLmIxMzhlYWJkMmZjMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtMTU3LDcg KzE1Nyw3IEBAIHB1YmxpYzoKICNlbmRpZgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShXSU4pIHx8 IFBMQVRGT1JNKENPQ09BKQorI2lmIFVTRShDRykKICAgICBib29sIGlzU3lzdGVtRm9udCgpIGNv bnN0IHsgcmV0dXJuIG1faXNTeXN0ZW1Gb250OyB9CiAjZW5kaWYKIApAQCAtMjkzLDcgKzI5Myw5 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3N5bnRoZXRpY09ibGlxdWUgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9pc0NvbG9yQml0bWFwRm9udCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzSGFzaFRh YmxlRGVsZXRlZFZhbHVlIHsgZmFsc2UgfTsKKyNpZiBVU0UoQ0cpCiAgICAgYm9vbCBtX2lzU3lz dGVtRm9udCB7IGZhbHNlIH07CisjZW5kaWYKICAgICBib29sIG1faGFzVmFyaWF0aW9ucyB7IGZh bHNlIH07CiAgICAgLy8gVGhlIHZhbHVlcyBhYm92ZSBhcmUgY29tbW9uIHRvIGFsbCBwb3J0cwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250 Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENh aXJvLmNwcAppbmRleCBhN2FmMGNlYjUyNDkuLjcyZjdkMjAxZDJmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCkBAIC0x MDcsNiArMTA3LDcgQEAgRmxvYXRSZWN0IEZvbnQ6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGgoR2x5 cGggZ2x5cGgpIGNvbnN0CiAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOwogfQogCisjaWYgIU9TKFdJ TkRPV1MpCiBmbG9hdCBGb250OjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNv bnN0CiB7CiAgICAgaWYgKCFtX3BsYXRmb3JtRGF0YS5zaXplKCkpCkBAIC0xMjEsNiArMTIyLDcg QEAgZmxvYXQgRm9udDo6cGxhdGZvcm1XaWR0aEZvckdseXBoKEdseXBoIGdseXBoKSBjb25zdAog ICAgIGZsb2F0IHdpZHRoID0gcGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBGb250T3Jp ZW50YXRpb246Okhvcml6b250YWwgPyBleHRlbnRzLnhfYWR2YW5jZSA6IC1leHRlbnRzLnlfYWR2 YW5jZTsKICAgICByZXR1cm4gd2lkdGggPyB3aWR0aCA6IG1fc3BhY2VXaWR0aDsKIH0KKyNlbmRp ZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Db21wbGV4VGV4dENvbnRyb2xsZXJVbmlzY3JpYmUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0NvbXBsZXhUZXh0Q29udHJv bGxlclVuaXNjcmliZS5jcHAKaW5kZXggNzc0YTUyYTI4NjkzLi5lMWE0NDVhYjUyODIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Db21wbGV4VGV4dENv bnRyb2xsZXJVbmlzY3JpYmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9Db21wbGV4VGV4dENvbnRyb2xsZXJVbmlzY3JpYmUuY3BwCkBAIC0yNTcsMTMgKzI1 Nyw2IEBAIHZvaWQgQ29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRleHRSdW5z Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY3AsCiAgICAgICAgICAgICBmbG9hdCBvZmZzZXRY ID0gb2Zmc2V0c1trXS5kdSAvIGNMb2dpY2FsU2NhbGU7CiAgICAgICAgICAgICBmbG9hdCBvZmZz ZXRZID0gb2Zmc2V0c1trXS5kdiAvIGNMb2dpY2FsU2NhbGU7CiAKLSAgICAgICAgICAgIC8vIE1h dGNoIEFwcEtpdCdzIHJ1bGVzIGZvciB0aGUgaW50ZWdlciB2cy4gbm9uLWludGVnZXIgcmVuZGVy aW5nIG1vZGVzLgotICAgICAgICAgICAgaWYgKCFmb250LT5wbGF0Zm9ybURhdGEoKS5pc1N5c3Rl bUZvbnQoKSkgewotICAgICAgICAgICAgICAgIGFkdmFuY2UgPSByb3VuZGYoYWR2YW5jZSk7Ci0g ICAgICAgICAgICAgICAgb2Zmc2V0WCA9IHJvdW5kZihvZmZzZXRYKTsKLSAgICAgICAgICAgICAg ICBvZmZzZXRZID0gcm91bmRmKG9mZnNldFkpOwotICAgICAgICAgICAgfQotCiAgICAgICAgICAg ICBiYXNlQWR2YW5jZXMudW5jaGVja2VkQXBwZW5kKHsgYWR2YW5jZSwgMCB9KTsKICAgICAgICAg ICAgIG9yaWdpbnMudW5jaGVja2VkQXBwZW5kKHsgb2Zmc2V0WCwgb2Zmc2V0WSB9KTsKICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0Zv bnRQbGF0Zm9ybURhdGFDYWlyb1dpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vRm9udFBsYXRmb3JtRGF0YUNhaXJvV2luLmNwcAppbmRleCA1OTE5OTk0NjEyNmMu LjRkODIyZTYwNmJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWlyb1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWlyb1dpbi5jcHAKQEAgLTU1 LDkgKzU1LDYgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybURhdGFJbml0KEhGT05U IGZvbnQsIGZsb2F0IHNpemUsIEhEQyBoZGMsIFdDSEFSKgogCiAgICAgbV9zY2FsZWRGb250ID0g YWRvcHRSZWYoY2Fpcm9fc2NhbGVkX2ZvbnRfY3JlYXRlKGZvbnRGYWNlLCAmc2l6ZU1hdHJpeCwg JmN0bSwgZm9udE9wdGlvbnMpKTsKICAgICBjYWlyb19mb250X2ZhY2VfZGVzdHJveShmb250RmFj ZSk7Ci0KLSAgICBpZiAoIW1fdXNlR0RJICYmIG1fc2l6ZSkKLSAgICAgICAgbV9pc1N5c3RlbUZv bnQgPSAhd2NzY21wKGZhY2VOYW1lLCBMIkx1Y2lkYSBHcmFuZGUiKTsKIH0KIAogRm9udFBsYXRm b3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShHRElPYmplY3Q8SEZPTlQ+IGZvbnQsIGNhaXJvX2Zv bnRfZmFjZV90KiBmb250RmFjZSwgZmxvYXQgc2l6ZSwgYm9vbCBib2xkLCBib29sIG9ibGlxdWUs IENyZWF0aW9uRGF0YSogY3JlYXRpb25EYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFEaXJlY3QyRC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udFBsYXRmb3JtRGF0YURpcmVjdDJE LmNwcAppbmRleCBkYzUxNzQ5YzExMzYuLmNiMDJhZDIxZDA0YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFEaXJlY3QyRC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9y bURhdGFEaXJlY3QyRC5jcHAKQEAgLTQ4LDkgKzQ4LDYgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRh OjpwbGF0Zm9ybURhdGFJbml0KEhGT05UIGZvbnQsIGZsb2F0IHNpemUsIEhEQyBoZGMsIFdDSEFS KgogCiAgICAgaHIgPSBtX2R3Rm9udC0+Q3JlYXRlRm9udEZhY2UoJm1fZHdGb250RmFjZSk7CiAg ICAgUkVMRUFTRV9BU1NFUlQoU1VDQ0VFREVEKGhyKSk7Ci0KLSAgICBpZiAoIW1fdXNlR0RJKQot ICAgICAgICBtX2lzU3lzdGVtRm9udCA9ICF3Y3NjbXAoZmFjZU5hbWUsIEwiTHVjaWRhIEdyYW5k ZSIpOwogfQogCiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKEdESU9iamVjdDxI Rk9OVD4mJiBoZm9udCwgQ09NUHRyPElEV3JpdGVGb250PiYmIGZvbnQsIGZsb2F0IHNpemUsIGJv b2wgYm9sZCwgYm9vbCBvYmxpcXVlLCBib29sIHVzZUdESSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNhaXJv V2luLmNwcAppbmRleCA2ZmQzZDNjNTk1MjYuLjM0MzUzOWNmMzg1NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250 RGF0YUNhaXJvV2luLmNwcApAQCAtMTIxLDQgKzEyMSwxNCBAQCBib29sIEZvbnQ6OnBsYXRmb3Jt U3VwcG9ydHNDb2RlUG9pbnQoVUNoYXIzMiBjaGFyYWN0ZXIsIHN0ZDo6b3B0aW9uYWw8VUNoYXIz Mj4gdgogICAgIHJldHVybiB2YXJpYXRpb24gPyBmYWxzZSA6IGdseXBoRm9yQ2hhcmFjdGVyKGNo YXJhY3Rlcik7CiB9CiAKK2Zsb2F0IEZvbnQ6OnBsYXRmb3JtV2lkdGhGb3JHbHlwaChHbHlwaCBn bHlwaCkgY29uc3QKK3sKKyAgICBIV25kREMgaGRjKDApOworICAgIEhHRElPQkogb2xkRm9udCA9 IFNlbGVjdE9iamVjdChoZGMsIHBsYXRmb3JtRGF0YSgpLmhmb250KCkpOworICAgIEFCQyBhYmM7 CisgICAgR2V0Q2hhckFCQ1dpZHRoc0koaGRjLCBnbHlwaCwgMSwgbnVsbHB0ciwgJmFiYyk7Cisg ICAgU2VsZWN0T2JqZWN0KGhkYywgb2xkRm9udCk7CisgICAgcmV0dXJuIChzdGF0aWNfY2FzdDxm bG9hdD4oYWJjLmFiY0EpICsgYWJjLmFiY0IgKyBhYmMuYWJjQykgLyAzMjsKK30KKwogfQo=