15177 2007-09-11 07:32:38 -0700 [gtk] FontPlatformData contains more fields than required 2007-09-11 08:11:06 -0700 1 1 1 Unclassified WebKit New Bugs 523.x (Safari 3) PC Linux RESOLVED FIXED P2 Normal --- 0 sven webkit-unassigned richard oldest_to_newest 673 0 sven 2007-09-11 07:32:38 -0700 FontPlatformData::setFont(cairo_t*) can be changed to use m_scaledFont directly. This makes the function easier readable and still works exactly as expected. m_fontFace, m_fontMatrix, and m_options are used in the main constructor in FontPlatformDataGdk.cpp only then. So they should be turned into local variables instead of extra fields. The attached patch-set reduces the memory footprint of each FontPlatformData by 3*sizeof(void*). The only issue that's left is that the former fields are not renamed according the the code conventions in my patches, do you want another patch for that? 672 1 16250 sven 2007-09-11 07:34:55 -0700 Created attachment 16250 0001 - Made setFont() easier 670 2 16251 sven 2007-09-11 07:35:28 -0700 Created attachment 16251 0002 - Removed m_fontFace 671 3 16252 sven 2007-09-11 07:36:09 -0700 Created attachment 16252 0003 - Removed m_fontMatrix 669 4 16253 sven 2007-09-11 07:36:49 -0700 Created attachment 16253 0004 - Removed m_options This is the last patch for now… 668 5 sven 2007-09-11 07:37:57 -0700 This is the diffstat output: FontDataGdk.cpp | 6 ------ FontPlatformData.h | 11 +---------- FontPlatformDataGdk.cpp | 17 ++++++++--------- 3 files changed, 9 insertions(+), 25 deletions(-) 667 6 16254 sven 2007-09-11 07:58:50 -0700 Created attachment 16254 Final Patch (all in one) Final patch (included the 4 previous ones plus a changelog entry) 666 7 16254 mrowe 2007-09-11 08:03:10 -0700 Comment on attachment 16254 Final Patch (all in one) Some minor comments: The local variables inside FontPlatformData::FontPlatformData should lose the m_ prefix, which is used only for members. I think the declarations can be moved to their point of first use too. Our coding style also requires no space between the function name and it's arguments. I'll make those minor tweaks when I land this. 665 8 mrowe 2007-09-11 08:11:06 -0700 Landed in r25489. 16250 2007-09-11 07:34:55 -0700 2007-09-11 07:58:50 -0700 0001 - Made setFont() easier 0001-Made-setFont-easier.patch text/plain 1217 sven RnJvbSA0MmU2YWIwYWY0YjIwZDAwNjIzZTc1YzRlNTU0ZGZjMTAwNmI4OTBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVuIEhlcnpiZXJnIDxzdmVuQGltZW5kaW8uY29tPgpEYXRl OiBUdWUsIDExIFNlcCAyMDA3IDE1OjM0OjI0ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gTWFkZSBz ZXRGb250KCkgZWFzaWVyCgoJKiBXZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRh R2RrLmNwcDogdXNlIHRoZQoJY2Fpcm9fc2NhbGVkX2ZvbnRfdCogdGhhdCB3ZSBoYXZlLCB0aGVy ZSdzIG5vIG5lZWQgdG8ga2VlcCBoYW5kbGluZyB0aGUKCW1hdHJpeCBldGMuCi0tLQogV2ViQ29y ZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHAgfCAgICA4ICsrLS0tLS0tCiAx IGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhR2RrLmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsuY3BwCmluZGV4IDY2YTYyM2QuLjE2 YmZiZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFH ZGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsuY3Bw CkBAIC0xNjYsMTMgKzE2Niw5IEBAIGNhaXJvX2ZvbnRfZmFjZV90KiogRm9udFBsYXRmb3JtRGF0 YTo6bGlzdChGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uCiAKIHZvaWQgRm9u dFBsYXRmb3JtRGF0YTo6c2V0Rm9udChjYWlyb190KiBjcikgY29uc3QKIHsKLSAgICBBU1NFUlQo bV9mb250RmFjZSk7Ci0gICAgQVNTRVJUKG1fZm9udE1hdHJpeCk7Ci0gICAgQVNTRVJUKG1fb3B0 aW9ucyk7CisgICAgQVNTRVJUKG1fc2NhbGVkRm9udCk7CiAKLSAgICBjYWlyb19zZXRfZm9udF9m YWNlKGNyLCBtX2ZvbnRGYWNlKTsKLSAgICBjYWlyb19zZXRfZm9udF9tYXRyaXgoY3IsIG1fZm9u dE1hdHJpeCk7Ci0gICAgY2Fpcm9fc2V0X2ZvbnRfb3B0aW9ucyhjciwgbV9vcHRpb25zKTsKKyAg ICBjYWlyb19zZXRfc2NhbGVkX2ZvbnQgKGNyLCBtX3NjYWxlZEZvbnQpOwogfQogCiBib29sIEZv bnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPT0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIp IGNvbnN0Ci0tIAoxLjUuMi4zCgo= 16251 2007-09-11 07:35:28 -0700 2007-09-11 07:58:50 -0700 0002 - Removed m_fontFace 0002-Removed-FontPlaformData-m_fontFace.patch text/plain 3390 sven RnJvbSA1Y2U4OGFhNDk0YmI3NTAyYmNiYjhhNDNjN2NmZTAxMWIxNmM2YjJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVuIEhlcnpiZXJnIDxzdmVuQGltZW5kaW8uY29tPgpEYXRl OiBUdWUsIDExIFNlcCAyMDA3IDE1OjU1OjEzICswMjAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3Zl ZCBGb250UGxhZm9ybURhdGE6Om1fZm9udEZhY2UKCgkqIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL0Zv bnRQbGF0Zm9ybURhdGEuaDogZG9uJ3QgZGVjbGFyZSBtX2ZvbnRGYWNlOwoJZG9uJ3QgaW5pdGlh bGl6ZSBtX2ZvbnRGYWNlIGluIHRoZSBkZWZhdWx0IGNvbnN0cnVjdG9ycwoJKiBXZWJDb3JlL3Bs YXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHA6IGRvbid0IGRlc3Ryb3kgbV9mb250Lm1fZm9udEZh Y2UKCWFueW1vcmUKCSogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5j cHA6IGRvbid0IGludGlhbGl6ZQoJbV9mb250RmFjZSBpbiB0aGUgY29uc3RydWN0b3I7IHVzZSBh IGxvY2FsIHZhcmlhYmxlIGZvciBtX2ZvbnRGYWNlCi0tLQogV2ViQ29yZS9wbGF0Zm9ybS9nZGsv Rm9udERhdGFHZGsuY3BwICAgICAgICAgfCAgICAyIC0tCiBXZWJDb3JlL3BsYXRmb3JtL2dkay9G b250UGxhdGZvcm1EYXRhLmggICAgICB8ICAgIDMgLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2dkay9G b250UGxhdGZvcm1EYXRhR2RrLmNwcCB8ICAgIDMgKystCiAzIGZpbGVzIGNoYW5nZWQsIDIgaW5z ZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dkay9Gb250RGF0YUdkay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250RGF0YUdkay5j cHAKaW5kZXggMTNmYWMxZi4uNDZjYzAyZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n ZGsvRm9udERhdGFHZGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnREYXRhR2Rr LmNwcApAQCAtNjcsOCArNjcsNiBAQCB2b2lkIEZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQog CiAgICAgaWYgKG1fZm9udC5tX2ZvbnRNYXRyaXgpCiAgICAgICAgIGZyZWUobV9mb250Lm1fZm9u dE1hdHJpeCk7Ci0gICAgaWYgKG1fZm9udC5tX2ZvbnRGYWNlKQotICAgICAgICBjYWlyb19mb250 X2ZhY2VfZGVzdHJveShtX2ZvbnQubV9mb250RmFjZSk7CiAgICAgaWYgKG1fZm9udC5tX3NjYWxl ZEZvbnQpCiAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rlc3Ryb3kobV9mb250Lm1fc2NhbGVk Rm9udCk7CiAgICAgaWYgKG1fZm9udC5tX29wdGlvbnMpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250 UGxhdGZvcm1EYXRhLmgKaW5kZXggZmJhYWQyNi4uM2E4MjMwZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Z2RrL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtNDEsNyArNDEsNiBAQCBwdWJsaWM6CiAgICAgRm9u dFBsYXRmb3JtRGF0YShEZWxldGVkKQogICAgICAgICA6IG1fcGF0dGVybihyZWludGVycHJldF9j YXN0PEZjUGF0dGVybio+KC0xKSkKICAgICAgICAgLCBtX2ZvbnRNYXRyaXgoMCkKLSAgICAgICAg LCBtX2ZvbnRGYWNlKDApCiAgICAgICAgICwgbV9vcHRpb25zKDApCiAgICAgICAgICwgbV9zY2Fs ZWRGb250KDApCiAgICAgICAgIHsgfQpAQCAtNDksNyArNDgsNiBAQCBwdWJsaWM6CiAgICAgRm9u dFBsYXRmb3JtRGF0YSgpCiAgICAgICAgIDogbV9wYXR0ZXJuKDApCiAgICAgICAgICwgbV9mb250 TWF0cml4KDApCi0gICAgICAgICwgbV9mb250RmFjZSgwKQogICAgICAgICAsIG1fb3B0aW9ucygw KQogICAgICAgICAsIG1fc2NhbGVkRm9udCgwKQogICAgICAgICB7IH0KQEAgLTc2LDcgKzc0LDYg QEAgcHVibGljOgogICAgIEZjUGF0dGVybiogbV9wYXR0ZXJuOwogICAgIEZvbnREZXNjcmlwdGlv biBtX2ZvbnREZXNjcmlwdGlvbjsKICAgICBjYWlyb19tYXRyaXhfdCogbV9mb250TWF0cml4Owot ICAgIGNhaXJvX2ZvbnRfZmFjZV90KiBtX2ZvbnRGYWNlOwogICAgIGNhaXJvX2ZvbnRfb3B0aW9u c190KiBtX29wdGlvbnM7CiAgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfdCogbV9zY2FsZWRGb250Owog fTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHAKaW5kZXgg MTZiZmJmZS4uNjFmNTk0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBs YXRmb3JtRGF0YUdkay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3Jt RGF0YUdkay5jcHAKQEAgLTQyLDcgKzQyLDYgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRm b3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QKICAg ICA6IG1fcGF0dGVybigwKQogICAgICwgbV9mb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9u KQogICAgICwgbV9mb250TWF0cml4KDApCi0gICAgLCBtX2ZvbnRGYWNlKDApCiAgICAgLCBtX29w dGlvbnMoMCkKICAgICAsIG1fc2NhbGVkRm9udCgwKQogewpAQCAtNjEsNiArNjAsNyBAQCBGb250 UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9u dERlc2NyaXB0aW9uLCBjb25zdAogICAgIGludCB0eXBlID0gZm9udERlc2NyaXB0aW9uLmdlbmVy aWNGYW1pbHkoKTsKIAogICAgIEZjUGF0dGVybiogcGF0dGVybiA9IEZjUGF0dGVybkNyZWF0ZSgp OworICAgIGNhaXJvX2ZvbnRfZmFjZV90KiBtX2ZvbnRGYWNlOwogCiAgICAgaWYgKCFGY1BhdHRl cm5BZGRTdHJpbmcocGF0dGVybiwgRkNfRkFNSUxZLCByZWludGVycHJldF9jYXN0PGNvbnN0IEZj Q2hhcjgqPihmY2ZhbWlseSkpKQogICAgICAgICBnb3RvIGZyZWVQYXR0ZXJuOwpAQCAtMTA1LDYg KzEwNSw3IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERl c2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0CiAgICAgY2Fpcm9fbWF0cml4X2luaXRf aWRlbnRpdHkoJmN0bSk7CiAgICAgbV9vcHRpb25zID0gY2Fpcm9fZm9udF9vcHRpb25zX2NyZWF0 ZSgpOwogICAgIG1fc2NhbGVkRm9udCA9IGNhaXJvX3NjYWxlZF9mb250X2NyZWF0ZShtX2ZvbnRG YWNlLCBtX2ZvbnRNYXRyaXgsICZjdG0sIG1fb3B0aW9ucyk7CisgICAgY2Fpcm9fZm9udF9mYWNl X2Rlc3Ryb3kgKG1fZm9udEZhY2UpOwogCiBmcmVlUGF0dGVybjoKICAgICBGY1BhdHRlcm5EZXN0 cm95KHBhdHRlcm4pOwotLSAKMS41LjIuMwoK 16252 2007-09-11 07:36:09 -0700 2007-09-11 07:58:50 -0700 0003 - Removed m_fontMatrix 0003-Removed-FontPlaformData-m_fontMatrix.patch text/plain 3761 sven RnJvbSA2NmQ4ZjVmNDgxYzNmMzI2Mjk4ZjQ4ZWMyYWIzMzY4MmU1YzIyMWM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVuIEhlcnpiZXJnIDxzdmVuQGltZW5kaW8uY29tPgpEYXRl OiBUdWUsIDExIFNlcCAyMDA3IDE2OjA5OjU3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3Zl ZCBGb250UGxhZm9ybURhdGE6Om1fZm9udE1hdHJpeAoKCSogV2ViQ29yZS9wbGF0Zm9ybS9nZGsv Rm9udFBsYXRmb3JtRGF0YS5oOiBkb24ndCBkZWNsYXJlIG1fZm9udE1hdHJpeDsKCWRvbid0IGlu aXRpYWxpemUgbV9mb250TWF0cml4IGluIHRoZSBkZWZhdWx0IGNvbnN0cnVjdG9yczsgaGFzaCgp IG9uCgl0aGUgc2NhbGVkIGZvbnQgb25seQoJKiBXZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250RGF0 YUdkay5jcHA6IGRvbid0IGRlc3Ryb3kgbV9mb250TWF0cml4IGhlcmUKCSogV2ViQ29yZS9wbGF0 Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHA6IGRvbid0IGluaXRpYWxpemUKCW1fZm9u dE1hdHJpeCBpbiB0aGUgY29uc3RydWN0b3I7IHVzZSBhIGxvY2FsIHZhcmlhYmxlIGZvciBtX2Zv bnRNYXRyaXgKLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHAgICAgICAg ICB8ICAgIDIgLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaCAgICAg IHwgICAgNSArLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5j cHAgfCAgICAzICsrLQogMyBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udERhdGFHZGsuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udERhdGFHZGsuY3BwCmluZGV4IDQ2Y2MwMmYuLmI4 ZDM0MzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnREYXRhR2RrLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHAKQEAgLTY1LDggKzY1LDYg QEAgdm9pZCBGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKICAgICBpZiAobV9mb250Lm1fcGF0 dGVybiAmJiAoKEZjUGF0dGVybiopLTEgIT0gbV9mb250Lm1fcGF0dGVybikpCiAgICAgICAgIEZj UGF0dGVybkRlc3Ryb3kobV9mb250Lm1fcGF0dGVybik7CiAKLSAgICBpZiAobV9mb250Lm1fZm9u dE1hdHJpeCkKLSAgICAgICAgZnJlZShtX2ZvbnQubV9mb250TWF0cml4KTsKICAgICBpZiAobV9m b250Lm1fc2NhbGVkRm9udCkKICAgICAgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfZGVzdHJveShtX2Zv bnQubV9zY2FsZWRGb250KTsKICAgICBpZiAobV9mb250Lm1fb3B0aW9ucykKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1dlYkNvcmUvcGxhdGZv cm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCAzYTgyMzBmLi5hYmNhZjE1IDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhLmgKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YS5oCkBAIC00MCwxNCArNDAsMTIgQEAgcHVi bGljOgogICAgIGNsYXNzIERlbGV0ZWQge307CiAgICAgRm9udFBsYXRmb3JtRGF0YShEZWxldGVk KQogICAgICAgICA6IG1fcGF0dGVybihyZWludGVycHJldF9jYXN0PEZjUGF0dGVybio+KC0xKSkK LSAgICAgICAgLCBtX2ZvbnRNYXRyaXgoMCkKICAgICAgICAgLCBtX29wdGlvbnMoMCkKICAgICAg ICAgLCBtX3NjYWxlZEZvbnQoMCkKICAgICAgICAgeyB9CiAKICAgICBGb250UGxhdGZvcm1EYXRh KCkKICAgICAgICAgOiBtX3BhdHRlcm4oMCkKLSAgICAgICAgLCBtX2ZvbnRNYXRyaXgoMCkKICAg ICAgICAgLCBtX29wdGlvbnMoMCkKICAgICAgICAgLCBtX3NjYWxlZEZvbnQoMCkKICAgICAgICAg eyB9CkBAIC02NSw3ICs2Myw3IEBAIHB1YmxpYzoKIAogICAgIHVuc2lnbmVkIGhhc2goKSBjb25z dAogICAgIHsKLSAgICAgICAgdWludHB0cl90IGhhc2hDb2Rlc1syXSA9IHsgcmVpbnRlcnByZXRf Y2FzdDx1aW50cHRyX3Q+KG1fcGF0dGVybiksIHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Piht X2ZvbnRNYXRyaXgpIH07CisgICAgICAgIHVpbnRwdHJfdCBoYXNoQ29kZXNbMV0gPSB7IHJlaW50 ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihtX3NjYWxlZEZvbnQpIH07CiAgICAgICAgIHJldHVybiBT dHJpbmdJbXBsOjpjb21wdXRlSGFzaCggcmVpbnRlcnByZXRfY2FzdDxVQ2hhcio+KGhhc2hDb2Rl cyksIHNpemVvZihoYXNoQ29kZXMpIC8gc2l6ZW9mKFVDaGFyKSk7CiAgICAgfQogCkBAIC03Myw3 ICs3MSw2IEBAIHB1YmxpYzoKIAogICAgIEZjUGF0dGVybiogbV9wYXR0ZXJuOwogICAgIEZvbnRE ZXNjcmlwdGlvbiBtX2ZvbnREZXNjcmlwdGlvbjsKLSAgICBjYWlyb19tYXRyaXhfdCogbV9mb250 TWF0cml4OwogICAgIGNhaXJvX2ZvbnRfb3B0aW9uc190KiBtX29wdGlvbnM7CiAgICAgY2Fpcm9f c2NhbGVkX2ZvbnRfdCogbV9zY2FsZWRGb250OwogfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsv Rm9udFBsYXRmb3JtRGF0YUdkay5jcHAKaW5kZXggNjFmNTk0Yi4uNWM0YmNjNiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHAKQEAgLTQxLDcgKzQxLDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3Ry aW5nJiBmYW1pbHlOYW1lKQogICAgIDogbV9wYXR0ZXJuKDApCiAgICAgLCBtX2ZvbnREZXNjcmlw dGlvbihmb250RGVzY3JpcHRpb24pCi0gICAgLCBtX2ZvbnRNYXRyaXgoMCkKICAgICAsIG1fb3B0 aW9ucygwKQogICAgICwgbV9zY2FsZWRGb250KDApCiB7CkBAIC02MSw2ICs2MCw3IEBAIEZvbnRQ bGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250 RGVzY3JpcHRpb24sIGNvbnN0CiAKICAgICBGY1BhdHRlcm4qIHBhdHRlcm4gPSBGY1BhdHRlcm5D cmVhdGUoKTsKICAgICBjYWlyb19mb250X2ZhY2VfdCogbV9mb250RmFjZTsKKyAgICBjYWlyb19t YXRyaXhfdCogbV9mb250TWF0cml4OwogCiAgICAgaWYgKCFGY1BhdHRlcm5BZGRTdHJpbmcocGF0 dGVybiwgRkNfRkFNSUxZLCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgqPihmY2ZhbWls eSkpKQogICAgICAgICBnb3RvIGZyZWVQYXR0ZXJuOwpAQCAtMTA2LDYgKzEwNiw3IEBAIEZvbnRQ bGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250 RGVzY3JpcHRpb24sIGNvbnN0CiAgICAgbV9vcHRpb25zID0gY2Fpcm9fZm9udF9vcHRpb25zX2Ny ZWF0ZSgpOwogICAgIG1fc2NhbGVkRm9udCA9IGNhaXJvX3NjYWxlZF9mb250X2NyZWF0ZShtX2Zv bnRGYWNlLCBtX2ZvbnRNYXRyaXgsICZjdG0sIG1fb3B0aW9ucyk7CiAgICAgY2Fpcm9fZm9udF9m YWNlX2Rlc3Ryb3kgKG1fZm9udEZhY2UpOworICAgIGZyZWUgKG1fZm9udE1hdHJpeCk7CiAKIGZy ZWVQYXR0ZXJuOgogICAgIEZjUGF0dGVybkRlc3Ryb3kocGF0dGVybik7Ci0tIAoxLjUuMi4zCgo= 16253 2007-09-11 07:36:49 -0700 2007-09-11 07:58:50 -0700 0004 - Removed m_options 0004-Removed-FontPlaformData-m_options.patch text/plain 3213 sven RnJvbSA1MzViMWY2N2MxZWVlNmUzMTQwNzUzMTRjMTE2YmI4MmFhNzUzNzJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVuIEhlcnpiZXJnIDxzdmVuQGltZW5kaW8uY29tPgpEYXRl OiBUdWUsIDExIFNlcCAyMDA3IDE2OjE3OjQwICswMjAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3Zl ZCBGb250UGxhZm9ybURhdGE6Om1fb3B0aW9ucwoKCSogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9u dFBsYXRmb3JtRGF0YS5oOiBkb24ndCBkZWNsYXJlIG1fb3B0aW9uczsKCWRvbid0IGluaXRpYWxp emUgbV9mb250TWF0cml4IGluIHRoZSBkZWZhdWx0IGNvbnN0cnVjdG9ycwoJKiBXZWJDb3JlL3Bs YXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHA6IGRvbid0IGRlc3Ryb3kgbV9vcHRpb25zIGluCglG b250RGF0YTo6ZGVzdHJveVBsYXRmb3JtKCkKCSogV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBs YXRmb3JtRGF0YUdkay5jcHA6IGRvbid0IGluaXRpYWxpemUKCW1fb3B0aW9ucyBpbiB0aGUgY29u c3RydWN0b3I7IHVzZSBhIGxvY2FsIHZhcmlhYmxlIGZvciBtX29wdGlvbnMKLS0tCiBXZWJDb3Jl L3BsYXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHAgICAgICAgICB8ICAgIDIgLS0KIFdlYkNvcmUv cGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaCAgICAgIHwgICAgMyAtLS0KIFdlYkNvcmUv cGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsuY3BwIHwgICAgMyArKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnREYXRhR2RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ2Rr L0ZvbnREYXRhR2RrLmNwcAppbmRleCBiOGQzNDMwLi4zMGI1ZTcwIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n ZGsvRm9udERhdGFHZGsuY3BwCkBAIC02Nyw4ICs2Nyw2IEBAIHZvaWQgRm9udERhdGE6OnBsYXRm b3JtRGVzdHJveSgpCiAKICAgICBpZiAobV9mb250Lm1fc2NhbGVkRm9udCkKICAgICAgICAgY2Fp cm9fc2NhbGVkX2ZvbnRfZGVzdHJveShtX2ZvbnQubV9zY2FsZWRGb250KTsKLSAgICBpZiAobV9m b250Lm1fb3B0aW9ucykKLSAgICAgICAgY2Fpcm9fZm9udF9vcHRpb25zX2Rlc3Ryb3kobV9mb250 Lm1fb3B0aW9ucyk7CiAgICAgZGVsZXRlIG1fc21hbGxDYXBzRm9udERhdGE7CiB9CiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1dlYkNvcmUv cGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCBhYmNhZjE1Li42ZWQ5Y2RjIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhLmgKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YS5oCkBAIC00MCwxMyArNDAsMTEg QEAgcHVibGljOgogICAgIGNsYXNzIERlbGV0ZWQge307CiAgICAgRm9udFBsYXRmb3JtRGF0YShE ZWxldGVkKQogICAgICAgICA6IG1fcGF0dGVybihyZWludGVycHJldF9jYXN0PEZjUGF0dGVybio+ KC0xKSkKLSAgICAgICAgLCBtX29wdGlvbnMoMCkKICAgICAgICAgLCBtX3NjYWxlZEZvbnQoMCkK ICAgICAgICAgeyB9CiAKICAgICBGb250UGxhdGZvcm1EYXRhKCkKICAgICAgICAgOiBtX3BhdHRl cm4oMCkKLSAgICAgICAgLCBtX29wdGlvbnMoMCkKICAgICAgICAgLCBtX3NjYWxlZEZvbnQoMCkK ICAgICAgICAgeyB9CiAKQEAgLTcxLDcgKzY5LDYgQEAgcHVibGljOgogCiAgICAgRmNQYXR0ZXJu KiBtX3BhdHRlcm47CiAgICAgRm9udERlc2NyaXB0aW9uIG1fZm9udERlc2NyaXB0aW9uOwotICAg IGNhaXJvX2ZvbnRfb3B0aW9uc190KiBtX29wdGlvbnM7CiAgICAgY2Fpcm9fc2NhbGVkX2ZvbnRf dCogbV9zY2FsZWRGb250OwogfTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsv Rm9udFBsYXRmb3JtRGF0YUdkay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZv cm1EYXRhR2RrLmNwcAppbmRleCA1YzRiY2M2Li42OGI1OGMzIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhR2RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2dkay9Gb250UGxhdGZvcm1EYXRhR2RrLmNwcApAQCAtNDEsNyArNDEsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWls eU5hbWUpCiAgICAgOiBtX3BhdHRlcm4oMCkKICAgICAsIG1fZm9udERlc2NyaXB0aW9uKGZvbnRE ZXNjcmlwdGlvbikKLSAgICAsIG1fb3B0aW9ucygwKQogICAgICwgbV9zY2FsZWRGb250KDApCiB7 CiAgICAgRm9udFBsYXRmb3JtRGF0YTo6aW5pdCgpOwpAQCAtNjAsNiArNTksNyBAQCBGb250UGxh dGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERl c2NyaXB0aW9uLCBjb25zdAogCiAgICAgRmNQYXR0ZXJuKiBwYXR0ZXJuID0gRmNQYXR0ZXJuQ3Jl YXRlKCk7CiAgICAgY2Fpcm9fZm9udF9mYWNlX3QqIG1fZm9udEZhY2U7CisgICAgY2Fpcm9fZm9u dF9vcHRpb25zX3QqIG1fb3B0aW9uczsKICAgICBjYWlyb19tYXRyaXhfdCogbV9mb250TWF0cml4 OwogCiAgICAgaWYgKCFGY1BhdHRlcm5BZGRTdHJpbmcocGF0dGVybiwgRkNfRkFNSUxZLCByZWlu dGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgqPihmY2ZhbWlseSkpKQpAQCAtMTA2LDYgKzEwNiw3 IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0CiAgICAgbV9vcHRpb25zID0gY2Fpcm9fZm9udF9v cHRpb25zX2NyZWF0ZSgpOwogICAgIG1fc2NhbGVkRm9udCA9IGNhaXJvX3NjYWxlZF9mb250X2Ny ZWF0ZShtX2ZvbnRGYWNlLCBtX2ZvbnRNYXRyaXgsICZjdG0sIG1fb3B0aW9ucyk7CiAgICAgY2Fp cm9fZm9udF9mYWNlX2Rlc3Ryb3kgKG1fZm9udEZhY2UpOworICAgIGNhaXJvX2ZvbnRfb3B0aW9u c19kZXN0cm95IChtX29wdGlvbnMpOwogICAgIGZyZWUgKG1fZm9udE1hdHJpeCk7CiAKIGZyZWVQ YXR0ZXJuOgotLSAKMS41LjIuMwoK 16254 2007-09-11 07:58:50 -0700 2007-09-11 08:03:10 -0700 Final Patch (all in one) final-patch.diff text/plain 4626 sven ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTAwNGFlMy4uNTkwM2FiMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwNy0wOS0xMSAgU3ZlbiBIZXJ6YmVy ZyAgPHN2ZW5AaW1lbmRpby5jb20+CisKKwlSZW1vdmUgdW5uZWNjZXNzYXJ5IGZpZWxkcyAoZml4 ZXMgIzE1MTc3KS4KKworCSogcGxhdGZvcm0vZ2RrL0ZvbnREYXRhR2RrLmNwcDogcmVtb3ZlZCB0 aGUgZGVzdHJveSBjb2RlIG9mIHRoZSBmaWVsZHMKKwl0aGF0IGhhdmUgYmVlbiByZW1vdmVkCisJ KiBwbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YS5oOiByZW1vdmVkIG1fZm9udEZhY2UsIG1f Zm9udE1hdHJpeAorCWFuZCBtX29wdGlvbnM7IGhhc2sgb24gbV9zY2FsZWRGb250CisJKiBwbGF0 Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YUdkay5jcHA6IHNpbXBsaWZpZWQgc2V0Rm9udCgpIGJ5 IHVzaW5nCisJbV9zY2FsZWRGb250IG9ubHk7IHR1cm5lZCB0aGUgZm9ybWVyIHN0cnVjdCBtZW1i ZXJzIGludG8gbG9jYWwKKwl2YXJpYWJsZXMKKwogMjAwNy0wOS0xMSAgR2VvcmdlIFN0YWlrb3Mg IDxzdGFpa29zQGtkZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRm9udERhdGFHZGsuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9nZGsvRm9udERhdGFHZGsuY3BwCmluZGV4IDEzZmFjMWYuLjMwYjVlNzAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnREYXRhR2RrLmNwcAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2dkay9Gb250RGF0YUdkay5jcHAKQEAgLTY1LDE0ICs2NSw4IEBAIHZvaWQgRm9udERh dGE6OnBsYXRmb3JtRGVzdHJveSgpCiAgICAgaWYgKG1fZm9udC5tX3BhdHRlcm4gJiYgKChGY1Bh dHRlcm4qKS0xICE9IG1fZm9udC5tX3BhdHRlcm4pKQogICAgICAgICBGY1BhdHRlcm5EZXN0cm95 KG1fZm9udC5tX3BhdHRlcm4pOwogCi0gICAgaWYgKG1fZm9udC5tX2ZvbnRNYXRyaXgpCi0gICAg ICAgIGZyZWUobV9mb250Lm1fZm9udE1hdHJpeCk7Ci0gICAgaWYgKG1fZm9udC5tX2ZvbnRGYWNl KQotICAgICAgICBjYWlyb19mb250X2ZhY2VfZGVzdHJveShtX2ZvbnQubV9mb250RmFjZSk7CiAg ICAgaWYgKG1fZm9udC5tX3NjYWxlZEZvbnQpCiAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rl c3Ryb3kobV9mb250Lm1fc2NhbGVkRm9udCk7Ci0gICAgaWYgKG1fZm9udC5tX29wdGlvbnMpCi0g ICAgICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19kZXN0cm95KG1fZm9udC5tX29wdGlvbnMpOwogICAg IGRlbGV0ZSBtX3NtYWxsQ2Fwc0ZvbnREYXRhOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250 UGxhdGZvcm1EYXRhLmgKaW5kZXggZmJhYWQyNi4uNmVkOWNkYyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9nZGsvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Z2RrL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtNDAsMTcgKzQwLDExIEBAIHB1YmxpYzoKICAgICBj bGFzcyBEZWxldGVkIHt9OwogICAgIEZvbnRQbGF0Zm9ybURhdGEoRGVsZXRlZCkKICAgICAgICAg OiBtX3BhdHRlcm4ocmVpbnRlcnByZXRfY2FzdDxGY1BhdHRlcm4qPigtMSkpCi0gICAgICAgICwg bV9mb250TWF0cml4KDApCi0gICAgICAgICwgbV9mb250RmFjZSgwKQotICAgICAgICAsIG1fb3B0 aW9ucygwKQogICAgICAgICAsIG1fc2NhbGVkRm9udCgwKQogICAgICAgICB7IH0KIAogICAgIEZv bnRQbGF0Zm9ybURhdGEoKQogICAgICAgICA6IG1fcGF0dGVybigwKQotICAgICAgICAsIG1fZm9u dE1hdHJpeCgwKQotICAgICAgICAsIG1fZm9udEZhY2UoMCkKLSAgICAgICAgLCBtX29wdGlvbnMo MCkKICAgICAgICAgLCBtX3NjYWxlZEZvbnQoMCkKICAgICAgICAgeyB9CiAKQEAgLTY3LDcgKzYx LDcgQEAgcHVibGljOgogCiAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0CiAgICAgewotICAgICAg ICB1aW50cHRyX3QgaGFzaENvZGVzWzJdID0geyByZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4o bV9wYXR0ZXJuKSwgcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KG1fZm9udE1hdHJpeCkgfTsK KyAgICAgICAgdWludHB0cl90IGhhc2hDb2Rlc1sxXSA9IHsgcmVpbnRlcnByZXRfY2FzdDx1aW50 cHRyX3Q+KG1fc2NhbGVkRm9udCkgfTsKICAgICAgICAgcmV0dXJuIFN0cmluZ0ltcGw6OmNvbXB1 dGVIYXNoKCByZWludGVycHJldF9jYXN0PFVDaGFyKj4oaGFzaENvZGVzKSwgc2l6ZW9mKGhhc2hD b2RlcykgLyBzaXplb2YoVUNoYXIpKTsKICAgICB9CiAKQEAgLTc1LDkgKzY5LDYgQEAgcHVibGlj OgogCiAgICAgRmNQYXR0ZXJuKiBtX3BhdHRlcm47CiAgICAgRm9udERlc2NyaXB0aW9uIG1fZm9u dERlc2NyaXB0aW9uOwotICAgIGNhaXJvX21hdHJpeF90KiBtX2ZvbnRNYXRyaXg7Ci0gICAgY2Fp cm9fZm9udF9mYWNlX3QqIG1fZm9udEZhY2U7Ci0gICAgY2Fpcm9fZm9udF9vcHRpb25zX3QqIG1f b3B0aW9uczsKICAgICBjYWlyb19zY2FsZWRfZm9udF90KiBtX3NjYWxlZEZvbnQ7CiB9OwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9Gb250UGxhdGZvcm1EYXRhR2RrLmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFHZGsuY3BwCmluZGV4IDY2YTYy M2QuLjY4YjU4YzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9y bURhdGFHZGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZvbnRQbGF0Zm9ybURhdGFH ZGsuY3BwCkBAIC00MSw5ICs0MSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIEZvbnRQbGF0Zm9y bURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3Jp cHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkKICAgICA6IG1fcGF0dGVybigw KQogICAgICwgbV9mb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKQotICAgICwgbV9mb250 TWF0cml4KDApCi0gICAgLCBtX2ZvbnRGYWNlKDApCi0gICAgLCBtX29wdGlvbnMoMCkKICAgICAs IG1fc2NhbGVkRm9udCgwKQogewogICAgIEZvbnRQbGF0Zm9ybURhdGE6OmluaXQoKTsKQEAgLTYx LDYgKzU4LDkgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250 RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QKICAgICBpbnQgdHlwZSA9IGZvbnRE ZXNjcmlwdGlvbi5nZW5lcmljRmFtaWx5KCk7CiAKICAgICBGY1BhdHRlcm4qIHBhdHRlcm4gPSBG Y1BhdHRlcm5DcmVhdGUoKTsKKyAgICBjYWlyb19mb250X2ZhY2VfdCogbV9mb250RmFjZTsKKyAg ICBjYWlyb19mb250X29wdGlvbnNfdCogbV9vcHRpb25zOworICAgIGNhaXJvX21hdHJpeF90KiBt X2ZvbnRNYXRyaXg7CiAKICAgICBpZiAoIUZjUGF0dGVybkFkZFN0cmluZyhwYXR0ZXJuLCBGQ19G QU1JTFksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZjZmFtaWx5KSkpCiAgICAg ICAgIGdvdG8gZnJlZVBhdHRlcm47CkBAIC0xMDUsNiArMTA1LDkgQEAgRm9udFBsYXRmb3JtRGF0 YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlv biwgY29uc3QKICAgICBjYWlyb19tYXRyaXhfaW5pdF9pZGVudGl0eSgmY3RtKTsKICAgICBtX29w dGlvbnMgPSBjYWlyb19mb250X29wdGlvbnNfY3JlYXRlKCk7CiAgICAgbV9zY2FsZWRGb250ID0g Y2Fpcm9fc2NhbGVkX2ZvbnRfY3JlYXRlKG1fZm9udEZhY2UsIG1fZm9udE1hdHJpeCwgJmN0bSwg bV9vcHRpb25zKTsKKyAgICBjYWlyb19mb250X2ZhY2VfZGVzdHJveSAobV9mb250RmFjZSk7Cisg ICAgY2Fpcm9fZm9udF9vcHRpb25zX2Rlc3Ryb3kgKG1fb3B0aW9ucyk7CisgICAgZnJlZSAobV9m b250TWF0cml4KTsKIAogZnJlZVBhdHRlcm46CiAgICAgRmNQYXR0ZXJuRGVzdHJveShwYXR0ZXJu KTsKQEAgLTE2NiwxMyArMTY5LDkgQEAgY2Fpcm9fZm9udF9mYWNlX3QqKiBGb250UGxhdGZvcm1E YXRhOjpsaXN0KEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb24KIAogdm9pZCBG b250UGxhdGZvcm1EYXRhOjpzZXRGb250KGNhaXJvX3QqIGNyKSBjb25zdAogewotICAgIEFTU0VS VChtX2ZvbnRGYWNlKTsKLSAgICBBU1NFUlQobV9mb250TWF0cml4KTsKLSAgICBBU1NFUlQobV9v cHRpb25zKTsKKyAgICBBU1NFUlQobV9zY2FsZWRGb250KTsKIAotICAgIGNhaXJvX3NldF9mb250 X2ZhY2UoY3IsIG1fZm9udEZhY2UpOwotICAgIGNhaXJvX3NldF9mb250X21hdHJpeChjciwgbV9m b250TWF0cml4KTsKLSAgICBjYWlyb19zZXRfZm9udF9vcHRpb25zKGNyLCBtX29wdGlvbnMpOwor ICAgIGNhaXJvX3NldF9zY2FsZWRfZm9udCAoY3IsIG1fc2NhbGVkRm9udCk7CiB9CiAKIGJvb2wg Rm9udFBsYXRmb3JtRGF0YTo6b3BlcmF0b3I9PShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBvdGhl cikgY29uc3QK