94782 2012-08-22 23:42:06 -0700 [Qt] Make ImageDiff similar to Chromium's ImageDiff 2013-03-19 08:42:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 94800 1 ossy ossy allan.jensen jturcotte oldest_to_newest 702734 0 ossy 2012-08-22 23:42:06 -0700 Now Qt's ImageDiff generate a grayscale image based on distance of actual and expected pngs: https://trac.webkit.org/browser/trunk/Tools/DumpRenderTree/qt/ImageDiff.cpp?rev=124324#L98 Zero distance is black, white-black distance is white on the diff image now. Unfortunately there are: - many failing tests on different distros (for example Ubuntu and Debian because of different libfreetype system package): minor font differences because of anti-aliasing - many failing tests on 32/64 bit systems: All pixels of a green rectangle are same green(128) on 64 bit, but the down margin line of this rectangle are lighter green(127) It causes minor pixel differences: (1,1,1) coloured line on the diff image, which is absolutely undetectable now. And in most cases NRWT reports this failures as "pixel hash failed (but diff passed)", because Qt's ImageDiff now ignores differences smaller than 0.01%. difference. 0.01% is 48 full pixel difference (black/white) now. (800x600 png) But a 800 pixel width (127/128, 0/0, 0/0) difference means only 1/256 * 800 = 3.125 px distance. That's why we get ~1800 "pixel hash failed (but diff passed)" failures on 32/64 bit builds. To detect and debug these failures, it would be great if - Qt's ImageDiff marked all different pixels as red (255,0,0) - same as Chromium's ImageDiff - Qt's ImageDiff marked same pixels darker as the original (r/2, g/2, b/2) - same as Chromium's ImageDiff - tolerance was based on the number of different pixels instead of the euclidean distance Proposed patch and examples are coming soon. 702736 1 160095 ossy 2012-08-22 23:48:15 -0700 Created attachment 160095 WIP patch 776858 2 allan.jensen 2012-11-27 09:27:32 -0800 This sounds like the compare util from ImageMagics, see http://www.imagemagick.org/Usage/compare/ Can we possibly use a standard tool like that? 779023 3 176739 allan.jensen 2012-11-29 08:23:38 -0800 Created attachment 176739 Patch A variant of the original idea, combining the measures. 779056 4 176739 jturcotte 2012-11-29 08:59:42 -0800 Comment on attachment 176739 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176739&action=review > Tools/ChangeLog:1 > +2012-11-29 Allan Sandfeld Jensen <allan.jensen@digia.com> I think you can give a bit of credit to Csaba for this one. I can rubber-stamp the patch if he wants to review it. 779058 5 jturcotte 2012-11-29 09:00:29 -0800 (In reply to comment #4) > I think you can give a bit of credit to Csaba for this one. > I can rubber-stamp the patch if he wants to review it. Unless the two patches are totally different, but from my quick look it seems like an iteration over the previous patch. 779113 6 176750 allan.jensen 2012-11-29 09:40:49 -0800 Created attachment 176750 Patch 804210 7 182102 allan.jensen 2013-01-10 02:51:50 -0800 Created attachment 182102 Patch rebased after imagediff moved 858177 8 182102 jturcotte 2013-03-19 04:58:40 -0700 Comment on attachment 182102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182102&action=review > Tools/ImageDiff/qt/ImageDiff.cpp:41 > + if (args[i] == "-f" || args[i] == "--fuzz") fuzz itself doesn't tell much about what it does. A comment here would be nice to explain its effects, until we get a "--help" (if ever). > Tools/ImageDiff/qt/ImageDiff.cpp:115 > count++; It seems like count had to be increased each time sum is. At this point though I think that we could remove count completely, seeing the change in bug #66299. > Tools/ImageDiff/qt/ImageDiff.cpp:119 > sum += distance; The fuzz then only applies to the visual result, it doesn't affect the difference ratio. Is this intended? If yes a note somewhere clarifying this could help. 858275 9 allan.jensen 2013-03-19 07:35:23 -0700 (In reply to comment #8) > (From update of attachment 182102 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182102&action=review > > > Tools/ImageDiff/qt/ImageDiff.cpp:41 > > + if (args[i] == "-f" || args[i] == "--fuzz") > > fuzz itself doesn't tell much about what it does. > A comment here would be nice to explain its effects, until we get a "--help" (if ever). > I will remove it for now. It is dead code until we actually use it. > > Tools/ImageDiff/qt/ImageDiff.cpp:115 > > count++; > > It seems like count had to be increased each time sum is. At this point though I think that we could remove count completely, seeing the change in bug #66299. > It is an error count. > > Tools/ImageDiff/qt/ImageDiff.cpp:119 > > sum += distance; > > The fuzz then only applies to the visual result, it doesn't affect the difference ratio. > Is this intended? If yes a note somewhere clarifying this could help. Yeah. This is part of the hybrid approach. Fuzz indicated when 0.5 was added on top of a pixel difference. 858290 10 193831 allan.jensen 2013-03-19 08:00:16 -0700 Created attachment 193831 Patch 858301 11 193831 jturcotte 2013-03-19 08:12:24 -0700 Comment on attachment 193831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193831&action=review > Tools/ImageDiff/qt/ImageDiff.cpp:35 > + qreal fuzz = 0; // Tolerated difference in color to indicate a pixel error. Rests of a previous patch? > Tools/ImageDiff/qt/ImageDiff.cpp:41 > - for (int i = 0; i < argc; ++i) > + for (int i = 0; i < argc; ++i) { > if (args[i] == "-t" || args[i] == "--tolerance") > tolerance = args[i + 1].toDouble(); > + } ditto > Tools/ImageDiff/qt/ImageDiff.cpp:109 > + if (distance > fuzz) { ditto 858312 12 193831 jturcotte 2013-03-19 08:32:23 -0700 Comment on attachment 193831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193831&action=review >> Tools/ImageDiff/qt/ImageDiff.cpp:109 >> + if (distance > fuzz) { > > ditto r=me if you replace this with distance > 0 and remove the fuzz variable. 858316 13 allan.jensen 2013-03-19 08:42:08 -0700 Committed r146206: <http://trac.webkit.org/changeset/146206> 160095 2012-08-22 23:48:15 -0700 2012-11-29 08:23:34 -0800 WIP patch bug-94782-20120823084811.patch text/plain 2843 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTEzNTRhZmUwNDQwY2YzZDkyODgzMjU3MWZlNDk0YmI0 N2I4MTRhYS4uN2M2MThiN2E0MjA3OWQ5NmMwMjc1ZmIxOTgwZTRkODE2M2MwNTZhNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA4LTIyICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XSBNYWtlIEltYWdlRGlmZiBzaW1pbGFyIHRvIENocm9taXVtJ3MgSW1hZ2VE aWZmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDc4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hcmsg YWxsIGRpZmZlcmVudCBwaXhlbHMgYXMgcmVkICgyNTUsMCwwKSwgcGFpbnQgc2FtZSBwaXhlbHMg ZGFya2VyIGFzIHRoZSBvcmlnaW5hbCAoci8yLCBnLzIsIGIvMikKKyAgICAgICAgYW5kIHRvbGVy YW5jZSBpcyBiYXNlZCBvbiB0aGUgbnVtYmVyIG9mIGRpZmZlcmVudCBwaXhlbHMgaW5zdGVhZCBv ZiB0aGUgZXVjbGlkZWFuIGRpc3RhbmNlLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQv SW1hZ2VEaWZmLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTA4LTIyICBBbGV4aXMgTWVu YXJkICA8YWxleGlzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCB1cGRhdGUgb2Yg bXkgZW1haWwuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYu Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvSW1hZ2VEaWZmLmNwcAppbmRleCA3YWZhMWVl MTg3OWQxNDA0MGJkNWIxNzhiZDI3MjFiNjBiYWI0ZmQ3Li41YzkwNzdlNDM0MWMxYzFlZjhjYzUx Mzc5ODc3MTFiYTYxNjdkNzFmIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9J bWFnZURpZmYuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0ltYWdlRGlmZi5jcHAK QEAgLTkyLDggKzkyLDYgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAg ICAgICAgICAgICBRSW1hZ2UgZGlmZkltYWdlKHcsIGgsIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMik7 CiAKICAgICAgICAgICAgICAgICBpbnQgY291bnQgPSAwOwotICAgICAgICAgICAgICAgIHFyZWFs IHN1bSA9IDA7Ci0gICAgICAgICAgICAgICAgcXJlYWwgbWF4RGlzdGFuY2UgPSAwOwogCiAgICAg ICAgICAgICAgICAgZm9yIChpbnQgeCA9IDA7IHggPCB3OyArK3gpCiAgICAgICAgICAgICAgICAg ICAgIGZvciAoaW50IHkgPSAwOyB5IDwgaDsgKyt5KSB7CkBAIC0xMDQsMTggKzEwMiwxNiBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICAgICAgICAgICAgICAgICAg cXJlYWwgYmx1ZSA9IChxQmx1ZShwaXhlbCkgLSBxQmx1ZShiYXNlUGl4ZWwpKSAvIHN0YXRpY19j YXN0PGZsb2F0PihxTWF4KDI1NSAtIHFCbHVlKGJhc2VQaXhlbCksIHFCbHVlKGJhc2VQaXhlbCkp KTsKICAgICAgICAgICAgICAgICAgICAgICAgIHFyZWFsIGFscGhhID0gKHFBbHBoYShwaXhlbCkg LSBxQWxwaGEoYmFzZVBpeGVsKSkgLyBzdGF0aWNfY2FzdDxmbG9hdD4ocU1heCgyNTUgLSBxQWxw aGEoYmFzZVBpeGVsKSwgcUFscGhhKGJhc2VQaXhlbCkpKTsKICAgICAgICAgICAgICAgICAgICAg ICAgIHFyZWFsIGRpc3RhbmNlID0gcVNxcnQocmVkICogcmVkICsgZ3JlZW4gKiBncmVlbiArIGJs dWUgKiBibHVlICsgYWxwaGEgKiBhbHBoYSkgLyAyLjBmOwotICAgICAgICAgICAgICAgICAgICAg ICAgaW50IGdyYXkgPSBkaXN0YW5jZSAqIHFyZWFsKDI1NSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYihncmF5LCBncmF5LCBncmF5KSk7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBpZiAoZGlzdGFuY2UgPj0gMSAvIHFyZWFsKDI1NSkpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZJbWFnZS5zZXRQaXhlbCh4LCB5LCBxUmdiKHFS ZWQoYmFzZVBpeGVsKSAvIDIsIHFHcmVlbihiYXNlUGl4ZWwpIC8gMiwgcUJsdWUoYmFzZVBpeGVs KSAvIDIpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkaXN0YW5jZSA+IDApIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYihx cmVhbCgyNTUpLCBxcmVhbCgwKSwgcXJlYWwoMCkpKTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb3VudCsrOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1bSArPSBkaXN0YW5j ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhEaXN0YW5jZSA9IHFNYXgobWF4RGlz dGFuY2UsIGRpc3RhbmNlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgICAgICBxcmVhbCBkaWZmZXJlbmNlID0gMDsKICAgICAgICAg ICAgICAgICBpZiAoY291bnQpCi0gICAgICAgICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSAxMDAg KiBzdW0gLyBzdGF0aWNfY2FzdDxxcmVhbD4odyAqIGgpOworICAgICAgICAgICAgICAgICAgICBk aWZmZXJlbmNlID0gMTAwICogY291bnQgLyBzdGF0aWNfY2FzdDxxcmVhbD4odyAqIGgpOwogICAg ICAgICAgICAgICAgIGlmIChkaWZmZXJlbmNlIDw9IHRvbGVyYW5jZSkgewogICAgICAgICAgICAg ICAgICAgICBkaWZmZXJlbmNlID0gMDsKICAgICAgICAgICAgICAgICB9IGVsc2Ugewo= 176739 2012-11-29 08:23:38 -0800 2012-11-29 09:40:46 -0800 Patch bug-94782-20121129172043.patch text/plain 4249 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MTI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDBiZTVkZTJjYWJjZTg5NmE1OTVhNjZmNWJkYzFmOTU1 YTQ4Yjc3Ni4uNmViNTRjMjM3MTZlMTNjYWVmZDRiYjBhOTZlN2ZkMmM3M2M3M2U3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTExLTI5ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBJbWFnZURpZmYgbW9yZSB1c2VmdWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NzgyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZXMgYSBtaXhlZCBh cHByb2FjaCB3aGVyZSBkaWZmZXJlbmNlIGlzIGhhbGYgYmFzZWQgb24gbnVtYmVyIG9mIHBpeGVs cyB3aXRoIGVycm9ycywKKyAgICAgICAgYW5kIGhhbGYgdGhlIHN1bSBvZiBjb2xvci1kaWZmZXJl bmNlLgorCisgICAgICAgIFRoZSBkaWZmIGltYWdlIGlzIGdlbmVyYXRlZCB3aXRoIGJyaWdodCBy ZWQgaW5kaWNhdGluZyBlcnJvcnMsIGJ1dCBsZXR0aW5nIHRoZSBiYXNlIGltYWdlCisgICAgICAg IHNoaW5lIHRocm91Z2ggc28gdGhlIGNvbnRleHQgb2YgdGhlIGVycm9yLXBpeGVsIGNhbiBiZSBp ZGVudGlmaWVkLgorCisgICAgICAgIEltYWdlRGlmZiBjYW4gbm93IHRha2UgYSAtLWZ1enogYXJn dW1lbnQgc2ltdWxhciB0byB0aGUgJ2NvbXBhcmUnIHV0aWwuIFRoaXMgaXMgdXNlZnVsIHRvCisg ICAgICAgIGlnbm9yZSBwaXhlbCBkaWZmZXJlbmNlcyBkdWUgdG8gZGlmZmVyZW50IHNjYWxpbmcg b3IgYW50aS1hbGlhc2luZyBhbGdvcml0aG1zLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv cXQvSW1hZ2VEaWZmLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTExLTI5ICBTdWRhcnNh bmEgTmFnaW5lbmkgIDxzdWRhcnNhbmEubmFnaW5lbmlAaW50ZWwuY29tPgogCiAgICAgICAgIFtF RkxdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIFBsYXRmb3JtV2ViVmlldzo6c2ltdWxhdGVNb3VzZU1v dmUoKSBpbiBUZXN0V2ViS2l0QVBJCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9x dC9JbWFnZURpZmYuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvSW1hZ2VEaWZmLmNwcApp bmRleCA1MzdiNjNkNzAxNGE1NjMwODY3NGI2OTFmNDFiMTNmYmJlZjk3YWYzLi40N2U2MDEzMGU4 Y2MwYWNjZGVjYTA2YmRlMjg4ODA3MTRjODY2ZmFhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9xdC9JbWFnZURpZmYuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0lt YWdlRGlmZi5jcHAKQEAgLTMyLDExICszMiwxNSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciog YXJndltdKQogICAgIFFDb3JlQXBwbGljYXRpb24gYXBwKGFyZ2MsIGFyZ3YpOwogCiAgICAgcXJl YWwgdG9sZXJhbmNlID0gMDsKKyAgICBxcmVhbCBmdXp6ID0gMDsKIAogICAgIFFTdHJpbmdMaXN0 IGFyZ3MgPSBhcHAuYXJndW1lbnRzKCk7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdjOyAr K2kpCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdjOyArK2kpIHsKICAgICAgICAgaWYgKGFy Z3NbaV0gPT0gIi10IiB8fCBhcmdzW2ldID09ICItLXRvbGVyYW5jZSIpCiAgICAgICAgICAgICB0 b2xlcmFuY2UgPSBhcmdzW2kgKyAxXS50b0RvdWJsZSgpOworICAgICAgICBpZiAoYXJnc1tpXSA9 PSAiLWYiIHx8IGFyZ3NbaV0gPT0gIi0tZnV6eiIpCisgICAgICAgICAgICBmdXp6ID0gYXJnc1tp ICsgMV0udG9Eb3VibGUoKTsKKyAgICB9CiAKICAgICBjaGFyIGJ1ZmZlclsyMDQ4XTsKICAgICBR SW1hZ2UgYWN0dWFsSW1hZ2U7CkBAIC05NSw3ICs5OSw2IEBAIGludCBtYWluKGludCBhcmdjLCBj aGFyKiBhcmd2W10pCiAKICAgICAgICAgICAgICAgICBpbnQgY291bnQgPSAwOwogICAgICAgICAg ICAgICAgIHFyZWFsIHN1bSA9IDA7Ci0gICAgICAgICAgICAgICAgcXJlYWwgbWF4RGlzdGFuY2Ug PSAwOwogCiAgICAgICAgICAgICAgICAgZm9yIChpbnQgeCA9IDA7IHggPCB3OyArK3gpCiAgICAg ICAgICAgICAgICAgICAgIGZvciAoaW50IHkgPSAwOyB5IDwgaDsgKyt5KSB7CkBAIC0xMDYsMjYg KzEwOSwyMyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICAgICAg ICAgICAgICAgICAgcXJlYWwgYmx1ZSA9IChxQmx1ZShwaXhlbCkgLSBxQmx1ZShiYXNlUGl4ZWwp KSAvIHN0YXRpY19jYXN0PGZsb2F0PihxTWF4KDI1NSAtIHFCbHVlKGJhc2VQaXhlbCksIHFCbHVl KGJhc2VQaXhlbCkpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHFyZWFsIGFscGhhID0gKHFB bHBoYShwaXhlbCkgLSBxQWxwaGEoYmFzZVBpeGVsKSkgLyBzdGF0aWNfY2FzdDxmbG9hdD4ocU1h eCgyNTUgLSBxQWxwaGEoYmFzZVBpeGVsKSwgcUFscGhhKGJhc2VQaXhlbCkpKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIHFyZWFsIGRpc3RhbmNlID0gcVNxcnQocmVkICogcmVkICsgZ3JlZW4g KiBncmVlbiArIGJsdWUgKiBibHVlICsgYWxwaGEgKiBhbHBoYSkgLyAyLjBmOwotICAgICAgICAg ICAgICAgICAgICAgICAgaW50IGdyYXkgPSBkaXN0YW5jZSAqIHFyZWFsKDI1NSk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYihncmF5LCBncmF5 LCBncmF5KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoZGlzdGFuY2UgPj0gMSAvIHFy ZWFsKDI1NSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHFyZWFsIGVycm9yID0g MC41ZiArIGRpc3RhbmNlIC8gMi4wZjsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHFy ZWFsIG9wYWNpdHkgPSAxLjBmIC0gZXJyb3I7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAo ZGlzdGFuY2UgPiBmdXp6KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY291bnQrKzsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdW0gKz0gZXJyb3I7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZGlmZkltYWdlLnNldFBpeGVsKHgsIHksIHFSZ2IoMjU1ICogZXJyb3Ig KyBxUmVkKGJhc2VQaXhlbCkgKiBvcGFjaXR5LCBxR3JlZW4oYmFzZVBpeGVsKSAqIG9wYWNpdHks IHFCbHVlKGJhc2VQaXhlbCkgKiBvcGFjaXR5KSk7CisgICAgICAgICAgICAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1bSArPSBkaXN0YW5jZTsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhEaXN0YW5jZSA9IHFNYXgobWF4RGlzdGFuY2Us IGRpc3RhbmNlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4 ZWwoeCwgeSwgcVJnYmEocVJlZChiYXNlUGl4ZWwpLCBxR3JlZW4oYmFzZVBpeGVsKSwgcUJsdWUo YmFzZVBpeGVsKSwgcUFscGhhKGJhc2VQaXhlbCkgKiBvcGFjaXR5KSk7CiAgICAgICAgICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgcXJlYWwg ZGlmZmVyZW5jZSA9IDA7CiAgICAgICAgICAgICAgICAgaWYgKGNvdW50KQogICAgICAgICAgICAg ICAgICAgICBkaWZmZXJlbmNlID0gMTAwICogc3VtIC8gc3RhdGljX2Nhc3Q8cXJlYWw+KHcgKiBo KTsKLSAgICAgICAgICAgICAgICBpZiAoZGlmZmVyZW5jZSA8PSB0b2xlcmFuY2UpIHsKLSAgICAg ICAgICAgICAgICAgICAgZGlmZmVyZW5jZSA9IDA7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsK LSAgICAgICAgICAgICAgICAgICAgZGlmZmVyZW5jZSA9IHFSb3VuZChkaWZmZXJlbmNlICogMTAw KSAvIDEwMC4wZjsKLSAgICAgICAgICAgICAgICAgICAgZGlmZmVyZW5jZSA9IHFNYXgoZGlmZmVy ZW5jZSwgcXJlYWwoMC4wMSkpOwotICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAg IGlmICghZGlmZmVyZW5jZSkKKyAgICAgICAgICAgICAgICBpZiAoZGlmZmVyZW5jZSA8PSB0b2xl cmFuY2UpCiAgICAgICAgICAgICAgICAgICAgIGZwcmludGYoc3Rkb3V0LCAiZGlmZjogJTAxLjJm JSUgcGFzc2VkXG4iLCBkaWZmZXJlbmNlKTsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgICAgICAgICAgUUJ1ZmZlciBidWZmZXI7Cg== 176750 2012-11-29 09:40:49 -0800 2013-01-10 02:51:46 -0800 Patch bug-94782-20121129183755.patch text/plain 4260 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MTM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWY5OWVjYWNjMjRiOTllMWQzNDgxODhmZjhiNTlmMjI3 YjUzNjQ5My4uOTY4MWYyZjBlMjM4ZWNkMjk4OWIzMjRmMDY4Yzg4ZjhlNmY3MDAxYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEyLTExLTI5ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBJbWFnZURpZmYgbW9yZSB1c2VmdWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NzgyCisKKyAgICAg ICAgQmFzZWQgb24gcGF0Y2ggYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgorICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYWtlcyBhIG1peGVkIGFwcHJvYWNoIHdo ZXJlIGRpZmZlcmVuY2UgaXMgaGFsZiBiYXNlZCBvbiBudW1iZXIgb2YgcGl4ZWxzIHdpdGggZXJy b3JzLAorICAgICAgICBhbmQgaGFsZiB0aGUgc3VtIG9mIGNvbG9yLWRpZmZlcmVuY2UuCisKKyAg ICAgICAgVGhlIGRpZmYgaW1hZ2UgaXMgZ2VuZXJhdGVkIHdpdGggYnJpZ2h0IHJlZCBpbmRpY2F0 aW5nIGVycm9ycywgYnV0IGxldHRpbmcgdGhlIGJhc2UgaW1hZ2UKKyAgICAgICAgc2hpbmUgdGhy b3VnaCBzbyB0aGUgY29udGV4dCBvZiB0aGUgZXJyb3ItcGl4ZWwgY2FuIGJlIGlkZW50aWZpZWQu CisKKyAgICAgICAgSW1hZ2VEaWZmIGNhbiBub3cgdGFrZSBhIC0tZnV6eiBhcmd1bWVudCBzaW11 bGFyIHRvIHRoZSAnY29tcGFyZScgdXRpbC4gVGhpcyBpcyB1c2VmdWwgdG8KKyAgICAgICAgaWdu b3JlIHBpeGVsIGRpZmZlcmVuY2VzIGR1ZSB0byBkaWZmZXJlbnQgc2NhbGluZyBvciBhbnRpLWFs aWFzaW5nIGFsZ29yaXRobXMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURp ZmYuY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTItMTEtMjkgIEVyaWMgU2VpZGVsICA8ZXJp Y0B3ZWJraXQub3JnPgogCiAgICAgICAgIHJ1bi1wZXJmLXRlc3RzIC0tY2hyb21pdW0tYW5kcm9p ZCBmYWlscyBkdWUgdG8gU2tpYSBJTkZPIGxvZ2dpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL3F0L0ltYWdlRGlmZi5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFn ZURpZmYuY3BwCmluZGV4IDUzN2I2M2Q3MDE0YTU2MzA4Njc0YjY5MWY0MWIxM2ZiYmVmOTdhZjMu LjQ3ZTYwMTMwZThjYzBhY2NkZWNhMDZiZGUyODg4MDcxNGM4NjZmYWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0ltYWdlRGlmZi5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvcXQvSW1hZ2VEaWZmLmNwcApAQCAtMzIsMTEgKzMyLDE1IEBAIGludCBtYWluKGludCBh cmdjLCBjaGFyKiBhcmd2W10pCiAgICAgUUNvcmVBcHBsaWNhdGlvbiBhcHAoYXJnYywgYXJndik7 CiAKICAgICBxcmVhbCB0b2xlcmFuY2UgPSAwOworICAgIHFyZWFsIGZ1enogPSAwOwogCiAgICAg UVN0cmluZ0xpc3QgYXJncyA9IGFwcC5hcmd1bWVudHMoKTsKLSAgICBmb3IgKGludCBpID0gMDsg aSA8IGFyZ2M7ICsraSkKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IGFyZ2M7ICsraSkgewogICAg ICAgICBpZiAoYXJnc1tpXSA9PSAiLXQiIHx8IGFyZ3NbaV0gPT0gIi0tdG9sZXJhbmNlIikKICAg ICAgICAgICAgIHRvbGVyYW5jZSA9IGFyZ3NbaSArIDFdLnRvRG91YmxlKCk7CisgICAgICAgIGlm IChhcmdzW2ldID09ICItZiIgfHwgYXJnc1tpXSA9PSAiLS1mdXp6IikKKyAgICAgICAgICAgIGZ1 enogPSBhcmdzW2kgKyAxXS50b0RvdWJsZSgpOworICAgIH0KIAogICAgIGNoYXIgYnVmZmVyWzIw NDhdOwogICAgIFFJbWFnZSBhY3R1YWxJbWFnZTsKQEAgLTk1LDcgKzk5LDYgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIAogICAgICAgICAgICAgICAgIGludCBjb3VudCA9IDA7 CiAgICAgICAgICAgICAgICAgcXJlYWwgc3VtID0gMDsKLSAgICAgICAgICAgICAgICBxcmVhbCBt YXhEaXN0YW5jZSA9IDA7CiAKICAgICAgICAgICAgICAgICBmb3IgKGludCB4ID0gMDsgeCA8IHc7 ICsreCkKICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQgeSA9IDA7IHkgPCBoOyArK3kpIHsK QEAgLTEwNiwyNiArMTA5LDIzIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAg ICAgICAgICAgICAgICAgICAgICAgICBxcmVhbCBibHVlID0gKHFCbHVlKHBpeGVsKSAtIHFCbHVl KGJhc2VQaXhlbCkpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHFNYXgoMjU1IC0gcUJsdWUoYmFzZVBp eGVsKSwgcUJsdWUoYmFzZVBpeGVsKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgcXJlYWwg YWxwaGEgPSAocUFscGhhKHBpeGVsKSAtIHFBbHBoYShiYXNlUGl4ZWwpKSAvIHN0YXRpY19jYXN0 PGZsb2F0PihxTWF4KDI1NSAtIHFBbHBoYShiYXNlUGl4ZWwpLCBxQWxwaGEoYmFzZVBpeGVsKSkp OwogICAgICAgICAgICAgICAgICAgICAgICAgcXJlYWwgZGlzdGFuY2UgPSBxU3FydChyZWQgKiBy ZWQgKyBncmVlbiAqIGdyZWVuICsgYmx1ZSAqIGJsdWUgKyBhbHBoYSAqIGFscGhhKSAvIDIuMGY7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbnQgZ3JheSA9IGRpc3RhbmNlICogcXJlYWwoMjU1 KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZJbWFnZS5zZXRQaXhlbCh4LCB5LCBxUmdi KGdyYXksIGdyYXksIGdyYXkpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkaXN0YW5j ZSA+PSAxIC8gcXJlYWwoMjU1KSkgeworICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgcXJl YWwgZXJyb3IgPSAwLjVmICsgZGlzdGFuY2UgLyAyLjBmOworICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgcXJlYWwgb3BhY2l0eSA9IDEuMGYgLSBlcnJvcjsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChkaXN0YW5jZSA+IGZ1enopIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb3VudCsrOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1bSArPSBlcnJvcjsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYigy NTUgKiBlcnJvciArIHFSZWQoYmFzZVBpeGVsKSAqIG9wYWNpdHksIHFHcmVlbihiYXNlUGl4ZWwp ICogb3BhY2l0eSwgcUJsdWUoYmFzZVBpeGVsKSAqIG9wYWNpdHkpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VtICs9IGRp c3RhbmNlOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heERpc3RhbmNlID0gcU1heCht YXhEaXN0YW5jZSwgZGlzdGFuY2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZJ bWFnZS5zZXRQaXhlbCh4LCB5LCBxUmdiYShxUmVkKGJhc2VQaXhlbCksIHFHcmVlbihiYXNlUGl4 ZWwpLCBxQmx1ZShiYXNlUGl4ZWwpLCBxQWxwaGEoYmFzZVBpeGVsKSAqIG9wYWNpdHkpKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg ICAgICBxcmVhbCBkaWZmZXJlbmNlID0gMDsKICAgICAgICAgICAgICAgICBpZiAoY291bnQpCiAg ICAgICAgICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSAxMDAgKiBzdW0gLyBzdGF0aWNfY2FzdDxx cmVhbD4odyAqIGgpOwotICAgICAgICAgICAgICAgIGlmIChkaWZmZXJlbmNlIDw9IHRvbGVyYW5j ZSkgewotICAgICAgICAgICAgICAgICAgICBkaWZmZXJlbmNlID0gMDsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBkaWZmZXJlbmNlID0gcVJvdW5kKGRpZmZl cmVuY2UgKiAxMDApIC8gMTAwLjBmOwotICAgICAgICAgICAgICAgICAgICBkaWZmZXJlbmNlID0g cU1heChkaWZmZXJlbmNlLCBxcmVhbCgwLjAxKSk7Ci0gICAgICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICAgICAgaWYgKCFkaWZmZXJlbmNlKQorICAgICAgICAgICAgICAgIGlmIChkaWZmZXJl bmNlIDw9IHRvbGVyYW5jZSkKICAgICAgICAgICAgICAgICAgICAgZnByaW50ZihzdGRvdXQsICJk aWZmOiAlMDEuMmYlJSBwYXNzZWRcbiIsIGRpZmZlcmVuY2UpOwogICAgICAgICAgICAgICAgIGVs c2UgewogICAgICAgICAgICAgICAgICAgICBRQnVmZmVyIGJ1ZmZlcjsK 182102 2013-01-10 02:51:50 -0800 2013-03-19 08:00:11 -0700 Patch bug-94782-20130110114817.patch text/plain 4475 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MzAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjE4N2U4MTRmNGMzNDAwYTEyNzM3ODI1MDU2MjQxYjhh NTVkNjg0ZC4uOWE4ZWY4ODc1ODNjMTgyOGU4NDZlNjUwYWU4Mzc4MWY4MTYwZTRiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAxLTEwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBJbWFnZURpZmYgbW9yZSB1c2VmdWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NzgyCisKKyAgICAg ICAgQmFzZWQgb24gcGF0Y2ggYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgorICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYWtlcyBhIG1peGVkIGFwcHJvYWNoIHdo ZXJlIGRpZmZlcmVuY2UgaXMgaGFsZiBiYXNlZCBvbiBudW1iZXIgb2YgcGl4ZWxzIHdpdGggZXJy b3JzLAorICAgICAgICBhbmQgaGFsZiB0aGUgc3VtIG9mIGNvbG9yLWRpZmZlcmVuY2UuCisKKyAg ICAgICAgVGhlIGRpZmYgaW1hZ2UgaXMgZ2VuZXJhdGVkIHdpdGggYnJpZ2h0IHJlZCBpbmRpY2F0 aW5nIGVycm9ycywgYnV0IGxldHRpbmcgdGhlIGJhc2UgaW1hZ2UKKyAgICAgICAgc2hpbmUgdGhy b3VnaCBzbyB0aGUgY29udGV4dCBvZiB0aGUgZXJyb3ItcGl4ZWwgY2FuIGJlIGlkZW50aWZpZWQu CisKKyAgICAgICAgSW1hZ2VEaWZmIGNhbiBub3cgdGFrZSBhIC0tZnV6eiBhcmd1bWVudCBzaW11 bGFyIHRvIHRoZSAnY29tcGFyZScgdXRpbC4gVGhpcyBpcyB1c2VmdWwgdG8KKyAgICAgICAgaWdu b3JlIHBpeGVsIGRpZmZlcmVuY2VzIGR1ZSB0byBkaWZmZXJlbnQgc2NhbGluZyBvciBhbnRpLWFs aWFzaW5nIGFsZ29yaXRobXMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURp ZmYuY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMTMtMDEtMTAgIFRpbSAnbWl0aHJvJyBBbnNl bGwgIDxtaXRocm9AbWl0aGlzLmNvbT4KIAogICAgICAgICBDaGFuZ2luZyB0ZXN0cyB0byBiZSBj b25zaXN0ZW50IGFuZCB1c2Ugc2VsZi5zY20gcmF0aGVyIHRoZW4gcmVjcmVhdGluZyB0aGUgc2Nt IG9iamVjdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0ltYWdlRGlmZi9xdC9JbWFnZURpZmYuY3BwIGIv VG9vbHMvSW1hZ2VEaWZmL3F0L0ltYWdlRGlmZi5jcHAKaW5kZXggNTM3YjYzZDcwMTRhNTYzMDg2 NzRiNjkxZjQxYjEzZmJiZWY5N2FmMy4uNTQyMDVhNzQzZDVmYjdmZTM5NDQ1YmM3ZDlhMmZkZGRh ZjJmNzYzYyAxMDA2NDQKLS0tIGEvVG9vbHMvSW1hZ2VEaWZmL3F0L0ltYWdlRGlmZi5jcHAKKysr IGIvVG9vbHMvSW1hZ2VEaWZmL3F0L0ltYWdlRGlmZi5jcHAKQEAgLTMyLDExICszMiwxNSBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIFFDb3JlQXBwbGljYXRpb24gYXBw KGFyZ2MsIGFyZ3YpOwogCiAgICAgcXJlYWwgdG9sZXJhbmNlID0gMDsKKyAgICBxcmVhbCBmdXp6 ID0gMDsKIAogICAgIFFTdHJpbmdMaXN0IGFyZ3MgPSBhcHAuYXJndW1lbnRzKCk7Ci0gICAgZm9y IChpbnQgaSA9IDA7IGkgPCBhcmdjOyArK2kpCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdj OyArK2kpIHsKICAgICAgICAgaWYgKGFyZ3NbaV0gPT0gIi10IiB8fCBhcmdzW2ldID09ICItLXRv bGVyYW5jZSIpCiAgICAgICAgICAgICB0b2xlcmFuY2UgPSBhcmdzW2kgKyAxXS50b0RvdWJsZSgp OworICAgICAgICBpZiAoYXJnc1tpXSA9PSAiLWYiIHx8IGFyZ3NbaV0gPT0gIi0tZnV6eiIpCisg ICAgICAgICAgICBmdXp6ID0gYXJnc1tpICsgMV0udG9Eb3VibGUoKTsKKyAgICB9CiAKICAgICBj aGFyIGJ1ZmZlclsyMDQ4XTsKICAgICBRSW1hZ2UgYWN0dWFsSW1hZ2U7CkBAIC05NSw5ICs5OSw4 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAKICAgICAgICAgICAgICAgICBp bnQgY291bnQgPSAwOwogICAgICAgICAgICAgICAgIHFyZWFsIHN1bSA9IDA7Ci0gICAgICAgICAg ICAgICAgcXJlYWwgbWF4RGlzdGFuY2UgPSAwOwogCi0gICAgICAgICAgICAgICAgZm9yIChpbnQg eCA9IDA7IHggPCB3OyArK3gpCisgICAgICAgICAgICAgICAgZm9yIChpbnQgeCA9IDA7IHggPCB3 OyArK3gpIHsKICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQgeSA9IDA7IHkgPCBoOyArK3kp IHsKICAgICAgICAgICAgICAgICAgICAgICAgIFFSZ2IgcGl4ZWwgPSBhY3R1YWxJbWFnZS5waXhl bCh4LCB5KTsKICAgICAgICAgICAgICAgICAgICAgICAgIFFSZ2IgYmFzZVBpeGVsID0gYmFzZWxp bmVJbWFnZS5waXhlbCh4LCB5KTsKQEAgLTEwNiwyNiArMTA5LDI0IEBAIGludCBtYWluKGludCBh cmdjLCBjaGFyKiBhcmd2W10pCiAgICAgICAgICAgICAgICAgICAgICAgICBxcmVhbCBibHVlID0g KHFCbHVlKHBpeGVsKSAtIHFCbHVlKGJhc2VQaXhlbCkpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHFN YXgoMjU1IC0gcUJsdWUoYmFzZVBpeGVsKSwgcUJsdWUoYmFzZVBpeGVsKSkpOwogICAgICAgICAg ICAgICAgICAgICAgICAgcXJlYWwgYWxwaGEgPSAocUFscGhhKHBpeGVsKSAtIHFBbHBoYShiYXNl UGl4ZWwpKSAvIHN0YXRpY19jYXN0PGZsb2F0PihxTWF4KDI1NSAtIHFBbHBoYShiYXNlUGl4ZWwp LCBxQWxwaGEoYmFzZVBpeGVsKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgcXJlYWwgZGlz dGFuY2UgPSBxU3FydChyZWQgKiByZWQgKyBncmVlbiAqIGdyZWVuICsgYmx1ZSAqIGJsdWUgKyBh bHBoYSAqIGFscGhhKSAvIDIuMGY7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbnQgZ3JheSA9 IGRpc3RhbmNlICogcXJlYWwoMjU1KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZJbWFn ZS5zZXRQaXhlbCh4LCB5LCBxUmdiKGdyYXksIGdyYXksIGdyYXkpKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChkaXN0YW5jZSA+PSAxIC8gcXJlYWwoMjU1KSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgcXJlYWwgZXJyb3IgPSAwLjVmICsgZGlzdGFuY2UgLyAyLjBmOwor ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgcXJlYWwgb3BhY2l0eSA9IDEuMGYgLSBlcnJv cjsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkaXN0YW5jZSA+IGZ1enopIHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb3VudCsrOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN1bSArPSBlcnJvcjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uu c2V0UGl4ZWwoeCwgeSwgcVJnYigyNTUgKiBlcnJvciArIHFSZWQoYmFzZVBpeGVsKSAqIG9wYWNp dHksIHFHcmVlbihiYXNlUGl4ZWwpICogb3BhY2l0eSwgcUJsdWUoYmFzZVBpeGVsKSAqIG9wYWNp dHkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3VtICs9IGRpc3RhbmNlOwotICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1heERpc3RhbmNlID0gcU1heChtYXhEaXN0YW5jZSwgZGlzdGFuY2UpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRpZmZJbWFnZS5zZXRQaXhlbCh4LCB5LCBxUmdiYShxUmVkKGJhc2VQ aXhlbCksIHFHcmVlbihiYXNlUGl4ZWwpLCBxQmx1ZShiYXNlUGl4ZWwpLCBxQWxwaGEoYmFzZVBp eGVsKSAqIG9wYWNpdHkpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIHFyZWFsIGRp ZmZlcmVuY2UgPSAwOwogICAgICAgICAgICAgICAgIGlmIChjb3VudCkKICAgICAgICAgICAgICAg ICAgICAgZGlmZmVyZW5jZSA9IDEwMCAqIHN1bSAvIHN0YXRpY19jYXN0PHFyZWFsPih3ICogaCk7 Ci0gICAgICAgICAgICAgICAgaWYgKGRpZmZlcmVuY2UgPD0gdG9sZXJhbmNlKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSAwOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSBxUm91bmQoZGlmZmVyZW5jZSAqIDEwMCkg LyAxMDAuMGY7Ci0gICAgICAgICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSBxTWF4KGRpZmZlcmVu Y2UsIHFyZWFsKDAuMDEpKTsKLSAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBp ZiAoIWRpZmZlcmVuY2UpCisgICAgICAgICAgICAgICAgaWYgKGRpZmZlcmVuY2UgPD0gdG9sZXJh bmNlKQogICAgICAgICAgICAgICAgICAgICBmcHJpbnRmKHN0ZG91dCwgImRpZmY6ICUwMS4yZiUl IHBhc3NlZFxuIiwgZGlmZmVyZW5jZSk7CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAgICAgICAgIFFCdWZmZXIgYnVmZmVyOwo= 193831 2013-03-19 08:00:16 -0700 2013-03-19 08:32:22 -0700 Patch bug-94782-20130319155513.patch text/plain 4225 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDk0OTMzYjgyODhlNWZiMzYxM2FiYjQzMjU4OGEwZGM3 N2MyZjI1Zi4uZWRlYzI3NThjZmY3NDQ5YjJlNTkxN2M2MWRhNjA0YjE2ZTNlN2EzZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEzLTAzLTE5ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gTWFrZSBJbWFnZURpZmYgc2ltaWxhciB0byBDaHJvbWl1 bSdzIEltYWdlRGlmZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTQ3ODIKKworICAgICAgICBCYXNlZCBvbiBwYXRjaCBieSBDc2FiYSBPc3p0cm9nb27D oWMuCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBk aWZmIGltYWdlIGlzIGdlbmVyYXRlZCB3aXRoIGJyaWdodCByZWQgaW5kaWNhdGluZyBlcnJvcnMs IGJ1dCBsZXR0aW5nIHRoZSBiYXNlIGltYWdlCisgICAgICAgIHNoaW5lIHRocm91Z2ggc28gdGhl IGNvbnRleHQgb2YgdGhlIGVycm9yLXBpeGVsIGNhbiBiZSBpZGVudGlmaWVkLgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvcXQvSW1hZ2VEaWZmLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAy MDEzLTAzLTE4ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgogCiAgICAg ICAgIFtRdF0gRml4IHRoZSBidWlsZCBvZiBRdFRlc3RCcm93c2VyIGlmIHRoZSBwcmludCBwcmV2 aWV3IGRpYWxvZyBpcyBkaXNhYmxlZCBpbiBRdApkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZm L3F0L0ltYWdlRGlmZi5jcHAgYi9Ub29scy9JbWFnZURpZmYvcXQvSW1hZ2VEaWZmLmNwcAppbmRl eCBjZWEyYjEzMzAyM2NhNzQxMTc2ZmM1MzJhY2ZjMjcwZDI2Njk3MDlmLi4wMGExMmUxMTAxZTM1 MTFlNzdlYWRkYjE1OWIzYmZiMjI1MmFjZGNmIDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYv cXQvSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9JbWFnZURpZmYvcXQvSW1hZ2VEaWZmLmNwcApA QCAtMzEsMTIgKzMxLDE0IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiB7CiAg ICAgUUNvcmVBcHBsaWNhdGlvbiBhcHAoYXJnYywgYXJndik7CiAKLSAgICBxcmVhbCB0b2xlcmFu Y2UgPSAwOworICAgIHFyZWFsIHRvbGVyYW5jZSA9IDA7IC8vIFRvbGVyYXRlZCBwZXJjZW50YWdl IG9mIGVycm9yIHBpeGVscy4KKyAgICBxcmVhbCBmdXp6ID0gMDsgLy8gVG9sZXJhdGVkIGRpZmZl cmVuY2UgaW4gY29sb3IgdG8gaW5kaWNhdGUgYSBwaXhlbCBlcnJvci4KIAogICAgIFFTdHJpbmdM aXN0IGFyZ3MgPSBhcHAuYXJndW1lbnRzKCk7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdj OyArK2kpCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdjOyArK2kpIHsKICAgICAgICAgaWYg KGFyZ3NbaV0gPT0gIi10IiB8fCBhcmdzW2ldID09ICItLXRvbGVyYW5jZSIpCiAgICAgICAgICAg ICB0b2xlcmFuY2UgPSBhcmdzW2kgKyAxXS50b0RvdWJsZSgpOworICAgIH0KIAogICAgIGNoYXIg YnVmZmVyWzIwNDhdOwogICAgIFFJbWFnZSBhY3R1YWxJbWFnZTsKQEAgLTkzLDExICs5NSw5IEBA IGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgICAgICAgICAgICAgaW50IGgg PSBhY3R1YWxJbWFnZS5oZWlnaHQoKTsKICAgICAgICAgICAgICAgICBRSW1hZ2UgZGlmZkltYWdl KHcsIGgsIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMik7CiAKLSAgICAgICAgICAgICAgICBpbnQgY291 bnQgPSAwOwotICAgICAgICAgICAgICAgIHFyZWFsIHN1bSA9IDA7Ci0gICAgICAgICAgICAgICAg cXJlYWwgbWF4RGlzdGFuY2UgPSAwOworICAgICAgICAgICAgICAgIGludCBlcnJvckNvdW50ID0g MDsKIAotICAgICAgICAgICAgICAgIGZvciAoaW50IHggPSAwOyB4IDwgdzsgKyt4KQorICAgICAg ICAgICAgICAgIGZvciAoaW50IHggPSAwOyB4IDwgdzsgKyt4KSB7CiAgICAgICAgICAgICAgICAg ICAgIGZvciAoaW50IHkgPSAwOyB5IDwgaDsgKyt5KSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICBRUmdiIHBpeGVsID0gYWN0dWFsSW1hZ2UucGl4ZWwoeCwgeSk7CiAgICAgICAgICAgICAgICAg ICAgICAgICBRUmdiIGJhc2VQaXhlbCA9IGJhc2VsaW5lSW1hZ2UucGl4ZWwoeCwgeSk7CkBAIC0x MDYsMjYgKzEwNiwxOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAg ICAgICAgICAgICAgICAgICAgcXJlYWwgYmx1ZSA9IChxQmx1ZShwaXhlbCkgLSBxQmx1ZShiYXNl UGl4ZWwpKSAvIHN0YXRpY19jYXN0PGZsb2F0PihxTWF4KDI1NSAtIHFCbHVlKGJhc2VQaXhlbCks IHFCbHVlKGJhc2VQaXhlbCkpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHFyZWFsIGFscGhh ID0gKHFBbHBoYShwaXhlbCkgLSBxQWxwaGEoYmFzZVBpeGVsKSkgLyBzdGF0aWNfY2FzdDxmbG9h dD4ocU1heCgyNTUgLSBxQWxwaGEoYmFzZVBpeGVsKSwgcUFscGhhKGJhc2VQaXhlbCkpKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIHFyZWFsIGRpc3RhbmNlID0gcVNxcnQocmVkICogcmVkICsg Z3JlZW4gKiBncmVlbiArIGJsdWUgKiBibHVlICsgYWxwaGEgKiBhbHBoYSkgLyAyLjBmOwotICAg ICAgICAgICAgICAgICAgICAgICAgaW50IGdyYXkgPSBkaXN0YW5jZSAqIHFyZWFsKDI1NSk7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYihncmF5 LCBncmF5LCBncmF5KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoZGlzdGFuY2UgPj0g MSAvIHFyZWFsKDI1NSkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb3VudCsrOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1bSArPSBkaXN0YW5jZTsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtYXhEaXN0YW5jZSA9IHFNYXgobWF4RGlzdGFuY2UsIGRpc3RhbmNl KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIGlm IChkaXN0YW5jZSA+IGZ1enopIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvckNv dW50Kys7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlmZkltYWdlLnNldFBpeGVsKHgs IHksIHFSZ2IoMjU1LCAwLCAwKSk7CisgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmSW1hZ2Uuc2V0UGl4ZWwoeCwgeSwgcVJnYmEo cVJlZChiYXNlUGl4ZWwpLCBxR3JlZW4oYmFzZVBpeGVsKSwgcUJsdWUoYmFzZVBpeGVsKSwgcUFs cGhhKGJhc2VQaXhlbCkgKiAwLjUpKTsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgIH0KIAogICAgICAgICAgICAgICAgIHFyZWFsIGRpZmZlcmVuY2UgPSAwOwotICAgICAg ICAgICAgICAgIGlmIChjb3VudCkKLSAgICAgICAgICAgICAgICAgICAgZGlmZmVyZW5jZSA9IDEw MCAqIHN1bSAvIHN0YXRpY19jYXN0PHFyZWFsPih3ICogaCk7Ci0gICAgICAgICAgICAgICAgaWYg KGRpZmZlcmVuY2UgPD0gdG9sZXJhbmNlKSB7Ci0gICAgICAgICAgICAgICAgICAgIGRpZmZlcmVu Y2UgPSAwOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIGRp ZmZlcmVuY2UgPSBxUm91bmQoZGlmZmVyZW5jZSAqIDEwMCkgLyAxMDAuMGY7Ci0gICAgICAgICAg ICAgICAgICAgIGRpZmZlcmVuY2UgPSBxTWF4KGRpZmZlcmVuY2UsIHFyZWFsKDAuMDEpKTsKLSAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKGVycm9yQ291bnQpCisgICAgICAg ICAgICAgICAgICAgIGRpZmZlcmVuY2UgPSAxMDAgKiBlcnJvckNvdW50IC8gc3RhdGljX2Nhc3Q8 cXJlYWw+KHcgKiBoKTsKIAotICAgICAgICAgICAgICAgIGlmICghZGlmZmVyZW5jZSkKKyAgICAg ICAgICAgICAgICBpZiAoZGlmZmVyZW5jZSA8PSB0b2xlcmFuY2UpCiAgICAgICAgICAgICAgICAg ICAgIGZwcmludGYoc3Rkb3V0LCAiZGlmZjogJTAxLjJmJSUgcGFzc2VkXG4iLCBkaWZmZXJlbmNl KTsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgUUJ1ZmZlciBi dWZmZXI7Cg==