41152 2010-06-24 05:12:13 -0700 Minor fixes to Mac FontPlatformData & SimpleFontPlatformData classes 2010-06-30 08:29:38 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 playmobil webkit-unassigned abarth commit-queue mitz oldest_to_newest 242455 0 playmobil 2010-06-24 05:12:13 -0700 Bug to track a few very minor fixes to the Mac FontPlatformData & SimpleFontPlatformData classes . 242458 1 59644 playmobil 2010-06-24 05:15:23 -0700 Created attachment 59644 patch 1 * Avoid an extra FontPlatformData copy in SimpleFontDataMac.mm * Fix a typo in a comment in FontPlatformDataMac.mm * Change ' *' -> '* ' to match style guide 242525 2 59644 mitz 2010-06-24 08:23:40 -0700 Comment on attachment 59644 patch 1 While the WebKit Coding Style Guidelines only say “Pointer types in non-C++ code — Pointer types should be written with a space between the type and the * (so the * is adjacent to the following identifier if any)”, WebKit style is for Objective-C types to always have a space between the type and the *, whether they appear in C, C++, Objective-C or Objective-C++ code, and most of the code adheres to this style. 242550 3 59663 playmobil 2010-06-24 09:39:03 -0700 Created attachment 59663 patch 2 243109 4 59663 ap 2010-06-25 11:52:00 -0700 Comment on attachment 59663 patch 2 + * Fix a typo in a comment in FontPlatformDataMac.mm The actual fix isn't in a comment. Please fix before loading. 243110 5 ap 2010-06-25 11:52:10 -0700 before landing 244746 6 60115 playmobil 2010-06-30 05:50:18 -0700 Created attachment 60115 patch 3 Changelog fixed up. 244768 7 60115 commit-queue 2010-06-30 07:37:14 -0700 Comment on attachment 60115 patch 3 Rejecting patch 60115 from commit-queue. Unexpected failure when processing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 60115, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Last 500 characters of output: cgi?id=60115&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=41152&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Processing patch 60115 from bug 41152. NOBODY (OOPS!) found in /Users/eseidel/Projects/CommitQueue/WebCore/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /Users/eseidel/Projects/CommitQueue/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). 244774 8 60119 playmobil 2010-06-30 08:01:56 -0700 Created attachment 60119 patch 4 244783 9 60119 commit-queue 2010-06-30 08:29:33 -0700 Comment on attachment 60119 patch 4 Clearing flags on attachment: 60119 Committed r62186: <http://trac.webkit.org/changeset/62186> 244784 10 commit-queue 2010-06-30 08:29:38 -0700 All reviewed patches have been landed. Closing bug. 59644 2010-06-24 05:15:23 -0700 2010-06-24 09:39:03 -0700 patch 1 font-style.patch text/plain 11822 playmobil Y29tbWl0IGVmMDFmOGE1ZjUzNjUyNzIwYmZhNzUyZDQ2ZGM0YWVlYzJhMmZlOWMKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxqZXJlbXlAY2hyb21pdW0ub3JnPgpEYXRlOiAgIFRodSBKdW4gMjQg MTU6MTI6MjkgMjAxMCArMDMwMAoKICAgIE1pbm9yIHR3ZWFrcyBhbmQgc3R5bGUgZml4ZXMgdG8g Rm9udFBsYXRmb3JtRGF0YSAmIFNpbXBsZUZvbnREYXRhTWFjLm1tCiAgICAKICAgICogQXZvaWQg YW4gZXh0cmEgRm9udFBsYXRmb3JtRGF0YSBjb3B5IGluIFNpbXBsZUZvbnREYXRhTWFjLm1tCiAg ICAqIEZpeCBhIHR5cG8gaW4gYSBjb21tZW50IGluIEZvbnRQbGF0Zm9ybURhdGFNYWMubW0KICAg ICogY2hhbmdlICcgKicgLT4gJyogJyB0byBtYXRjaCBzdHlsZSBndWlkZS4KICAgIAogICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTUyCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MWQwZjdmLi41NTAw MTM0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDM3IEBACisyMDEwLTA2LTI0ICBKZXJlbXkgTW9za292aWNoICA8amVyZW15 QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNaW5vciB0d2Vha3MgYW5kIHN0eWxlIGZpeGVzIHRvIEZvbnRQbGF0Zm9ybURhdGEg JiBTaW1wbGVGb250RGF0YU1hYy5tbQorCisgICAgICAgICogQXZvaWQgYW4gZXh0cmEgRm9udFBs YXRmb3JtRGF0YSBjb3B5IGluIFNpbXBsZUZvbnREYXRhTWFjLm1tCisgICAgICAgICogRml4IGEg dHlwbyBpbiBhIGNvbW1lbnQgaW4gRm9udFBsYXRmb3JtRGF0YU1hYy5tbQorICAgICAgICAqIENo YW5nZSAnIConIC0+ICcqICcgdG8gbWF0Y2ggc3R5bGUgZ3VpZGUKKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNTIKKworICAgICAgICBObyBiZWhh dmlvciBjaGFuZ2VzIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL21hYy9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjp0b0NURm9udFJl Zik6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpmb250KToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6Omhhc2hUYWJsZURlbGV0ZWRGb250VmFsdWUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250UGxhdGZvcm1EYXRhTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6Cisg ICAgICAgIChXZWJDb3JlOjp+Rm9udFBsYXRmb3JtRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpG b250UGxhdGZvcm1EYXRhOjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRm b3JtRGF0YTo6c2V0Rm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpk ZXNjcmlwdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnRE YXRhTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6aW5pdEZvbnREYXRhKToKKyAgICAgICAgKFdl YkNvcmU6OndlYkZhbGxiYWNrRm9udEZhbWlseSk6CisgICAgICAgIChXZWJDb3JlOjpwYXRoRnJv bUZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCk6 CisgICAgICAgIChXZWJDb3JlOjpjb3B5Rm9udFRhYmxlRm9yVGFnKToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YSk6CisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 OlNpbXBsZUZvbnREYXRhOjpkZXRlcm1pbmVQaXRjaCk6CisKIDIwMTAtMDYtMjQgIFNhdGlzaCBT YW1wYXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50 IFRhbXVyYS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRQ bGF0Zm9ybURhdGEuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRQbGF0Zm9y bURhdGEuaAppbmRleCBmNGM5MmJlLi44Zjg2YTFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9Gb250UGxhdGZvcm1EYXRhLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YS5oCkBAIC00OCw3ICs0OCw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIGNsYXNzIFN0cmluZzsKIAogI2lmbmRlZiBCVUlMRElOR19PTl9USUdF UgotaW5saW5lIENURm9udFJlZiB0b0NURm9udFJlZihOU0ZvbnQgKm5zRm9udCkgeyByZXR1cm4g cmVpbnRlcnByZXRfY2FzdDxDVEZvbnRSZWY+KG5zRm9udCk7IH0KK2lubGluZSBDVEZvbnRSZWYg dG9DVEZvbnRSZWYoTlNGb250KiBuc0ZvbnQpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Q1RG b250UmVmPihuc0ZvbnQpOyB9CiAjZW5kaWYKIAogY2xhc3MgRm9udFBsYXRmb3JtRGF0YSB7CkBA IC02Niw3ICs2Niw3IEBAIGNsYXNzIEZvbnRQbGF0Zm9ybURhdGEgewogICAgIHsKICAgICB9CiAK LSAgICBGb250UGxhdGZvcm1EYXRhKE5TRm9udCAqbnNGb250LCBib29sIHN5bnRoZXRpY0JvbGQg PSBmYWxzZSwgYm9vbCBzeW50aGV0aWNPYmxpcXVlID0gZmFsc2UpOworICAgIEZvbnRQbGF0Zm9y bURhdGEoTlNGb250KiBuc0ZvbnQsIGJvb2wgc3ludGhldGljQm9sZCA9IGZhbHNlLCBib29sIHN5 bnRoZXRpY09ibGlxdWUgPSBmYWxzZSk7CiAgICAgCiAgICAgRm9udFBsYXRmb3JtRGF0YShDR0Zv bnRSZWYgY2dGb250LCBBVFNVRm9udElEIGZvbnRJRCwgZmxvYXQgc2l6ZSwgYm9vbCBzeW50aGV0 aWNCb2xkLCBib29sIHN5bnRoZXRpY09ibGlxdWUpCiAgICAgICAgIDogbV9zeW50aGV0aWNCb2xk KHN5bnRoZXRpY0JvbGQpCkBAIC0xMTEsOCArMTExLDggQEAgY2xhc3MgRm9udFBsYXRmb3JtRGF0 YSB7CiAgICAgICAgICAgICAgICBtX2NnRm9udCA9PSBvdGhlci5tX2NnRm9udCAmJiBtX3NpemUg PT0gb3RoZXIubV9zaXplICYmIG1fYXRzdUZvbnRJRCA9PSBvdGhlci5tX2F0c3VGb250SUQ7CiAg ICAgfQogCi0gICAgTlNGb250ICpmb250KCkgY29uc3QgeyByZXR1cm4gbV9mb250OyB9Ci0gICAg dm9pZCBzZXRGb250KE5TRm9udCAqZm9udCk7CisgICAgTlNGb250KiBmb250KCkgY29uc3QgeyBy ZXR1cm4gbV9mb250OyB9CisgICAgdm9pZCBzZXRGb250KE5TRm9udCogZm9udCk7CiAKICAgICBi b29sIHJvdW5kc0dseXBoQWR2YW5jZXMoKSBjb25zdDsKICAgICBib29sIGFsbG93c0xpZ2F0dXJl cygpIGNvbnN0OwpAQCAtMTI5LDkgKzEyOSw5IEBAIGNsYXNzIEZvbnRQbGF0Zm9ybURhdGEgewog I2VuZGlmCiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIE5TRm9udCAqaGFzaFRhYmxlRGVsZXRlZEZv bnRWYWx1ZSgpIHsgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8TlNGb250ICo+KC0xKTsgfQorICAg IHN0YXRpYyBOU0ZvbnQqIGhhc2hUYWJsZURlbGV0ZWRGb250VmFsdWUoKSB7IHJldHVybiByZWlu dGVycHJldF9jYXN0PE5TRm9udCo+KC0xKTsgfQogCi0gICAgTlNGb250ICptX2ZvbnQ7CisgICAg TlNGb250KiBtX2ZvbnQ7CiAjaWZuZGVmIEJVSUxESU5HX09OX1RJR0VSCiAgICAgUmV0YWluUHRy PENHRm9udFJlZj4gbV9jZ0ZvbnQ7CiAjZWxzZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL0ZvbnRQbGF0Zm9ybURhdGFNYWMubW0KaW5kZXggZTJhYjQwNS4uMDAzMWFj YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3Jt RGF0YU1hYy5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250UGxhdGZv cm1EYXRhTWFjLm1tCkBAIC0yOSw3ICsyOSw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShOU0ZvbnQgKm5zRm9udCwgYm9vbCBz eW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY09ibGlxdWUpCitGb250UGxhdGZvcm1EYXRhOjpG b250UGxhdGZvcm1EYXRhKE5TRm9udCogbnNGb250LCBib29sIHN5bnRoZXRpY0JvbGQsIGJvb2wg c3ludGhldGljT2JsaXF1ZSkKICAgICA6IG1fc3ludGhldGljQm9sZChzeW50aGV0aWNCb2xkKQog ICAgICwgbV9zeW50aGV0aWNPYmxpcXVlKHN5bnRoZXRpY09ibGlxdWUpCiAgICAgLCBtX2ZvbnQo bnNGb250KQpAQCAtNTMsNyArNTMsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1E YXRhKE5TRm9udCAqbnNGb250LCBib29sIHN5bnRoZXRpY0JvbGQsIGJvb2wgc3ludAogCiBGb250 UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGYp CiB7Ci0gICAgbV9mb250ID0gZi5tX2ZvbnQgJiYgZi5tX2ZvbnQgIT0gcmVpbnRlcnByZXRfY2Fz dDxOU0ZvbnQgKj4oLTEpID8gY29uc3RfY2FzdDxOU0ZvbnQgKj4oc3RhdGljX2Nhc3Q8Y29uc3Qg TlNGb250ICo+KENGUmV0YWluKGYubV9mb250KSkpIDogZi5tX2ZvbnQ7CisgICAgbV9mb250ID0g Zi5tX2ZvbnQgJiYgZi5tX2ZvbnQgIT0gcmVpbnRlcnByZXRfY2FzdDxOU0ZvbnQqPigtMSkgPyBj b25zdF9jYXN0PE5TRm9udCo+KHN0YXRpY19jYXN0PGNvbnN0IE5TRm9udCo+KENGUmV0YWluKGYu bV9mb250KSkpIDogZi5tX2ZvbnQ7CiAKICAgICBtX3N5bnRoZXRpY0JvbGQgPSBmLm1fc3ludGhl dGljQm9sZDsKICAgICBtX3N5bnRoZXRpY09ibGlxdWUgPSBmLm1fc3ludGhldGljT2JsaXF1ZTsK QEAgLTY1LDcgKzY1LDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25z dCBGb250UGxhdGZvcm1EYXRhJiBmKQogCiBGb250UGxhdGZvcm1EYXRhOjogfkZvbnRQbGF0Zm9y bURhdGEoKQogewotICAgIGlmIChtX2ZvbnQgJiYgbV9mb250ICE9IHJlaW50ZXJwcmV0X2Nhc3Q8 TlNGb250ICo+KC0xKSkKKyAgICBpZiAobV9mb250ICYmIG1fZm9udCAhPSByZWludGVycHJldF9j YXN0PE5TRm9udCo+KC0xKSkKICAgICAgICAgQ0ZSZWxlYXNlKG1fZm9udCk7CiB9CiAKQEAgLTc4 LDIyICs3OCwyMiBAQCBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpv cGVyYXRvcj0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZikKICAgICBtX2F0c3VGb250SUQgPSBm Lm1fYXRzdUZvbnRJRDsKICAgICBpZiAobV9mb250ID09IGYubV9mb250KQogICAgICAgICByZXR1 cm4gKnRoaXM7Ci0gICAgaWYgKGYubV9mb250ICYmIGYubV9mb250ICE9IHJlaW50ZXJwcmV0X2Nh c3Q8TlNGb250ICo+KC0xKSkKKyAgICBpZiAoZi5tX2ZvbnQgJiYgZi5tX2ZvbnQgIT0gcmVpbnRl cnByZXRfY2FzdDxOU0ZvbnQqPigtMSkpCiAgICAgICAgIENGUmV0YWluKGYubV9mb250KTsKLSAg ICBpZiAobV9mb250ICYmIG1fZm9udCAhPSByZWludGVycHJldF9jYXN0PE5TRm9udCAqPigtMSkp CisgICAgaWYgKG1fZm9udCAmJiBtX2ZvbnQgIT0gcmVpbnRlcnByZXRfY2FzdDxOU0ZvbnQqPigt MSkpCiAgICAgICAgIENGUmVsZWFzZShtX2ZvbnQpOwogICAgIG1fZm9udCA9IGYubV9mb250Owog ICAgIG1faXNDb2xvckJpdG1hcEZvbnQgPSBmLm1faXNDb2xvckJpdG1hcEZvbnQ7CiAgICAgcmV0 dXJuICp0aGlzOwogfQogCi12b2lkIEZvbnRQbGF0Zm9ybURhdGE6OnNldEZvbnQoTlNGb250ICpm b250KQordm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRGb250KE5TRm9udCogZm9udCkKIHsKICAg ICBpZiAobV9mb250ID09IGZvbnQpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoZm9udCkKICAg ICAgICAgQ0ZSZXRhaW4oZm9udCk7Ci0gICAgaWYgKG1fZm9udCAmJiBtX2ZvbnQgIT0gcmVpbnRl cnByZXRfY2FzdDxOU0ZvbnQgKj4oLTEpKQorICAgIGlmIChtX2ZvbnQgJiYgbV9mb250ICE9IHJl aW50ZXJwcmV0X2Nhc3Q8TlNGb250Kj4oLTEpKQogICAgICAgICBDRlJlbGVhc2UobV9mb250KTsK ICAgICBtX2ZvbnQgPSBmb250OwogICAgIG1fc2l6ZSA9IGZvbnQgPyBbZm9udCBwb2ludFNpemVd IDogMC4wZjsKQEAgLTEyMyw3ICsxMjMsNyBAQCBib29sIEZvbnRQbGF0Zm9ybURhdGE6OmFsbG93 c0xpZ2F0dXJlcygpIGNvbnN0CiBTdHJpbmcgRm9udFBsYXRmb3JtRGF0YTo6ZGVzY3JpcHRpb24o KSBjb25zdAogewogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gY2dGb250RGVzY3JpcHRpb24o QWRvcHRDRiwgQ0ZDb3B5RGVzY3JpcHRpb24oY2dGb250KCkpKTsKLSAgICByZXR1cm4gU3RyaW5n KGNnRm9udERlc2NyaXB0aW9uLmdldCgpKSArICIgIiArIFN0cmluZzo6bnVtYmVyKG1fc2l6ZSkg KyAobV9zeW50aGV0aWNCb2xkID8gIiBzeW50aGV0aWMgYm9sZCIgOiAiIikgKyAobV9zeW50aGV0 aWNPYmxpcXVlID8gIiBzeW50aGVpdGljIG9ibGlxdWUiIDogIiIpOworICAgIHJldHVybiBTdHJp bmcoY2dGb250RGVzY3JpcHRpb24uZ2V0KCkpICsgIiAiICsgU3RyaW5nOjpudW1iZXIobV9zaXpl KSArIChtX3N5bnRoZXRpY0JvbGQgPyAiIHN5bnRoZXRpYyBib2xkIiA6ICIiKSArIChtX3N5bnRo ZXRpY09ibGlxdWUgPyAiIHN5bnRoZXRpYyBvYmxpcXVlIiA6ICIiKTsKIH0KICNlbmRpZgogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1h Yy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1t CmluZGV4IGJkZGIyYWQuLjA4MjdkYWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCkBAIC03Niw3ICs3Niw3IEBAIHN0YXRpYyBi b29sIGluaXRGb250RGF0YShTaW1wbGVGb250RGF0YSogZm9udERhdGEpCiAKICAgICBBVFNVQXR0 cmlidXRlVGFnIHRhZyA9IGtBVFNVRm9udFRhZzsKICAgICBCeXRlQ291bnQgc2l6ZSA9IHNpemVv ZihBVFNVRm9udElEKTsKLSAgICBBVFNVRm9udElEICp2YWx1ZUFycmF5WzFdID0geyZmb250SWR9 OworICAgIEFUU1VGb250SUQqIHZhbHVlQXJyYXlbMV0gPSB7JmZvbnRJZH07CiAgICAgT1NTdGF0 dXMgc3RhdHVzID0gQVRTVVNldEF0dHJpYnV0ZXMoZm9udFN0eWxlLCAxLCAmdGFnLCAmc2l6ZSwg KHZvaWQqIGNvbnN0Kil2YWx1ZUFycmF5KTsKICAgICBpZiAoc3RhdHVzICE9IG5vRXJyKSB7CiAg ICAgICAgIEFUU1VEaXNwb3NlU3R5bGUoZm9udFN0eWxlKTsKQEAgLTk0LDcgKzk0LDcgQEAgc3Rh dGljIGJvb2wgaW5pdEZvbnREYXRhKFNpbXBsZUZvbnREYXRhKiBmb250RGF0YSkKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotc3RhdGljIE5TU3RyaW5nICp3ZWJGYWxsYmFja0ZvbnRGYW1pbHkodm9p ZCkKK3N0YXRpYyBOU1N0cmluZyogd2ViRmFsbGJhY2tGb250RmFtaWx5KHZvaWQpCiB7CiAgICAg REVGSU5FX1NUQVRJQ19MT0NBTChSZXRhaW5QdHI8TlNTdHJpbmc+LCB3ZWJGYWxsYmFja0ZvbnRG YW1pbHksIChbW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOjE2LjBmXSBmYW1pbHlOYW1lXSkpOwog ICAgIHJldHVybiB3ZWJGYWxsYmFja0ZvbnRGYW1pbHkuZ2V0KCk7CkBAIC0xMDksNyArMTA5LDcg QEAgc3RhdGljIE5TU3RyaW5nKiBwYXRoRnJvbUZvbnQoTlNGb250KikKICAgICByZXR1cm4gbmls OwogfQogI2Vsc2UKLXN0YXRpYyBOU1N0cmluZyogcGF0aEZyb21Gb250KE5TRm9udCAqZm9udCkK K3N0YXRpYyBOU1N0cmluZyogcGF0aEZyb21Gb250KE5TRm9udCogZm9udCkKIHsKICNpZm5kZWYg QlVJTERJTkdfT05fVElHRVIKICAgICBBVFNGb250UmVmIGF0c0ZvbnQgPSBGTUdldEFUU0ZvbnRS ZWZGcm9tRm9udChDVEZvbnRHZXRQbGF0Zm9ybUZvbnQodG9DVEZvbnRSZWYoZm9udCksIDApKTsK QEAgLTE2NSw3ICsxNjUsNyBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQog ICAgICAgICAvLyAiVGltZXMgUk8iIGlzIGEgY29tbW9uIGZvbnQgd2hvc2UgZmFtaWx5IG5hbWUg aXMgIlRpbWVzIi4KICAgICAgICAgLy8gSXQgb3ZlcnJpZGVzIHRoZSBub3JtYWwgIlRpbWVzIiBm YW1pbHkgZm9udC4KICAgICAgICAgLy8gSXQgYWxzbyBhcHBlYXJzIHRvIGhhdmUgYSBjb3JydXB0 IHJlZ3VsYXIgdmFyaWFudC4KLSAgICAgICAgTlNTdHJpbmcgKmZhbGxiYWNrRm9udEZhbWlseTsK KyAgICAgICAgTlNTdHJpbmcqIGZhbGxiYWNrRm9udEZhbWlseTsKICAgICAgICAgaWYgKFtbbV9w bGF0Zm9ybURhdGEuZm9udCgpIGZhbWlseU5hbWVdIGlzRXF1YWw6QCJUaW1lcyJdKQogICAgICAg ICAgICAgZmFsbGJhY2tGb250RmFtaWx5ID0gQCJUaW1lcyBOZXcgUm9tYW4iOwogICAgICAgICBl bHNlCkBAIC0xODEsNyArMTgxLDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0 KCkKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9wbGF0Zm9ybURhdGEuc2V0Rm9udChbTlNG b250IGZvbnRXaXRoTmFtZTpmYWxsYmFja0ZvbnRGYW1pbHkgc2l6ZTptX3BsYXRmb3JtRGF0YS5z aXplKCldKTsKICNpZiAhRVJST1JfRElTQUJMRUQKLSAgICAgICAgTlNTdHJpbmcgKmZpbGVQYXRo ID0gcGF0aEZyb21Gb250KGluaXRpYWxGb250LmdldCgpKTsKKyAgICAgICAgTlNTdHJpbmcqIGZp bGVQYXRoID0gcGF0aEZyb21Gb250KGluaXRpYWxGb250LmdldCgpKTsKICAgICAgICAgaWYgKCFm aWxlUGF0aCkKICAgICAgICAgICAgIGZpbGVQYXRoID0gQCJub3Qga25vd24iOwogI2VuZGlmCkBA IC0yMzcsNyArMjM3LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAg ICAvLyB3ZWIgc3RhbmRhcmQuIFRoZSBBcHBLaXQgYWRqdXN0bWVudCBvZiAyMCUgaXMgdG9vIGJp ZyBhbmQgaXMKICAgICAvLyBpbmNvcnJlY3RseSBhZGRlZCB0byBsaW5lIHNwYWNpbmcsIHNvIHdl IHVzZSBhIDE1JSBhZGp1c3RtZW50IGluc3RlYWQKICAgICAvLyBhbmQgYWRkIGl0IHRvIHRoZSBh c2NlbnQuCi0gICAgTlNTdHJpbmcgKmZhbWlseU5hbWUgPSBbbV9wbGF0Zm9ybURhdGEuZm9udCgp IGZhbWlseU5hbWVdOworICAgIE5TU3RyaW5nKiBmYW1pbHlOYW1lID0gW21fcGxhdGZvcm1EYXRh LmZvbnQoKSBmYW1pbHlOYW1lXTsKICAgICBpZiAoW2ZhbWlseU5hbWUgaXNFcXVhbFRvU3RyaW5n OkAiVGltZXMiXSB8fCBbZmFtaWx5TmFtZSBpc0VxdWFsVG9TdHJpbmc6QCJIZWx2ZXRpY2EiXSB8 fCBbZmFtaWx5TmFtZSBpc0VxdWFsVG9TdHJpbmc6QCJDb3VyaWVyIl0pCiAgICAgICAgIGZBc2Nl bnQgKz0gZmxvb3JmKCgoZkFzY2VudCArIGZEZXNjZW50KSAqIDAuMTVmKSArIDAuNWYpOwogICAg IGVsc2UgaWYgKFtmYW1pbHlOYW1lIGlzRXF1YWxUb1N0cmluZzpAIkdlZXphIFBybyJdKSB7CkBA IC0yODAsNyArMjgwLDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAg ICB9CiB9CiAgICAgCi1zdGF0aWMgQ0ZEYXRhUmVmIGNvcHlGb250VGFibGVGb3JUYWcoRm9udFBs YXRmb3JtRGF0YSBwbGF0Zm9ybURhdGEsIEZvdXJDaGFyQ29kZSB0YWJsZU5hbWUpCitzdGF0aWMg Q0ZEYXRhUmVmIGNvcHlGb250VGFibGVGb3JUYWcoRm9udFBsYXRmb3JtRGF0YSYgcGxhdGZvcm1E YXRhLCBGb3VyQ2hhckNvZGUgdGFibGVOYW1lKQogewogI2lmZGVmIEJVSUxESU5HX09OX1RJR0VS CiAgICAgQVRTRm9udFJlZiBhdHNGb250ID0gRk1HZXRBVFNGb250UmVmRnJvbUZvbnQocGxhdGZv cm1EYXRhLm1fYXRzdUZvbnRJRCk7CkBAIC0zNjIsNyArMzYyLDcgQEAgU2ltcGxlRm9udERhdGEq IFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24m IGZvbnREZXMKICAgICAgICAgICAgIHNtYWxsQ2Fwc0ZvbnQuc2V0Rm9udChmb250RGVzY3JpcHRp b24udXNlUHJpbnRlckZvbnQoKSA/IFtzbWFsbENhcHNGb250LmZvbnQoKSBwcmludGVyRm9udF0g OiBbc21hbGxDYXBzRm9udC5mb250KCkgc2NyZWVuRm9udF0pOwogCiAgICAgICAgICAgICBpZiAo c21hbGxDYXBzRm9udC5mb250KCkpIHsKLSAgICAgICAgICAgICAgICBOU0ZvbnRNYW5hZ2VyICpm b250TWFuYWdlciA9IFtOU0ZvbnRNYW5hZ2VyIHNoYXJlZEZvbnRNYW5hZ2VyXTsKKyAgICAgICAg ICAgICAgICBOU0ZvbnRNYW5hZ2VyKiBmb250TWFuYWdlciA9IFtOU0ZvbnRNYW5hZ2VyIHNoYXJl ZEZvbnRNYW5hZ2VyXTsKICAgICAgICAgICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgZm9udFRyYWl0 cyA9IFtmb250TWFuYWdlciB0cmFpdHNPZkZvbnQ6bV9wbGF0Zm9ybURhdGEuZm9udCgpXTsKIAog ICAgICAgICAgICAgICAgIGlmIChtX3BsYXRmb3JtRGF0YS5tX3N5bnRoZXRpY0JvbGQpCkBAIC0z ODQsOCArMzg0LDggQEAgU2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNG b250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXMKIAogYm9vbCBTaW1wbGVGb250 RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVu Z3RoKSBjb25zdAogewotICAgIE5TU3RyaW5nICpzdHJpbmcgPSBbW05TU3RyaW5nIGFsbG9jXSBp bml0V2l0aENoYXJhY3RlcnNOb0NvcHk6Y29uc3RfY2FzdDx1bmljaGFyKj4oY2hhcmFjdGVycykg bGVuZ3RoOmxlbmd0aCBmcmVlV2hlbkRvbmU6Tk9dOwotICAgIE5TQ2hhcmFjdGVyU2V0ICpzZXQg PSBbW21fcGxhdGZvcm1EYXRhLmZvbnQoKSBjb3ZlcmVkQ2hhcmFjdGVyU2V0XSBpbnZlcnRlZFNl dF07CisgICAgTlNTdHJpbmcqIHN0cmluZyA9IFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoQ2hh cmFjdGVyc05vQ29weTpjb25zdF9jYXN0PHVuaWNoYXIqPihjaGFyYWN0ZXJzKSBsZW5ndGg6bGVu Z3RoIGZyZWVXaGVuRG9uZTpOT107CisgICAgTlNDaGFyYWN0ZXJTZXQqIHNldCA9IFtbbV9wbGF0 Zm9ybURhdGEuZm9udCgpIGNvdmVyZWRDaGFyYWN0ZXJTZXRdIGludmVydGVkU2V0XTsKICAgICBi b29sIHJlc3VsdCA9IHNldCAmJiBbc3RyaW5nIHJhbmdlT2ZDaGFyYWN0ZXJGcm9tU2V0OnNldF0u bG9jYXRpb24gPT0gTlNOb3RGb3VuZDsKICAgICBbc3RyaW5nIHJlbGVhc2VdOwogICAgIHJldHVy biByZXN1bHQ7CkBAIC00MDYsNyArNDA2LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6ZGV0ZXJt aW5lUGl0Y2goKQogICAgIC8vIEFjY29yZGluZyB0byA8cmRhcjovL3Byb2JsZW0vNTQ1NDcwND4s IHdlIHNob3VsZCBub3QgdHJlYXQgTW9ub3R5cGVDb3JzaXZhIGFzIGZpeGVkIHBpdGNoLgogICAg IC8vIE5vdGUgdGhhdCBBcHBLaXQgZG9lcyByZXBvcnQgTW9ub3R5cGVDb3JzaXZhIGFzIGZpeGVk IHBpdGNoLgogCi0gICAgTlNTdHJpbmcgKm5hbWUgPSBbZiBmb250TmFtZV07CisgICAgTlNTdHJp bmcqIG5hbWUgPSBbZiBmb250TmFtZV07CiAgICAgbV90cmVhdEFzRml4ZWRQaXRjaCA9IChbZiBp c0ZpeGVkUGl0Y2hdIHx8IFtmIF9pc0Zha2VGaXhlZFBpdGNoXSB8fAogICAgICAgICAgICBbbmFt ZSBjYXNlSW5zZW5zaXRpdmVDb21wYXJlOkAiT3Nha2EtTW9ubyJdID09IE5TT3JkZXJlZFNhbWUp ICYmCiAgICAgICAgICAgIFtuYW1lIGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJNUy1QR290aGlj Il0gIT0gTlNPcmRlcmVkU2FtZSAmJgo= 59663 2010-06-24 09:39:03 -0700 2010-06-30 05:50:18 -0700 patch 2 minor_fix.patch text/plain 2474 playmobil Y29tbWl0IDU3NTkyOWFkNzMwMDhhYzMyZGExMmMzZTFkZDc4Y2IwZTM1OWE1ZjkKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxqZXJlbXlAY2hyb21pdW0ub3JnPgpEYXRlOiAgIFRodSBKdW4gMjQg MTk6NDA6MjUgMjAxMCArMDMwMAoKICAgIE1pbm9yIENsZWFudXAKCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDU5ZWM4ZGIuLjZiNWQyNzEg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDYtMjQgIEplcmVteSBNb3Nrb3ZpY2ggIDxqZXJlbXlAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1pbm9yIHR3ZWFrcyBhbmQgc3R5bGUgZml4ZXMgdG8gRm9udFBsYXRmb3JtRGF0YU1hYyAm IFNpbXBsZUZvbnREYXRhTWFjLm1tCisKKyAgICAgICAgKiBBdm9pZCBhbiBleHRyYSBGb250UGxh dGZvcm1EYXRhIGNvcHkgaW4gU2ltcGxlRm9udERhdGFNYWMubW0KKyAgICAgICAgKiBGaXggYSB0 eXBvIGluIGEgY29tbWVudCBpbiBGb250UGxhdGZvcm1EYXRhTWFjLm1tCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTUyCisKKyAgICAgICAgTm8g YmVoYXZpb3IgY2hhbmdlcyBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRQbGF0Zm9ybURhdGE6OmRlc2NyaXB0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpjb3B5Rm9udFRh YmxlRm9yVGFnKToKKwogMjAxMC0wNi0yMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5t bSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRQbGF0Zm9ybURhdGFNYWMubW0K aW5kZXggZTJhYjQwNS4uYWViZDlmNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL21hYy9Gb250UGxhdGZvcm1EYXRhTWFjLm1tCkBAIC0xMjMsNyArMTIzLDcgQEAgYm9v bCBGb250UGxhdGZvcm1EYXRhOjphbGxvd3NMaWdhdHVyZXMoKSBjb25zdAogU3RyaW5nIEZvbnRQ bGF0Zm9ybURhdGE6OmRlc2NyaXB0aW9uKCkgY29uc3QKIHsKICAgICBSZXRhaW5QdHI8Q0ZTdHJp bmdSZWY+IGNnRm9udERlc2NyaXB0aW9uKEFkb3B0Q0YsIENGQ29weURlc2NyaXB0aW9uKGNnRm9u dCgpKSk7Ci0gICAgcmV0dXJuIFN0cmluZyhjZ0ZvbnREZXNjcmlwdGlvbi5nZXQoKSkgKyAiICIg KyBTdHJpbmc6Om51bWJlcihtX3NpemUpICsgKG1fc3ludGhldGljQm9sZCA/ICIgc3ludGhldGlj IGJvbGQiIDogIiIpICsgKG1fc3ludGhldGljT2JsaXF1ZSA/ICIgc3ludGhlaXRpYyBvYmxpcXVl IiA6ICIiKTsKKyAgICByZXR1cm4gU3RyaW5nKGNnRm9udERlc2NyaXB0aW9uLmdldCgpKSArICIg IiArIFN0cmluZzo6bnVtYmVyKG1fc2l6ZSkgKyAobV9zeW50aGV0aWNCb2xkID8gIiBzeW50aGV0 aWMgYm9sZCIgOiAiIikgKyAobV9zeW50aGV0aWNPYmxpcXVlID8gIiBzeW50aGV0aWMgb2JsaXF1 ZSIgOiAiIik7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQppbmRleCBiZGRiMmFkLi4xMjZlZjJkIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpA QCAtMjgwLDcgKzI4MCw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAg ICAgfQogfQogICAgIAotc3RhdGljIENGRGF0YVJlZiBjb3B5Rm9udFRhYmxlRm9yVGFnKEZvbnRQ bGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhLCBGb3VyQ2hhckNvZGUgdGFibGVOYW1lKQorc3RhdGlj IENGRGF0YVJlZiBjb3B5Rm9udFRhYmxlRm9yVGFnKEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3Jt RGF0YSwgRm91ckNoYXJDb2RlIHRhYmxlTmFtZSkKIHsKICNpZmRlZiBCVUlMRElOR19PTl9USUdF UgogICAgIEFUU0ZvbnRSZWYgYXRzRm9udCA9IEZNR2V0QVRTRm9udFJlZkZyb21Gb250KHBsYXRm b3JtRGF0YS5tX2F0c3VGb250SUQpOwo= 60115 2010-06-30 05:50:18 -0700 2010-06-30 08:01:56 -0700 patch 3 minor_fix.patch text/plain 2445 playmobil Y29tbWl0IDVmZDc4MzBiYWQzYjJmODFmMjJlZmM2Y2UyMTE1YzJjZTliOTYyZDYKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxwbGF5bW9iaWxAem9hbC50bHYuY29ycC5nb29nbGUuY29tPgpEYXRl OiAgIFdlZCBKdW4gMzAgMTU6NDk6MjIgMjAxMCArMDMwMAoKICAgIE1pbm9yIHR3ZWFrcwoKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVh ODZlNy4uYWIwNmYzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNi0yNCAgSmVyZW15IE1vc2tvdmlj aCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWlub3IgdHdlYWtzIHRvIEZvbnRQbGF0Zm9ybURhdGFNYWMgJiBT aW1wbGVGb250RGF0YU1hYy5tbQorCisgICAgICAgICogQXZvaWQgYW4gZXh0cmEgRm9udFBsYXRm b3JtRGF0YSBjb3B5IGluIFNpbXBsZUZvbnREYXRhTWFjLm1tCisgICAgICAgICogRml4IGEgdHlw byBpbiBGb250UGxhdGZvcm1EYXRhTWFjLm1tCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTUyCisKKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdl cyBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9u dFBsYXRmb3JtRGF0YU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6 OmRlc2NyaXB0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9u dERhdGFNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpjb3B5Rm9udFRhYmxlRm9yVGFnKToKKwog MjAxMC0wNi0zMCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0ZvbnRQbGF0Zm9ybURhdGFNYWMubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9Gb250UGxhdGZvcm1EYXRhTWFjLm1tCmluZGV4IGUyYWI0MDUuLmFlYmQ5ZjcgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRQbGF0Zm9ybURhdGFNYWMu bW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1h Yy5tbQpAQCAtMTIzLDcgKzEyMyw3IEBAIGJvb2wgRm9udFBsYXRmb3JtRGF0YTo6YWxsb3dzTGln YXR1cmVzKCkgY29uc3QKIFN0cmluZyBGb250UGxhdGZvcm1EYXRhOjpkZXNjcmlwdGlvbigpIGNv bnN0CiB7CiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjZ0ZvbnREZXNjcmlwdGlvbihBZG9w dENGLCBDRkNvcHlEZXNjcmlwdGlvbihjZ0ZvbnQoKSkpOwotICAgIHJldHVybiBTdHJpbmcoY2dG b250RGVzY3JpcHRpb24uZ2V0KCkpICsgIiAiICsgU3RyaW5nOjpudW1iZXIobV9zaXplKSArICht X3N5bnRoZXRpY0JvbGQgPyAiIHN5bnRoZXRpYyBib2xkIiA6ICIiKSArIChtX3N5bnRoZXRpY09i bGlxdWUgPyAiIHN5bnRoZWl0aWMgb2JsaXF1ZSIgOiAiIik7CisgICAgcmV0dXJuIFN0cmluZyhj Z0ZvbnREZXNjcmlwdGlvbi5nZXQoKSkgKyAiICIgKyBTdHJpbmc6Om51bWJlcihtX3NpemUpICsg KG1fc3ludGhldGljQm9sZCA/ICIgc3ludGhldGljIGJvbGQiIDogIiIpICsgKG1fc3ludGhldGlj T2JsaXF1ZSA/ICIgc3ludGhldGljIG9ibGlxdWUiIDogIiIpOwogfQogI2VuZGlmCiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1t IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KaW5k ZXggYmRkYjJhZC4uMTI2ZWYyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KQEAgLTI4MCw3ICsyODAsNyBAQCB2b2lkIFNpbXBs ZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgIH0KIH0KICAgICAKLXN0YXRpYyBDRkRhdGFS ZWYgY29weUZvbnRUYWJsZUZvclRhZyhGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0YSwgRm91 ckNoYXJDb2RlIHRhYmxlTmFtZSkKK3N0YXRpYyBDRkRhdGFSZWYgY29weUZvbnRUYWJsZUZvclRh ZyhGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEsIEZvdXJDaGFyQ29kZSB0YWJsZU5hbWUp CiB7CiAjaWZkZWYgQlVJTERJTkdfT05fVElHRVIKICAgICBBVFNGb250UmVmIGF0c0ZvbnQgPSBG TUdldEFUU0ZvbnRSZWZGcm9tRm9udChwbGF0Zm9ybURhdGEubV9hdHN1Rm9udElEKTsK 60119 2010-06-30 08:01:56 -0700 2010-06-30 08:29:33 -0700 patch 4 minor_fix.patch text/plain 2444 playmobil Y29tbWl0IGNmYzM0ZDU5OTFiNjU1NzM1NGU2NmFhYmFlNzcwZGEzZDdhNzVlMzQKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxwbGF5bW9iaWxAem9hbC50bHYuY29ycC5nb29nbGUuY29tPgpEYXRl OiAgIFdlZCBKdW4gMzAgMTU6NDk6MjIgMjAxMCArMDMwMAoKICAgIE1pbm9yIHR3ZWFrcwoKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVh ODZlNy4uOGIzMDE4ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNi0yNCAgSmVyZW15IE1vc2tvdmlj aCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5z dGVpbi4KKworICAgICAgICBNaW5vciB0d2Vha3MgdG8gRm9udFBsYXRmb3JtRGF0YU1hYyAmIFNp bXBsZUZvbnREYXRhTWFjLm1tCisKKyAgICAgICAgKiBBdm9pZCBhbiBleHRyYSBGb250UGxhdGZv cm1EYXRhIGNvcHkgaW4gU2ltcGxlRm9udERhdGFNYWMubW0KKyAgICAgICAgKiBGaXggYSB0eXBv IGluIEZvbnRQbGF0Zm9ybURhdGFNYWMubW0KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNTIKKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2Vz IHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 UGxhdGZvcm1EYXRhTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6 ZGVzY3JpcHRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250 RGF0YU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvcHlGb250VGFibGVGb3JUYWcpOgorCiAy MDEwLTA2LTMwICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0ZvbnRQbGF0Zm9ybURhdGFNYWMubW0KaW5kZXggZTJhYjQwNS4uYWViZDlmNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udFBsYXRmb3JtRGF0YU1hYy5t bQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250UGxhdGZvcm1EYXRhTWFj Lm1tCkBAIC0xMjMsNyArMTIzLDcgQEAgYm9vbCBGb250UGxhdGZvcm1EYXRhOjphbGxvd3NMaWdh dHVyZXMoKSBjb25zdAogU3RyaW5nIEZvbnRQbGF0Zm9ybURhdGE6OmRlc2NyaXB0aW9uKCkgY29u c3QKIHsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNnRm9udERlc2NyaXB0aW9uKEFkb3B0 Q0YsIENGQ29weURlc2NyaXB0aW9uKGNnRm9udCgpKSk7Ci0gICAgcmV0dXJuIFN0cmluZyhjZ0Zv bnREZXNjcmlwdGlvbi5nZXQoKSkgKyAiICIgKyBTdHJpbmc6Om51bWJlcihtX3NpemUpICsgKG1f c3ludGhldGljQm9sZCA/ICIgc3ludGhldGljIGJvbGQiIDogIiIpICsgKG1fc3ludGhldGljT2Js aXF1ZSA/ICIgc3ludGhlaXRpYyBvYmxpcXVlIiA6ICIiKTsKKyAgICByZXR1cm4gU3RyaW5nKGNn Rm9udERlc2NyaXB0aW9uLmdldCgpKSArICIgIiArIFN0cmluZzo6bnVtYmVyKG1fc2l6ZSkgKyAo bV9zeW50aGV0aWNCb2xkID8gIiBzeW50aGV0aWMgYm9sZCIgOiAiIikgKyAobV9zeW50aGV0aWNP YmxpcXVlID8gIiBzeW50aGV0aWMgb2JsaXF1ZSIgOiAiIik7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0g Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQppbmRl eCBiZGRiMmFkLi4xMjZlZjJkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpAQCAtMjgwLDcgKzI4MCw3IEBAIHZvaWQgU2ltcGxl Rm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgfQogfQogICAgIAotc3RhdGljIENGRGF0YVJl ZiBjb3B5Rm9udFRhYmxlRm9yVGFnKEZvbnRQbGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhLCBGb3Vy Q2hhckNvZGUgdGFibGVOYW1lKQorc3RhdGljIENGRGF0YVJlZiBjb3B5Rm9udFRhYmxlRm9yVGFn KEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgRm91ckNoYXJDb2RlIHRhYmxlTmFtZSkK IHsKICNpZmRlZiBCVUlMRElOR19PTl9USUdFUgogICAgIEFUU0ZvbnRSZWYgYXRzRm9udCA9IEZN R2V0QVRTRm9udFJlZkZyb21Gb250KHBsYXRmb3JtRGF0YS5tX2F0c3VGb250SUQpOwo=