72411 2011-11-15 13:34:12 -0800 No-op filter changes color output because of colorspace issues 2012-03-09 06:16:16 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino thorton abarth cc-bugs dglazkov dino eoconnor jamesr krit macpherson menard mitz ojan simon.fraser thorton webkit-bug-importer webkit.review.bot zimmermann oldest_to_newest 503203 0 dino 2011-11-15 13:34:12 -0800 See attached test case. There are three filters in there, but I'm only using the null version (which is an empty feMerge). Notice that the output colors are not the same as the input, although they should be. Firefox renders this as expected - no change in output. This results in the inverse filter (included) giving much brighter values than expected. 503205 1 115233 dino 2011-11-15 13:34:38 -0800 Created attachment 115233 Test case 503219 2 dino 2011-11-15 13:44:16 -0800 This depends on the color profile selected for the display, so may be OS X only. If I chose Generic RGB, the colors pass through unchanged. Nearly everything else produces a different result. Interestingly, Firefox remains unchanged in all profiles. In fact, even the unfiltered colors are unaffected by the color profile. 503223 3 dino 2011-11-15 13:48:42 -0800 So the bug is probably "Why isn't SVG filters using the same color profile as the rest of the page?" 503583 4 krit 2011-11-15 21:50:18 -0800 (In reply to comment #3) > So the bug is probably "Why isn't SVG filters using the same color profile as the rest of the page?" The default color space for SVG Filters is 'linearRGB'. The color space can be set with the CSS property 'color-interpolation-filters'. At the moment 'linearRGB' is the only color space that we support for SVG Filters. Please see also: http://dev.w3.org/Graphics-FX/modules/filters/publish/SVGFilter.html#FilterPrimitivesOverviewIntro http://www.w3.org/TR/2003/REC-SVG11-20030114/painting.html#ColorInterpolationFiltersProperty 504035 5 dino 2011-11-16 10:38:21 -0800 (In reply to comment #4) > (In reply to comment #3) > > So the bug is probably "Why isn't SVG filters using the same color profile as the rest of the page?" > > The default color space for SVG Filters is 'linearRGB'. The color space can be set with the CSS property 'color-interpolation-filters'. At the moment 'linearRGB' is the only color space that we support for SVG Filters. Please see also: > > http://dev.w3.org/Graphics-FX/modules/filters/publish/SVGFilter.html#FilterPrimitivesOverviewIntro > http://www.w3.org/TR/2003/REC-SVG11-20030114/painting.html#ColorInterpolationFiltersProperty I guess I misunderstood that property to mean that it applies to the filter operations themselves, not to the rendering of the output into the document. I think this is an issue because it means there currently is no way to provide a filter that doesn't change its input, unless your system is set to linearRGB (or sRGB when we support it). 504578 6 krit 2011-11-16 23:05:13 -0800 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > So the bug is probably "Why isn't SVG filters using the same color profile as the rest of the page?" > > > > The default color space for SVG Filters is 'linearRGB'. The color space can be set with the CSS property 'color-interpolation-filters'. At the moment 'linearRGB' is the only color space that we support for SVG Filters. Please see also: > > > > http://dev.w3.org/Graphics-FX/modules/filters/publish/SVGFilter.html#FilterPrimitivesOverviewIntro > > http://www.w3.org/TR/2003/REC-SVG11-20030114/painting.html#ColorInterpolationFiltersProperty > > I guess I misunderstood that property to mean that it applies to the filter operations themselves, not to the rendering of the output into the document. > > I think this is an issue because it means there currently is no way to provide a filter that doesn't change its input, unless your system is set to linearRGB (or sRGB when we support it). The default color space of SVG Masking was changed from linearRGB to sRGB as default (can be changed with 'color-interpolation' property). Maybe the same could be done for filters with changing the initial value of 'color-interpolation-filters'? This needs to get discussed on public-fx, since HTML doesn't support linearRGB yet IIRC. Maybe linearRGB could be added beside the supported color spaces sRGB and DeviceRGB. It is already an option in ColorSpace.h, just the CSS parser doesn't support it yet. Supporting sRGB for filters is not a big deal. When I implemented linearRGB, I had problems to understand if the input of an effect needs to get transformed to linearRGB/sRGB or if the result needs to get transformed (the CSS property gets applied to certain effects). What happens if an effect has two inputs, both in different color spaces? I wrote some tests and couldn't get a sense full explanation of the behavior on testing other SVG Viewers. At the end I decided to use linearRGB as default and support 'color-interpolation-filters' later. We already have a bug report for this: bug 6033. And I think this bug is a duplication of bug 6033 . 522123 7 webkit-bug-importer 2011-12-15 11:59:38 -0800 <rdar://problem/10588374> 525385 8 120200 simon.fraser 2011-12-21 11:32:41 -0800 Created attachment 120200 CSS filter test case 525851 9 simon.fraser 2011-12-21 17:09:37 -0800 We start losing fidelity of the pixel values in the resultImage->context()->drawImageBuffer(filter->sourceImage(), ColorSpaceDeviceRGB, IntPoint()); in SourceGraphic::platformApplySoftware() before we've done any filter or alpha premult stuff. 525894 10 simon.fraser 2011-12-21 17:53:19 -0800 So right now SourceGraphic has a deviceRGB image buffer and we paint into that. That gets copied to a linearRGB buffer, thence to another linearRGB buffer, and that buffer gets copied to the final context. Somewhere in that process we lose color fidelity. In theory I think CG should be doing colorspace conversion when the deviceRGB buffer is painted to the linearRGB buffer, and again when the lienarRGB buffer is painted to the destination. I'm not sure why that isn't' happening. 561093 11 thorton 2012-02-21 11:45:39 -0800 (In reply to comment #10) > So right now SourceGraphic has a deviceRGB image buffer and we paint into that. That gets copied to a linearRGB buffer, thence to another linearRGB buffer, and that buffer gets copied to the final context. Somewhere in that process we lose color fidelity. > > In theory I think CG should be doing colorspace conversion when the deviceRGB buffer is painted to the linearRGB buffer, and again when the lienarRGB buffer is painted to the destination. I'm not sure why that isn't' happening. gdb'ing the CSS testcase shows that both of SourceGraphic's buffers (filter->sourceImage and resultImage) are DeviceRGB, so I'm not sure this description is accurate. 561136 12 thorton 2012-02-21 12:33:47 -0800 (In reply to comment #11) > gdb'ing the CSS testcase shows that both of SourceGraphic's buffers (filter->sourceImage and resultImage) are DeviceRGB, so I'm not sure this description is accurate. Nevermind, I was misunderstanding the GraphicsContextState story. 568234 13 129616 thorton 2012-02-29 19:33:35 -0800 Created attachment 129616 patch One thing I think we need is an additional bug to look at turning this on for Windows. 568237 14 129616 thorton 2012-02-29 19:35:12 -0800 Comment on attachment 129616 patch View in context: https://bugs.webkit.org/attachment.cgi?id=129616&action=review > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:119 > + CFBundleRef webCoreBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebCore")); > + CFURLRef iccProfileURL = CFBundleCopyResourceURL(webCoreBundle, CFSTR("linearSRGB"), CFSTR("icc"), NULL); > + CFDataRef iccProfileData; > + CFURLCreateDataAndPropertiesFromResource(NULL, iccProfileURL, &iccProfileData, NULL, NULL, NULL); > + CFRelease(iccProfileURL); > + linearSRGBSpace = CGColorSpaceCreateWithICCProfile(iccProfileData); > + CFRelease(iccProfileData); And some error checking if the file doesn't exist! I love how I always find things once I'm looking at it in the review interface that I'm totally blind to in Xcode. 568262 15 129616 mitz 2012-02-29 19:56:40 -0800 Comment on attachment 129616 patch View in context: https://bugs.webkit.org/attachment.cgi?id=129616&action=review > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:110 > + static CGColorSpaceRef linearSRGBSpace = NULL; statics are initialized to 0 by the compiler. > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:112 > + if (linearSRGBSpace == NULL) { This should be written as if (!linearSRGBSpace). >> Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:119 >> + CFRelease(iccProfileData); > > And some error checking if the file doesn't exist! > > I love how I always find things once I'm looking at it in the review interface that I'm totally blind to in Xcode. Please use RetainPtr<> for iccProfileURL and iccProfileData. > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:123 > #endif A common style in WebKit is to write a (static) create() function and initialize the static variable by calling it, rather than doing the manual null check as you do above. An even neater way to do this is to use a block. 568314 16 129616 webkit.review.bot 2012-02-29 21:26:19 -0800 Comment on attachment 129616 patch Attachment 129616 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11757201 New failing tests: fast/workers/storage/use-same-database-in-page-and-workers.html 568376 17 thorton 2012-02-29 23:22:44 -0800 (In reply to comment #15) > (From update of attachment 129616 [details]) > Please use RetainPtr<> for iccProfileURL and iccProfileData. I can see that working for iccProfileURL, but I'm not sure how (in the iccProfileData case) this would interact with the CFData being created by CFURLCreateDataAndPropertiesFromResource. It doesn't seem to "just work", in any case. I'll have to look at it tomorrow. 568387 18 129641 thorton 2012-02-29 23:39:01 -0800 Created attachment 129641 patch with most of Dan's changes This is just missing the RetainPtr for iccProfileData. 568389 19 129642 thorton 2012-02-29 23:41:13 -0800 Created attachment 129642 preempting the style bot 568392 20 webkit.review.bot 2012-02-29 23:44:21 -0800 Attachment 129642 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast..." exit_code: 1 Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 85 files If any of these errors are false positives, please file a bug against check-webkit-style. 568394 21 thorton 2012-02-29 23:46:14 -0800 (In reply to comment #20) > Attachment 129642 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast..." exit_code: 1 > Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] > Total errors found: 1 in 85 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Wahaa? I didn't touch that file. 568396 22 129642 mitz 2012-02-29 23:47:31 -0800 Comment on attachment 129642 preempting the style bot View in context: https://bugs.webkit.org/attachment.cgi?id=129642&action=review > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:80 > + CGColorSpaceRef linearSRGBSpace = deviceRGBColorSpaceRef(); I would have initialized this to 0 here… > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:92 > + return linearSRGBSpace; …and 0-checked it here, and only if it’s 0, call deviceRGBColorSpaceRef(). One reason is to save that function call in the success case. The other is to avoid returning 0 if CGColorSpaceCreateWithICCProfile() failed for some reason. 568409 23 thorton 2012-03-01 00:00:17 -0800 Thanks for the review! Unfortunately, this is going to need a lot of new baselines. Even more unfortunately, when poking through the new baselines, I noticed that at least svg/filters/feColorMatrix-offset.svg doesn't look right. I'll take a look tomorrow; it's possible that the other browsers I'm trying are getting it wrong instead. 574103 24 thorton 2012-03-08 12:46:42 -0800 (In reply to comment #23) > Thanks for the review! > > Unfortunately, this is going to need a lot of new baselines. Even more unfortunately, when poking through the new baselines, I noticed that at least svg/filters/feColorMatrix-offset.svg doesn't look right. I'll take a look tomorrow; it's possible that the other browsers I'm trying are getting it wrong instead. Ok, so we're (as of the patch I'm going to post in a second) down to just needing new pixel baselines, which is currently not possible due to https://bugs.webkit.org/show_bug.cgi?id=80571. In the interests of landing this patch sooner rather than later, ... what should I do? I wish I could temporarily skip just the pixel tests for the affected bunch of tests. 574104 25 130883 thorton 2012-03-08 12:48:57 -0800 Created attachment 130883 patch This patch differs from the last only slightly: - if (iccProfileURL && !CFURLCreateDataAndPropertiesFromResource(0, iccProfileURL.get(), &iccProfileData, 0, 0, 0)) + if (iccProfileURL && CFURLCreateDataAndPropertiesFromResource(0, iccProfileURL.get(), &iccProfileData, 0, 0, 0)) I'd misread the CFURL docs when reorganizing this function and got the expected return value swapped. So, now it's just up to the tests. 574105 26 jamesr 2012-03-08 12:53:52 -0800 (In reply to comment #24) > (In reply to comment #23) > > Thanks for the review! > > > > Unfortunately, this is going to need a lot of new baselines. Even more unfortunately, when poking through the new baselines, I noticed that at least svg/filters/feColorMatrix-offset.svg doesn't look right. I'll take a look tomorrow; it's possible that the other browsers I'm trying are getting it wrong instead. > > Ok, so we're (as of the patch I'm going to post in a second) down to just needing new pixel baselines, which is currently not possible due to https://bugs.webkit.org/show_bug.cgi?id=80571. In the interests of landing this patch sooner rather than later, ... what should I do? I wish I could temporarily skip just the pixel tests for the affected bunch of tests. You can mark the tests as failing pixel tests only by adding appropriate lines to the test_expectations.txt for your platform. The lines would look something like this: // Description of why this set of tests is expected to have pixel diffs BUGWK12345 path/to/test.html = IMAGE ... Then if the tests start failing in any other way (crash, text diffs) they will still go red. This should work for any port using NRWT, which IIRC is everything but windows 574106 27 thorton 2012-03-08 12:55:43 -0800 > Then if the tests start failing in any other way (crash, text diffs) they will still go red. This should work for any port using NRWT, which IIRC is everything but windows Oh, test_expectations works for Mac? I had no idea! 574195 28 130883 dino 2012-03-08 14:19:07 -0800 Comment on attachment 130883 patch View in context: https://bugs.webkit.org/attachment.cgi?id=130883&action=review This looks fine to me. Are you going to send another patch with the skips or test_expectations? > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:124 > + // FIXME: Windows should be able to use linear sRGB, this is tracked by http://webkit.org/b/80000. I protest that such a nice id is for such a boring bug 574201 29 thorton 2012-03-08 14:24:17 -0800 (In reply to comment #28) > (From update of attachment 130883 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=130883&action=review > > This looks fine to me. Are you going to send another patch with the skips or test_expectations? Thanks! Indeed, I'm trying to work out the test_expectations right now! Which might be leading to me filing another tools bug :-\ > > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:124 > > + // FIXME: Windows should be able to use linear sRGB, this is tracked by http://webkit.org/b/80000. > > I protest that such a nice id is for such a boring bug I said the same thing, in the bug :-D 574317 30 thorton 2012-03-08 15:33:07 -0800 (In reply to comment #29) > (In reply to comment #28) > > (From update of attachment 130883 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=130883&action=review > > > > This looks fine to me. Are you going to send another patch with the skips or test_expectations? > > Thanks! > > Indeed, I'm trying to work out the test_expectations right now! Which might be leading to me filing another tools bug :-\ > > > > Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp:124 > > > + // FIXME: Windows should be able to use linear sRGB, this is tracked by http://webkit.org/b/80000. > > > > I protest that such a nice id is for such a boring bug > > I said the same thing, in the bug :-D Landed (with test_expectations updates for Mac) in http://trac.webkit.org/changeset/110221 574826 31 zimmermann 2012-03-09 05:11:29 -0800 (In reply to comment #30) > Landed (with test_expectations updates for Mac) in http://trac.webkit.org/changeset/110221 Hrm, this made nrwt --tolerance 0 -p svg useless for me. Without the fix in bug 80571, the pixel test baseline can't be correctly updated - at least I can't find a way to. I wouldn't have landed this with test_expectations.txt changes, until it's clear when and how it can be fixed. I usually mark a test as failing IMAGE, when I know it just needs a rebaseline. The test that you've marked as IMAGE, can't be updated atm due to bug 80571... Anyhow, I'd like to hear how you want to move on with this. I'm reopening this bug for potential rebaselines after 80571 landed. 574850 32 zimmermann 2012-03-09 06:16:16 -0800 Closing again, I rebaselined everything using Generic RGB profile in r110292, and restored several missing results that got removed by wrong rebaselining. We have to fix bug 80571 ASAP, to make sure only Generic RGB pixel test results are added to the Mac baseline. 115233 2011-11-15 13:34:38 -0800 2011-11-15 13:34:38 -0800 Test case filter-inverse.svg image/svg+xml 1335 dino PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRw Oi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDxzdHlsZT4KICAgICAgICAuZmlsdGVyZWQg ewogICAgICAgICAgICBmaWx0ZXI6IHVybCgnI251bGwnKTsKICAgICAgICB9CiAgICA8L3N0eWxl PgogICAgPGRlZnM+CiAgICAgICAgPGZpbHRlciBpZD0iaW52ZXJ0Ij4KICAgICAgICAgICAgPGZl Q29tcG9uZW50VHJhbnNmZXI+CiAgICAgICAgICAgICAgICA8ZmVGdW5jUiB0eXBlPSJ0YWJsZSIg dGFibGVWYWx1ZXM9IjEgMCIvPgogICAgICAgICAgICAgICAgPGZlRnVuY0cgdHlwZT0idGFibGUi IHRhYmxlVmFsdWVzPSIxIDAiLz4KICAgICAgICAgICAgICAgIDxmZUZ1bmNCIHR5cGU9InRhYmxl IiB0YWJsZVZhbHVlcz0iMSAwIi8+CiAgICAgICAgICAgIDwvZmVDb21wb25lbnRUcmFuc2Zlcj4K ICAgICAgICA8L2ZpbHRlcj4KICAgICAgICA8ZmlsdGVyIGlkPSJudWxsIj4KICAgICAgICAgICAg PGZlTWVyZ2U+CiAgICAgICAgICAgICAgICA8ZmVNZXJnZU5vZGUvPgogICAgICAgICAgICA8L2Zl TWVyZ2U+CiAgICAgICAgPC9maWx0ZXI+CiAgICAgICAgPGZpbHRlciBpZD0iaHVlLXJvdGF0ZSI+ CiAgICAgICAgICAgIDxmZUNvbG9yTWF0cml4IHR5cGU9Imh1ZVJvdGF0ZSIKICAgICAgICAgICAg ICAgICAgICAgICAgICAgdmFsdWVzPSIxODAiLz4KICAgICAgICA8L2ZpbHRlcj4KICAgIDwvZGVm cz4KCiAgICA8cmVjdCB4PSIxMCIgeT0iMCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAiIGZpbGw9 IiNmMDAiLz4KICAgIDxyZWN0IHg9IjIxMCIgeT0iMCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAi IGZpbGw9IiNmMDAiIGNsYXNzPSJmaWx0ZXJlZCIvPgoKICAgIDxyZWN0IHg9IjEwIiB5PSIxMTAi IHdpZHRoPSIyMDAiIGhlaWdodD0iMTAwIiBmaWxsPSIjMGYwIi8+CiAgICA8cmVjdCB4PSIyMTAi IHk9IjExMCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAiIGZpbGw9IiMwZjAiIGNsYXNzPSJmaWx0 ZXJlZCIvPgoKICAgIDxyZWN0IHg9IjEwIiB5PSIyMjAiIHdpZHRoPSIyMDAiIGhlaWdodD0iMTAw IiBmaWxsPSIjMDBmIi8+CiAgICA8cmVjdCB4PSIyMTAiIHk9IjIyMCIgd2lkdGg9IjIwMCIgaGVp Z2h0PSIxMDAiIGZpbGw9IiMwMGYiIGNsYXNzPSJmaWx0ZXJlZCIvPgoKICAgIDxyZWN0IHg9IjEw IiB5PSIzMzAiIHdpZHRoPSIyMDAiIGhlaWdodD0iMTAwIiBmaWxsPSIjMGZmIi8+CiAgICA8cmVj dCB4PSIyMTAiIHk9IjMzMCIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIxMDAiIGZpbGw9IiMwZmYiIGNs YXNzPSJmaWx0ZXJlZCIvPgo8L3N2Zz4K 120200 2011-12-21 11:32:41 -0800 2011-12-21 11:32:41 -0800 CSS filter test case filter-region.html text/html 445 simon.fraser PCFET0NUWVBFIGh0bWw+Cgo8aHRtbCBsYW5nPSJlbiI+CjxoZWFkPgogIDxzdHlsZT4KICAgIC5i b3ggewogICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgIGhlaWdodDogMTAwcHg7CiAgICAg IHdpZHRoOiAxMDBweDsKICAgICAgbWFyZ2luOiAyMHB4OwogICAgICBib3JkZXI6IDFweCBzb2xp ZCBibGFjazsKICAgICAgYm94LXNoYWRvdzogMCAwIDIwcHggYmx1ZTsKICAgIH0KICAgIAogICAg LmJveDpob3ZlciB7CiAgICAgIC13ZWJraXQtZmlsdGVyOiBibHVyKDApOwovKiAgICAgIG9wYWNp dHk6IDAuNTsqLwogICAgfQogIDwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+CgogIDxkaXYgY2xhc3M9 ImZpbHRlcmVkIGJveCI+CiAgICA8ZGl2IGNsYXNzPSJib3giIHN0eWxlPSJ0b3A6IDUwcHg7IGxl ZnQ6IDUwcHgiPgogICAgPC9kaXY+CiAgPC9kaXY+CjwvYm9keT4KPC9odG1sPg== 129616 2012-02-29 19:33:35 -0800 2012-02-29 23:39:01 -0800 patch colorspaces.patch text/plain 6618 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2U0MGFjLi45ZWMzZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDItMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTm8tb3AgZmlsdGVyIGNoYW5nZXMgY29sb3Igb3V0cHV0IGJlY2F1c2Ugb2YgY29s b3JzcGFjZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNDExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDU4ODM3ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWRlZmluZSAibGluZWFy IFJHQiIgY29sb3Igc3BhY2Ugb24gTWFjIHRvIG1lYW4gbGluZWFyaXplZCBzUkdCLCBpbnN0ZWFk IG9mIGxpbmVhcgorICAgICAgICBHZW5lcmljIFJHQi4gVGhpcyBtYWtlcyBleGlzdGluZyBDRyBj b2xvciBtYXRjaGluZyBlcXVpdmFsZW50IHRvIHdoYXQgb3RoZXIgcG9ydHMgZG8gdmlhCisgICAg ICAgIEltYWdlQnVmZmVyOjp0cmFuc2Zvcm1Db2xvclNwYWNlICh3aGljaCBvbmx5IGFkanVzdHMg Z2FtbWEsIGFzIHdlIHdpbGwgbm93KS4gUHJldmlvdXNseSwKKyAgICAgICAgd2Ugd2VyZSBhbHNv IGNhdXNpbmcgYWN0dWFsIChub24tZ2FtbWEpIGNvbG9yIGFkanVzdG1lbnRzIHdoaWNoIHdlcmUg bm90IHJldmVyc2libGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGFsbCBl eGlzdGluZyBTVkcgYW5kIENTUyBmaWx0ZXIgdGVzdHMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMv bGluZWFyU1JHQi5pY2M6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaW5lYXJSR0JDb2xvclNwYWNlUmVmKToKKwog MjAxMi0wMi0yOSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIERvbid0IGxldCBpbnZhbGlkYXRpb24gZm9yIG5leHQgZnJhbWUgcHJldmVu dCB0aWxlIHVwbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVh clNSR0IuaWNjIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVhclNSR0IuaWNjCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjVjYzQzNzEwNjllOTU1MjQ3MWU2YWEwNzdkNDc1ZDdhYzU2Y2NmNTAKR0lUIGJpbmFy eSBwYXRjaApsaXRlcmFsIDQ2MAp6Y21aUXpVXzZzcFA+e25VemAmNTNTNWckQD94WVlBOEt1QzAx UUxecjNtZ0xpZTJ8M0RuQlQ1M0ZvSnxHPnc/VGUKemxPKTlET2kzK0gxfWdkaCNBKVJ2MXRrbSZq MWZTI05LIVZLNEtoIXAyPFJ4RmNtcyU/NHE7Q0x0QVZncmZZcFFxCnpJUm4rfjBrWmoka2w1KStZ XllzOEJAOEAxblIlJitNR0QxMEtaRSNHMSZBPkc5MCgyQE16SiNwRkAja0p2SFYzMAp1Mz5JRyo3 Pz52QCNGQXoqRmw9dlNWMzQ/bDVLfiNlemApPGF6XzlJbmElb1crKUZlaHdAQjt1N2J2ZnElCgps aXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMTNiNmM0NS4uYjNlODhiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzYyLDYg Kzc2Miw3IEBACiAJCTJEOEZFQkREMTQzRTNFRjcwMDcyNTAyQiAvKiBDU1NDcm9zc2ZhZGVWYWx1 ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkQ4RkVC REIxNDNFM0VGNzAwNzI1MDJCIC8qIENTU0Nyb3NzZmFkZVZhbHVlLmggKi87IH07CiAJCTJEOTA2 NjA2MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRDkwNjYwNDBCRTE0MUQ0MDA5NTY5OTggLyog TGF5b3V0U3RhdGUuY3BwICovOyB9OwogCQkyRDkwNjYwNzBCRTE0MUQ0MDA5NTY5OTggLyogTGF5 b3V0U3RhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDJEOTA2NjA1MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTJEOUYwRTEzMTRGRjFDQkYwMEJB MEZGNyAvKiBsaW5lYXJTUkdCLmljYyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMkQ5RjBFMTIxNEZGMUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNj ICovOyB9OwogCQkyRTA4ODhENDExNDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMjEx NDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAgKi87IH07CiAJCTJFMDg4OEQ1MTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMzExNDg4NDhBMDBBRjQyNjUgLyogSlNET01G b3JtRGF0YS5oICovOyB9OwogCQkyRTA4ODhFNjExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3Jt RGF0YUN1c3RvbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyRTA4ODhFNTExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YUN1c3RvbS5jcHAg Ki87IH07CkBAIC03NTUyLDYgKzc1NTMsNyBAQAogCQkyRDkwNjYwNTBCRTE0MUQ0MDA5NTY5OTgg LyogTGF5b3V0U3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExheW91 dFN0YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEOTA2NjBCMDY2NUQ5Mzcw MDZCNkYxQSAvKiBDbGlwYm9hcmRNYWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSAzMDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQ2xpcGJvYXJkTWFjLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQkyRDkwNjYwQzA2NjVEOTM3MDA2 QjZGMUEgLyogQ2xpcGJvYXJkTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDMwOyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ2xpcGJvYXJkTWFjLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKKwkJMkQ5RjBFMTIxNEZG MUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IGxpbmVhclNSR0IuaWNjOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyRTA4ODhDMzExNDg4M0E5MDBBRjQyNjUgLyogRE9N Rm9ybURhdGEuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IERPTUZvcm1EYXRhLmlkbDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkUwODg4RDIxMTQ4ODQ4QTAwQUY0MjY1IC8qIEpT RE9NRm9ybURhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNE T01Gb3JtRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJFMDg4OEQzMTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEpTRE9NRm9ybURhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTEzNjc1LDYgKzEzNjc3LDcgQEAKIAkJCQk4NTEzNkM4QTBBRUQ2NjU4MDBGOTBBM0QgLyogZWFz dFdlc3RSZXNpemVDdXJzb3IucG5nICovLAogCQkJCTg1MTM2QzhCMEFFRDY2NTgwMEY5MEEzRCAv KiBoZWxwQ3Vyc29yLnBuZyAqLywKIAkJCQk5MzE1M0JFMzE0MTk1QjI5MDBGQ0Y1QkUgLyogaW5w dXRTcGVlY2gucG5nICovLAorCQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJT UkdCLmljYyAqLywKIAkJCQk4NTEzNkM4QzBBRUQ2NjU4MDBGOTBBM0QgLyogbGlua0N1cnNvci5w bmcgKi8sCiAJCQkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXphYmxlLnN0cmlu Z3MgKi8sCiAJCQkJOTMxNTNCRTExNDE5NUE1NzAwRkNGNUJFIC8qIG1pc3NpbmdJbWFnZS5wbmcg Ki8sCkBAIC0yNDUwOCw2ICsyNDUxMSw3IEBACiAJCQkJODUxMzZDQTgwQUVENjY1OTAwRjkwQTNE IC8qIHdlc3RSZXNpemVDdXJzb3IucG5nIGluIFJlc291cmNlcyAqLywKIAkJCQkxQUIxQUU3QTBD MDUxRkRFMDAxMzlGNEYgLyogem9vbUluQ3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJ MUFCMUFFN0IwQzA1MUZERTAwMTM5RjRGIC8qIHpvb21PdXRDdXJzb3IucG5nIGluIFJlc291cmNl cyAqLywKKwkJCQkyRDlGMEUxMzE0RkYxQ0JGMDBCQTBGRjcgLyogbGluZWFyU1JHQi5pY2MgaW4g UmVzb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Np bmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDRiNjE5MmYuLmFjNDkwMDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFw aGljc0NvbnRleHRDRy5jcHAKQEAgLTEwMywxMiArMTAzLDIzIEBAIENHQ29sb3JTcGFjZVJlZiBz UkdCQ29sb3JTcGFjZVJlZigpCiAKIENHQ29sb3JTcGFjZVJlZiBsaW5lYXJSR0JDb2xvclNwYWNl UmVmKCkKIHsKLSAgICAvLyBGSVhNRTogV2luZG93cyBzaG91bGQgYmUgYWJsZSB0byB1c2Uga0NH Q29sb3JTcGFjZUdlbmVyaWNSR0JMaW5lYXIsIHRoaXMgaXMgdHJhY2tlZCBieSBodHRwOi8vd2Vi a2l0Lm9yZy9iLzMxMzYzLgorICAgIC8vIEZJWE1FOiBXaW5kb3dzIHNob3VsZCBiZSBhYmxlIHRv IHVzZSBsaW5lYXIgU1JHQgogI2lmIFBMQVRGT1JNKFdJTikKICAgICByZXR1cm4gZGV2aWNlUkdC Q29sb3JTcGFjZVJlZigpOwogI2Vsc2UKLSAgICBzdGF0aWMgQ0dDb2xvclNwYWNlUmVmIGxpbmVh clJHQlNwYWNlID0gQ0dDb2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NHQ29sb3JTcGFjZUdlbmVy aWNSR0JMaW5lYXIpOwotICAgIHJldHVybiBsaW5lYXJSR0JTcGFjZTsKKyAgICBzdGF0aWMgQ0dD b2xvclNwYWNlUmVmIGxpbmVhclNSR0JTcGFjZSA9IE5VTEw7CisKKyAgICBpZiAobGluZWFyU1JH QlNwYWNlID09IE5VTEwpIHsKKyAgICAgICAgQ0ZCdW5kbGVSZWYgd2ViQ29yZUJ1bmRsZSA9IENG QnVuZGxlR2V0QnVuZGxlV2l0aElkZW50aWZpZXIoQ0ZTVFIoImNvbS5hcHBsZS5XZWJDb3JlIikp OworICAgICAgICBDRlVSTFJlZiBpY2NQcm9maWxlVVJMID0gQ0ZCdW5kbGVDb3B5UmVzb3VyY2VV Ukwod2ViQ29yZUJ1bmRsZSwgQ0ZTVFIoImxpbmVhclNSR0IiKSwgQ0ZTVFIoImljYyIpLCBOVUxM KTsKKyAgICAgICAgQ0ZEYXRhUmVmIGljY1Byb2ZpbGVEYXRhOworICAgICAgICBDRlVSTENyZWF0 ZURhdGFBbmRQcm9wZXJ0aWVzRnJvbVJlc291cmNlKE5VTEwsIGljY1Byb2ZpbGVVUkwsICZpY2NQ cm9maWxlRGF0YSwgTlVMTCwgTlVMTCwgTlVMTCk7CisgICAgICAgIENGUmVsZWFzZShpY2NQcm9m aWxlVVJMKTsKKyAgICAgICAgbGluZWFyU1JHQlNwYWNlID0gQ0dDb2xvclNwYWNlQ3JlYXRlV2l0 aElDQ1Byb2ZpbGUoaWNjUHJvZmlsZURhdGEpOworICAgICAgICBDRlJlbGVhc2UoaWNjUHJvZmls ZURhdGEpOworICAgIH0KKyAgICAKKyAgICByZXR1cm4gbGluZWFyU1JHQlNwYWNlOwogI2VuZGlm CiB9CiAK 129641 2012-02-29 23:39:01 -0800 2012-02-29 23:41:13 -0800 patch with most of Dan's changes colorspaces.patch text/plain 7091 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2U0MGFjLi45ZWMzZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDItMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTm8tb3AgZmlsdGVyIGNoYW5nZXMgY29sb3Igb3V0cHV0IGJlY2F1c2Ugb2YgY29s b3JzcGFjZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNDExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDU4ODM3ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWRlZmluZSAibGluZWFy IFJHQiIgY29sb3Igc3BhY2Ugb24gTWFjIHRvIG1lYW4gbGluZWFyaXplZCBzUkdCLCBpbnN0ZWFk IG9mIGxpbmVhcgorICAgICAgICBHZW5lcmljIFJHQi4gVGhpcyBtYWtlcyBleGlzdGluZyBDRyBj b2xvciBtYXRjaGluZyBlcXVpdmFsZW50IHRvIHdoYXQgb3RoZXIgcG9ydHMgZG8gdmlhCisgICAg ICAgIEltYWdlQnVmZmVyOjp0cmFuc2Zvcm1Db2xvclNwYWNlICh3aGljaCBvbmx5IGFkanVzdHMg Z2FtbWEsIGFzIHdlIHdpbGwgbm93KS4gUHJldmlvdXNseSwKKyAgICAgICAgd2Ugd2VyZSBhbHNv IGNhdXNpbmcgYWN0dWFsIChub24tZ2FtbWEpIGNvbG9yIGFkanVzdG1lbnRzIHdoaWNoIHdlcmUg bm90IHJldmVyc2libGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGFsbCBl eGlzdGluZyBTVkcgYW5kIENTUyBmaWx0ZXIgdGVzdHMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMv bGluZWFyU1JHQi5pY2M6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaW5lYXJSR0JDb2xvclNwYWNlUmVmKToKKwog MjAxMi0wMi0yOSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIERvbid0IGxldCBpbnZhbGlkYXRpb24gZm9yIG5leHQgZnJhbWUgcHJldmVu dCB0aWxlIHVwbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVh clNSR0IuaWNjIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVhclNSR0IuaWNjCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjVjYzQzNzEwNjllOTU1MjQ3MWU2YWEwNzdkNDc1ZDdhYzU2Y2NmNTAKR0lUIGJpbmFy eSBwYXRjaApsaXRlcmFsIDQ2MAp6Y21aUXpVXzZzcFA+e25VemAmNTNTNWckQD94WVlBOEt1QzAx UUxecjNtZ0xpZTJ8M0RuQlQ1M0ZvSnxHPnc/VGUKemxPKTlET2kzK0gxfWdkaCNBKVJ2MXRrbSZq MWZTI05LIVZLNEtoIXAyPFJ4RmNtcyU/NHE7Q0x0QVZncmZZcFFxCnpJUm4rfjBrWmoka2w1KStZ XllzOEJAOEAxblIlJitNR0QxMEtaRSNHMSZBPkc5MCgyQE16SiNwRkAja0p2SFYzMAp1Mz5JRyo3 Pz52QCNGQXoqRmw9dlNWMzQ/bDVLfiNlemApPGF6XzlJbmElb1crKUZlaHdAQjt1N2J2ZnElCgps aXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMTNiNmM0NS4uYjNlODhiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzYyLDYg Kzc2Miw3IEBACiAJCTJEOEZFQkREMTQzRTNFRjcwMDcyNTAyQiAvKiBDU1NDcm9zc2ZhZGVWYWx1 ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkQ4RkVC REIxNDNFM0VGNzAwNzI1MDJCIC8qIENTU0Nyb3NzZmFkZVZhbHVlLmggKi87IH07CiAJCTJEOTA2 NjA2MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRDkwNjYwNDBCRTE0MUQ0MDA5NTY5OTggLyog TGF5b3V0U3RhdGUuY3BwICovOyB9OwogCQkyRDkwNjYwNzBCRTE0MUQ0MDA5NTY5OTggLyogTGF5 b3V0U3RhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDJEOTA2NjA1MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTJEOUYwRTEzMTRGRjFDQkYwMEJB MEZGNyAvKiBsaW5lYXJTUkdCLmljYyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMkQ5RjBFMTIxNEZGMUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNj ICovOyB9OwogCQkyRTA4ODhENDExNDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMjEx NDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAgKi87IH07CiAJCTJFMDg4OEQ1MTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMzExNDg4NDhBMDBBRjQyNjUgLyogSlNET01G b3JtRGF0YS5oICovOyB9OwogCQkyRTA4ODhFNjExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3Jt RGF0YUN1c3RvbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyRTA4ODhFNTExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YUN1c3RvbS5jcHAg Ki87IH07CkBAIC03NTUyLDYgKzc1NTMsNyBAQAogCQkyRDkwNjYwNTBCRTE0MUQ0MDA5NTY5OTgg LyogTGF5b3V0U3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExheW91 dFN0YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEOTA2NjBCMDY2NUQ5Mzcw MDZCNkYxQSAvKiBDbGlwYm9hcmRNYWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSAzMDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQ2xpcGJvYXJkTWFjLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQkyRDkwNjYwQzA2NjVEOTM3MDA2 QjZGMUEgLyogQ2xpcGJvYXJkTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDMwOyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ2xpcGJvYXJkTWFjLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKKwkJMkQ5RjBFMTIxNEZG MUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IGxpbmVhclNSR0IuaWNjOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyRTA4ODhDMzExNDg4M0E5MDBBRjQyNjUgLyogRE9N Rm9ybURhdGEuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IERPTUZvcm1EYXRhLmlkbDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkUwODg4RDIxMTQ4ODQ4QTAwQUY0MjY1IC8qIEpT RE9NRm9ybURhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNE T01Gb3JtRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJFMDg4OEQzMTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEpTRE9NRm9ybURhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTEzNjc1LDYgKzEzNjc3LDcgQEAKIAkJCQk4NTEzNkM4QTBBRUQ2NjU4MDBGOTBBM0QgLyogZWFz dFdlc3RSZXNpemVDdXJzb3IucG5nICovLAogCQkJCTg1MTM2QzhCMEFFRDY2NTgwMEY5MEEzRCAv KiBoZWxwQ3Vyc29yLnBuZyAqLywKIAkJCQk5MzE1M0JFMzE0MTk1QjI5MDBGQ0Y1QkUgLyogaW5w dXRTcGVlY2gucG5nICovLAorCQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJT UkdCLmljYyAqLywKIAkJCQk4NTEzNkM4QzBBRUQ2NjU4MDBGOTBBM0QgLyogbGlua0N1cnNvci5w bmcgKi8sCiAJCQkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXphYmxlLnN0cmlu Z3MgKi8sCiAJCQkJOTMxNTNCRTExNDE5NUE1NzAwRkNGNUJFIC8qIG1pc3NpbmdJbWFnZS5wbmcg Ki8sCkBAIC0yNDUwOCw2ICsyNDUxMSw3IEBACiAJCQkJODUxMzZDQTgwQUVENjY1OTAwRjkwQTNE IC8qIHdlc3RSZXNpemVDdXJzb3IucG5nIGluIFJlc291cmNlcyAqLywKIAkJCQkxQUIxQUU3QTBD MDUxRkRFMDAxMzlGNEYgLyogem9vbUluQ3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJ MUFCMUFFN0IwQzA1MUZERTAwMTM5RjRGIC8qIHpvb21PdXRDdXJzb3IucG5nIGluIFJlc291cmNl cyAqLywKKwkJCQkyRDlGMEUxMzE0RkYxQ0JGMDBCQTBGRjcgLyogbGluZWFyU1JHQi5pY2MgaW4g UmVzb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Np bmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDRiNjE5MmYuLjY1NTc2YzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFw aGljc0NvbnRleHRDRy5jcHAKQEAgLTczLDYgKzczLDI0IEBAIGV4dGVybiAiQyIgewogdXNpbmcg bmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIAorc3RhdGljIENHQ29s b3JTcGFjZVJlZiBjcmVhdGVMaW5lYXJTUkdCQ29sb3JTcGFjZSgpCit7CisgICAgLy8gSWYgd2Ug ZmFpbCB0byBsb2FkIHRoZSBsaW5lYXJpemVkIHNSR0IgSUNDIHByb2ZpbGUsIGZhbGwgYmFjayB0 byBEZXZpY2VSR0IuCisgICAgQ0dDb2xvclNwYWNlUmVmIGxpbmVhclNSR0JTcGFjZSA9IGRldmlj ZVJHQkNvbG9yU3BhY2VSZWYoKTsKKyAgICAKKyAgICBDRkJ1bmRsZVJlZiB3ZWJDb3JlQnVuZGxl ID0gQ0ZCdW5kbGVHZXRCdW5kbGVXaXRoSWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYkNv cmUiKSk7CisgICAgUmV0YWluUHRyPENGVVJMUmVmPiBpY2NQcm9maWxlVVJMKENGQnVuZGxlQ29w eVJlc291cmNlVVJMKHdlYkNvcmVCdW5kbGUsIENGU1RSKCJsaW5lYXJTUkdCIiksIENGU1RSKCJp Y2MiKSwgTlVMTCkpOworICAgIENGRGF0YVJlZiBpY2NQcm9maWxlRGF0YTsKKyAgICAKKyAgICBp ZihpY2NQcm9maWxlVVJMICYmICFDRlVSTENyZWF0ZURhdGFBbmRQcm9wZXJ0aWVzRnJvbVJlc291 cmNlKE5VTEwsIGljY1Byb2ZpbGVVUkwuZ2V0KCksICZpY2NQcm9maWxlRGF0YSwgTlVMTCwgTlVM TCwgTlVMTCkpCisgICAgICAgIGxpbmVhclNSR0JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdp dGhJQ0NQcm9maWxlKGljY1Byb2ZpbGVEYXRhKTsKKyAgICAKKyAgICBpZiAoaWNjUHJvZmlsZURh dGEpCisgICAgICAgIENGUmVsZWFzZShpY2NQcm9maWxlRGF0YSk7CisgICAgCisgICAgcmV0dXJu IGxpbmVhclNSR0JTcGFjZTsKK30KIAogc3RhdGljIHZvaWQgc2V0Q0dGaWxsQ29sb3IoQ0dDb250 ZXh0UmVmIGNvbnRleHQsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSBjb2xvclNwYWNl KQogewpAQCAtMTAzLDEyICsxMjEsMTIgQEAgQ0dDb2xvclNwYWNlUmVmIHNSR0JDb2xvclNwYWNl UmVmKCkKIAogQ0dDb2xvclNwYWNlUmVmIGxpbmVhclJHQkNvbG9yU3BhY2VSZWYoKQogewotICAg IC8vIEZJWE1FOiBXaW5kb3dzIHNob3VsZCBiZSBhYmxlIHRvIHVzZSBrQ0dDb2xvclNwYWNlR2Vu ZXJpY1JHQkxpbmVhciwgdGhpcyBpcyB0cmFja2VkIGJ5IGh0dHA6Ly93ZWJraXQub3JnL2IvMzEz NjMuCisgICAgLy8gRklYTUU6IFdpbmRvd3Mgc2hvdWxkIGJlIGFibGUgdG8gdXNlIGxpbmVhciBz UkdCLCB0aGlzIGlzIHRyYWNrZWQgYnkgaHR0cDovL3dlYmtpdC5vcmcvYi84MDAwMC4KICNpZiBQ TEFURk9STShXSU4pCiAgICAgcmV0dXJuIGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKTsKICNlbHNl Ci0gICAgc3RhdGljIENHQ29sb3JTcGFjZVJlZiBsaW5lYXJSR0JTcGFjZSA9IENHQ29sb3JTcGFj ZUNyZWF0ZVdpdGhOYW1lKGtDR0NvbG9yU3BhY2VHZW5lcmljUkdCTGluZWFyKTsKLSAgICByZXR1 cm4gbGluZWFyUkdCU3BhY2U7CisgICAgc3RhdGljIENHQ29sb3JTcGFjZVJlZiBsaW5lYXJTUkdC U3BhY2UgPSBjcmVhdGVMaW5lYXJTUkdCQ29sb3JTcGFjZSgpOworICAgIHJldHVybiBsaW5lYXJT UkdCU3BhY2U7CiAjZW5kaWYKIH0KIAo= 129642 2012-02-29 23:41:13 -0800 2012-03-08 12:48:57 -0800 preempting the style bot colorspaces.patch text/plain 7077 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2U0MGFjLi45ZWMzZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDItMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTm8tb3AgZmlsdGVyIGNoYW5nZXMgY29sb3Igb3V0cHV0IGJlY2F1c2Ugb2YgY29s b3JzcGFjZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNDExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDU4ODM3ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWRlZmluZSAibGluZWFy IFJHQiIgY29sb3Igc3BhY2Ugb24gTWFjIHRvIG1lYW4gbGluZWFyaXplZCBzUkdCLCBpbnN0ZWFk IG9mIGxpbmVhcgorICAgICAgICBHZW5lcmljIFJHQi4gVGhpcyBtYWtlcyBleGlzdGluZyBDRyBj b2xvciBtYXRjaGluZyBlcXVpdmFsZW50IHRvIHdoYXQgb3RoZXIgcG9ydHMgZG8gdmlhCisgICAg ICAgIEltYWdlQnVmZmVyOjp0cmFuc2Zvcm1Db2xvclNwYWNlICh3aGljaCBvbmx5IGFkanVzdHMg Z2FtbWEsIGFzIHdlIHdpbGwgbm93KS4gUHJldmlvdXNseSwKKyAgICAgICAgd2Ugd2VyZSBhbHNv IGNhdXNpbmcgYWN0dWFsIChub24tZ2FtbWEpIGNvbG9yIGFkanVzdG1lbnRzIHdoaWNoIHdlcmUg bm90IHJldmVyc2libGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGFsbCBl eGlzdGluZyBTVkcgYW5kIENTUyBmaWx0ZXIgdGVzdHMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMv bGluZWFyU1JHQi5pY2M6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaW5lYXJSR0JDb2xvclNwYWNlUmVmKToKKwog MjAxMi0wMi0yOSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIERvbid0IGxldCBpbnZhbGlkYXRpb24gZm9yIG5leHQgZnJhbWUgcHJldmVu dCB0aWxlIHVwbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVh clNSR0IuaWNjIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVhclNSR0IuaWNjCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjVjYzQzNzEwNjllOTU1MjQ3MWU2YWEwNzdkNDc1ZDdhYzU2Y2NmNTAKR0lUIGJpbmFy eSBwYXRjaApsaXRlcmFsIDQ2MAp6Y21aUXpVXzZzcFA+e25VemAmNTNTNWckQD94WVlBOEt1QzAx UUxecjNtZ0xpZTJ8M0RuQlQ1M0ZvSnxHPnc/VGUKemxPKTlET2kzK0gxfWdkaCNBKVJ2MXRrbSZq MWZTI05LIVZLNEtoIXAyPFJ4RmNtcyU/NHE7Q0x0QVZncmZZcFFxCnpJUm4rfjBrWmoka2w1KStZ XllzOEJAOEAxblIlJitNR0QxMEtaRSNHMSZBPkc5MCgyQE16SiNwRkAja0p2SFYzMAp1Mz5JRyo3 Pz52QCNGQXoqRmw9dlNWMzQ/bDVLfiNlemApPGF6XzlJbmElb1crKUZlaHdAQjt1N2J2ZnElCgps aXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMTNiNmM0NS4uYjNlODhiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzYyLDYg Kzc2Miw3IEBACiAJCTJEOEZFQkREMTQzRTNFRjcwMDcyNTAyQiAvKiBDU1NDcm9zc2ZhZGVWYWx1 ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkQ4RkVC REIxNDNFM0VGNzAwNzI1MDJCIC8qIENTU0Nyb3NzZmFkZVZhbHVlLmggKi87IH07CiAJCTJEOTA2 NjA2MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRDkwNjYwNDBCRTE0MUQ0MDA5NTY5OTggLyog TGF5b3V0U3RhdGUuY3BwICovOyB9OwogCQkyRDkwNjYwNzBCRTE0MUQ0MDA5NTY5OTggLyogTGF5 b3V0U3RhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDJEOTA2NjA1MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTJEOUYwRTEzMTRGRjFDQkYwMEJB MEZGNyAvKiBsaW5lYXJTUkdCLmljYyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMkQ5RjBFMTIxNEZGMUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNj ICovOyB9OwogCQkyRTA4ODhENDExNDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMjEx NDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAgKi87IH07CiAJCTJFMDg4OEQ1MTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMzExNDg4NDhBMDBBRjQyNjUgLyogSlNET01G b3JtRGF0YS5oICovOyB9OwogCQkyRTA4ODhFNjExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3Jt RGF0YUN1c3RvbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyRTA4ODhFNTExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YUN1c3RvbS5jcHAg Ki87IH07CkBAIC03NTUyLDYgKzc1NTMsNyBAQAogCQkyRDkwNjYwNTBCRTE0MUQ0MDA5NTY5OTgg LyogTGF5b3V0U3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExheW91 dFN0YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEOTA2NjBCMDY2NUQ5Mzcw MDZCNkYxQSAvKiBDbGlwYm9hcmRNYWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSAzMDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQ2xpcGJvYXJkTWFjLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQkyRDkwNjYwQzA2NjVEOTM3MDA2 QjZGMUEgLyogQ2xpcGJvYXJkTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDMwOyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ2xpcGJvYXJkTWFjLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKKwkJMkQ5RjBFMTIxNEZG MUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IGxpbmVhclNSR0IuaWNjOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyRTA4ODhDMzExNDg4M0E5MDBBRjQyNjUgLyogRE9N Rm9ybURhdGEuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IERPTUZvcm1EYXRhLmlkbDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkUwODg4RDIxMTQ4ODQ4QTAwQUY0MjY1IC8qIEpT RE9NRm9ybURhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNE T01Gb3JtRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJFMDg4OEQzMTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEpTRE9NRm9ybURhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTEzNjc1LDYgKzEzNjc3LDcgQEAKIAkJCQk4NTEzNkM4QTBBRUQ2NjU4MDBGOTBBM0QgLyogZWFz dFdlc3RSZXNpemVDdXJzb3IucG5nICovLAogCQkJCTg1MTM2QzhCMEFFRDY2NTgwMEY5MEEzRCAv KiBoZWxwQ3Vyc29yLnBuZyAqLywKIAkJCQk5MzE1M0JFMzE0MTk1QjI5MDBGQ0Y1QkUgLyogaW5w dXRTcGVlY2gucG5nICovLAorCQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJT UkdCLmljYyAqLywKIAkJCQk4NTEzNkM4QzBBRUQ2NjU4MDBGOTBBM0QgLyogbGlua0N1cnNvci5w bmcgKi8sCiAJCQkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXphYmxlLnN0cmlu Z3MgKi8sCiAJCQkJOTMxNTNCRTExNDE5NUE1NzAwRkNGNUJFIC8qIG1pc3NpbmdJbWFnZS5wbmcg Ki8sCkBAIC0yNDUwOCw2ICsyNDUxMSw3IEBACiAJCQkJODUxMzZDQTgwQUVENjY1OTAwRjkwQTNE IC8qIHdlc3RSZXNpemVDdXJzb3IucG5nIGluIFJlc291cmNlcyAqLywKIAkJCQkxQUIxQUU3QTBD MDUxRkRFMDAxMzlGNEYgLyogem9vbUluQ3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJ MUFCMUFFN0IwQzA1MUZERTAwMTM5RjRGIC8qIHpvb21PdXRDdXJzb3IucG5nIGluIFJlc291cmNl cyAqLywKKwkJCQkyRDlGMEUxMzE0RkYxQ0JGMDBCQTBGRjcgLyogbGluZWFyU1JHQi5pY2MgaW4g UmVzb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Np bmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDRiNjE5MmYuLjA0ODllYzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFw aGljc0NvbnRleHRDRy5jcHAKQEAgLTczLDYgKzczLDI0IEBAIGV4dGVybiAiQyIgewogdXNpbmcg bmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIAorc3RhdGljIENHQ29s b3JTcGFjZVJlZiBjcmVhdGVMaW5lYXJTUkdCQ29sb3JTcGFjZSgpCit7CisgICAgLy8gSWYgd2Ug ZmFpbCB0byBsb2FkIHRoZSBsaW5lYXJpemVkIHNSR0IgSUNDIHByb2ZpbGUsIGZhbGwgYmFjayB0 byBEZXZpY2VSR0IuCisgICAgQ0dDb2xvclNwYWNlUmVmIGxpbmVhclNSR0JTcGFjZSA9IGRldmlj ZVJHQkNvbG9yU3BhY2VSZWYoKTsKKyAgICAKKyAgICBDRkJ1bmRsZVJlZiB3ZWJDb3JlQnVuZGxl ID0gQ0ZCdW5kbGVHZXRCdW5kbGVXaXRoSWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYkNv cmUiKSk7CisgICAgUmV0YWluUHRyPENGVVJMUmVmPiBpY2NQcm9maWxlVVJMKENGQnVuZGxlQ29w eVJlc291cmNlVVJMKHdlYkNvcmVCdW5kbGUsIENGU1RSKCJsaW5lYXJTUkdCIiksIENGU1RSKCJp Y2MiKSwgMCkpOworICAgIENGRGF0YVJlZiBpY2NQcm9maWxlRGF0YTsKKyAgICAKKyAgICBpZiAo aWNjUHJvZmlsZVVSTCAmJiAhQ0ZVUkxDcmVhdGVEYXRhQW5kUHJvcGVydGllc0Zyb21SZXNvdXJj ZSgwLCBpY2NQcm9maWxlVVJMLmdldCgpLCAmaWNjUHJvZmlsZURhdGEsIDAsIDAsIDApKQorICAg ICAgICBsaW5lYXJTUkdCU3BhY2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVXaXRoSUNDUHJvZmlsZShp Y2NQcm9maWxlRGF0YSk7CisgICAgCisgICAgaWYgKGljY1Byb2ZpbGVEYXRhKQorICAgICAgICBD RlJlbGVhc2UoaWNjUHJvZmlsZURhdGEpOworICAgIAorICAgIHJldHVybiBsaW5lYXJTUkdCU3Bh Y2U7Cit9CiAKIHN0YXRpYyB2b2lkIHNldENHRmlsbENvbG9yKENHQ29udGV4dFJlZiBjb250ZXh0 LCBjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKIHsKQEAgLTEwMywx MiArMTIxLDEyIEBAIENHQ29sb3JTcGFjZVJlZiBzUkdCQ29sb3JTcGFjZVJlZigpCiAKIENHQ29s b3JTcGFjZVJlZiBsaW5lYXJSR0JDb2xvclNwYWNlUmVmKCkKIHsKLSAgICAvLyBGSVhNRTogV2lu ZG93cyBzaG91bGQgYmUgYWJsZSB0byB1c2Uga0NHQ29sb3JTcGFjZUdlbmVyaWNSR0JMaW5lYXIs IHRoaXMgaXMgdHJhY2tlZCBieSBodHRwOi8vd2Via2l0Lm9yZy9iLzMxMzYzLgorICAgIC8vIEZJ WE1FOiBXaW5kb3dzIHNob3VsZCBiZSBhYmxlIHRvIHVzZSBsaW5lYXIgc1JHQiwgdGhpcyBpcyB0 cmFja2VkIGJ5IGh0dHA6Ly93ZWJraXQub3JnL2IvODAwMDAuCiAjaWYgUExBVEZPUk0oV0lOKQog ICAgIHJldHVybiBkZXZpY2VSR0JDb2xvclNwYWNlUmVmKCk7CiAjZWxzZQotICAgIHN0YXRpYyBD R0NvbG9yU3BhY2VSZWYgbGluZWFyUkdCU3BhY2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVXaXRoTmFt ZShrQ0dDb2xvclNwYWNlR2VuZXJpY1JHQkxpbmVhcik7Ci0gICAgcmV0dXJuIGxpbmVhclJHQlNw YWNlOworICAgIHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYgbGluZWFyU1JHQlNwYWNlID0gY3JlYXRl TGluZWFyU1JHQkNvbG9yU3BhY2UoKTsKKyAgICByZXR1cm4gbGluZWFyU1JHQlNwYWNlOwogI2Vu ZGlmCiB9CiAK 130883 2012-03-08 12:48:57 -0800 2012-03-08 14:19:07 -0800 patch colorspaces.patch text/plain 7076 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlN2U0MGFjLi45ZWMzZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDItMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTm8tb3AgZmlsdGVyIGNoYW5nZXMgY29sb3Igb3V0cHV0IGJlY2F1c2Ugb2YgY29s b3JzcGFjZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNDExCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDU4ODM3ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWRlZmluZSAibGluZWFy IFJHQiIgY29sb3Igc3BhY2Ugb24gTWFjIHRvIG1lYW4gbGluZWFyaXplZCBzUkdCLCBpbnN0ZWFk IG9mIGxpbmVhcgorICAgICAgICBHZW5lcmljIFJHQi4gVGhpcyBtYWtlcyBleGlzdGluZyBDRyBj b2xvciBtYXRjaGluZyBlcXVpdmFsZW50IHRvIHdoYXQgb3RoZXIgcG9ydHMgZG8gdmlhCisgICAg ICAgIEltYWdlQnVmZmVyOjp0cmFuc2Zvcm1Db2xvclNwYWNlICh3aGljaCBvbmx5IGFkanVzdHMg Z2FtbWEsIGFzIHdlIHdpbGwgbm93KS4gUHJldmlvdXNseSwKKyAgICAgICAgd2Ugd2VyZSBhbHNv IGNhdXNpbmcgYWN0dWFsIChub24tZ2FtbWEpIGNvbG9yIGFkanVzdG1lbnRzIHdoaWNoIHdlcmUg bm90IHJldmVyc2libGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGFsbCBl eGlzdGluZyBTVkcgYW5kIENTUyBmaWx0ZXIgdGVzdHMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMv bGluZWFyU1JHQi5pY2M6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaW5lYXJSR0JDb2xvclNwYWNlUmVmKToKKwog MjAxMi0wMi0yOSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIERvbid0IGxldCBpbnZhbGlkYXRpb24gZm9yIG5leHQgZnJhbWUgcHJldmVu dCB0aWxlIHVwbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVh clNSR0IuaWNjIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2xpbmVhclNSR0IuaWNjCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjVjYzQzNzEwNjllOTU1MjQ3MWU2YWEwNzdkNDc1ZDdhYzU2Y2NmNTAKR0lUIGJpbmFy eSBwYXRjaApsaXRlcmFsIDQ2MAp6Y21aUXpVXzZzcFA+e25VemAmNTNTNWckQD94WVlBOEt1QzAx UUxecjNtZ0xpZTJ8M0RuQlQ1M0ZvSnxHPnc/VGUKemxPKTlET2kzK0gxfWdkaCNBKVJ2MXRrbSZq MWZTI05LIVZLNEtoIXAyPFJ4RmNtcyU/NHE7Q0x0QVZncmZZcFFxCnpJUm4rfjBrWmoka2w1KStZ XllzOEJAOEAxblIlJitNR0QxMEtaRSNHMSZBPkc5MCgyQE16SiNwRkAja0p2SFYzMAp1Mz5JRyo3 Pz52QCNGQXoqRmw9dlNWMzQ/bDVLfiNlemApPGF6XzlJbmElb1crKUZlaHdAQjt1N2J2ZnElCgps aXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMTNiNmM0NS4uYjNlODhiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzYyLDYg Kzc2Miw3IEBACiAJCTJEOEZFQkREMTQzRTNFRjcwMDcyNTAyQiAvKiBDU1NDcm9zc2ZhZGVWYWx1 ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkQ4RkVC REIxNDNFM0VGNzAwNzI1MDJCIC8qIENTU0Nyb3NzZmFkZVZhbHVlLmggKi87IH07CiAJCTJEOTA2 NjA2MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRDkwNjYwNDBCRTE0MUQ0MDA5NTY5OTggLyog TGF5b3V0U3RhdGUuY3BwICovOyB9OwogCQkyRDkwNjYwNzBCRTE0MUQ0MDA5NTY5OTggLyogTGF5 b3V0U3RhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDJEOTA2NjA1MEJFMTQxRDQwMDk1Njk5OCAvKiBMYXlvdXRTdGF0ZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTJEOUYwRTEzMTRGRjFDQkYwMEJB MEZGNyAvKiBsaW5lYXJTUkdCLmljYyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMkQ5RjBFMTIxNEZGMUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNj ICovOyB9OwogCQkyRTA4ODhENDExNDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMjEx NDg4NDhBMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YS5jcHAgKi87IH07CiAJCTJFMDg4OEQ1MTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRTA4ODhEMzExNDg4NDhBMDBBRjQyNjUgLyogSlNET01G b3JtRGF0YS5oICovOyB9OwogCQkyRTA4ODhFNjExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3Jt RGF0YUN1c3RvbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAyRTA4ODhFNTExNDg4NEUyMDBBRjQyNjUgLyogSlNET01Gb3JtRGF0YUN1c3RvbS5jcHAg Ki87IH07CkBAIC03NTUyLDYgKzc1NTMsNyBAQAogCQkyRDkwNjYwNTBCRTE0MUQ0MDA5NTY5OTgg LyogTGF5b3V0U3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExheW91 dFN0YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEOTA2NjBCMDY2NUQ5Mzcw MDZCNkYxQSAvKiBDbGlwYm9hcmRNYWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSAzMDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gQ2xpcGJvYXJkTWFjLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQkyRDkwNjYwQzA2NjVEOTM3MDA2 QjZGMUEgLyogQ2xpcGJvYXJkTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDMwOyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ2xpcGJvYXJkTWFjLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKKwkJMkQ5RjBFMTIxNEZG MUNCRjAwQkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IGxpbmVhclNSR0IuaWNjOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyRTA4ODhDMzExNDg4M0E5MDBBRjQyNjUgLyogRE9N Rm9ybURhdGEuaWRsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IERPTUZvcm1EYXRhLmlkbDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkUwODg4RDIxMTQ4ODQ4QTAwQUY0MjY1IC8qIEpT RE9NRm9ybURhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNE T01Gb3JtRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJFMDg4OEQzMTE0 ODg0OEEwMEFGNDI2NSAvKiBKU0RPTUZvcm1EYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IEpTRE9NRm9ybURhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTEzNjc1LDYgKzEzNjc3LDcgQEAKIAkJCQk4NTEzNkM4QTBBRUQ2NjU4MDBGOTBBM0QgLyogZWFz dFdlc3RSZXNpemVDdXJzb3IucG5nICovLAogCQkJCTg1MTM2QzhCMEFFRDY2NTgwMEY5MEEzRCAv KiBoZWxwQ3Vyc29yLnBuZyAqLywKIAkJCQk5MzE1M0JFMzE0MTk1QjI5MDBGQ0Y1QkUgLyogaW5w dXRTcGVlY2gucG5nICovLAorCQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJT UkdCLmljYyAqLywKIAkJCQk4NTEzNkM4QzBBRUQ2NjU4MDBGOTBBM0QgLyogbGlua0N1cnNvci5w bmcgKi8sCiAJCQkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXphYmxlLnN0cmlu Z3MgKi8sCiAJCQkJOTMxNTNCRTExNDE5NUE1NzAwRkNGNUJFIC8qIG1pc3NpbmdJbWFnZS5wbmcg Ki8sCkBAIC0yNDUwOCw2ICsyNDUxMSw3IEBACiAJCQkJODUxMzZDQTgwQUVENjY1OTAwRjkwQTNE IC8qIHdlc3RSZXNpemVDdXJzb3IucG5nIGluIFJlc291cmNlcyAqLywKIAkJCQkxQUIxQUU3QTBD MDUxRkRFMDAxMzlGNEYgLyogem9vbUluQ3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJ MUFCMUFFN0IwQzA1MUZERTAwMTM5RjRGIC8qIHpvb21PdXRDdXJzb3IucG5nIGluIFJlc291cmNl cyAqLywKKwkJCQkyRDlGMEUxMzE0RkYxQ0JGMDBCQTBGRjcgLyogbGluZWFyU1JHQi5pY2MgaW4g UmVzb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Np bmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDRiNjE5MmYuLjA0ODllYzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFw aGljc0NvbnRleHRDRy5jcHAKQEAgLTczLDYgKzczLDI0IEBAIGV4dGVybiAiQyIgewogdXNpbmcg bmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIAorc3RhdGljIENHQ29s b3JTcGFjZVJlZiBjcmVhdGVMaW5lYXJTUkdCQ29sb3JTcGFjZSgpCit7CisgICAgLy8gSWYgd2Ug ZmFpbCB0byBsb2FkIHRoZSBsaW5lYXJpemVkIHNSR0IgSUNDIHByb2ZpbGUsIGZhbGwgYmFjayB0 byBEZXZpY2VSR0IuCisgICAgQ0dDb2xvclNwYWNlUmVmIGxpbmVhclNSR0JTcGFjZSA9IGRldmlj ZVJHQkNvbG9yU3BhY2VSZWYoKTsKKyAgICAKKyAgICBDRkJ1bmRsZVJlZiB3ZWJDb3JlQnVuZGxl ID0gQ0ZCdW5kbGVHZXRCdW5kbGVXaXRoSWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYkNv cmUiKSk7CisgICAgUmV0YWluUHRyPENGVVJMUmVmPiBpY2NQcm9maWxlVVJMKENGQnVuZGxlQ29w eVJlc291cmNlVVJMKHdlYkNvcmVCdW5kbGUsIENGU1RSKCJsaW5lYXJTUkdCIiksIENGU1RSKCJp Y2MiKSwgMCkpOworICAgIENGRGF0YVJlZiBpY2NQcm9maWxlRGF0YTsKKyAgICAKKyAgICBpZiAo aWNjUHJvZmlsZVVSTCAmJiBDRlVSTENyZWF0ZURhdGFBbmRQcm9wZXJ0aWVzRnJvbVJlc291cmNl KDAsIGljY1Byb2ZpbGVVUkwuZ2V0KCksICZpY2NQcm9maWxlRGF0YSwgMCwgMCwgMCkpCisgICAg ICAgIGxpbmVhclNSR0JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhJQ0NQcm9maWxlKGlj Y1Byb2ZpbGVEYXRhKTsKKyAgICAKKyAgICBpZiAoaWNjUHJvZmlsZURhdGEpCisgICAgICAgIENG UmVsZWFzZShpY2NQcm9maWxlRGF0YSk7CisgICAgCisgICAgcmV0dXJuIGxpbmVhclNSR0JTcGFj ZTsKK30KIAogc3RhdGljIHZvaWQgc2V0Q0dGaWxsQ29sb3IoQ0dDb250ZXh0UmVmIGNvbnRleHQs IGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQogewpAQCAtMTAzLDEy ICsxMjEsMTIgQEAgQ0dDb2xvclNwYWNlUmVmIHNSR0JDb2xvclNwYWNlUmVmKCkKIAogQ0dDb2xv clNwYWNlUmVmIGxpbmVhclJHQkNvbG9yU3BhY2VSZWYoKQogewotICAgIC8vIEZJWE1FOiBXaW5k b3dzIHNob3VsZCBiZSBhYmxlIHRvIHVzZSBrQ0dDb2xvclNwYWNlR2VuZXJpY1JHQkxpbmVhciwg dGhpcyBpcyB0cmFja2VkIGJ5IGh0dHA6Ly93ZWJraXQub3JnL2IvMzEzNjMuCisgICAgLy8gRklY TUU6IFdpbmRvd3Mgc2hvdWxkIGJlIGFibGUgdG8gdXNlIGxpbmVhciBzUkdCLCB0aGlzIGlzIHRy YWNrZWQgYnkgaHR0cDovL3dlYmtpdC5vcmcvYi84MDAwMC4KICNpZiBQTEFURk9STShXSU4pCiAg ICAgcmV0dXJuIGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKTsKICNlbHNlCi0gICAgc3RhdGljIENH Q29sb3JTcGFjZVJlZiBsaW5lYXJSR0JTcGFjZSA9IENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1l KGtDR0NvbG9yU3BhY2VHZW5lcmljUkdCTGluZWFyKTsKLSAgICByZXR1cm4gbGluZWFyUkdCU3Bh Y2U7CisgICAgc3RhdGljIENHQ29sb3JTcGFjZVJlZiBsaW5lYXJTUkdCU3BhY2UgPSBjcmVhdGVM aW5lYXJTUkdCQ29sb3JTcGFjZSgpOworICAgIHJldHVybiBsaW5lYXJTUkdCU3BhY2U7CiAjZW5k aWYKIH0KIAo=