5579 2005-11-01 02:45:58 -0800 WebKit+SVG renders full-filters-example incorrectly 2007-08-21 14:34:18 -0700 1 1 1 Unclassified WebKit SVG 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://www.w3.org/Graphics/SVG/Test/20030813/htmlframe/full-filters-example-01-b.html NeedsReduction P4 Normal --- 4462 4883 5526 1 eric webkit-unassigned ian oldest_to_newest 23428 0 eric 2005-11-01 02:45:58 -0800 WebKit+SVG renders full-filters-example renderers incorrectly This seems to a coordinates/clipping issue. 23429 1 eric 2005-11-01 02:47:42 -0800 Erick is taking a crack at this one. 24006 2 4684 erickt 2005-11-13 21:43:18 -0800 Created attachment 4684 patch to fix the clipping problem This should fix the clipping problem. So what happened is that the input image was centered at 0,0, but it was supposed to be translated to the (x,y) of the filter location. This should fix the problem. 24007 3 4685 erickt 2005-11-13 21:57:42 -0800 Created attachment 4685 properly patching 24008 4 4685 eric 2005-11-13 22:26:07 -0800 Comment on attachment 4685 properly patching Erick and I talked about this over IRC. One more round of patch cleanup is necessary here. Also, there seems to be a stray ASSERT. 24009 5 4686 erickt 2005-11-13 22:56:58 -0800 Created attachment 4686 added MacDome's suggestions 24010 6 4687 erickt 2005-11-13 23:14:22 -0800 Created attachment 4687 hopefully final patch 24011 7 4688 erickt 2005-11-13 23:15:44 -0800 Created attachment 4688 expanded some tabs 24012 8 4688 eric 2005-11-13 23:23:39 -0800 Comment on attachment 4688 expanded some tabs Looks good. r=me. I'll land this early this week, hopefully as early as tomorrow. 24589 9 4688 eric 2005-11-26 14:38:07 -0800 Comment on attachment 4688 expanded some tabs Unfortunately this patch no longer applies cleanly after the big merger. There still need to be fixes in this area, however this patch is going to need to be re-worked a bit now. Best if we discuss this over IRC. Removing the review flag for now. 25627 10 eric 2005-12-06 04:46:17 -0800 It actually does a very good job of rendering this example now in TOT, however there are still some clipping issues, which I believe are caused by rounding errors due to our use of ints: http://bugzilla.opendarwin.org/show_bug.cgi?id=4462 Also, this example also suffers from the filter scaling problem: http://bugzilla.opendarwin.org/show_bug.cgi?id=5526 25721 11 eric 2005-12-08 04:40:40 -0800 The only thing left "wrong" is the grainyness: http://bugzilla.opendarwin.org/show_bug.cgi?id=5526 Lack of Text: http://bugzilla.opendarwin.org/show_bug.cgi?id=4883 And integer clipping: http://bugzilla.opendarwin.org/show_bug.cgi?id=4462 I'm not sure that this bug serves a lot of use anymore. But I'll leave it for now. 1758 12 zimmermann 2007-08-21 14:34:18 -0700 Landed in r25175. 4684 2005-11-13 21:43:18 -0800 2005-11-13 21:57:42 -0800 patch to fix the clipping problem clipping.patch text/plain 3190 erickt ZGlmZiAtcjEuMTAgS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQoxMjFjMTIxCjwgQ0dSZWN0IEtDYW52 YXNGaWx0ZXJRdWFydHo6OmZpbHRlckJCb3hGb3JJdGVtQkJveChDR1JlY3QgaXRlbUJCb3gsIENH QWZmaW5lVHJhbnNmb3JtIGN1cnJlbnRDVE0pIGNvbnN0Ci0tLQo+IENHUmVjdCBLQ2FudmFzRmls dGVyUXVhcnR6OjpmaWx0ZXJCQm94Rm9ySXRlbUJCb3goQ0dSZWN0IGl0ZW1CQm94LCBDR0FmZmlu ZVRyYW5zZm9ybSBvYmplY3RUcmFuc2Zvcm0pIGNvbnN0CjEyMmExMjMsMTI0Cj4gICAgICAgLy9O U0xvZyhAIml0ZW1CQm94OiAlQCIsIE5TU3RyaW5nRnJvbVJlY3QoKihOU1JlY3QgKikmaXRlbUJC b3gpKTsKPiAKMTI0YTEyNywxMjgKPiAKPiAgICAgICAvLyBpZiByZXR1cm5zIHRydWUsIHdlJ3Jl IHVzaW5nIG9iamVjdEJvdW5kaW5nQm94CjEyN2MxMzEKPCAgICAgICAgICAgICAgIC8vTlNMb2co QCJyZWxhdGl2ZSBiYm94OiAlQCIsIE5TU3RyaW5nRnJvbVJlY3QoKihOU1JlY3QgKikmZmlsdGVy QkJveCkpOwotLS0KPiAgICAgICAgICAgICAgIC8vTlNMb2coQCJyZWxhdGl2ZSBmaWx0ZXJCQm94 OiAlQCIsIE5TU3RyaW5nRnJvbVJlY3QoKihOU1JlY3QgKikmZmlsdGVyQkJveCkpOwoxMzVjMTM5 LDE1MAo8ICAgICAgICAgICAgICAgLy9maWx0ZXJCQm94ID0gQ0dSZWN0QXBwbHlBZmZpbmVUcmFu c2Zvcm0oZmlsdGVyQkJveCwgY3VycmVudENUTSk7Ci0tLQo+ICAgICAgICAgICAgICAgQVNTRVJU KGl0ZW1CQm94LnNpemUgPT0gZmlsdGVyQkJveC5zaXplKTsKPiAgICAgICAgICAgICAgIC8qCj4g ICAgICAgICAgICAgICBOU0xvZyhAImFic29sdXRlIGZpbHRlckJCb3g6ICVAIiwgTlNTdHJpbmdG cm9tUmVjdCgqKE5TUmVjdCAqKSZmaWx0ZXJCQm94KSk7Cj4gICAgICAgICAgICAgICBOU0xvZyhA Int7JWYgJWZ9IHslZiAlZn19IHslZiAlZn0iLCAKPiAgICAgICAgICAgICAgICAgICAgICAgb2Jq ZWN0VHJhbnNmb3JtLmEsIAo+ICAgICAgICAgICAgICAgICAgICAgICBvYmplY3RUcmFuc2Zvcm0u YiwgCj4gICAgICAgICAgICAgICAgICAgICAgIG9iamVjdFRyYW5zZm9ybS5jLCAKPiAgICAgICAg ICAgICAgICAgICAgICAgb2JqZWN0VHJhbnNmb3JtLmQsIAo+ICAgICAgICAgICAgICAgICAgICAg ICBvYmplY3RUcmFuc2Zvcm0udHgsIAo+ICAgICAgICAgICAgICAgICAgICAgICBvYmplY3RUcmFu c2Zvcm0udHkpOyAKPiAgICAgICAgICAgICAgICovCj4gICAgICAgICAgICAgICBmaWx0ZXJCQm94 ID0gQ0dSZWN0QXBwbHlBZmZpbmVUcmFuc2Zvcm0oZmlsdGVyQkJveCwgb2JqZWN0VHJhbnNmb3Jt KTsKMTM2YTE1MiwxNTQKPiAKPiAgICAgICAvL05TTG9nKEAib3V0cHV0IGZpbHRlckJCb3g6ICVA IiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZmaWx0ZXJCQm94KSk7Cj4gCjE1M2ExNzIs MTczCj4gICAgICAgQ0dSZWN0IGl0ZW1CQm94ID0gQ0dSZWN0KGJib3gpOwo+IAoxNTVhMTc2LDE4 MAo+IAo+ICAgICAgIC8vIG1vdmUgdGhlIGlucHV0IGltYWdlIHRvIHRoZSByaWdodCBsb2NhdGlv bgo+ICAgICAgIENHQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IENHQWZmaW5lVHJhbnNmb3Jt TWFrZVRyYW5zbGF0aW9uKGl0ZW1CQm94Lm9yaWdpbi54LCBpdGVtQkJveC5vcmlnaW4ueSk7Cj4g ICAgICAgaW5wdXRJbWFnZSA9IFtpbnB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTp0 cmFuc2Zvcm1dOwo+IAoxNjQsMTgyYzE4OSwxOTMKPCAgICAgICAgICAgICAgIC8vIGFjdHVhbGx5 IGRyYXcgdGhlIHJlc3VsdCB0byB0aGUgb3JpZ2luYWwgY29udGV4dAo8IAo8ICAgICAgICAgICAg ICAgQ0dSZWN0IGZpbHRlclJlY3QgPSBmaWx0ZXJCQm94Rm9ySXRlbUJCb3goQ0dSZWN0KGJib3gp LCBvYmplY3RUcmFuc2Zvcm0pOwo8ICAgICAgICAgICAgICAgQ0dSZWN0IHRyYW5zbGF0ZWQgPSBm aWx0ZXJSZWN0Owo8ICAgICAgICAgICAgICAgQ0dQb2ludCBiYm94T3JpZ2luID0gQ0dSZWN0KGJi b3gpLm9yaWdpbjsKPCAvLyAgICAgICAgICAgIHRyYW5zbGF0ZWQub3JpZ2luLnggKz0gYmJveE9y aWdpbi54Owo8IC8vICAgICAgICAgICAgdHJhbnNsYXRlZC5vcmlnaW4ueSArPSBiYm94T3JpZ2lu Lnk7CjwgICAgICAgICAgICAgICBDR1JlY3Qgc291cmNlUmVjdCA9IENHUmVjdEludGVyc2VjdGlv bih0cmFuc2xhdGVkLFtvdXRwdXRJbWFnZSBleHRlbnRdKTsKPCAgICAgICAgICAgICAgIC8vIEZJ WE1FOiBvYmplY3RUcmFuc2Zvcm0gc2VlbXMgbGlrZSBhIGhhY2suCjwgCjwgICAgICAgICAgICAg ICBDR1BvaW50IGRlc3RPcmlnaW4gPSBzb3VyY2VSZWN0Lm9yaWdpbjsKPCAgICAgICAgICAgICAg IGRlc3RPcmlnaW4ueCArPSBiYm94T3JpZ2luLng7CjwgICAgICAgICAgICAgICBkZXN0T3JpZ2lu LnkgKz0gYmJveE9yaWdpbi55Owo8IAo8ICAgICAgICAgICAgICAgLy9DR1JlY3QgZXh0ZW50ID0g W291dHB1dEltYWdlIGV4dGVudF07CjwgICAgICAgICAgICAgICAvL05TTG9nKEAiRHJhd2luZyBm cm9tIHJlY3Q6IFxuJUAgXG4gYXQgcG9pbnQ6IFxuJUAgXG5leHRlbnQ6IFxuJUAgXG5tYXRyaXg6 IFxuJUAiLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0ICopJnNvdXJjZVJlY3QpLCBOU1N0cmlu Z0Zyb21Qb2ludCgqKE5TUG9pbnQgKikmZGVzdE9yaWdpbiksIE5TU3RyaW5nRnJvbVJlY3QoKihO U1JlY3QgKikmZXh0ZW50KSwgQ0ZTdHJpbmdGcm9tQ0dBZmZpbmVUcmFuc2Zvcm0ob2JqZWN0VHJh bnNmb3JtKSk7CjwgICAgICAgICAgICAgICAvL291dHB1dEltYWdlID0gW291dHB1dEltYWdlIGlt YWdlQnlBcHBseWluZ1RyYW5zZm9ybTpvYmplY3RUcmFuc2Zvcm1dOwo8ICAgICAgICAgICAgICAg W21fZmlsdGVyQ0lDb250ZXh0IGRyYXdJbWFnZTpvdXRwdXRJbWFnZSBhdFBvaW50OmRlc3RPcmln aW4gZnJvbVJlY3Q6c291cmNlUmVjdF07CjwgICAgICAgfSBlbHNlCi0tLQo+ICAgICAgICAgICAg ICAgQ0dSZWN0IGZpbHRlckJCb3ggPSBmaWx0ZXJCQm94Rm9ySXRlbUJCb3goaXRlbUJCb3gsIG9i amVjdFRyYW5zZm9ybSk7Cj4gCj4gICAgICAgICAgICAgICBbbV9maWx0ZXJDSUNvbnRleHQgZHJh d0ltYWdlOm91dHB1dEltYWdlIGF0UG9pbnQ6ZmlsdGVyQkJveC5vcmlnaW4gZnJvbVJlY3Q6Zmls dGVyQkJveF07Cj4gCj4gICAgICAgfSBlbHNlIHsKMTgzYTE5NSwxOTYKPiAgICAgICB9Cj4gCg== 4685 2005-11-13 21:57:42 -0800 2005-11-13 22:56:58 -0800 properly patching clipping.patch text/plain 4175 erickt SW5kZXg6IEtDYW52YXNGaWx0ZXJRdWFydHoubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1NWR1N1cHBvcnQva2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNGaWx0ZXJRdWFydHou bW0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtcCAtdSAtcjEuMTAgS0NhbnZhc0Zp bHRlclF1YXJ0ei5tbQotLS0gS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQk1IE9jdCAyMDA1IDA1OjM2 OjUxIC0wMDAwCTEuMTAKKysrIEtDYW52YXNGaWx0ZXJRdWFydHoubW0JMTQgTm92IDIwMDUgMDY6 MDI6MDEgLTAwMDAKQEAgLTExOCwxMyArMTE4LDE3IEBAIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6cHJlcGFyZUZpbHRlcigKIAlDR0NvbnRleHRDb25jYXRDVE0oKmNvbnRleHQsQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlVHJhbnNsYXRpb24oZmxvYXQoLTEgKiBiYm94LngoKSksZmxvYXQoLTEgKiBi Ym94LnkoKSkpKTsKIH0KIAotQ0dSZWN0IEtDYW52YXNGaWx0ZXJRdWFydHo6OmZpbHRlckJCb3hG b3JJdGVtQkJveChDR1JlY3QgaXRlbUJCb3gsIENHQWZmaW5lVHJhbnNmb3JtIGN1cnJlbnRDVE0p IGNvbnN0CitDR1JlY3QgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6ZmlsdGVyQkJveEZvckl0ZW1CQm94 KENHUmVjdCBpdGVtQkJveCwgQ0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKSBjb25z dAogeworCS8vTlNMb2coQCJpdGVtQkJveDogJUAiLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0 ICopJml0ZW1CQm94KSk7CisJCiAJLy8gRklYTUU6IGhhY2sgZm9yIG5vdwogCUNHUmVjdCBmaWx0 ZXJCQm94ID0gQ0dSZWN0KGZpbHRlclJlY3QoKSk7CisKKwkvLyBpZiByZXR1cm5zIHRydWUsIHdl J3JlIHVzaW5nIG9iamVjdEJvdW5kaW5nQm94CiAJaWYoZmlsdGVyQm91bmRpbmdCb3hNb2RlKCkp CiAJewotCQkvL05TTG9nKEAicmVsYXRpdmUgYmJveDogJUAiLCBOU1N0cmluZ0Zyb21SZWN0KCoo TlNSZWN0ICopJmZpbHRlckJCb3gpKTsKKwkJLy9OU0xvZyhAInJlbGF0aXZlIGZpbHRlckJCb3g6 ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZmaWx0ZXJCQm94KSk7CiAJCWZpbHRl ckJCb3ggPQogCQkJQ0dSZWN0TWFrZSgoZmlsdGVyQkJveC5vcmlnaW4ueC8xMDAuZiAqIGl0ZW1C Qm94LnNpemUud2lkdGgpLCAKIAkJCQkJCShmaWx0ZXJCQm94Lm9yaWdpbi55LzEwMC5mICogaXRl bUJCb3guc2l6ZS5oZWlnaHQpLCAKQEAgLTEzMiw4ICsxMzYsMjIgQEAgQ0dSZWN0IEtDYW52YXNG aWx0ZXJRdWFydHo6OmZpbHRlckJCb3hGbwogCQkJCQkgICAoZmlsdGVyQkJveC5zaXplLmhlaWdo dC8xMDAuZiAqIGl0ZW1CQm94LnNpemUuaGVpZ2h0KSk7CiAJCS8vTlNMb2coQCJzY2FsZWQgYmJv eDogJUAiLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0ICopJmZpbHRlckJCb3gpKTsKIAl9IGVs c2UgewotCQkvL2ZpbHRlckJCb3ggPSBDR1JlY3RBcHBseUFmZmluZVRyYW5zZm9ybShmaWx0ZXJC Qm94LCBjdXJyZW50Q1RNKTsKKwkJQVNTRVJUKGl0ZW1CQm94LnNpemUgPT0gZmlsdGVyQkJveC5z aXplKTsKKwkJLyoKKwkJTlNMb2coQCJhYnNvbHV0ZSBmaWx0ZXJCQm94OiAlQCIsIE5TU3RyaW5n RnJvbVJlY3QoKihOU1JlY3QgKikmZmlsdGVyQkJveCkpOworCQlOU0xvZyhAInt7JWYgJWZ9IHsl ZiAlZn19IHslZiAlZn0iLCAKKwkJCW9iamVjdFRyYW5zZm9ybS5hLCAKKwkJCW9iamVjdFRyYW5z Zm9ybS5iLCAKKwkJCW9iamVjdFRyYW5zZm9ybS5jLCAKKwkJCW9iamVjdFRyYW5zZm9ybS5kLCAK KwkJCW9iamVjdFRyYW5zZm9ybS50eCwgCisJCQlvYmplY3RUcmFuc2Zvcm0udHkpOyAKKwkJKi8K KwkJZmlsdGVyQkJveCA9IENHUmVjdEFwcGx5QWZmaW5lVHJhbnNmb3JtKGZpbHRlckJCb3gsIG9i amVjdFRyYW5zZm9ybSk7CiAJfQorCisJLy9OU0xvZyhAIm91dHB1dCBmaWx0ZXJCQm94OiAlQCIs IE5TU3RyaW5nRnJvbVJlY3QoKihOU1JlY3QgKikmZmlsdGVyQkJveCkpOworCiAJcmV0dXJuIGZp bHRlckJCb3g7CiB9CiAKQEAgLTE1MSw4ICsxNjksMTUgQEAgdm9pZCBLQ2FudmFzRmlsdGVyUXVh cnR6OjphcHBseUZpbHRlcihDRwogCSpjb250ZXh0ID0gbV9zdG9yZWRDR0NvbnRleHQ7CiAJbV9z dG9yZWRDR0NvbnRleHQgPSBOVUxMOwogCisJQ0dSZWN0IGl0ZW1CQm94ID0gQ0dSZWN0KGJib3gp OworCiAJLy8gYWN0dWFsbHkgYXBwbHkgdGhlIGZpbHRlciBlZmZlY3RzCiAJQ0lJbWFnZSAqaW5w dXRJbWFnZSA9IFtDSUltYWdlIGltYWdlV2l0aENHTGF5ZXI6bV9maWx0ZXJDR0xheWVyXTsKKwkK KwkvLyBtb3ZlIHRoZSBpbnB1dCBpbWFnZSB0byB0aGUgcmlnaHQgbG9jYXRpb24KKwlDR0FmZmlu ZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBDR0FmZmluZVRyYW5zZm9ybU1ha2VUcmFuc2xhdGlvbihp dGVtQkJveC5vcmlnaW4ueCwgaXRlbUJCb3gub3JpZ2luLnkpOworCWlucHV0SW1hZ2UgPSBbaW5w dXRJbWFnZSBpbWFnZUJ5QXBwbHlpbmdUcmFuc2Zvcm06dHJhbnNmb3JtXTsKKwogCU5TQXJyYXkg KmZpbHRlclN0YWNrID0gZ2V0Q0lGaWx0ZXJTdGFjayhpbnB1dEltYWdlKTsKIAlpZiAoW2ZpbHRl clN0YWNrIGNvdW50XSkgewogCQlDSUltYWdlICpvdXRwdXRJbWFnZSA9IFtbZmlsdGVyU3RhY2sg bGFzdE9iamVjdF0gdmFsdWVGb3JLZXk6QCJvdXRwdXRJbWFnZSJdOwpAQCAtMTYxLDI2ICsxODYs MTQgQEAgdm9pZCBLQ2FudmFzRmlsdGVyUXVhcnR6OjphcHBseUZpbHRlcihDRwogCQkJcmV0dXJu OwogCQl9CiAJCQotCQkvLyBhY3R1YWxseSBkcmF3IHRoZSByZXN1bHQgdG8gdGhlIG9yaWdpbmFs IGNvbnRleHQKLQkJCi0JCUNHUmVjdCBmaWx0ZXJSZWN0ID0gZmlsdGVyQkJveEZvckl0ZW1CQm94 KENHUmVjdChiYm94KSwgb2JqZWN0VHJhbnNmb3JtKTsKLQkJQ0dSZWN0IHRyYW5zbGF0ZWQgPSBm aWx0ZXJSZWN0OwotCQlDR1BvaW50IGJib3hPcmlnaW4gPSBDR1JlY3QoYmJveCkub3JpZ2luOwot Ly8JCXRyYW5zbGF0ZWQub3JpZ2luLnggKz0gYmJveE9yaWdpbi54OwotLy8JCXRyYW5zbGF0ZWQu b3JpZ2luLnkgKz0gYmJveE9yaWdpbi55OwotCQlDR1JlY3Qgc291cmNlUmVjdCA9IENHUmVjdElu dGVyc2VjdGlvbih0cmFuc2xhdGVkLFtvdXRwdXRJbWFnZSBleHRlbnRdKTsKLQkJLy8gRklYTUU6 IG9iamVjdFRyYW5zZm9ybSBzZWVtcyBsaWtlIGEgaGFjay4KLQkJCi0JCUNHUG9pbnQgZGVzdE9y aWdpbiA9IHNvdXJjZVJlY3Qub3JpZ2luOwotCQlkZXN0T3JpZ2luLnggKz0gYmJveE9yaWdpbi54 OwotCQlkZXN0T3JpZ2luLnkgKz0gYmJveE9yaWdpbi55OwotCQkKLQkJLy9DR1JlY3QgZXh0ZW50 ID0gW291dHB1dEltYWdlIGV4dGVudF07Ci0JCS8vTlNMb2coQCJEcmF3aW5nIGZyb20gcmVjdDog XG4lQCBcbiBhdCBwb2ludDogXG4lQCBcbmV4dGVudDogXG4lQCBcbm1hdHJpeDogXG4lQCIsIE5T U3RyaW5nRnJvbVJlY3QoKihOU1JlY3QgKikmc291cmNlUmVjdCksIE5TU3RyaW5nRnJvbVBvaW50 KCooTlNQb2ludCAqKSZkZXN0T3JpZ2luKSwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZl eHRlbnQpLCBDRlN0cmluZ0Zyb21DR0FmZmluZVRyYW5zZm9ybShvYmplY3RUcmFuc2Zvcm0pKTsK LQkJLy9vdXRwdXRJbWFnZSA9IFtvdXRwdXRJbWFnZSBpbWFnZUJ5QXBwbHlpbmdUcmFuc2Zvcm06 b2JqZWN0VHJhbnNmb3JtXTsKLQkJW21fZmlsdGVyQ0lDb250ZXh0IGRyYXdJbWFnZTpvdXRwdXRJ bWFnZSBhdFBvaW50OmRlc3RPcmlnaW4gZnJvbVJlY3Q6c291cmNlUmVjdF07Ci0JfSBlbHNlCisJ CUNHUmVjdCBmaWx0ZXJCQm94ID0gZmlsdGVyQkJveEZvckl0ZW1CQm94KGl0ZW1CQm94LCBvYmpl Y3RUcmFuc2Zvcm0pOworCisJCVttX2ZpbHRlckNJQ29udGV4dCBkcmF3SW1hZ2U6b3V0cHV0SW1h Z2UgYXRQb2ludDpmaWx0ZXJCQm94Lm9yaWdpbiBmcm9tUmVjdDpmaWx0ZXJCQm94XTsKKworCX0g ZWxzZSB7CiAJCU5TTG9nKEAiTm8gZmlsdGVyIHN0YWNrLCBjYW4ndCBkcmF3IGZpbHRlci4iKTsK Kwl9CisKIAkvLyBjbGVhbnVwCiAJQ0dMYXllclJlbGVhc2UobV9maWx0ZXJDR0xheWVyKTsKIAkv L0NHQ29udGV4dFJlbGVhc2UobGF5ZXJDb250ZXh0KTsgLy8gSSBkb24ndCBzZWVtIHRvIG5lZWQg dG8gZG8gdGhpcy4uLgo= 4686 2005-11-13 22:56:58 -0800 2005-11-13 23:23:50 -0800 added MacDome's suggestions clipping.patch text/plain 5583 erickt SW5kZXg6IEtDYW52YXNGaWx0ZXJRdWFydHoubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1NWR1N1cHBvcnQva2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNGaWx0ZXJRdWFydHou bW0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtcCAtdSAtcjEuMTAgS0NhbnZhc0Zp bHRlclF1YXJ0ei5tbQotLS0gS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQk1IE9jdCAyMDA1IDA1OjM2 OjUxIC0wMDAwCTEuMTAKKysrIEtDYW52YXNGaWx0ZXJRdWFydHoubW0JMTQgTm92IDIwMDUgMDY6 NTU6MTAgLTAwMDAKQEAgLTExOCw3MyArMTE4LDY0IEBAIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6cHJlcGFyZUZpbHRlcigKIAlDR0NvbnRleHRDb25jYXRDVE0oKmNvbnRleHQsQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlVHJhbnNsYXRpb24oZmxvYXQoLTEgKiBiYm94LngoKSksZmxvYXQoLTEgKiBi Ym94LnkoKSkpKTsKIH0KIAotQ0dSZWN0IEtDYW52YXNGaWx0ZXJRdWFydHo6OmZpbHRlckJCb3hG b3JJdGVtQkJveChDR1JlY3QgaXRlbUJCb3gsIENHQWZmaW5lVHJhbnNmb3JtIGN1cnJlbnRDVE0p IGNvbnN0CitDR1JlY3QgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6ZmlsdGVyQkJveEZvckl0ZW1CQm94 KENHUmVjdCBpdGVtQkJveCwgQ0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKSBjb25z dAogewotCS8vIEZJWE1FOiBoYWNrIGZvciBub3cKLQlDR1JlY3QgZmlsdGVyQkJveCA9IENHUmVj dChmaWx0ZXJSZWN0KCkpOwotCWlmKGZpbHRlckJvdW5kaW5nQm94TW9kZSgpKQotCXsKLQkJLy9O U0xvZyhAInJlbGF0aXZlIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZm aWx0ZXJCQm94KSk7Ci0JCWZpbHRlckJCb3ggPQotCQkJQ0dSZWN0TWFrZSgoZmlsdGVyQkJveC5v cmlnaW4ueC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJCShmaWx0ZXJCQm94 Lm9yaWdpbi55LzEwMC5mICogaXRlbUJCb3guc2l6ZS5oZWlnaHQpLCAKLQkJCQkJICAgKGZpbHRl ckJCb3guc2l6ZS53aWR0aC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJICAg KGZpbHRlckJCb3guc2l6ZS5oZWlnaHQvMTAwLmYgKiBpdGVtQkJveC5zaXplLmhlaWdodCkpOwot CQkvL05TTG9nKEAic2NhbGVkIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAq KSZmaWx0ZXJCQm94KSk7Ci0JfSBlbHNlIHsKLQkJLy9maWx0ZXJCQm94ID0gQ0dSZWN0QXBwbHlB ZmZpbmVUcmFuc2Zvcm0oZmlsdGVyQkJveCwgY3VycmVudENUTSk7Ci0JfQotCXJldHVybiBmaWx0 ZXJCQm94OworICAgIENHUmVjdCBmaWx0ZXJCQm94ID0gQ0dSZWN0KGZpbHRlclJlY3QoKSk7CisK KyAgICAvLyBpZiByZXR1cm5zIHRydWUsIHdlJ3JlIHVzaW5nIG9iamVjdEJvdW5kaW5nQm94Cisg ICAgaWYoZmlsdGVyQm91bmRpbmdCb3hNb2RlKCkpIHsKKyAgICAgICAgZmlsdGVyQkJveCA9Cisg ICAgICAgICAgICBDR1JlY3RNYWtlKChmaWx0ZXJCQm94Lm9yaWdpbi54LzEwMC5mICogaXRlbUJC b3guc2l6ZS53aWR0aCksIAorICAgICAgICAgICAgICAgICAgICAgICAoZmlsdGVyQkJveC5vcmln aW4ueS8xMDAuZiAqIGl0ZW1CQm94LnNpemUuaGVpZ2h0KSwgCisgICAgICAgICAgICAgICAgICAg ICAgIChmaWx0ZXJCQm94LnNpemUud2lkdGgvMTAwLmYgKiBpdGVtQkJveC5zaXplLndpZHRoKSwg CisgICAgICAgICAgICAgICAgICAgICAgIChmaWx0ZXJCQm94LnNpemUuaGVpZ2h0LzEwMC5mICog aXRlbUJCb3guc2l6ZS5oZWlnaHQpKTsKKyAgICB9IGVsc2UgCisgICAgICAgIGZpbHRlckJCb3gg PSBDR1JlY3RBcHBseUFmZmluZVRyYW5zZm9ybShmaWx0ZXJCQm94LCBvYmplY3RUcmFuc2Zvcm0p OworCisgICAgcmV0dXJuIGZpbHRlckJCb3g7CiB9CiAKIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6YXBwbHlGaWx0ZXIoQ0dDb250ZXh0UmVmICpjb250ZXh0LCBjb25zdCBRUmVjdCAmYmJveCwg Q0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKQogewotCWlmIChtX2VmZmVjdHMuaXNF bXB0eSgpKSByZXR1cm47IC8vIFdlIGxvZyBkdXJpbmcgInByZXBhcmUiCi0JQVNTRVJUKG1fc3Rv cmVkQ0dDb250ZXh0KTsKLQlBU1NFUlQoY29udGV4dCk7Ci0JLy9DR0NvbnRleHRSZWYgbGF5ZXJD b250ZXh0ID0gKmNvbnRleHQ7Ci0JCi0JLy9OU0xvZyhAImFwcGx5IGZpbHRlciBpbiBjb250ZXh0 OiAlcCB0byBjb250ZXh0OiAlcCBiYm94OiAlQCIsICpjb250ZXh0LAotCS8vCW1fc3RvcmVkQ0dD b250ZXh0LCBOU1N0cmluZ0Zyb21SZWN0KE5TUmVjdChiYm94KSkpOwotCQotCS8vIHN3YXAgY29u dGV4dHMgYmFjawotCSpjb250ZXh0ID0gbV9zdG9yZWRDR0NvbnRleHQ7Ci0JbV9zdG9yZWRDR0Nv bnRleHQgPSBOVUxMOwotCi0JLy8gYWN0dWFsbHkgYXBwbHkgdGhlIGZpbHRlciBlZmZlY3RzCi0J Q0lJbWFnZSAqaW5wdXRJbWFnZSA9IFtDSUltYWdlIGltYWdlV2l0aENHTGF5ZXI6bV9maWx0ZXJD R0xheWVyXTsKLQlOU0FycmF5ICpmaWx0ZXJTdGFjayA9IGdldENJRmlsdGVyU3RhY2soaW5wdXRJ bWFnZSk7Ci0JaWYgKFtmaWx0ZXJTdGFjayBjb3VudF0pIHsKLQkJQ0lJbWFnZSAqb3V0cHV0SW1h Z2UgPSBbW2ZpbHRlclN0YWNrIGxhc3RPYmplY3RdIHZhbHVlRm9yS2V5OkAib3V0cHV0SW1hZ2Ui XTsKLQkJaWYgKCFvdXRwdXRJbWFnZSkgewotCQkJTlNMb2coQCJGYWlsZWQgdG8gZ2V0IG91cHV0 SW1hZ2UgZnJvbSBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcuIik7Ci0JCQlyZXR1cm47Ci0JCX0K LQkJCi0JCS8vIGFjdHVhbGx5IGRyYXcgdGhlIHJlc3VsdCB0byB0aGUgb3JpZ2luYWwgY29udGV4 dAotCQkKLQkJQ0dSZWN0IGZpbHRlclJlY3QgPSBmaWx0ZXJCQm94Rm9ySXRlbUJCb3goQ0dSZWN0 KGJib3gpLCBvYmplY3RUcmFuc2Zvcm0pOwotCQlDR1JlY3QgdHJhbnNsYXRlZCA9IGZpbHRlclJl Y3Q7Ci0JCUNHUG9pbnQgYmJveE9yaWdpbiA9IENHUmVjdChiYm94KS5vcmlnaW47Ci0vLwkJdHJh bnNsYXRlZC5vcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0vLwkJdHJhbnNsYXRlZC5vcmlnaW4u eSArPSBiYm94T3JpZ2luLnk7Ci0JCUNHUmVjdCBzb3VyY2VSZWN0ID0gQ0dSZWN0SW50ZXJzZWN0 aW9uKHRyYW5zbGF0ZWQsW291dHB1dEltYWdlIGV4dGVudF0pOwotCQkvLyBGSVhNRTogb2JqZWN0 VHJhbnNmb3JtIHNlZW1zIGxpa2UgYSBoYWNrLgotCQkKLQkJQ0dQb2ludCBkZXN0T3JpZ2luID0g c291cmNlUmVjdC5vcmlnaW47Ci0JCWRlc3RPcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0JCWRl c3RPcmlnaW4ueSArPSBiYm94T3JpZ2luLnk7Ci0JCQotCQkvL0NHUmVjdCBleHRlbnQgPSBbb3V0 cHV0SW1hZ2UgZXh0ZW50XTsKLQkJLy9OU0xvZyhAIkRyYXdpbmcgZnJvbSByZWN0OiBcbiVAIFxu IGF0IHBvaW50OiBcbiVAIFxuZXh0ZW50OiBcbiVAIFxubWF0cml4OiBcbiVAIiwgTlNTdHJpbmdG cm9tUmVjdCgqKE5TUmVjdCAqKSZzb3VyY2VSZWN0KSwgTlNTdHJpbmdGcm9tUG9pbnQoKihOU1Bv aW50ICopJmRlc3RPcmlnaW4pLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0ICopJmV4dGVudCks IENGU3RyaW5nRnJvbUNHQWZmaW5lVHJhbnNmb3JtKG9iamVjdFRyYW5zZm9ybSkpOwotCQkvL291 dHB1dEltYWdlID0gW291dHB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTpvYmplY3RU cmFuc2Zvcm1dOwotCQlbbV9maWx0ZXJDSUNvbnRleHQgZHJhd0ltYWdlOm91dHB1dEltYWdlIGF0 UG9pbnQ6ZGVzdE9yaWdpbiBmcm9tUmVjdDpzb3VyY2VSZWN0XTsKLQl9IGVsc2UKLQkJTlNMb2co QCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcgZmlsdGVyLiIpOwotCS8vIGNsZWFudXAKLQlD R0xheWVyUmVsZWFzZShtX2ZpbHRlckNHTGF5ZXIpOwotCS8vQ0dDb250ZXh0UmVsZWFzZShsYXll ckNvbnRleHQpOyAvLyBJIGRvbid0IHNlZW0gdG8gbmVlZCB0byBkbyB0aGlzLi4uCi0JW21fZmls dGVyQ0lDb250ZXh0IHJlbGVhc2VdOworICAgIGlmIChtX2VmZmVjdHMuaXNFbXB0eSgpKSByZXR1 cm47IC8vIFdlIGxvZyBkdXJpbmcgInByZXBhcmUiCisgICAgQVNTRVJUKG1fc3RvcmVkQ0dDb250 ZXh0KTsKKyAgICBBU1NFUlQoY29udGV4dCk7CisgICAgCisgICAgLy8gc3dhcCBjb250ZXh0cyBi YWNrCisgICAgKmNvbnRleHQgPSBtX3N0b3JlZENHQ29udGV4dDsKKyAgICBtX3N0b3JlZENHQ29u dGV4dCA9IE5VTEw7CisKKyAgICBDR1JlY3QgaXRlbUJCb3ggPSBDR1JlY3QoYmJveCk7CisKKyAg ICAvLyBhY3R1YWxseSBhcHBseSB0aGUgZmlsdGVyIGVmZmVjdHMKKyAgICBDSUltYWdlICppbnB1 dEltYWdlID0gW0NJSW1hZ2UgaW1hZ2VXaXRoQ0dMYXllcjptX2ZpbHRlckNHTGF5ZXJdOworICAg IAorICAgIC8vIG1vdmUgdGhlIGlucHV0IGltYWdlIHRvIHRoZSByaWdodCBsb2NhdGlvbgorICAg IENHQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IENHQWZmaW5lVHJhbnNmb3JtTWFrZVRyYW5z bGF0aW9uKGl0ZW1CQm94Lm9yaWdpbi54LCBpdGVtQkJveC5vcmlnaW4ueSk7CisgICAgaW5wdXRJ bWFnZSA9IFtpbnB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTp0cmFuc2Zvcm1dOwor CisgICAgTlNBcnJheSAqZmlsdGVyU3RhY2sgPSBnZXRDSUZpbHRlclN0YWNrKGlucHV0SW1hZ2Up OworICAgIGlmIChbZmlsdGVyU3RhY2sgY291bnRdKSB7CisgICAgICAgIENJSW1hZ2UgKm91dHB1 dEltYWdlID0gW1tmaWx0ZXJTdGFjayBsYXN0T2JqZWN0XSB2YWx1ZUZvcktleTpAIm91dHB1dElt YWdlIl07CisgICAgICAgIGlmICghb3V0cHV0SW1hZ2UpIHsKKyAgICAgICAgICAgIE5TTG9nKEAi RmFpbGVkIHRvIGdldCBvdXB1dEltYWdlIGZyb20gZmlsdGVyIHN0YWNrLCBjYW4ndCBkcmF3LiIp OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIAorCQkvLyBsb29rdXAg dGhlIGJvdW5kcyBmb3IgdGhlIGZpbHRlcgorICAgICAgICBDR1JlY3QgZmlsdGVyQkJveCA9IGZp bHRlckJCb3hGb3JJdGVtQkJveChpdGVtQkJveCwgb2JqZWN0VHJhbnNmb3JtKTsKKworCQkvLyBj bGlwIHRoZSBmaWx0ZXIgYm94CisJCWZpbHRlckJCb3ggPSBDR1JlY3RJbnRlcnNlY3Rpb24oZmls dGVyQkJveCwgW291dHB1dEltYWdlIGV4dGVudF0pOworCisJCS8vIGRyYXcgdGhlIGZpbHRlcmVk IGltYWdlCisgICAgICAgIFttX2ZpbHRlckNJQ29udGV4dCBkcmF3SW1hZ2U6b3V0cHV0SW1hZ2Ug YXRQb2ludDpmaWx0ZXJCQm94Lm9yaWdpbiBmcm9tUmVjdDpmaWx0ZXJCQm94XTsKKyAgICB9IGVs c2UKKyAgICAgICAgTlNMb2coQCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcgZmlsdGVyLiIp OworCisgICAgLy8gY2xlYW51cAorICAgIENHTGF5ZXJSZWxlYXNlKG1fZmlsdGVyQ0dMYXllcik7 CisgICAgW21fZmlsdGVyQ0lDb250ZXh0IHJlbGVhc2VdOwogfQogCiBOU0FycmF5ICpLQ2FudmFz RmlsdGVyUXVhcnR6OjpnZXRDSUZpbHRlclN0YWNrKENJSW1hZ2UgKmlucHV0SW1hZ2UpIHsK 4687 2005-11-13 23:14:22 -0800 2005-11-13 23:15:44 -0800 hopefully final patch clipping.patch text/plain 5526 erickt SW5kZXg6IEtDYW52YXNGaWx0ZXJRdWFydHoubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1NWR1N1cHBvcnQva2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNGaWx0ZXJRdWFydHou bW0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtcCAtdSAtcjEuMTAgS0NhbnZhc0Zp bHRlclF1YXJ0ei5tbQotLS0gS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQk1IE9jdCAyMDA1IDA1OjM2 OjUxIC0wMDAwCTEuMTAKKysrIEtDYW52YXNGaWx0ZXJRdWFydHoubW0JMTQgTm92IDIwMDUgMDc6 MTk6NTIgLTAwMDAKQEAgLTExOCw3MyArMTE4LDY0IEBAIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6cHJlcGFyZUZpbHRlcigKIAlDR0NvbnRleHRDb25jYXRDVE0oKmNvbnRleHQsQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlVHJhbnNsYXRpb24oZmxvYXQoLTEgKiBiYm94LngoKSksZmxvYXQoLTEgKiBi Ym94LnkoKSkpKTsKIH0KIAotQ0dSZWN0IEtDYW52YXNGaWx0ZXJRdWFydHo6OmZpbHRlckJCb3hG b3JJdGVtQkJveChDR1JlY3QgaXRlbUJCb3gsIENHQWZmaW5lVHJhbnNmb3JtIGN1cnJlbnRDVE0p IGNvbnN0CitDR1JlY3QgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6ZmlsdGVyQkJveEZvckl0ZW1CQm94 KENHUmVjdCBpdGVtQkJveCwgQ0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKSBjb25z dAogewotCS8vIEZJWE1FOiBoYWNrIGZvciBub3cKLQlDR1JlY3QgZmlsdGVyQkJveCA9IENHUmVj dChmaWx0ZXJSZWN0KCkpOwotCWlmKGZpbHRlckJvdW5kaW5nQm94TW9kZSgpKQotCXsKLQkJLy9O U0xvZyhAInJlbGF0aXZlIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZm aWx0ZXJCQm94KSk7Ci0JCWZpbHRlckJCb3ggPQotCQkJQ0dSZWN0TWFrZSgoZmlsdGVyQkJveC5v cmlnaW4ueC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJCShmaWx0ZXJCQm94 Lm9yaWdpbi55LzEwMC5mICogaXRlbUJCb3guc2l6ZS5oZWlnaHQpLCAKLQkJCQkJICAgKGZpbHRl ckJCb3guc2l6ZS53aWR0aC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJICAg KGZpbHRlckJCb3guc2l6ZS5oZWlnaHQvMTAwLmYgKiBpdGVtQkJveC5zaXplLmhlaWdodCkpOwot CQkvL05TTG9nKEAic2NhbGVkIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAq KSZmaWx0ZXJCQm94KSk7Ci0JfSBlbHNlIHsKLQkJLy9maWx0ZXJCQm94ID0gQ0dSZWN0QXBwbHlB ZmZpbmVUcmFuc2Zvcm0oZmlsdGVyQkJveCwgY3VycmVudENUTSk7Ci0JfQotCXJldHVybiBmaWx0 ZXJCQm94OworICAgIENHUmVjdCBmaWx0ZXJCQm94ID0gQ0dSZWN0KGZpbHRlclJlY3QoKSk7CisK KyAgICAvLyBpZiByZXR1cm5zIHRydWUsIHdlJ3JlIHVzaW5nIG9iamVjdEJvdW5kaW5nQm94Cisg ICAgaWYoZmlsdGVyQm91bmRpbmdCb3hNb2RlKCkpIHsKKyAgICAgICAgZmlsdGVyQkJveCA9Cisg ICAgICAgICAgICBDR1JlY3RNYWtlKChmaWx0ZXJCQm94Lm9yaWdpbi54LzEwMC5mICogaXRlbUJC b3guc2l6ZS53aWR0aCksIAorICAgICAgICAgICAgICAgICAgICAgICAoZmlsdGVyQkJveC5vcmln aW4ueS8xMDAuZiAqIGl0ZW1CQm94LnNpemUuaGVpZ2h0KSwgCisgICAgICAgICAgICAgICAgICAg ICAgIChmaWx0ZXJCQm94LnNpemUud2lkdGgvMTAwLmYgKiBpdGVtQkJveC5zaXplLndpZHRoKSwg CisgICAgICAgICAgICAgICAgICAgICAgIChmaWx0ZXJCQm94LnNpemUuaGVpZ2h0LzEwMC5mICog aXRlbUJCb3guc2l6ZS5oZWlnaHQpKTsKKyAgICB9IGVsc2UgCisgICAgICAgIGZpbHRlckJCb3gg PSBDR1JlY3RBcHBseUFmZmluZVRyYW5zZm9ybShmaWx0ZXJCQm94LCBvYmplY3RUcmFuc2Zvcm0p OworCisgICAgcmV0dXJuIGZpbHRlckJCb3g7CiB9CiAKIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6YXBwbHlGaWx0ZXIoQ0dDb250ZXh0UmVmICpjb250ZXh0LCBjb25zdCBRUmVjdCAmYmJveCwg Q0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKQogewotCWlmIChtX2VmZmVjdHMuaXNF bXB0eSgpKSByZXR1cm47IC8vIFdlIGxvZyBkdXJpbmcgInByZXBhcmUiCi0JQVNTRVJUKG1fc3Rv cmVkQ0dDb250ZXh0KTsKLQlBU1NFUlQoY29udGV4dCk7Ci0JLy9DR0NvbnRleHRSZWYgbGF5ZXJD b250ZXh0ID0gKmNvbnRleHQ7Ci0JCi0JLy9OU0xvZyhAImFwcGx5IGZpbHRlciBpbiBjb250ZXh0 OiAlcCB0byBjb250ZXh0OiAlcCBiYm94OiAlQCIsICpjb250ZXh0LAotCS8vCW1fc3RvcmVkQ0dD b250ZXh0LCBOU1N0cmluZ0Zyb21SZWN0KE5TUmVjdChiYm94KSkpOwotCQotCS8vIHN3YXAgY29u dGV4dHMgYmFjawotCSpjb250ZXh0ID0gbV9zdG9yZWRDR0NvbnRleHQ7Ci0JbV9zdG9yZWRDR0Nv bnRleHQgPSBOVUxMOwotCi0JLy8gYWN0dWFsbHkgYXBwbHkgdGhlIGZpbHRlciBlZmZlY3RzCi0J Q0lJbWFnZSAqaW5wdXRJbWFnZSA9IFtDSUltYWdlIGltYWdlV2l0aENHTGF5ZXI6bV9maWx0ZXJD R0xheWVyXTsKLQlOU0FycmF5ICpmaWx0ZXJTdGFjayA9IGdldENJRmlsdGVyU3RhY2soaW5wdXRJ bWFnZSk7Ci0JaWYgKFtmaWx0ZXJTdGFjayBjb3VudF0pIHsKLQkJQ0lJbWFnZSAqb3V0cHV0SW1h Z2UgPSBbW2ZpbHRlclN0YWNrIGxhc3RPYmplY3RdIHZhbHVlRm9yS2V5OkAib3V0cHV0SW1hZ2Ui XTsKLQkJaWYgKCFvdXRwdXRJbWFnZSkgewotCQkJTlNMb2coQCJGYWlsZWQgdG8gZ2V0IG91cHV0 SW1hZ2UgZnJvbSBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcuIik7Ci0JCQlyZXR1cm47Ci0JCX0K LQkJCi0JCS8vIGFjdHVhbGx5IGRyYXcgdGhlIHJlc3VsdCB0byB0aGUgb3JpZ2luYWwgY29udGV4 dAotCQkKLQkJQ0dSZWN0IGZpbHRlclJlY3QgPSBmaWx0ZXJCQm94Rm9ySXRlbUJCb3goQ0dSZWN0 KGJib3gpLCBvYmplY3RUcmFuc2Zvcm0pOwotCQlDR1JlY3QgdHJhbnNsYXRlZCA9IGZpbHRlclJl Y3Q7Ci0JCUNHUG9pbnQgYmJveE9yaWdpbiA9IENHUmVjdChiYm94KS5vcmlnaW47Ci0vLwkJdHJh bnNsYXRlZC5vcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0vLwkJdHJhbnNsYXRlZC5vcmlnaW4u eSArPSBiYm94T3JpZ2luLnk7Ci0JCUNHUmVjdCBzb3VyY2VSZWN0ID0gQ0dSZWN0SW50ZXJzZWN0 aW9uKHRyYW5zbGF0ZWQsW291dHB1dEltYWdlIGV4dGVudF0pOwotCQkvLyBGSVhNRTogb2JqZWN0 VHJhbnNmb3JtIHNlZW1zIGxpa2UgYSBoYWNrLgotCQkKLQkJQ0dQb2ludCBkZXN0T3JpZ2luID0g c291cmNlUmVjdC5vcmlnaW47Ci0JCWRlc3RPcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0JCWRl c3RPcmlnaW4ueSArPSBiYm94T3JpZ2luLnk7Ci0JCQotCQkvL0NHUmVjdCBleHRlbnQgPSBbb3V0 cHV0SW1hZ2UgZXh0ZW50XTsKLQkJLy9OU0xvZyhAIkRyYXdpbmcgZnJvbSByZWN0OiBcbiVAIFxu IGF0IHBvaW50OiBcbiVAIFxuZXh0ZW50OiBcbiVAIFxubWF0cml4OiBcbiVAIiwgTlNTdHJpbmdG cm9tUmVjdCgqKE5TUmVjdCAqKSZzb3VyY2VSZWN0KSwgTlNTdHJpbmdGcm9tUG9pbnQoKihOU1Bv aW50ICopJmRlc3RPcmlnaW4pLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0ICopJmV4dGVudCks IENGU3RyaW5nRnJvbUNHQWZmaW5lVHJhbnNmb3JtKG9iamVjdFRyYW5zZm9ybSkpOwotCQkvL291 dHB1dEltYWdlID0gW291dHB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTpvYmplY3RU cmFuc2Zvcm1dOwotCQlbbV9maWx0ZXJDSUNvbnRleHQgZHJhd0ltYWdlOm91dHB1dEltYWdlIGF0 UG9pbnQ6ZGVzdE9yaWdpbiBmcm9tUmVjdDpzb3VyY2VSZWN0XTsKLQl9IGVsc2UKLQkJTlNMb2co QCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcgZmlsdGVyLiIpOwotCS8vIGNsZWFudXAKLQlD R0xheWVyUmVsZWFzZShtX2ZpbHRlckNHTGF5ZXIpOwotCS8vQ0dDb250ZXh0UmVsZWFzZShsYXll ckNvbnRleHQpOyAvLyBJIGRvbid0IHNlZW0gdG8gbmVlZCB0byBkbyB0aGlzLi4uCi0JW21fZmls dGVyQ0lDb250ZXh0IHJlbGVhc2VdOworICAgIGlmIChtX2VmZmVjdHMuaXNFbXB0eSgpKSAKKyAg ICAgICAgcmV0dXJuOyAvLyBXZSBsb2cgZHVyaW5nICJwcmVwYXJlIgorCisgICAgQVNTRVJUKG1f c3RvcmVkQ0dDb250ZXh0KTsKKyAgICBBU1NFUlQoY29udGV4dCk7CisgICAgCisgICAgLy8gc3dh cCBjb250ZXh0cyBiYWNrCisgICAgKmNvbnRleHQgPSBtX3N0b3JlZENHQ29udGV4dDsKKyAgICBt X3N0b3JlZENHQ29udGV4dCA9IE5VTEw7CisKKyAgICBDR1JlY3QgaXRlbUJCb3ggPSBDR1JlY3Qo YmJveCk7CisKKyAgICAvLyBhY3R1YWxseSBhcHBseSB0aGUgZmlsdGVyIGVmZmVjdHMKKyAgICBD SUltYWdlICppbnB1dEltYWdlID0gW0NJSW1hZ2UgaW1hZ2VXaXRoQ0dMYXllcjptX2ZpbHRlckNH TGF5ZXJdOworICAgIAorICAgIC8vIG1vdmUgdGhlIGlucHV0IGltYWdlIHRvIHRoZSByaWdodCBs b2NhdGlvbgorICAgIENHQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IENHQWZmaW5lVHJhbnNm b3JtTWFrZVRyYW5zbGF0aW9uKGl0ZW1CQm94Lm9yaWdpbi54LCBpdGVtQkJveC5vcmlnaW4ueSk7 CisgICAgaW5wdXRJbWFnZSA9IFtpbnB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTp0 cmFuc2Zvcm1dOworCisgICAgTlNBcnJheSAqZmlsdGVyU3RhY2sgPSBnZXRDSUZpbHRlclN0YWNr KGlucHV0SW1hZ2UpOworICAgIGlmIChbZmlsdGVyU3RhY2sgY291bnRdKSB7CisgICAgICAgIENJ SW1hZ2UgKm91dHB1dEltYWdlID0gW1tmaWx0ZXJTdGFjayBsYXN0T2JqZWN0XSB2YWx1ZUZvcktl eTpAIm91dHB1dEltYWdlIl07CisgICAgICAgIGlmICghb3V0cHV0SW1hZ2UpIHsKKyAgICAgICAg ICAgIE5TTG9nKEAiRmFpbGVkIHRvIGdldCBvdXB1dEltYWdlIGZyb20gZmlsdGVyIHN0YWNrLCBj YW4ndCBkcmF3LiIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIAor ICAgICAgICBDR1JlY3QgZmlsdGVyQkJveCA9IGZpbHRlckJCb3hGb3JJdGVtQkJveChpdGVtQkJv eCwgb2JqZWN0VHJhbnNmb3JtKTsKKworCQkvLyBjbGlwIHRoZSBmaWx0ZXIgYm94CisJCWZpbHRl ckJCb3ggPSBDR1JlY3RJbnRlcnNlY3Rpb24oZmlsdGVyQkJveCwgW291dHB1dEltYWdlIGV4dGVu dF0pOworCisgICAgICAgIFttX2ZpbHRlckNJQ29udGV4dCBkcmF3SW1hZ2U6b3V0cHV0SW1hZ2Ug YXRQb2ludDpmaWx0ZXJCQm94Lm9yaWdpbiBmcm9tUmVjdDpmaWx0ZXJCQm94XTsKKyAgICB9IGVs c2UKKyAgICAgICAgTlNMb2coQCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcgZmlsdGVyLiIp OworCisgICAgLy8gY2xlYW51cAorICAgIENHTGF5ZXJSZWxlYXNlKG1fZmlsdGVyQ0dMYXllcik7 CisgICAgW21fZmlsdGVyQ0lDb250ZXh0IHJlbGVhc2VdOwogfQogCiBOU0FycmF5ICpLQ2FudmFz RmlsdGVyUXVhcnR6OjpnZXRDSUZpbHRlclN0YWNrKENJSW1hZ2UgKmlucHV0SW1hZ2UpIHsK 4688 2005-11-13 23:15:44 -0800 2005-11-26 14:38:07 -0800 expanded some tabs clipping.patch text/plain 5538 erickt SW5kZXg6IEtDYW52YXNGaWx0ZXJRdWFydHoubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1NWR1N1cHBvcnQva2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNGaWx0ZXJRdWFydHou bW0sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtcCAtdSAtcjEuMTAgS0NhbnZhc0Zp bHRlclF1YXJ0ei5tbQotLS0gS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQk1IE9jdCAyMDA1IDA1OjM2 OjUxIC0wMDAwCTEuMTAKKysrIEtDYW52YXNGaWx0ZXJRdWFydHoubW0JMTQgTm92IDIwMDUgMDc6 MjE6MTQgLTAwMDAKQEAgLTExOCw3MyArMTE4LDY0IEBAIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6cHJlcGFyZUZpbHRlcigKIAlDR0NvbnRleHRDb25jYXRDVE0oKmNvbnRleHQsQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlVHJhbnNsYXRpb24oZmxvYXQoLTEgKiBiYm94LngoKSksZmxvYXQoLTEgKiBi Ym94LnkoKSkpKTsKIH0KIAotQ0dSZWN0IEtDYW52YXNGaWx0ZXJRdWFydHo6OmZpbHRlckJCb3hG b3JJdGVtQkJveChDR1JlY3QgaXRlbUJCb3gsIENHQWZmaW5lVHJhbnNmb3JtIGN1cnJlbnRDVE0p IGNvbnN0CitDR1JlY3QgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6ZmlsdGVyQkJveEZvckl0ZW1CQm94 KENHUmVjdCBpdGVtQkJveCwgQ0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKSBjb25z dAogewotCS8vIEZJWE1FOiBoYWNrIGZvciBub3cKLQlDR1JlY3QgZmlsdGVyQkJveCA9IENHUmVj dChmaWx0ZXJSZWN0KCkpOwotCWlmKGZpbHRlckJvdW5kaW5nQm94TW9kZSgpKQotCXsKLQkJLy9O U0xvZyhAInJlbGF0aXZlIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAqKSZm aWx0ZXJCQm94KSk7Ci0JCWZpbHRlckJCb3ggPQotCQkJQ0dSZWN0TWFrZSgoZmlsdGVyQkJveC5v cmlnaW4ueC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJCShmaWx0ZXJCQm94 Lm9yaWdpbi55LzEwMC5mICogaXRlbUJCb3guc2l6ZS5oZWlnaHQpLCAKLQkJCQkJICAgKGZpbHRl ckJCb3guc2l6ZS53aWR0aC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLQkJCQkJICAg KGZpbHRlckJCb3guc2l6ZS5oZWlnaHQvMTAwLmYgKiBpdGVtQkJveC5zaXplLmhlaWdodCkpOwot CQkvL05TTG9nKEAic2NhbGVkIGJib3g6ICVAIiwgTlNTdHJpbmdGcm9tUmVjdCgqKE5TUmVjdCAq KSZmaWx0ZXJCQm94KSk7Ci0JfSBlbHNlIHsKLQkJLy9maWx0ZXJCQm94ID0gQ0dSZWN0QXBwbHlB ZmZpbmVUcmFuc2Zvcm0oZmlsdGVyQkJveCwgY3VycmVudENUTSk7Ci0JfQotCXJldHVybiBmaWx0 ZXJCQm94OworICAgIENHUmVjdCBmaWx0ZXJCQm94ID0gQ0dSZWN0KGZpbHRlclJlY3QoKSk7CisK KyAgICAvLyBpZiByZXR1cm5zIHRydWUsIHdlJ3JlIHVzaW5nIG9iamVjdEJvdW5kaW5nQm94Cisg ICAgaWYoZmlsdGVyQm91bmRpbmdCb3hNb2RlKCkpIHsKKyAgICAgICAgZmlsdGVyQkJveCA9Cisg ICAgICAgICAgICBDR1JlY3RNYWtlKChmaWx0ZXJCQm94Lm9yaWdpbi54LzEwMC5mICogaXRlbUJC b3guc2l6ZS53aWR0aCksIAorICAgICAgICAgICAgICAgICAgICAgICAoZmlsdGVyQkJveC5vcmln aW4ueS8xMDAuZiAqIGl0ZW1CQm94LnNpemUuaGVpZ2h0KSwgCisgICAgICAgICAgICAgICAgICAg ICAgIChmaWx0ZXJCQm94LnNpemUud2lkdGgvMTAwLmYgKiBpdGVtQkJveC5zaXplLndpZHRoKSwg CisgICAgICAgICAgICAgICAgICAgICAgIChmaWx0ZXJCQm94LnNpemUuaGVpZ2h0LzEwMC5mICog aXRlbUJCb3guc2l6ZS5oZWlnaHQpKTsKKyAgICB9IGVsc2UgCisgICAgICAgIGZpbHRlckJCb3gg PSBDR1JlY3RBcHBseUFmZmluZVRyYW5zZm9ybShmaWx0ZXJCQm94LCBvYmplY3RUcmFuc2Zvcm0p OworCisgICAgcmV0dXJuIGZpbHRlckJCb3g7CiB9CiAKIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0 ejo6YXBwbHlGaWx0ZXIoQ0dDb250ZXh0UmVmICpjb250ZXh0LCBjb25zdCBRUmVjdCAmYmJveCwg Q0dBZmZpbmVUcmFuc2Zvcm0gb2JqZWN0VHJhbnNmb3JtKQogewotCWlmIChtX2VmZmVjdHMuaXNF bXB0eSgpKSByZXR1cm47IC8vIFdlIGxvZyBkdXJpbmcgInByZXBhcmUiCi0JQVNTRVJUKG1fc3Rv cmVkQ0dDb250ZXh0KTsKLQlBU1NFUlQoY29udGV4dCk7Ci0JLy9DR0NvbnRleHRSZWYgbGF5ZXJD b250ZXh0ID0gKmNvbnRleHQ7Ci0JCi0JLy9OU0xvZyhAImFwcGx5IGZpbHRlciBpbiBjb250ZXh0 OiAlcCB0byBjb250ZXh0OiAlcCBiYm94OiAlQCIsICpjb250ZXh0LAotCS8vCW1fc3RvcmVkQ0dD b250ZXh0LCBOU1N0cmluZ0Zyb21SZWN0KE5TUmVjdChiYm94KSkpOwotCQotCS8vIHN3YXAgY29u dGV4dHMgYmFjawotCSpjb250ZXh0ID0gbV9zdG9yZWRDR0NvbnRleHQ7Ci0JbV9zdG9yZWRDR0Nv bnRleHQgPSBOVUxMOwotCi0JLy8gYWN0dWFsbHkgYXBwbHkgdGhlIGZpbHRlciBlZmZlY3RzCi0J Q0lJbWFnZSAqaW5wdXRJbWFnZSA9IFtDSUltYWdlIGltYWdlV2l0aENHTGF5ZXI6bV9maWx0ZXJD R0xheWVyXTsKLQlOU0FycmF5ICpmaWx0ZXJTdGFjayA9IGdldENJRmlsdGVyU3RhY2soaW5wdXRJ bWFnZSk7Ci0JaWYgKFtmaWx0ZXJTdGFjayBjb3VudF0pIHsKLQkJQ0lJbWFnZSAqb3V0cHV0SW1h Z2UgPSBbW2ZpbHRlclN0YWNrIGxhc3RPYmplY3RdIHZhbHVlRm9yS2V5OkAib3V0cHV0SW1hZ2Ui XTsKLQkJaWYgKCFvdXRwdXRJbWFnZSkgewotCQkJTlNMb2coQCJGYWlsZWQgdG8gZ2V0IG91cHV0 SW1hZ2UgZnJvbSBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcuIik7Ci0JCQlyZXR1cm47Ci0JCX0K LQkJCi0JCS8vIGFjdHVhbGx5IGRyYXcgdGhlIHJlc3VsdCB0byB0aGUgb3JpZ2luYWwgY29udGV4 dAotCQkKLQkJQ0dSZWN0IGZpbHRlclJlY3QgPSBmaWx0ZXJCQm94Rm9ySXRlbUJCb3goQ0dSZWN0 KGJib3gpLCBvYmplY3RUcmFuc2Zvcm0pOwotCQlDR1JlY3QgdHJhbnNsYXRlZCA9IGZpbHRlclJl Y3Q7Ci0JCUNHUG9pbnQgYmJveE9yaWdpbiA9IENHUmVjdChiYm94KS5vcmlnaW47Ci0vLwkJdHJh bnNsYXRlZC5vcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0vLwkJdHJhbnNsYXRlZC5vcmlnaW4u eSArPSBiYm94T3JpZ2luLnk7Ci0JCUNHUmVjdCBzb3VyY2VSZWN0ID0gQ0dSZWN0SW50ZXJzZWN0 aW9uKHRyYW5zbGF0ZWQsW291dHB1dEltYWdlIGV4dGVudF0pOwotCQkvLyBGSVhNRTogb2JqZWN0 VHJhbnNmb3JtIHNlZW1zIGxpa2UgYSBoYWNrLgotCQkKLQkJQ0dQb2ludCBkZXN0T3JpZ2luID0g c291cmNlUmVjdC5vcmlnaW47Ci0JCWRlc3RPcmlnaW4ueCArPSBiYm94T3JpZ2luLng7Ci0JCWRl c3RPcmlnaW4ueSArPSBiYm94T3JpZ2luLnk7Ci0JCQotCQkvL0NHUmVjdCBleHRlbnQgPSBbb3V0 cHV0SW1hZ2UgZXh0ZW50XTsKLQkJLy9OU0xvZyhAIkRyYXdpbmcgZnJvbSByZWN0OiBcbiVAIFxu IGF0IHBvaW50OiBcbiVAIFxuZXh0ZW50OiBcbiVAIFxubWF0cml4OiBcbiVAIiwgTlNTdHJpbmdG cm9tUmVjdCgqKE5TUmVjdCAqKSZzb3VyY2VSZWN0KSwgTlNTdHJpbmdGcm9tUG9pbnQoKihOU1Bv aW50ICopJmRlc3RPcmlnaW4pLCBOU1N0cmluZ0Zyb21SZWN0KCooTlNSZWN0ICopJmV4dGVudCks IENGU3RyaW5nRnJvbUNHQWZmaW5lVHJhbnNmb3JtKG9iamVjdFRyYW5zZm9ybSkpOwotCQkvL291 dHB1dEltYWdlID0gW291dHB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTpvYmplY3RU cmFuc2Zvcm1dOwotCQlbbV9maWx0ZXJDSUNvbnRleHQgZHJhd0ltYWdlOm91dHB1dEltYWdlIGF0 UG9pbnQ6ZGVzdE9yaWdpbiBmcm9tUmVjdDpzb3VyY2VSZWN0XTsKLQl9IGVsc2UKLQkJTlNMb2co QCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRyYXcgZmlsdGVyLiIpOwotCS8vIGNsZWFudXAKLQlD R0xheWVyUmVsZWFzZShtX2ZpbHRlckNHTGF5ZXIpOwotCS8vQ0dDb250ZXh0UmVsZWFzZShsYXll ckNvbnRleHQpOyAvLyBJIGRvbid0IHNlZW0gdG8gbmVlZCB0byBkbyB0aGlzLi4uCi0JW21fZmls dGVyQ0lDb250ZXh0IHJlbGVhc2VdOworICAgIGlmIChtX2VmZmVjdHMuaXNFbXB0eSgpKSAKKyAg ICAgICAgcmV0dXJuOyAvLyBXZSBsb2cgZHVyaW5nICJwcmVwYXJlIgorCisgICAgQVNTRVJUKG1f c3RvcmVkQ0dDb250ZXh0KTsKKyAgICBBU1NFUlQoY29udGV4dCk7CisgICAgCisgICAgLy8gc3dh cCBjb250ZXh0cyBiYWNrCisgICAgKmNvbnRleHQgPSBtX3N0b3JlZENHQ29udGV4dDsKKyAgICBt X3N0b3JlZENHQ29udGV4dCA9IE5VTEw7CisKKyAgICBDR1JlY3QgaXRlbUJCb3ggPSBDR1JlY3Qo YmJveCk7CisKKyAgICAvLyBhY3R1YWxseSBhcHBseSB0aGUgZmlsdGVyIGVmZmVjdHMKKyAgICBD SUltYWdlICppbnB1dEltYWdlID0gW0NJSW1hZ2UgaW1hZ2VXaXRoQ0dMYXllcjptX2ZpbHRlckNH TGF5ZXJdOworICAgIAorICAgIC8vIG1vdmUgdGhlIGlucHV0IGltYWdlIHRvIHRoZSByaWdodCBs b2NhdGlvbgorICAgIENHQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybSA9IENHQWZmaW5lVHJhbnNm b3JtTWFrZVRyYW5zbGF0aW9uKGl0ZW1CQm94Lm9yaWdpbi54LCBpdGVtQkJveC5vcmlnaW4ueSk7 CisgICAgaW5wdXRJbWFnZSA9IFtpbnB1dEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5zZm9ybTp0 cmFuc2Zvcm1dOworCisgICAgTlNBcnJheSAqZmlsdGVyU3RhY2sgPSBnZXRDSUZpbHRlclN0YWNr KGlucHV0SW1hZ2UpOworICAgIGlmIChbZmlsdGVyU3RhY2sgY291bnRdKSB7CisgICAgICAgIENJ SW1hZ2UgKm91dHB1dEltYWdlID0gW1tmaWx0ZXJTdGFjayBsYXN0T2JqZWN0XSB2YWx1ZUZvcktl eTpAIm91dHB1dEltYWdlIl07CisgICAgICAgIGlmICghb3V0cHV0SW1hZ2UpIHsKKyAgICAgICAg ICAgIE5TTG9nKEAiRmFpbGVkIHRvIGdldCBvdXB1dEltYWdlIGZyb20gZmlsdGVyIHN0YWNrLCBj YW4ndCBkcmF3LiIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIAor ICAgICAgICBDR1JlY3QgZmlsdGVyQkJveCA9IGZpbHRlckJCb3hGb3JJdGVtQkJveChpdGVtQkJv eCwgb2JqZWN0VHJhbnNmb3JtKTsKKworICAgICAgICAvLyBjbGlwIHRoZSBmaWx0ZXIgYm94Cisg ICAgICAgIGZpbHRlckJCb3ggPSBDR1JlY3RJbnRlcnNlY3Rpb24oZmlsdGVyQkJveCwgW291dHB1 dEltYWdlIGV4dGVudF0pOworCisgICAgICAgIFttX2ZpbHRlckNJQ29udGV4dCBkcmF3SW1hZ2U6 b3V0cHV0SW1hZ2UgYXRQb2ludDpmaWx0ZXJCQm94Lm9yaWdpbiBmcm9tUmVjdDpmaWx0ZXJCQm94 XTsKKyAgICB9IGVsc2UKKyAgICAgICAgTlNMb2coQCJObyBmaWx0ZXIgc3RhY2ssIGNhbid0IGRy YXcgZmlsdGVyLiIpOworCisgICAgLy8gY2xlYW51cAorICAgIENHTGF5ZXJSZWxlYXNlKG1fZmls dGVyQ0dMYXllcik7CisgICAgW21fZmlsdGVyQ0lDb250ZXh0IHJlbGVhc2VdOwogfQogCiBOU0Fy cmF5ICpLQ2FudmFzRmlsdGVyUXVhcnR6OjpnZXRDSUZpbHRlclN0YWNrKENJSW1hZ2UgKmlucHV0 SW1hZ2UpIHsK