26379 2009-06-13 18:08:28 -0700 Reconsider image decoding architecture/APIs 2009-06-18 10:30:56 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) PC All RESOLVED DUPLICATE 26467 P2 Normal --- 1 pkasting webkit-unassigned bfulgham brettw emacemac7 eric hyatt kevino tonikitoo xan.lopez zecke oldest_to_newest 125702 0 pkasting 2009-06-13 18:08:28 -0700 Several good questions came up while I worked on bug 25709, including: * Why isn't RGBA32Buffer called FrameBuffer? * Why doesn't it use WebKit types like IntSize instead of "int width, int height"? * How is it different than ImageBuffer? Can the two be combined? * Or maybe should it become more private to ImageDecoder and have all the decoders go through the ImageDecoder object? * Can all the #if PLATFORM(...) stuff in it move to implementation-specific files, maybe by using subclasses or PIMPL or something? * Can all the people using the cross-platform decoders use a common ImageSource? * Should ImageSource and ImageDecoder merge? I'm sure I'm missing some, too. This bug is a good place to discuss or post idea patches. I don't feel like I fully understand all the image decoder classes so for the time being I'll probably stick with cleanup like the first bullet or two at the top. CCing some people who might have input. 125705 1 zecke 2009-06-13 18:46:03 -0700 Some more: * Where is the difference between ImageBuffer and RGBA32Buffer now? * Why should RGBA32Buffer ever know how to construct a native image? I opt for a method/function that takes a RGBA32 and gives you a NativeImagePtr. Skia code can still use secrets of the RGBA32Buffer to convert that... 125712 2 pkasting 2009-06-13 19:27:09 -0700 (In reply to comment #1) > * Where is the difference between ImageBuffer and RGBA32Buffer now? Yes, this was asked in comment 0. > * Why should RGBA32Buffer ever know how to construct a native image? I opt for > a method/function that takes a RGBA32 and gives you a NativeImagePtr. Skia code > can still use secrets of the RGBA32Buffer to convert that... If you can whip up a patch I'd be happy to look at it, even though I can't r+. 125762 3 zecke 2009-06-14 06:26:59 -0700 Okay, let me start with patches to make the code cross-platform again. It was cross-platform in a sense that the decoded image buffer could be simply consumed (e.g. uploaded to the graphics server). There is no reason to not support this default case, it is useful to Qt (external patches), Torchmobile, the EFL port... 125763 4 31258 zecke 2009-06-14 06:40:47 -0700 Created attachment 31258 Restore cross platform behavior Restore the old behavior of RGBA32Buffer this includes only special casing Skia to have something else as buffer. This is restoring the capability to just consume the decoded image without undoing the Skia part. 125764 5 31259 zecke 2009-06-14 06:42:16 -0700 Created attachment 31259 Make ImageDecoder.cpp cross-platform There is no need to force every port to have the exact same implementation of RGBA32Buffer, the only symbol that is platform depended is the conversion to a NativeImage and that does not belong into the buffer class anyway. 125765 6 31260 zecke 2009-06-14 06:43:40 -0700 Created attachment 31260 Move the secret how to create a cairo_surface_t back to ImageSourceCairo.cpp This makes ImageDecoder.cpp truly cross-platform again (without any #ifdef). 125766 7 31261 zecke 2009-06-14 06:45:04 -0700 Created attachment 31261 Unfork the WX, no need to have an exact copy of the RGBA32Buffer... use the common code Move the WX code back to ImageSourceWX.cpp and attempt to update the buildsystem. The whitespace is left there on purpose as this is mostly moving stuff around and not intended as a cleanup. 125767 8 31262 zecke 2009-06-14 06:46:14 -0700 Created attachment 31262 Call the thing by its name and rename ImageDecoder.cpp to RGBA32Buffer.cpp The only symbols in this file are RGBA32Buffer symbols, rename the file to match the reality. 125768 9 31263 zecke 2009-06-14 06:47:23 -0700 Created attachment 31263 Unfork the various ImageSource*.cpp copies Unfork the three copies of ImageSource.cpp and have a common copy, the only symbol that is platform specific is to convert the RGBA32Buffer into a native image pointer.... 125769 10 31264 zecke 2009-06-14 06:51:11 -0700 Created attachment 31264 Take out asNativeImagePtr Proposal to take out the asNativeImagePtr from RGBA32Buffer and move it to skia specific files. The name "RGBA32Buffer" indicates that the secret of the class is to hold a buffer for RGBA8888 pixel manipulation, I don't think the class should know how to construct a image, someone else should know how to turn the buffer into a NativeImage... The only #ifdef's left in the code are for Skia header files and members and there is nothing at this point we can do to avoid that. So I will stop here. 125771 11 pkasting 2009-06-14 09:02:30 -0700 (In reply to comment #4) > Restore the old behavior of RGBA32Buffer this includes only special casing Skia > to have something else as buffer. This is restoring the capability to just > consume the decoded image without undoing the Skia part. I don't think this patch should be landed. The Cairo and wx ports are about to move away from using Vector<unsigned> to store their data, which this patch prevents. And no one else is actually using this. Anyone who did would be better served by using their platform-specific storage type in the backend. I don't think you grasp what a perf difference it makes not to use Vector<unsigned>. This is necessary for anyone who wants to ship a performant renderer. 125772 12 pkasting 2009-06-14 09:03:33 -0700 (In reply to comment #5) > There is no need to force every port to have the exact same implementation of > RGBA32Buffer, the only symbol that is platform depended is the conversion to a > NativeImage and that does not belong into the buffer class anyway. Again, this should not be landed. This hinders the backends using appropriate per-platform storage classes. 125774 13 pkasting 2009-06-14 09:07:01 -0700 (In reply to comment #9) > Created an attachment (id=31263) [review] > Unfork the various ImageSource*.cpp copies This is the only patch in this series I support. I think this is fine, and in fact if we leave asNewNativeImage() (which I think is important to do) we can collapse the files entirely and not partially. 125775 14 pkasting 2009-06-14 09:11:33 -0700 I haven't given explicit "no" replies to every single patch, but that's because I think all but the ImageSource collapsing are really a single patch that simply undoes all of the ImageDecoder unforking. You have never stated how you intend these ports to obtain acceptable performance or what concrete benefits this has. I have worked with the image decoders for several years and know enough to say that this is a damaging set of patches that we should not land. I think your only motivation is a mistaken sense of some sort of "cross-platform" idealism that fails to account for the real constraints here. The original decoders weren't written the way they were because it was better. They were written for one port as a quick experiment to get something onscreen. Since then a few other ports have done the minimal amount of work to get images onscreen, but Chromium is the only one that has actively worked to make this code production-ready. Don't undo this work when you don't have the background on why it was done. 125777 15 bfulgham 2009-06-14 10:16:02 -0700 I feel like this bug is being hijacked to flip things back to the "bad" old way, rather than being a useful conversation about how to make the whole image decoder better. When Apple abandoned these decoders in favor of the CoreGraphics routines, they effectively headed down a road that provided superior performance through internal use of CGImageRef types (which abstract the various image types). Peter's patches brought the image-decoder classes more in line with this philosophy. It seems to me that the Qt port's objection is addressed entirely in the current sources, with the one small nit that there are now some #ifdefs in the header. Perhaps we can figure out how to remove the #ifdef code from the header through PIMPL or some other technique. 125780 16 bfulgham 2009-06-14 10:29:52 -0700 Another point in all this work is that the benefit of unforking Chromium's code is a huge benefit to the WebKit project, especially ports like GTK+/Windows Cairo that do not have access to the same development resources as Qt or Apple. Prior to Peter's modifications, all the Cairo ports were unable to view XBM/ICO/BMP files, and with virtually no effort on our parts we now have these features. I look forward to receiving other great new functionality and bug fixes as Google moves forward updating these now-shared image decoders as their team finds bugs, fixes performance issues, and so forth. I am frankly dismayed by the poor attitude displayed in IRC and these bugs towards this work. Google did not receive any benefit from doing this work, but the Linux and redistributable Windows ports gained significant useful functionality. And the fact that as far as I can tell the majority of the objection boils down to a tirade over the presence of #ifdef guards in the header (perhaps temporarily) seems like a major overreaction. It's nice that various embedded projects use the Qt environment and perhaps use the ImageDecoder stuff (which as far as I can tell is unimpeded by these changes). But there are also cell phone companies, Windows API-compatible embedded projects, the Titanium project, and people that wish to have a redistributable WebKit on Windows that use the Windows Cairo port, as well as the myriad of Linux-based teams that use the GTK+ port, that will greatly benefit from these changes. Backing Peter's changes out now will adversely affect all of these projects. Now, can we please discuss how to make the image decoders *better*, rather than trying to undo history? 125814 17 pkasting 2009-06-14 14:14:30 -0700 (Adding Kevin Ollivier since he might have perspective on the wx side of things.) Thanks for the comments, Brent. For background, a chief reason to go the direction I have so far with RGBA32Buffer is to allow platforms to write directly into a native buffer that they can then avoid copying. If you consider a single 1024 x 768 JPEG, storing the data in a Vector<unsigned> and then copying it to a native storage location costs 3 MB and the cpu time to copy. Animated GIFs can be far worse than this since they have many frames, although the decoders go to some effort to scavenge memory for large GIFs. And finally pages can have many images. If you start paying 1 - 100 MB of extra memory, plus the time to memcpy it, on a page, you will quickly understand why the current design is useful. And for backends that don't want to take the time to use this model yet, it still accommodates the Vector<unsigned> implementation quite well. Now, since I read Holger's main concern as the existence of #ifdefs in ImageDecoder.h, I think there are ways to avoid them. I'm thinking of pulling RGBA32Buffer out into a separate header that can live in graphics/ instead of image-decoders/, which I hope would make Holger a bit more comfortable. Given the little I have heard about ImageBuffer, I think its goals are probably similar enough to RGBA32Buffer that the two can be combined into a single class that represents a single native frame with per-pixel write access. An Image can then be one or more of these frames and an ImageDecoder can write into an image or its frame(s). The exact details will take some care to avoid memory corruption; over the lifetime of the Chromium port we've managed to subtlely break image memory management several times, because it's quite tricky to get right. I will also need to better understand the image caching system. I don't know whether ImageSource in its current state has much utility or should be folded into another class, but I certainly like Holger's idea of collapsing all the separate implementaions into one for starters. Another piece of work I know needs to be done is to make the BMP decoder decode on demand rather than when setData() is called; I wrote that decoder a couple years ago before I fully understood the ImageDecoder class, so it works but can waste CPU/memory. Luckily BMP and ICO are not too common on the web so this doesn't turn out to be a huge headache. I hope the suggestions above not only provide concrete ideas to move forward but go at least some way towards satisfying Holger's concerns. While I don't think his patches on this bug are valid, I do think we can avoid #ifdefs in ImageDecoder if that's a real sticking point for any ports. In the meantime, please let me know if the current system actively hinders any ports; comment 3 seems to imply that it is a problem for a number of people but I haven't heard specific feedback from any of them. By contrast, the GTK and wx folks were very helpful last night on IRC in pointing out exactly what was and wasn't working, so I was able to work with them. 125834 18 zecke 2009-06-14 15:26:54 -0700 Unforking Chromium meant breaking Gtk+, WX, EFL, Torchmobile Windows CE. The cost of you "unforking" is that _now_ every port needs to copy and paste (fork) +115 lines of code. It is not a fair trade.... there is no reason to create this mess. Performance: As with every thing it depends. For Skia and even the current Cairo usage I agree that the additional malloc, memcpy, free create problems in terms of memory copying and memory fragmentation and still in some cases this doesn't matter... E.g. you might have a memory strategy where you keep the compressed image in memory and move the uncompressed image to another process/system (e.g. GL, or Xserver memory) or you have API that can operate on the allocated memory without a memcpy. And I strongly discourage forcing every port to copy and paste the exact +115 lines of RGBA32Buffer.cpp for absolutely no gain about the status quo of yesterday. It is no acceptable solution to force this duplication on ports. Your changes have so many conceptually weaknesses that you make every other port suffer and this needs to change. I see you have a hardtime admitting that there is _no_ improvement for cairo, wx, EFL, yet. Instead you talk about a mystique future improvement... Copy and Pasting RGBA32Buffer is not the future. You should evaluate how to adjust the ImageBuffer interface and make ImageDecoder truly corss-platform again bringing your improvement to everyone with client side image memory. Until then I strongly urge to unbreak the damage that was done to RGBA32Buffer. 125837 19 zecke 2009-06-14 15:35:56 -0700 (In reply to comment #14) > I haven't given explicit "no" replies to every single patch, but that's because > I think all but the ImageSource collapsing are really a single patch that > simply undoes all of the ImageDecoder unforking. You have never stated how you > intend these ports to obtain acceptable performance or what concrete benefits > this has. I have worked with the image decoders for several years and know > enough to say that this is a damaging set of patches that we should not land. > I think your only motivation is a mistaken sense of some sort of > "cross-platform" idealism that fails to account for the real constraints here. You impose a big penalty on other ports for _no_ performance gain at all. You force to copy and paste code just to unfork Skia. You could nuke RGBA32Buffer completely in favor for extending ImageBuffer. For your performance statement... let me cite the cairo documentation for me. * @data: a pointer to a buffer supplied by the application in which * to write contents. This pointer must be suitably aligned for any * kind of variable, (for example, a pointer returned by malloc). * * Creates an image surface for the provided pixel data. The output * buffer must be kept around until the #cairo_surface_t is destroyed * or cairo_surface_finish() is called on the surface. The initial * contents of @buffer will be used as the initial image contents; you * must explicitly clear the buffer, using, for example, * cairo_rectangle() and cairo_fill() if you want it cleared. so even for Cairo no _more_ changes than using a Vector<char> are needed (unless I'm mistaken). So for no gain at all we have to live with a copy and paste of RGBA32Buffer... it is no gain at all... the only gain for you is to have unforked Chromium at the cost of forcing everyone else to copy and paste. 125843 20 bfulgham 2009-06-14 16:38:35 -0700 (In reply to comment #18) > Unforking Chromium meant breaking Gtk+, WX, EFL, Torchmobile Windows CE. The > cost of you "unforking" is that _now_ every port needs to copy and paste (fork) > +115 lines of code. It is not a fair trade.... there is no reason to create > this mess. Can we please tone down the hyperbole? Let's review the actual events: 1. Unforking only broke GTK+ very temporarily. By the end of the day (PST) Friday the Windows Cairo and GTK+ code was in great shape and working better than ever. 2. Once Kevin Ollivier was available on-line, Peter was able to get the wxWidgets port working properly and I believe things are fine there as well. 3. As for the EFL and Windows CE ports, these are basically Qt ports, so this sounds akin to arguing that "pkasting broke the Qt port, and he also broke the Qt port and the other Qt port to boot." I don't think it's reasonable to demand source-level compatibility with projects that are not part of the WebKit tree. Do you expect developers to scour the web searching for WebKit forks that might be affected by changes? Should we feel guilty about breaking the code for groups that don't respond on the mailing lists and don't communicate on IRC? For that matter, where is the Qt build bot to help ensure that although architectural issues might be introduced, at least build and stability regressions will not occur? Finally, I disagree that "every" port must create a forked file. It is more accurate to say that "some graphical backends needs an implementation". 125845 21 bfulgham 2009-06-14 16:45:24 -0700 (In reply to comment #5) > Created an attachment (id=31259) [review] > Make ImageDecoder.cpp cross-platform > > There is no need to force every port to have the exact same implementation of > RGBA32Buffer, the only symbol that is platform depended is the conversion to a > NativeImage and that does not belong into the buffer class anyway. I think there is a good reason for these methods to be backend-dependent. As with Skia, the Cairo port will refer to the internal image buffer (rather than the array of bytes) to provide the implementations for these method calls. I agree it looks a little silly right now, since the wx and Cairo ports are nearly identical, but I am planning to revise the Cairo version of this file to use internal Cairo buffer/image handling routines which will remove the seeming duplication here. 125847 22 bfulgham 2009-06-14 16:49:48 -0700 (In reply to comment #7) > Created an attachment (id=31261) [review] > Unfork the WX, no need to have an exact copy of the RGBA32Buffer... use the > common code This is related to the issue in comment #5 -- they are identical *today*, but in a few days they will NOT be the same. I don't believe this change is desirable. 125859 23 pkasting 2009-06-14 18:52:01 -0700 (In reply to comment #20) > 3. As for the EFL and Windows CE ports, these are basically Qt ports, so this > sounds akin to arguing that "pkasting broke the Qt port, and he also broke the > Qt port and the other Qt port to boot." Plus, I asked repeatedly both on bugs and IRC for input from Qt port maintainers to ensure that my changes didn't break Qt, and it was my impression that Qt _isn't_ broken. None of the Torchmobile or EFL people have asked for help in any way. The only bustage to Qt I'm aware of was the the temporary bustage about 48 hours ago that I _had already said I was planning to fix_ and that _was_ in fact worked around with a roughly 3-line patch (not a "115 line copy"). These comments boil down to "you kept other ports working by copying a few functions' implementations temporarily. THIS IS AN ENORMOUS PENALTY!" I think it's clear that this isn't an "enormous penalty" or in fact much of any penalty, since it applies to exactly _two_ ports (not CG, the most widely used port as part of Safari; not Skia, the second most widely used port as part of Chromium; and not QT, the port I broke so apparently badly), and in fact _I_ was the one that made the changes for those other ports, not those ports' maintainers (although kollivier on IRC last night said the changes "sounded easy" before I went ahead and wrote the wx patch, so even that wasn't a big deal). I could alternately have provided an ImageDecoder.cpp that implemented these two ports' functions for things they have in common at the moment, but this seemed like just causing the ports additional hassle since as Brent said in comment 21 things are about to change even more. In summary, Holger, you are arguing that I have caused great pain to wx and Cairo, but the only thing I've caused is my _own_ patches to implement some functions that are shortly going to differ between the two ports, the Cairo maintainer doesn't agree with your position, and the wx maintainer has not spoken. And you give little indication as to whether the idea of moving RGBA32Buffer into a class in graphics/ would satisfy you at all: some of your comments sound as if it would, but they are so tangled in comments about how I must reverse my patches (rather than simply move toward merging these two classes, which is surely easier now if I've actually made RGBA32Buffer more like ImageBuffer) that I don't know what to think. This isn't productive dialog at all. Be reasonable and stop trying to use other ports as weapons against me when their maintainers disagree with you or are silent. 125864 24 kevino 2009-06-14 19:45:30 -0700 I don't really want to get in the middle of all this, but for the record, I really feel that only people who actually build and run the wx port are entitled to speak for it. I'm certainly not happy about port breakages, but that's really a side-effect of not being on the build bot, so I don't hold committers personally responsible for breakages they can't easily become aware of. As for the rest, honestly, I just don't see what is so contentious about this change. I certainly haven't seen any evidence (e.g. benchmarks, etc.) of the kind of performance or functional regression that would warrant a revert. The rest of the criticisms seem to be issues of design and/or style, and while platform #ifdefs aren't pretty, they aren't exactly forbidden in WebCore, so I really don't see how their existence is somehow grounds for revert. It looks like some interesting ideas have already been floated about in regards to removing them, though, so I think it's a shame that the focus of this discussion has mostly been on reverting rather than on a patch (or patches) to improve what's already there. 125874 25 zecke 2009-06-14 21:14:27 -0700 (In reply to comment #23) > (In reply to comment #20) > > 3. As for the EFL and Windows CE ports, these are basically Qt ports, so this > > sounds akin to arguing that "pkasting broke the Qt port, and he also broke the > > Qt port and the other Qt port to boot." I don't even know where to start to get the record straight... 1.) EFL is using EFL... and not Qt... 2.) Torchmobile is a Windows CE port 3.) Me using image-decoders on Qt, yes is Qt related... > Plus, I asked repeatedly both on bugs and IRC for input from Qt port > maintainers to ensure that my changes didn't break Qt, and it was my impression > that Qt _isn't_ broken. None of the Torchmobile or EFL people have asked for > help in any way. The only bustage to Qt I'm aware of was the the temporary > bustage about 48 hours ago that I _had already said I was planning to fix_ and > that _was_ in fact worked around with a roughly 3-line patch (not a "115 line > copy"). I don't event want to go in the process. Landing patches with a reviewer raising his flag is not nice and the responses I got on irc are not making me feel comfortable about Chromium at all. But leave that out for now. > > These comments boil down to "you kept other ports working by copying a few > functions' implementations temporarily. THIS IS AN ENORMOUS PENALTY!" I think > it's clear that this isn't an "enormous penalty" or in fact much of any > penalty, since it applies to exactly _two_ ports (not CG, the most widely used > port as part of Safari; not Skia, the second most widely used port as part of > Chromium; and not QT, the port I broke so apparently badly), and in fact _I_ > was the one that made the changes for those other ports, not those ports' > maintainers (although kollivier on IRC last night said the changes "sounded > easy" before I went ahead and wrote the wx patch, so even that wasn't a big > deal). I could alternately have provided an ImageDecoder.cpp that implemented > these two ports' functions for things they have in common at the moment, but > this seemed like just causing the ports additional hassle since as Brent said > in comment 21 things are about to change even more. In a way I fundamentally disagree with. > In summary, Holger, you are arguing that I have caused great pain to wx and > Cairo, but the only thing I've caused is my _own_ patches to implement some > functions that are shortly going to differ between the two ports, the Cairo > maintainer which is alp and me as we inherited it and not brent! > This isn't productive dialog at all. Be reasonable and stop trying to use > other ports as weapons against me when their maintainers disagree with you or > are silent. Sigh. To summarize: I disagree with the changes to RGBA32Buffer. I think Skia should move towards making ImageBuffer suitable for use and nuke RGBA32Buffer all together or make truly cross platform. It is no acceptable temporarily solution to create a copy of clones (cairo, wx, Qt... whatever port)... it is moving in the wrong direction and my patch is reinforcing it. And second. There is no reason to change the default behavior (no reason to #ifdef for CAIRO,WX), it should work for everyone (with eventually some performance impacts): 1.) sometimes the decoded image is just copied somewhere else 2.) some graphics libraries (e.g. cairo) allow you to adopt the memory and there will be exactly one conversion to image triggered the BitmapImage::cacheFrame. and again my patch is restoring sanity. So from my point of view your changes shouldn't have landed as they are a step back and not one ahead. The way ahead is to move the code over to ImageBuffer which I'm very supportive of and until then I want the sanity of the old solution back. 125878 26 bfulgham 2009-06-14 22:04:55 -0700 (In reply to comment #25) > I don't even know where to start to get the record straight... > > 1.) EFL is using EFL... and not Qt... > 2.) Torchmobile is a Windows CE port > 3.) Me using image-decoders on Qt, yes is Qt related... I based the EFL comment on the EFL Wiki ("EFL WebKit is a project aiming at porting this WebKit to the Enlightenment Foundation Libraries, and as the developers also work on the Qt port, we try to keep the implementation as close as possible to that of QtWebKit."). I guess on closer reading that the Qt stuff was not actually related to the EFL work. Regarding Torchmobile, I ran across "Our source code is now imported into the git server at git://code.staikos.net/ alongside the QtWebKit and Torch Mobile Qt WebKit code, and we hope to move active development into git in the near future.", but I now see that there are two Torch Mobile ports. 125879 27 zecke 2009-06-14 22:09:20 -0700 (In reply to comment #25) > (In reply to comment #23) > > (In reply to comment #20) Or in more simple words: 1.) The WebCore/image-decoders where cross-platform without a performance impact on Cairo (as the image data was not copied and the cairo_image_surface was created exactly once, at least to what I think is right) 2.) Now we have multiple copies of RGBA32Buffer.cpp and every port that wants to use the decoders need to copy it. Which makes the WebCore/image-decoders not cross-platform 3.) a) Make them cross-platform again (this series) as they are just fine for Cairo (again up to my knowledge). b) Make them fast and cross-platform for everyone (including Skia) by using ImageBuffer. We are at 2nd, I did 3a, you can do 3b and the amount of users does not matter, we are at a technical issue here (otherwise one should work on the IE Team). 125880 28 zecke 2009-06-14 22:11:56 -0700 (In reply to comment #26) > (In reply to comment #25) > > I don't even know where to start to get the record straight... > > > > 1.) EFL is using EFL... and not Qt... > > 2.) Torchmobile is a Windows CE port > > 3.) Me using image-decoders on Qt, yes is Qt related... > > I based the EFL comment on the EFL Wiki ("EFL WebKit is a project aiming at > porting this WebKit to the Enlightenment Foundation Libraries, and as the > developers also work on the Qt port, we try to keep the implementation as close > as possible to that of QtWebKit."). I guess on closer reading that the Qt > stuff was not actually related to the EFL work. > > Regarding Torchmobile, I ran across "Our source code is now imported into the > git server at git://code.staikos.net/ alongside the QtWebKit and Torch Mobile > Qt WebKit code, and we hope to move active development into git in the near > future.", but I now see that there are two Torch Mobile ports. And just for the record. I don't mind source level breakage. Apple is doing it all the time and it is the right thing to do as things progress in a good way. I just have so many issues with the RGBA32Buffer approach, technically it is not the right one(tm). 125886 29 pkasting 2009-06-14 22:36:48 -0700 I had a long reply, but I see no purpose in it. I will restrict my comments to this: (In reply to comment #28) > And just for the record. I don't mind source level breakage. Apple is doing it > all the time and it is the right thing to do as things progress in a good way. I find this disingenuous. > I just have so many issues with the RGBA32Buffer approach, technically it is > not the right one(tm). While I respect your position as a port maintainer, given your comments on IRC and the past couple bugs, I believe that the people disagreeing with you have superior knowledge of this particular area of the code and how the various ports have been affected. As Kevin noted, there are no performance or bustage problems with my patch and I don't think your dislike of 83 lines (I counted) of common C++ implementation copied to _one_ additional location for the time being is a sufficient reason for reverting. So I think we are simply going to have to disagree on the approach. That said, given that you would like to see this code merged with ImageBuffer, I would like to ask (as a way of burying the hatchet) if you know the ImageBuffer code well enough to provide some sample patches on how this can be done. Clearly you're capable of whipping up patches very quickly, and as I've already mentioned, ImageBuffer is a class I'm not as familiar with. If you can help with this I'd be most grateful, as that was one of the reasons I reported the bug in the first place. We can keep arguing about what to do in the interim, or we can try to work together to get to an end state that we can both be happy with. Please, work with me here, not against me. 125887 30 bfulgham 2009-06-14 22:41:17 -0700 (In reply to comment #17) > Now, since I read Holger's main concern as the existence of #ifdefs in > ImageDecoder.h, I think there are ways to avoid them. I'm thinking of pulling > RGBA32Buffer out into a separate header that can live in graphics/ instead of > image-decoders/, which I hope would make Holger a bit more comfortable. Given > the little I have heard about ImageBuffer, I think its goals are probably > similar enough to RGBA32Buffer that the two can be combined into a single class > that represents a single native frame with per-pixel write access. An Image > can then be one or more of these frames and an ImageDecoder can write into an > image or its frame(s). The exact details will take some care to avoid memory > corruption; over the lifetime of the Chromium port we've managed to subtlely > break image memory management several times, because it's quite tricky to get > right. I will also need to better understand the image caching system. This seems reasonable to me. After looking things over, the stuff in ImageDecoder (RGBA32Buffer) that is duplicated in wx and Cairo are themselves duplicates of concepts in the ImageBuffer class. To build on some of Holger's suggestions, could the RGBA32Buffer be handled as a cross-platform base class (which the ImageBuffer would inherit from), and push the platform-specific logic into the individual ImageBuffer classes? The decoder class could then deal in ImageBuffers: RGBA32Buffer::clear <==> ImageBuffer::clearImage RGBA32Buffer::width/height <==> ImageBuffer::size ImageBuffer would inherit some pixel-level access methods, which might or might not be useful/good. > [...] but I certainly like Holger's idea of collapsing all the separate implementaions into one for > starters. Agreed. 125888 31 pkasting 2009-06-14 22:48:17 -0700 (In reply to comment #30) > This seems reasonable to me. After looking things over, the stuff in > ImageDecoder (RGBA32Buffer) that is duplicated in wx and Cairo are themselves > duplicates of concepts in the ImageBuffer class. That is good to hear. I can start trying to understand ImageBuffer tomorrow, hopefully soon I will grasp it enough to make a concrete proposal. Sounds promising though. > To build on some of Holger's suggestions, could the RGBA32Buffer be handled as > a cross-platform base class (which the ImageBuffer would inherit from), and > push the platform-specific logic into the individual ImageBuffer classes? The > decoder class could then deal in ImageBuffers: > > RGBA32Buffer::clear <==> ImageBuffer::clearImage > RGBA32Buffer::width/height <==> ImageBuffer::size > > ImageBuffer would inherit some pixel-level access methods, which might or might > not be useful/good. I am too ignorant to say at the moment. My one concern with having too much of an inheritance hierarchy is that I'd like to make sure there is not much overhead involved in things that happen in the inner loop of the decoders, which is primarily "set this pixel". In fact I could have avoided most of the current #ifdefs in ImageDecoder.h if I just made getAddr() not be inline, but I was worried about not wanting to hurt performance. I should probably run some tests on some Chromium builds (as we have good perf-testing infrastructure) to see whether this kind of thing actually hurts. Pointless optimization just hurts readability. In the meantime, don't be shy about posting patches if you want; code is always more concrete than a description. > > [...] but I certainly like Holger's idea of collapsing all the separate implementaions into one for > > starters. > > Agreed. I will post an updated version of that patch tomorrow that will apply to the tree as-is (and, I suspect, remove all the per-platform files here). Eventually I'd like to take a look at the function this class is performing to ensure it makes sense. Of course, eventually I'd like to write a detailed design doc for the entire image subsystem :) 125890 32 bfulgham 2009-06-14 23:04:22 -0700 Looking some of this stuff over, the fact that getImageData always returns a copy seems inefficient. Consider the code in svg/graphics/SVGResourceMasker.cpp::applyMask: PassRefPtr<CanvasPixelArray> srcPixelArray(m_mask->getImageData(intImageRect)->data()); PassRefPtr<ImageData> destImageData(luminancedImage->getImageData(intImageRect)); for (unsigned pixelOffset = 0; pixelOffset < srcPixelArray->length(); pixelOffset++) { unsigned pixelByteOffset = pixelOffset * 4; unsigned char r = 0, g = 0, b = 0, a = 0; srcPixelArray->get(pixelByteOffset, r); srcPixelArray->get(pixelByteOffset + 1, g); srcPixelArray->get(pixelByteOffset + 2, b); srcPixelArray->get(pixelByteOffset + 3, a); double luma = (r * 0.2125 + g * 0.7154 + b * 0.0721) * ((double)a / 255.0); destImageData->data()->set(pixelByteOffset + 3, luma); } I *think* the srcPixelArray is a full copy of the data (based on the ImageBuffer source), but is only ever read. I guess the copy is made to provide an "intImageRect"-sized window into the source, but I wonder if this copy could be avoided somehow. What if the intImageRect is the size of the source image? It seems like having a way to return an immutable view of the original image data would be useful. 125894 33 pkasting 2009-06-14 23:13:38 -0700 (In reply to comment #27) > (as the image data was not copied and the cairo_image_surface was > created exactly once, at least to what I think is right) BTW Brent, I think this is correct, and may actually be a bug. From my reading of some of the Cairo docs today, cairo_image_surface_create_for_data() doesn't copy the data, which means your returned surface is at the merge of the lifetime of the RGBA32Buffer -- which is managed by the ImageDecoder, which may delete it (see e.g. clear()). I don't think it's safe to have the frames returned from the ImageSource depend on the vagaries of the ImageDecoder. I assumed this code was copying since wx copies, Skia refs, and when we used to have a different backing implementation here, we had all kinds of problems until we ensured that the lifetimes were separate. So you may want to see if you can write this in a way that allocates the buffer in some kind of a refcounted object. 125896 34 zecke 2009-06-14 23:40:04 -0700 (In reply to comment #33) > (In reply to comment #27) > > (as the image data was not copied and the cairo_image_surface was > > created exactly once, at least to what I think is right) > > BTW Brent, I think this is correct, and may actually be a bug. From my reading > of some of the Cairo docs today, cairo_image_surface_create_for_data() doesn't > copy the data, which means your returned surface is at the merge of the > lifetime of the RGBA32Buffer -- which is managed by the ImageDecoder, which may > delete it (see e.g. clear()). I don't think it's safe to have the frames > returned from the ImageSource depend on the vagaries of the ImageDecoder. I > assumed this code was copying since wx copies, Skia refs, and when we used to > have a different backing implementation here, we had all kinds of problems > until we ensured that the lifetimes were separate. I'm not aware of any crash/issue with the Cairo backend, I don't remember seeing a crash in it since 2007... anyway. I take that as an ACK that the default implementation of Vector<PixelData> can be the "optimized" version for some platforms? See, it would be so much easier if you would ack when you mess things up... Until now you are not even able to ACK that you made something that was cross-platform need platform specific code. Instead you defend it by saying "Copy and Paste ain't bad." and that Skia is the 2nd most often used platform. Please at least ack that you removed the cross platform property. See I honestly care about all ports and making their life more easy and I'm just afraid you continue this way (making code less portable). greetings from your general reviewer, Gtk+, Qt maintainer and janitor. PS: Maybe just ack that your changes made things less portable? 125897 35 pkasting 2009-06-15 00:04:07 -0700 (In reply to comment #34) > anyway. I take that as an ACK that the > default implementation of Vector<PixelData> can be the "optimized" version for > some platforms? No, I don't think the existing implementation, as-is, is appropriate for any platform. However, I will certainly acknowledge that I believed the Cairo call in question copied its source pointer when it in fact didn't. > See, it would be so much easier if you would ack when you mess things up... I would prefer if you did not take a patronizing tone with me. > See I honestly care about all ports and making their life more easy I guess I will take your word for that. Perhaps you could take my word that that is also the motivation for these changes. And perhaps we could please, please, for crying out loud, stop discussing bug 25709 and start talking about something productive. 125960 36 manyoso 2009-06-15 09:02:09 -0700 <quote>While I respect your position as a port maintainer, given your comments on IRC and the past couple bugs, I believe that the people disagreeing with you have superior knowledge of this particular area of the code and how the various ports have been affected.</quote> This looks like an argument from authority to me and was in response to a technical argument made by Holger that the RGBA32Buffer class should, in fact, reflect its actual name. Also, it is not clear to me that the argument to authority in this particular instance even works conceptually. Regardless, I believe technical arguments should be given technical responses rather than relying upon logical fallacies. From my vantage it seems that Holger has raised specific qualms with the design introduced by these recent changes and met with the following responses: 1) The changes are already in the tree... 2) It fixes a performance problem in some ports (although I haven't seen a rebuttal to Holger's point that the GTK+ port did not suffer such a problem.) 3) Changes that will be made in the future will address the design problem. None of these seem to be responsive to me. One is clearly not an answer. Two might well be true, but this doesn't absolve the changes with regard to the stated design problem. Three is also clearly not an answer. Whatever the merits of the recent changes I think Holger's objections based on a fundamental design problem should be given due attention and resolved before proceeding. 125975 37 kevino 2009-06-15 10:02:11 -0700 (In reply to comment #36) > <quote>While I respect your position as a port maintainer, given your comments > on IRC > and the past couple bugs, I believe that the people disagreeing with you have > superior knowledge of this particular area of the code and how the various > ports have been affected.</quote> > > This looks like an argument from authority to me and was in response to a > technical argument made by Holger that the RGBA32Buffer class should, in fact, > reflect its actual name. Also, it is not clear to me that the argument to > authority in this particular instance even works conceptually. Regardless, I > believe technical arguments should be given technical responses rather than > relying upon logical fallacies. I have to say that a problem with the naming of the RGBA32Buffer class doesn't sound like a technical argument at all to me, as different people may conceptualize tbe name differently, and I'd like to know what empirical technical data could be used to prove one side or the other's conceptualization as correct. Technical arguments can be proven or disproven with performance benchmarks, unit tests, or other empircal data, and I have yet to see anything of the sort that shows a technical problem in Peter's design. Do you or Holger have such empirical data to show? Because you have not yet done so according to the bug tracker. Without empirical data, what's left is people's opinions, and frankly I think mostly this has been a long debate about a difference of opinion that has gotten really heated. In that case, I think what's best is for everyone to take a step back and cool down and re-think whether this whole debate over reverting is really the only way to go about resolving the problem, or whether it can really have a productive outcome. 125976 38 brettw 2009-06-15 10:06:48 -0700 (In reply to comment #34) > See I honestly care about all ports and making their life more easy and I'm > just afraid you continue this way (making code less portable). > > greetings from your general reviewer, Gtk+, Qt maintainer and janitor. > > PS: Maybe just ack that your changes made things less portable? I was the main maintainer of the Chromium image decoders before Peter was. I had originally moved them completely out of the WebCore port directory with the intention of not sharing with other platforms at all since I figured it might be too much bother. Instead Peter is spending a bunch of time trying to unify our code (which, though in some places is quite messy, generally works much better than ports other than CG). There is no reason for this work other than helping other ports in WebKit as far as I can tell, and your accusations are generally upsetting to me. 125977 39 bfulgham 2009-06-15 10:12:21 -0700 (In reply to comment #34) > greetings from your general reviewer, Gtk+, Qt maintainer and janitor. > > PS: Maybe just ack that your changes made things less portable? > Hi Holger -- Setting all that aside, do you have any suggestions regarding Peter's request regarding ImageBuffer modifications: > [...] [do] you know the ImageBuffer code well enough to provide some sample patches on how > [merging RGBA32Buffer and ImageBuffer] can be done? Clearly you're capable of whipping up > patches very quickly, and as I've already mentioned, ImageBuffer is a class I'm not as familiar with. > If you can help with this I'd be most grateful, as that was one of the reasons I reported > the bug in the first place. I also don't know this area as well as I would like, and I think you could help us avoid any further architectural faux pas that don't help us advance the project. 125978 40 pkasting 2009-06-15 10:17:05 -0700 (In reply to comment #36) > Whatever the merits of the recent changes I think Holger's objections based on > a fundamental design problem should be given due attention and resolved before > proceeding. I have spent over twenty hours in the past two days trying to respond to Holger's concerns. If I have not given them "due attention" it has certainly not been for lack of trying. While I tend to agree with Kevin Ollivier's recent comment that this is more an issue of semantics that cannot truly be resolved with facts, I will do my best to elaborate my responses to anything technical I can discern: As far as I understand it the specific concern raised is that RGBA32Buffer should use a Vector<unsigned> as its low-level storage type. The reason for this seems to be: (1) That's what it was doing before (2) This is sufficient for all ports My answer to this technical concern was that (1) is not really a justification for anything and (2) is not accurate. Vector<unsigned> is not usable by the Skia port today, which is the primary concern; it is in my opinion inappropriate for the wx port long term and not the best design for the Cairo port, though these are secondary issues. (I was about to write up some patches which would, in fact, convert these ports to using a different backing store, so the question of "future" work here was not very abstract.) There was an additional concern raised that other ports now needed to do extra work to use the image decoders. I don't believe this is a practical objection as I am aware of no other ports making such an effort. I don't feel a design should be based on elevating the concerns of hypothetical other ports over the real needs of existing ports. There was an additional concern raised that using NativeImagePtr from ImageDecoder.h is a "layering violation". I have worked with the image decoders for several years now and have never been made aware of any layering requirement to avoid this type. Both sides expressed interest in merging the functionality of RGBA32Buffer and ImageBuffer and the proposed difference in action seemed solely to be, whether or not to revert some changes in ImageDecoder.* before doing this work. Given that I see no gain from doing this, I don't understand how this is anything other than a time cost and a hindrance to doing the work. In summary, I believe the technical concerns raised were mainly that the work done on bug 25709 decreased the "cross-platformness" of ImageDecoder and related classes, to which my response was that these were certainly not sufficiently cross-platform before to account for all platforms, but now are; and that the changes made to accommodate ports like Skia were not harmful to other ports (and thus should be backed out and rethought) but instead helpful (now, for minor things like removing ImageSourceXXX.cpp files, and in the future, for writing clearer or more efficient backend storage functions). As far as I know Holger continues to disagree with me on this and I do not know how to further resolve this disagreement, which is why I proposed attempting to reach a state where ImageBuffer and RGBA32Buffer are merged as quickly as possible. I hope this is helpful. 125990 41 manyoso 2009-06-15 11:17:15 -0700 I appreciate that a lot of time has been spent trying to rectify the disagreements over the scope of these changes and that everyone involved is earnestly looking for the correct and proper way forward, but respectfully, I don't think the issue is simply one of the now improper name of RGBA32Buffer. Were that the case, RGBA32Buffer could simply be renamed to something more appropriate. Rather, it is the case that the image-decoders as now configured are no longer cross-platform and regardless whether this is a layering violation or not, I think it prudent to consider whether this is wise in the long term. From a technical perspective let's list the pros and cons mentioned as we currently stand: Pro: 1) As Skia is currently written (to my knowledge) this is a definite performance advantage as it removes the necessity for a copy of the buffer into the native Skia bitmap type. 2) ... I've seen pkasting mention that the current Vector<unsigned> is suboptimal for Cairo and WX, but I haven't seen the details of what this will move to and whether or not there is any possibility Cairo/WX/FooPort can share the future backend data store. It'd be nice to have more info please. Con: 1) We lose flexibility in the image-decoders as they now depend on platform/graphics 2) Duplication of effort with ImageBuffer 3) Merging with mozilla versions becomes harder 4) Introducing copy+paste code which is is frowned upon. Cairo and WX (and presumably all future ports that wish to use this) have the exact same implementation of ImageDecoderFoo except for the 'asNewNativeImage' method. Given the above, I'd like to know if it'd be possible for Skia to introduce a ctor for its SkBitmap that can take an existing buffer without copying, much as Cairo and Qt are doing now. What would this lose the Skia port and/or how is it insufficient given #2 above? RE: Kevin Techical arguments do not always require empirical data of the sort you are requesting. Patches are often turned down based on technical reasons other than a lack of unit tests or benchmarks. RE: Brett Peter has made very valuable contributions to the image-decoders. No one disputes that. However, _so far_ I have a hard time seeing the benefits to the other ports in the recent changes other than the opportunity to share the code with the Skia port. Maybe I'm not reading something correctly... RE: Peter I don't think you can honestly object that the changes _have_ made the image-decoders less _cross-platform_. Where before the code was not particularly dependent on any platform, now it is. Anyways, can you elaborate on the pro #2 above and the related question of whether it'd be sufficient to introduce a new ctor to SkBitmap instead to operate on the underlying RGB32Buffer without a memcpy? 125996 42 bfulgham 2009-06-15 11:43:08 -0700 (In reply to comment #41) > 2) ... I've seen pkasting mention that the current Vector<unsigned> is > suboptimal for Cairo and WX, but I haven't seen the details of what this will > move to and whether or not there is any possibility Cairo/WX/FooPort can share > the future backend data store. It'd be nice to have more info please. As Holger pointed out, Cairo can 'adopt' memory (without copy) so there does appear to be less of a performance impact than initially thought. However, there might be some advantages gained by calling some of the cairo_surface_t-based calls rather than performing math on the raw vectors, and I think this should be considered as a potential performance gain. > Con: > 2) Duplication of effort with ImageBuffer Well, the point of this current bug is to move much of the RGBA32Buffer logic to ImageBuffer, so perhaps this isn't really a con so much as an active development goal. > RE: Brett > > Peter has made very valuable contributions to the image-decoders. No one > disputes that. However, _so far_ I have a hard time seeing the benefits to the > other ports in the recent changes other than the opportunity to share the code > with the Skia port. Maybe I'm not reading something correctly... We now have image-decoder implementations for BMP, XBM, and ICO, which did not previously exist. GTK+, wxWindows, and Cairo can now use these implementations which I do consider to be benefits to these other ports. 125999 43 pkasting 2009-06-15 12:19:58 -0700 (In reply to comment #41) > Rather, it is the case that the image-decoders as now configured > are no longer cross-platform and regardless whether this is a layering > violation or not, I think it prudent to consider whether this is wise in the > long term. Thank you for the calm tone in this reply :) > 2) ... I've seen pkasting mention that the current Vector<unsigned> is > suboptimal for Cairo and WX, but I haven't seen the details of what this will > move to and whether or not there is any possibility Cairo/WX/FooPort can share > the future backend data store. It'd be nice to have more info please. From a high level, the idea for Cairo is for setSize() to do a cairo_image_create_surface(), have the operations that write pixels operate on that surface, and have asNewNativeImage() simply return a copy of the surface (which is cheap as Cairo surfaces refcount like Skia bitmaps do, from my limited reading of the Cairo APIs). For wx the idea is similar except to use a wxBitmap instead of a cairo_surface_t. The benefits are more concrete for wx as it is definitely not only copying the data when reading it out, but also flipping BGRA -> RGBA. Another benefit here is that the data ownership becomes more clear: the lifetime of the returned pointer is not tied to the lifetime of the RGBA32Buffer inside the ImageDecoder. Holger says he hasn't seen any problems in the Cairo port due to this, and I believe him. I'm still not certain that it's _not_ a problem for Cairo given that we had issues with Skia with this, and I believe the Skia backend is far more well-tested on the web at large than the other non-CG ports. On net I'm not sure how much weight to give this concern but I am not willing to dismiss it. > Con: > 1) We lose flexibility in the image-decoders as they now depend on > platform/graphics If you could elaborate more on this loss I'd be interested. I'm not completely sure what sorts of flexibility are actually disappearing; on the surface, #include "FrameBuffer.h" where that header lives in graphics/ does not seem different to me than if it lives in image-decoders/. > 2) Duplication of effort with ImageBuffer I consider this an active area of development interest. To the degree that the two are duplicated, we should definitely converge. Note that if the two weren't precisely duplicated before, but are now and can be combined, without loss of performance, then there is a net code (and complexity) savings. This isn't yet quantifiable since there aren't yet concrete designs here. > 3) Merging with mozilla versions becomes harder I object to this for two reasons. First, the Mozilla decoders used are pretty much limited to the files in GIFImageReader.*; the JPEG/PNG decoders are just wrappers around libjpg and libpng, the XBM/ICO/BMP decoders were written by Google, and the files in GIFImageDecoder.* were written by hyatt long ago to shim the Mozilla decoders into WebKit. So when we focus narrowly on what's actually been copied from Mozilla, we find that the series of patches on bug 25709 barely affected it at all, since they were to GIFImageDecoder.* rather than GIFImageReader.*. Thus I don't think merging has actually become harder. Second, to my knowledge there is no maintainer of these decoders on the WebKit side and has been no attempt to merge new code from Mozilla. As far as I know I've been the only one working with the GIF decoder's internals for a few years, and Eric Seidel noted to me privately that whether I like it or not, I have basically taken over ownership of these decoders. In that light, it doesn't seem like merging was actively happening or was an interest of any of the other coders, at least not more than other responsibilities they had. Finally, I am in fact interested in looking at more recent work by Mozilla, especially color profile support, as this is a notable lack in the cross-platform decoders compared to the CG ones. So I expect that at some point I will be attempting a merge, and if there are difficulties at that point I am willing to resolve them. > 4) Introducing copy+paste code which is is frowned upon. Cairo and WX (and > presumably all future ports that wish to use this) have the exact same > implementation of ImageDecoderFoo except for the 'asNewNativeImage' method. I agree that this occurred. As I mentioned before, the current scope of this is 83 lines duplicated in one file, and once pro (2) above is addressed (which I intended to help do imminently) it will not occur at all. Therefore I feel this is a transient issue. However, if this is seen as a huge problem, one solution would be to temporarily introduce an ImageDecoder.cpp file alongside ImageDecoder.h that contains the functions that are currently common to wx and Cairo. While I think this is something of a waste of time it would be preferable (to me) to backing out much of the ImageDecoder work. > Given the above, I'd like to know if it'd be possible for Skia to introduce a > ctor for its SkBitmap that can take an existing buffer without copying, much as > Cairo and Qt are doing now. What would this lose the Skia port and/or how is > it insufficient given #2 above? I don't know how to judge what Qt is doing now (since you mention it), because as I have said before I don't believe Qt is using the cross-platform decoders or very much from ImageDecoder.h. As to behaving like Cairo currently does, it is possible for Skia to adopt an external buffer and not manage its memory; however, this loses the lifetime safety that I mentioned above. I am gravely concerned about doing something like this if the sole benefit is to share more of the RGBA32Buffer implementation, when I am fearful of the downsides and convinced that at the very least wx does not benefit from this implementation. > Where before the code was not > particularly dependent on any platform, now it is. Before the code _was_ dependent on platforms, in the form of having an implementation for Cairo and wx and one for Skia. I don't think it's fair to consider only image-decoders/ImageDecoder.h and not also image-decoders/skia/ImageDecoder.h in describing the prior state of the world. I think it is inherently sensible that low-level pixel storage differ platform to platform, and it already does elsewhere in the code. What I am trying to do is to work towards unifying all the different ways in which low-level storage is achieved so the entire image subsystem, not just the decoders, is as simple, consistent, safe, and performant as possible. The origin of RGBA32Buffer was as a fairly quick hack to get something working, and I think the larger picture of the rest of the image system suggests that while it works to some degree it is not the best design. I believe Holger actually agrees with this last point, at least to some degree, and mainly differs from me in that he would prefer the old ImageDecoder code to the new code until that larger transition moves further, whereas I see the new code as making it much more clear where the needs of the image decoders lie (as we do the broader refactoring) and being generally simply on net (when Skia is factored in) than the old situation. Therefore one of us feels this is a step backward and one a step forward, but I don't believe either of us believes that this is the ideal endpoint for the code. My proposed plan forward is: * Merge all the ImageSource files * Simplify the RGBA32Buffer interface slightly by e.g. replacing "width, height" with IntSize, etc. * Pull RGBA32Buffer out of image-decoders entirely into a class called FrameBuffer in graphics/ * Consider pulling implementations of getAddr() out into the platform-specific files to reduce #ifdefs in header * Write Cairo- and wx-specific implementations of FrameBuffer * Examine uses of ImageBuffer and attempt to merge it with FrameBuffer * Examine uses of the merged class e.g. in the ImageDecoder versus as returned from the ImageSource and see if ImageDecoder can be made simpler, in terms of simply taking an empty image as input and writing into it rather than owning any pointers * Examine ImageSource and the other image system classes and attempt to collapse/simplify where possible * Publish design document for image system indicating control flow, data ownership and lifetime, caching behavior, etc. These last points (except the design doc) are more speculative and vague, of course, but hopefully that gives a broad idea of what my goals are. I had not originally planned to do all this immediately, but I am willing to prioritize it highly given the concerns expressed on this bug. 126004 44 manyoso 2009-06-15 12:33:49 -0700 > > We now have image-decoder implementations for BMP, XBM, and ICO, which did not > previously exist. GTK+, wxWindows, and Cairo can now use these implementations > which I do consider to be benefits to these other ports. > While this is true, I don't think (and please correct me if I'm wrong) these decoders are dependent on the objected parts of the recent changes. Thus, it is kind of sideways to the discussion :) 126007 45 bfulgham 2009-06-15 12:48:52 -0700 (In reply to comment #44) > > We now have image-decoder implementations for BMP, XBM, and ICO, which did not > > previously exist. GTK+, wxWindows, and Cairo can now use these implementations > > which I do consider to be benefits to these other ports. > > While this is true, I don't think (and please correct me if I'm wrong) these > decoders are dependent on the objected parts of the recent changes. Thus, it > is kind of sideways to the discussion :) These implementations were Skia-specific, so the expected interface (via ImageDecoder.h) was the Skia-specific style. Peter's changes to ImageDecoder brought these more in line with the Skia version, allowing a single set of image-decoders (including these new ones). The desire to roll back all of the changes would mean a loss of these new decoders, at least until they had been revised to work with the original style image decoder. I would really prefer not to roll any of this back, and instead try to address the various concerns with the current source base and move forward. My understanding is that Holger's proposal to undo all of the original bug's changes would mean a loss of this new functionality. I strongly oppose this. 126010 46 pkasting 2009-06-15 13:00:44 -0700 (In reply to comment #45) > The desire to roll back all of the changes would mean a loss of these new > decoders, at least until they had been revised to work with the original style > image decoder. > > I would really prefer not to roll any of this back, and instead try to address > the various concerns with the current source base and move forward. > > My understanding is that Holger's proposal to undo all of the original bug's > changes would mean a loss of this new functionality. I strongly oppose this. I don't think this is actually what Holger is asking for. I think the disputed pieces of the code could probably be modified without losing the new decoders. My own objection to Holger's proposal is not along the lines of losing new image decoders but rather of gaining no practical advantage (see my detailed responses to Adam Treat's list of cons above) and yet losing clarity and simplicity. Basically, I claim it makes moving forward harder and costs time to what I see as no good purpose (obviously Holger disagrees). 126012 47 manyoso 2009-06-15 13:09:34 -0700 (In reply to comment #43) > From a high level, the idea for Cairo is for setSize() to do a > cairo_image_create_surface(), have the operations that write pixels operate on > that surface, and have asNewNativeImage() simply return a copy of the surface > (which is cheap as Cairo surfaces refcount like Skia bitmaps do, from my > limited reading of the Cairo APIs). Notwithstanding what you write below about the data ownership issues, I don't see how this will help the Cairo port at all versus the current situation where it adopts the Vector<unsigned> of the RGBA32Buffer. Am I missing anything? Also, because you asked about Qt... while it is true that the Qt port doesn't currently use the image-decoders, that has not always been the case. Holger wrote a patch in the past that converted the Qt port to use the built-in WebCore image-decoders. That never went into mainline, but at Torch Mobile we used a similar approach for our version of the Qt port. It operated much like the Cairo port does today: we use a QImage/QPixmap ctor that adopts the underlying data of the RGBA32Buffer. So I'm a bit familiar with this code. As an aside, we have other Torch Mobile devs who've made extensive changes and as a consequence have some pretty deep knowledge of the image-decoders for use by our windows mobile port. > For wx the idea is similar except to use a wxBitmap instead of a > cairo_surface_t. The benefits are more concrete for wx as it is definitely not > only copying the data when reading it out, but also flipping BGRA -> RGBA. Hmm, that is interesting. Of course, another alternative would be to modify wxBitmap so it could adopt an RGBA8888 buffer, but on to your other points... > Another benefit here is that the data ownership becomes more clear: the > lifetime of the returned pointer is not tied to the lifetime of the > RGBA32Buffer inside the ImageDecoder. Holger says he hasn't seen any problems > in the Cairo port due to this, and I believe him. I'm still not certain that > it's _not_ a problem for Cairo given that we had issues with Skia with this, > and I believe the Skia backend is far more well-tested on the web at large than > the other non-CG ports. On net I'm not sure how much weight to give this > concern but I am not willing to dismiss it. Absolutely shouldn't be dismissed. OTOH, I don't see this as a fundamental win of the new design given that we have no concrete example of data lifetime issues in the real world. And certainly were we given such an example I see no reason to believe that it wouldn't be fairly easily fixed given the previous design. > > Con: > > 1) We lose flexibility in the image-decoders as they now depend on > > platform/graphics > > If you could elaborate more on this loss I'd be interested. I'm not completely > sure what sorts of flexibility are actually disappearing; on the surface, > #include "FrameBuffer.h" where that header lives in graphics/ does not seem > different to me than if it lives in image-decoders/. For one we lose the ability to modify the image-decoders in anyway that might depend upon the underlying data buffer. Just as a brainstorm, if in the future we wanted to modify the decoders so that they'd sample only 16 bit data and sync it into a RGBA4444 buffer this becomes more difficult with the addition of the native platform stores. Or say we come up with a new way of optimizing the jpeg decoder that is relies upon querying the underlying data array. I'm just brainstorming, but I think it is not entirely clear that we want to sacrifice this flexibility if it can be reasonably avoided. > > 2) Duplication of effort with ImageBuffer > > I consider this an active area of development interest. To the degree that the > two are duplicated, we should definitely converge. > > Note that if the two weren't precisely duplicated before, but are now and can > be combined, without loss of performance, then there is a net code (and > complexity) savings. This isn't yet quantifiable since there aren't yet > concrete designs here. If we continue with this strategy for sure. And looking at your outline below, I think that would be a good map if we do continue with this change. > > 3) Merging with mozilla versions becomes harder > > I object to this for two reasons. First, the Mozilla decoders used are pretty > Point(s) taken. > > 4) Introducing copy+paste code which is is frowned upon. Cairo and WX (and > > presumably all future ports that wish to use this) have the exact same > > implementation of ImageDecoderFoo except for the 'asNewNativeImage' method. > > I agree that this occurred. As I mentioned before, the current scope of this > is 83 lines duplicated in one file, and once pro (2) above is addressed (which > I intended to help do imminently) it will not occur at all. Therefore I feel Only because you'd be exacerbating the platform dependencies of the image-decoders by moving Cairo and WX away from the Vector<unsigned> :) Right now, if Cairo and Wx were to remain as they are, then we really only need _two_ ImageDecoderFoo.cpp files: ImageDecoderSkia.cpp and ImageDecoderCrossPlatform.cpp :) asNativeImagePtr could be moved to WebCore/platform/graphics :) > > Given the above, I'd like to know if it'd be possible for Skia to introduce a > > ctor for its SkBitmap that can take an existing buffer without copying, much as > > Cairo and Qt are doing now. What would this lose the Skia port and/or how is > > it insufficient given #2 above? > > I don't know how to judge what Qt is doing now (since you mention it), because > as I have said before I don't believe Qt is using the cross-platform decoders > or very much from ImageDecoder.h. Mentioned above... > As to behaving like Cairo currently does, it > is possible for Skia to adopt an external buffer and not manage its memory; > however, this loses the lifetime safety that I mentioned above. I am gravely > concerned about doing something like this if the sole benefit is to share more > of the RGBA32Buffer implementation, when I am fearful of the downsides and > convinced that at the very least wx does not benefit from this implementation. From what I can tell the only benefit of these changes is this theoretical data lifetime issue which has not been found in the wild yet. Theoretically, the Wx port could, along with Skia port, be changed to work in the same way that Cairo and Qt now work: to adopt the underlying buffer of RGBA32Buffer. To me this would preserve the flexibility iherant in the old way of doing things. All the pro's without any of the con's (except the work involved of course :) Now how much work do you think it'd be to modify Wx and Skia to work this way and do you think it worthwhile given my answer to the flexibilty question above? > My proposed plan forward is: > * Merge all the ImageSource files > * Simplify the RGBA32Buffer interface slightly by e.g. replacing "width, > height" with IntSize, etc. > * Pull RGBA32Buffer out of image-decoders entirely into a class called > FrameBuffer in graphics/ > * Consider pulling implementations of getAddr() out into the platform-specific > files to reduce #ifdefs in header > * Write Cairo- and wx-specific implementations of FrameBuffer > * Examine uses of ImageBuffer and attempt to merge it with FrameBuffer > * Examine uses of the merged class e.g. in the ImageDecoder versus as returned > from the ImageSource and see if ImageDecoder can be made simpler, in terms of > simply taking an empty image as input and writing into it rather than owning > any pointers > * Examine ImageSource and the other image system classes and attempt to > collapse/simplify where possible > * Publish design document for image system indicating control flow, data > ownership and lifetime, caching behavior, etc. If we're to continue with the platform dependent image-decoders then the above sounds like a good plan. I'm still not sure the platform dependent image-decoders are necessary or wise given the alternative. Thoughts? 126018 48 eric 2009-06-15 13:43:05 -0700 So the debate boils down to if it's OK to add a image abstraction around the Vector<unsigned>. Correct? RGBA32Buffer used to be a thin layer you could grab through. Now Peter's changed it to be an image abstraction, like ImageBuffer. I don't see why this breaks ports? Can't we have a default ImageBuffer which uses Vector<unsigned> under the covers? Although it seems that would only be needed by platforms which don't provide an Image type to decode into, or? For what it's worth, CoreGraphics (what I tend to use as my reference for graphics APIs), decodes into an opaque image type: http://developer.apple.com/documentation/graphicsimaging/reference/CGImage/Reference/reference.html#//apple_ref/c/func/CGImageCreate I feel much more informed after all this, and am looking forward to peter's next round of patches to share more platform/graphics code between all ports. 126021 49 pkasting 2009-06-15 13:51:37 -0700 (In reply to comment #47) > Notwithstanding what you write below about the data ownership issues, I don't > see how this will help the Cairo port at all versus the current situation where > it adopts the Vector<unsigned> of the RGBA32Buffer. Am I missing anything? Brent posted some ideas at the beginning of comment 42. Besides those (if they pan out), the lifetime issue, and the forward motion I proposed with the classes as a whole, no, there are not further benefits to Cairo I am aware of. But I think those are not things that should necessarily be discounted. > at Torch Mobile we > used a similar approach for our version of the Qt port. It operated much like > the Cairo port does today: we use a QImage/QPixmap ctor that adopts the > underlying data of the RGBA32Buffer. So I'm a bit familiar with this code. As > an aside, we have other Torch Mobile devs who've made extensive changes and as > a consequence have some pretty deep knowledge of the image-decoders for use by > our windows mobile port. Thanks, this is helpful background for me. > Absolutely shouldn't be dismissed. OTOH, I don't see this as a fundamental win > of the new design given that we have no concrete example of data lifetime > issues in the real world. And certainly were we given such an example I see no > reason to believe that it wouldn't be fairly easily fixed given the previous > design. I am not sure how to address it with a design that writes to a Vector<unsigned> unless either (a) the ImageSource is invoked to provide the vector, so that it is managing the lifetime (seems cumbersome) or (b) the data is copied-on-exit, like wx currently does, which has performance issues. As you say though, it is very hard to quantify this. > For one we lose the ability to modify the image-decoders in anyway that might > depend upon the underlying data buffer. Just as a brainstorm, if in the future > we wanted to modify the decoders so that they'd sample only 16 bit data and > sync it into a RGBA4444 buffer this becomes more difficult with the addition of > the native platform stores. This is precisely the sort of optimization I'm attempting to enable, by allowing a port where this matters (for example, a mobile device with low memory) to downsample inside the functions that write data to the backing store. I don't see this class of optimizations as something we'd ever want to apply globally to all ports. Perhaps I am mistaken? > Or say we come up with a new way of optimizing the > jpeg decoder that is relies upon querying the underlying data array. I'm just > brainstorming, but I think it is not entirely clear that we want to sacrifice > this flexibility if it can be reasonably avoided. I don't think moving to a per-platform storage system necessarily prevents this if it ever wants to occur. We already have APIs (that I added) that abstract writing the pixel data as the decoders needed, it would certainly be possible to add abstractions to read it as well (and simple, given that all these systems give users ways of getting at the underlying data buffer directly). So I don't think this is lost flexibility. Even if I am mistaken that we lose no flexibility here, I am hard-pressed to think of realistic probable modifications along the lines you suggest. I'm also very reluctant to optimize a design for a low-likelihood future possibility that is not yet present versus current needs. From the larger perspective of the image system as a whole, is seems clear that writing pixel elements into some sort of storage and being able to display the result is work that was being done in multiple places, and it seems like trying to combine those is sensical. > If we continue with this strategy for sure. And looking at your outline below, > I think that would be a good map if we do continue with this change. Note that my intent was to work on this "in the next few days", not at an unspecified future date. I filed this bug in hopes of getting the precise technical details needed to do this work immediately. So the question should only be whether we even want to see this end state happen at all. > > I agree that this occurred. As I mentioned before, the current scope of this > > is 83 lines duplicated in one file, and once pro (2) above is addressed (which > > I intended to help do imminently) it will not occur at all. Therefore I feel > > Only because you'd be exacerbating the platform dependencies of the > image-decoders by moving Cairo and WX away from the Vector<unsigned> :) Right > now, if Cairo and Wx were to remain as they are, then we really only need _two_ > ImageDecoderFoo.cpp files: ImageDecoderSkia.cpp and > ImageDecoderCrossPlatform.cpp :) asNativeImagePtr could be moved to > WebCore/platform/graphics :) But I have already mentioned that certainly wx does have concrete perf impact from the current design, so at the very least it would _want_ to move away from the "cross platform" code. At that point, whether or not Cairo used Vector<unsigned>, the implementation would only be used by Cairo. And of course this still sets aside the three points mentioned at the top of this replay as to possibilities why this might make sense. > From what I can tell the only benefit of these changes is this theoretical data > lifetime issue which has not been found in the wild yet. As I said, we saw concrete issues with Skia here during our testing. It was well over a year ago so I no longer recall how to reproduce. Certainly without a reproduction case I cannot say whether it would affect other ports; it could be that it was due to an interaction of this code with other parts of the Skia image framework. > Theoretically, the Wx > port could, along with Skia port, be changed to work in the same way that Cairo > and Qt now work: to adopt the underlying buffer of RGBA32Buffer. I do not know wx APIs well enough to say whether this is in fact true. Note that moving asNewNativeImage() from RGBA32Buffer back to ImageSource prevents completely unifying the ImageSource class into one that is entirely cross-platform. To me this makes the question feel somewhat like "six of one, a half-dozen of the other". > To me this > would preserve the flexibility iherant in the old way of doing things. All the > pro's without any of the con's (except the work involved of course :) ...And the con of basically closing down any ability to further simplify the overall image system architecture. > Now how much work do you think it'd be to modify Wx and Skia to work this way > and do you think it worthwhile given my answer to the flexibilty question > above? I do not know for Wx. For Skia I would be unwilling to do this modification without guaranteeing the data lifetime irrespective of the ImageDecoder implementation. As I said above, I am not convinced the solution to that is clean and easy. Given that I believe the current system to be equally flexible to the old system (modulo writing a call to read data out), the benefit seems to me to be zero while the costs (ignoring the actual work to do this) are nonzero. As always, I could be wrong. A possibility that eseidel alludes to somewhat above is that I could continue by attempting to merge RGBA32Buffer and ImageBuffer while seeking to maintain the current Vector<unsigned> as the low-level implementation of the pixel storage in this class, at least for the time being. In this scenario I would probably collect the Cairo and wx implementations into one, but leave Skia separate (and still using an SkBitmap) for now. I'm not sure exactly who allocates the storage when in this model but I'm sure that could be worked out, perhaps ignoring the lifetime issue (which does not seem to be affecting wx and Cairo in practice at the moment anyway). Given that due to not using a Vector<unsigned for Skia, ImageDecoder would still have to speak to an (apparently) opaque backing store class (the unified ImageBuffer/RGBA32Buffer) I'm not sure this satisfies the concerns raised, but perhaps it does. Thank you again for your detailed replies. This is the sort of background that is helpful to me. 126050 50 eric 2009-06-15 15:09:04 -0700 I talked more with pkasting over email, and Adam over IRC. I'd like to talk more with Holger (zecke) over IRC, but Adam and I seem to agree that letting Peter continue with his changes is a good thing (at least not harmful). I intend to obsolete all the patches on this bug once I can teach my fancy bugzilla-tool how to obsolete a patch. :) Thanks for them, but my understanding is Peter intends to work on these further and plans to take things in a slightly different direction than your patches. Holger, let's talk over IRC when you're next around. I think we're close to an understanding here. 126083 51 kevino 2009-06-15 16:41:32 -0700 (In reply to comment #43) > (In reply to comment #41) > For wx the idea is similar except to use a wxBitmap instead of a > cairo_surface_t. The benefits are more concrete for wx as it is definitely not > only copying the data when reading it out, but also flipping BGRA -> RGBA. BTW, while I probably won't have time to delve too deeply into this over the next couple days, I did want to mention a possible source of confusion if you plan on looking at the wx port. As I mentioned in our discussion on IRC, the wx port has two different graphics rendering APIs. There is wxDC, a bitmap-based API which uses GDI, GDK and CoreGraphics APIs to draw, and wxGraphicsContext, a vector-based API which uses GDI+, Cairo and CoreGraphics to draw. Use of wxGraphicsContext is designated in wx code using #if USE(WXGC) blocks. Of course, whenever possible we want to use wxGraphicsContext since WebCore::GraphicsContext is based around a vector-based drawing API. Unfortunately, even if we use wxGraphicsContext, wxBitmap stores the bitmap data using the native type expected by wxDC, rather than wxGraphicsContext. This is why we do a conversion (and data copy, really) from wxBitmap to wxGraphicsBitmap in RGBA32Buffer::asNewNativeImage, because when USE(WXGC) is true (eventually always), we need the image data to be in a format usable by wxGraphicsContext. To make matters worse, the APIs for types like wxGraphicsBitmap are very minimal and essentially only allow conversion from the standard wx data type (e.g. wxBitmap to wxGraphicsBitmap), so there's currently no way to do things like get direct pixel access for reading or writing with these types. So, unfortunately, even if we use wxBitmap as the image buffer type, we will still have a copy operation to go from wxBitmap to wxGraphicsBitmap. My concern performance-wise is whether or not we can continue to efficiently cache the wxGraphicsBitmap type if the underlying wxBitmap buffer can change at any time. e.g. we'd need a way to know when the buffer has been 'dirtied' and needs a new wxGraphicsBitmap to be created from it, so that we're only creating new wxGraphicsBitmap types when necessary and not any time a wxGraphicsBitmap is being asked for. At the same time, we probably don't want to recreate it after every write operation, so we'd probably need some mechanism to return a cache if not dirty or recreate the image if so. I realize this sucks, but it's what I've got to work with right now. :/ I can look at extending the wxGraphicsBitmap API, of course, but it will take some time to both implement and then have the change propagate into a release wx version, so we'll need a workaround in place in the short term. RE: Adam > Techical arguments do not always require empirical data of the sort you are > requesting. Patches are often turned down based on technical reasons other > than a lack of unit tests or benchmarks. Yes, but we're discussing a patch that has already gone through the review process and been approved, meaning that the person or persons who reviewed the patch did not consider whatever flaws they saw as serious enough to outweigh the benefit of getting the patch into the tree. (An assessment I'd agree with in this case.) While no one is perfect, given that, I think as a practical matter there should be a higher burden of proof to show that the flaws are serious enough to warrant a revert. Anyway, I think things are going in right direction now and people are getting on the same page, so it's probably a moot point now. :) 126351 52 eric 2009-06-16 16:25:49 -0700 I spoke with Holger (zecke) over IRC just now. I think we're all much closer to the same page now. Peter will continue with his refactoring work. Peter says that the above patches are unfortunately in conflict with his next set. I've encouraged him to file a new bug to track the next round of refactoring work and mark this as a dupe. Thank you again for your patches Holger, and your thoughts on this issue. 126365 53 pkasting 2009-06-16 17:37:53 -0700 Holger, I want to extend a public apology to you for comment 14 on this bug which was completely inappropriate, as well as any other unprofessional comments I made on IRC, on bug 25709, or on this bug. I am sorry for caring insufficiently about other ports in my original patch set, for losing my temper with you, and for being insufficiently informed up front to fully understand the alternatives to my design or the objections shared here. For anything you have said which has been out of line, I completely forgive you. I sincerely believe you have the best interests of the codebase as a whole at heart, and I am happy to have your input as a long-time contributor. 126366 54 pkasting 2009-06-16 17:38:18 -0700 With that said, at eseidel's request I am closing this bug in favor of a new one, to try and gain clarity. I have CCed most of the folks on this bug there, and have tried to cover things completely and without bias. Please correct me where I have misstated or overlooked anything. *** This bug has been marked as a duplicate of 26467 *** 126721 55 31258 manyoso 2009-06-18 10:19:11 -0700 Comment on attachment 31258 Restore cross platform behavior We've moved onto another bug report I believe and zecke has indicated a new direction is acceptable. 126724 56 31263 manyoso 2009-06-18 10:24:46 -0700 Comment on attachment 31263 Unfork the various ImageSource*.cpp copies I think there was agreement unifying the ImageSource copies floating around is the correct approach, but I don' think it applies cleanly now? 126726 57 pkasting 2009-06-18 10:30:56 -0700 (In reply to comment #56) > (From update of attachment 31263 [review]) > I think there was agreement unifying the ImageSource copies floating around is > the correct approach, but I don' think it applies cleanly now? True, and I also found on closer inspection that the patch here overlooked some subtle differences between the sources. I'm working towards unifying the ImageSources as we speak, I need to correct some issues with Skia's usage of the ICO decoder to do so. 31258 2009-06-14 06:40:47 -0700 2009-06-18 10:19:11 -0700 Restore cross platform behavior 0001-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 4363 zecke RnJvbSA3YTUxYzA0NjI3ZjBkNzdkYWE1YTRmYjYxMmM1ZGM5Y2NhMGZlOTBiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6MzE6MjMgKzAyMDAKU3ViamVjdDog W1BBVENIIDEvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIE1ha2UgaW1hZ2UtZGVjb2RlcnMgY3Jvc3MtcGxhdGZvcm0gYWdhaW4uIEN1cnJlbnRseSBp dCBpcwogICAgICAgIFNraWEgb3IgbGlrZSB0aGUgb2xkIHdheS4gaW1hZ2UtZGVjb2RlcnMgY2Fu IGFuZCBzaG91bGQgYmUKICAgICAgICB1c2VkIGJ5IGV2ZXJ5b25lLiBUaGlzIGluY2x1ZGVzIGlu IHRyZWUgdXNlcnMgV1ggYW5kIENhaXJvCiAgICAgICAgYW5kIHRvIGJlIG1lcmdlZCBvdXQgb2Yg dHJlZSB1c2VycyBsaWtlIFdpbmRvd3MgQ0UsIEVGTC4uLgoKICAgICAgICBNYWtlIHN0b3Jpbmcg cGl4ZWwgZGF0YSBpbiBWZWN0b3I8UGl4ZWxEYXRhPiB0aGUgZGVmYXVsdCBhbmQKICAgICAgICBy ZSBhZGQgdGhlIGJ5dGVzIGFjY2Vzb3IgdG8gYWNjZXNzIHRoZSBwaXhlbCBkYXRhLiBUaGlzIHNo b3VsZAogICAgICAgIGZpeCB2YXJpb3VzIGlzc3VlcyBmb3IgbWFueSBwb3J0cy4KCiAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuaDoKICAgICAgICAoV2ViQ29y ZTo6UkdCQTMyQnVmZmVyOjpieXRlcyk6CiAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6 Z2V0QWRkcik6Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVj b2RlcnMvSW1hZ2VEZWNvZGVyLmggfCAgIDIyICsrKysrKysrKystLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNmQxMTgyLi43 NWZkNDQ0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDA5LTA2LTE0ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5 dGhlciAgPHplY2tlQHNlbGZpc2gub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1ha2UgaW1hZ2UtZGVjb2RlcnMgY3Jvc3MtcGxhdGZvcm0gYWdh aW4uIEN1cnJlbnRseSBpdCBpcworICAgICAgICBTa2lhIG9yIGxpa2UgdGhlIG9sZCB3YXkuIGlt YWdlLWRlY29kZXJzIGNhbiBhbmQgc2hvdWxkIGJlCisgICAgICAgIHVzZWQgYnkgZXZlcnlvbmUu IFRoaXMgaW5jbHVkZXMgaW4gdHJlZSB1c2VycyBXWCBhbmQgQ2Fpcm8KKyAgICAgICAgYW5kIHRv IGJlIG1lcmdlZCBvdXQgb2YgdHJlZSB1c2VycyBsaWtlIFdpbmRvd3MgQ0UsIEVGTC4uLgorCisg ICAgICAgIE1ha2Ugc3RvcmluZyBwaXhlbCBkYXRhIGluIFZlY3RvcjxQaXhlbERhdGE+IHRoZSBk ZWZhdWx0IGFuZAorICAgICAgICByZSBhZGQgdGhlIGJ5dGVzIGFjY2Vzb3IgdG8gYWNjZXNzIHRo ZSBwaXhlbCBkYXRhLiBUaGlzIHNob3VsZAorICAgICAgICBmaXggdmFyaW91cyBpc3N1ZXMgZm9y IG1hbnkgcG9ydHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURl Y29kZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6Ynl0ZXMpOgorICAgICAg ICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpnZXRBZGRyKToKKwogMjAwOS0wNi0xMyAgUGV0ZXIg S2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2V2 aW4gT2xsaXZpZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJz L0ltYWdlRGVjb2Rlci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURl Y29kZXIuaAppbmRleCAzNmFiZWI4Li42NDc3M2M1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v aW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmgKQEAgLTU0LDExICs1NCw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgICAgIERpc3Bvc2VPdmVyd3JpdGVCZ2NvbG9yLCAgIC8vIENs ZWFyIGZyYW1lIHRvIHRyYW5zcGFyZW50CiAgICAgICAgICAgICBEaXNwb3NlT3ZlcndyaXRlUHJl dmlvdXMsICAvLyBDbGVhciBmcmFtZSB0byBwcmV2aW91cyBmcmFtZWJ1ZmZlciBjb250ZW50cwog ICAgICAgICB9OwotI2lmIFBMQVRGT1JNKFNLSUEpCisKICAgICAgICAgdHlwZWRlZiB1aW50MzJf dCBQaXhlbERhdGE7Ci0jZWxzZQotICAgICAgICB0eXBlZGVmIHVuc2lnbmVkIFBpeGVsRGF0YTsK LSNlbmRpZgogCiAgICAgICAgIFJHQkEzMkJ1ZmZlcigpOwogCkBAIC0xMDQsMTAgKzEwMSwxNCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIGxlYWsgbWVtb3J5LgogICAgICAgICBi b29sIHNldFNpemUoaW50IG5ld1dpZHRoLCBpbnQgbmV3SGVpZ2h0KTsKIAorI2lmIFBMQVRGT1JN KFNLSUEpIHx8IFBMQVRGT1JNKENBSVJPKSB8fCBQTEFURk9STShXWCkKICAgICAgICAgLy8gVG8g YmUgdXNlZCBieSBJbWFnZVNvdXJjZTo6Y3JlYXRlRnJhbWVBdEluZGV4KCkuICBSZXR1cm5zIGEg cG9pbnRlcgogICAgICAgICAvLyB0byB0aGUgdW5kZXJseWluZyBuYXRpdmUgaW1hZ2UgZGF0YS4g IFRoaXMgcG9pbnRlciB3aWxsIGJlIG93bmVkIGJ5CiAgICAgICAgIC8vIHRoZSBCaXRtYXBJbWFn ZSBhbmQgZnJlZWQgaW4gRnJhbWVEYXRhOjpjbGVhcigpLgogICAgICAgICBOYXRpdmVJbWFnZVB0 ciBhc05ld05hdGl2ZUltYWdlKCkgY29uc3Q7CisjZWxzZQorICAgICAgICBWZWN0b3I8UGl4ZWxE YXRhPiYgYnl0ZXMoKSB7IHJldHVybiBtX2J5dGVzOyB9CisjZW5kaWYKIAogICAgICAgICBib29s IGhhc0FscGhhKCkgY29uc3Q7CiAgICAgICAgIGNvbnN0IEludFJlY3QmIHJlY3QoKSBjb25zdCB7 IHJldHVybiBtX3JlY3Q7IH0KQEAgLTEzNCwxMyArMTM1LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogICAgICAgICBpbmxpbmUgUGl4ZWxEYXRhKiBnZXRBZGRyKGludCB4LCBpbnQgeSkKICAg ICAgICAgewotI2lmIFBMQVRGT1JNKENBSVJPKSB8fCBQTEFURk9STShXWCkKLSAgICAgICAgICAg IHJldHVybiBtX2J5dGVzLmRhdGEoKSArICh5ICogd2lkdGgoKSkgKyB4OwotI2VsaWYgUExBVEZP Uk0oU0tJQSkKKyNpZiBQTEFURk9STShTS0lBKQogICAgICAgICAgICAgcmV0dXJuIG1fYml0bWFw LmdldEFkZHIzMih4LCB5KTsKICNlbHNlCi0gICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIG1fYnl0ZXMuZGF0 YSgpICsgKHkgKiB3aWR0aCgpKSArIHg7CiAjZW5kaWYKICAgICAgICAgfQogCkBAIC0xNjAsMTMg KzE1OCwxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K IAotI2lmIFBMQVRGT1JNKENBSVJPKSB8fCBQTEFURk9STShXWCkKKyNpZiBQTEFURk9STShTS0lB KQorICAgICAgICBOYXRpdmVJbWFnZVNraWEgbV9iaXRtYXA7CisjZWxzZQogICAgICAgICBWZWN0 b3I8UGl4ZWxEYXRhPiBtX2J5dGVzOwogICAgICAgICBJbnRTaXplIG1fc2l6ZTsgICAgICAgLy8g VGhlIHNpemUgb2YgdGhlIGJ1ZmZlci4gIFRoaXMgc2hvdWxkIGJlIHRoZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLy8gc2FtZSBhcyBJbWFnZURlY29kZXI6Om1fc2l6ZS4KICAgICAg ICAgYm9vbCBtX2hhc0FscGhhOyAgICAgIC8vIFdoZXRoZXIgb3Igbm90IGFueSBvZiB0aGUgcGl4 ZWxzIGluIHRoZSBidWZmZXIgaGF2ZSB0cmFuc3BhcmVuY3kuCi0jZWxpZiBQTEFURk9STShTS0lB KQotICAgICAgICBOYXRpdmVJbWFnZVNraWEgbV9iaXRtYXA7CiAjZW5kaWYKICAgICAgICAgSW50 UmVjdCBtX3JlY3Q7ICAgICAgIC8vIFRoZSByZWN0IG9mIHRoZSBvcmlnaW5hbCBzcGVjaWZpZWQg ZnJhbWUgd2l0aGluIHRoZSBvdmVyYWxsIGJ1ZmZlci4KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFRoaXMgd2lsbCBhbHdheXMganVzdCBiZSB0aGUgZW50aXJlIGJ1ZmZlciBleGNl cHQgZm9yIEdJRiBmcmFtZXMKLS0gCjEuNi4zLjEKCg== 31259 2009-06-14 06:42:16 -0700 2009-06-18 10:19:33 -0700 Make ImageDecoder.cpp cross-platform 0002-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 11722 zecke RnJvbSA3MGEyOGJhYjg3ODMzOGQ3YzEwNDEyOGFiMTAzNWU3OTY1NWMzNzI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6MzM6NDQgKzAyMDAKU3ViamVjdDog W1BBVENIIDIvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIE1ha2UgSW1hZ2VEZWNvZGVyLmNwcCBjcm9zcyBwbGF0Zm9ybS4gRm9yIG5vdyAjaWZkZWYK ICAgICAgICB0aGUgb25seSBjYWlybyBzcGVjaWZpYyBmdW5jdGlvbi4gVGhpcyBmaWxlIHNob3Vs ZCBiZQogICAgICAgIGFkZGVkIGJ5IHBvcnRzIHVzaW5nIHRoZSBnZW5lcmljIFdlYkNvcmUgaW1h Z2UgZGVjb2RlcnMuCgogICAgICAgICogR05VbWFrZWZpbGUuYW06CiAgICAgICAgKiBwbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwOiBBZGRlZC4KICAgICAgICAoV2ViQ29y ZTo6UkdCQTMyQnVmZmVyOjpSR0JBMzJCdWZmZXIpOgogICAgICAgIChXZWJDb3JlOjpSR0JBMzJC dWZmZXI6OmNsZWFyKToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjp6ZXJvRmlsbCk6 CiAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6Y29weUJpdG1hcERhdGEpOgogICAgICAg IChXZWJDb3JlOjpSR0JBMzJCdWZmZXI6OnNldFNpemUpOgogICAgICAgIChXZWJDb3JlOjpSR0JB MzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UpOgogICAgICAgIChXZWJDb3JlOjpSR0JBMzJCdWZm ZXI6Omhhc0FscGhhKToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpzZXRIYXNBbHBo YSk6CiAgICAgICAgKFdlYkNvcmU6OnNldFN0YXR1cyk6CiAgICAgICAgKFdlYkNvcmU6OlJHQkEz MkJ1ZmZlcjo6b3BlcmF0b3I9KToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjp3aWR0 aCk6CiAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6aGVpZ2h0KToKICAgICAgICAqIHBs YXRmb3JtL2ltYWdlLWRlY29kZXJzL2NhaXJvL0ltYWdlRGVjb2RlckNhaXJvLmNwcDogUmVtb3Zl ZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMjQgKysrKwogV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgICAyICstCiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdl RGVjb2Rlci5jcHAgICB8ICAxMjkgKysrKysrKysrKysrKysrKysrKysKIC4uLi9pbWFnZS1kZWNv ZGVycy9jYWlyby9JbWFnZURlY29kZXJDYWlyby5jcHAgICAgIHwgIDEyNSAtLS0tLS0tLS0tLS0t LS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE1NCBpbnNlcnRpb25zKCspLCAxMjYgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9J bWFnZURlY29kZXIuY3BwCiBkZWxldGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9jYWlyby9JbWFnZURlY29kZXJDYWlyby5jcHAKCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc1ZmQ0NDQuLjNkZGRmOGIg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0yLDYgKzIsMzAgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAor ICAgICAgICBNYWtlIEltYWdlRGVjb2Rlci5jcHAgY3Jvc3MgcGxhdGZvcm0uIEZvciBub3cgI2lm ZGVmCisgICAgICAgIHRoZSBvbmx5IGNhaXJvIHNwZWNpZmljIGZ1bmN0aW9uLiBUaGlzIGZpbGUg c2hvdWxkIGJlCisgICAgICAgIGFkZGVkIGJ5IHBvcnRzIHVzaW5nIHRoZSBnZW5lcmljIFdlYkNv cmUgaW1hZ2UgZGVjb2RlcnMuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKyAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6UkdCQTMyQnVmZmVyKToKKyAgICAgICAgKFdlYkNv cmU6OlJHQkEzMkJ1ZmZlcjo6Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVy Ojp6ZXJvRmlsbCk6CisgICAgICAgIChXZWJDb3JlOjpSR0JBMzJCdWZmZXI6OmNvcHlCaXRtYXBE YXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6c2V0U2l6ZSk6CisgICAgICAg IChXZWJDb3JlOjpSR0JBMzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6UkdCQTMyQnVmZmVyOjpoYXNBbHBoYSk6CisgICAgICAgIChXZWJDb3JlOjpSR0JBMzJC dWZmZXI6OnNldEhhc0FscGhhKToKKyAgICAgICAgKFdlYkNvcmU6OnNldFN0YXR1cyk6CisgICAg ICAgIChXZWJDb3JlOjpSR0JBMzJCdWZmZXI6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJDb3Jl OjpSR0JBMzJCdWZmZXI6OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6 aGVpZ2h0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9jYWlyby9JbWFnZURl Y29kZXJDYWlyby5jcHA6IFJlbW92ZWQuCisKKzIwMDktMDYtMTQgIEhvbGdlciBIYW5zIFBldGVy IEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKICAgICAgICAgTWFrZSBpbWFnZS1kZWNvZGVycyBjcm9zcy1wbGF0Zm9y bSBhZ2Fpbi4gQ3VycmVudGx5IGl0IGlzCiAgICAgICAgIFNraWEgb3IgbGlrZSB0aGUgb2xkIHdh eS4gaW1hZ2UtZGVjb2RlcnMgY2FuIGFuZCBzaG91bGQgYmUKICAgICAgICAgdXNlZCBieSBldmVy eW9uZS4gVGhpcyBpbmNsdWRlcyBpbiB0cmVlIHVzZXJzIFdYIGFuZCBDYWlybwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSBiL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KaW5kZXgg NjI1YzQ0Yy4uYzgxNDRiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQorKysg Yi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCkBAIC0xODYwLDExICsxODYwLDExIEBAIHdlYmNvcmVn dGtfc291cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYyBcCiAJ V2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrZHJhd2luZy5oIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oIFwKKwlXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL0ltYWdlRGVjb2Rlci5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvYm1wL0JNUEltYWdlRGVjb2Rlci5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVj b2RlcnMvYm1wL0JNUEltYWdlRGVjb2Rlci5oIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL2JtcC9CTVBJbWFnZVJlYWRlci5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvYm1wL0JNUEltYWdlUmVhZGVyLmggXAotCVdlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvY2Fpcm8vSW1hZ2VEZWNvZGVyQ2Fpcm8uY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuY3BwIFwKIAlXZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWRlY29kZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuaCBcCiAJV2ViQ29yZS9wbGF0 Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lGSW1hZ2VSZWFkZXIuY3BwIFwKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi41MzA1NWI3Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCkBAIC0wLDAgKzEsMTI5 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUg bWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhF CisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLiAKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi SW1hZ2VEZWNvZGVyLmgiCisKKyNpZiBQTEFURk9STShDQUlSTykKKyNpbmNsdWRlIDxjYWlyby5o PgorI2VuZGlmCisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworUkdCQTMyQnVmZmVyOjpSR0JBMzJC dWZmZXIoKQorICAgIDogbV9oYXNBbHBoYShmYWxzZSkKKyAgICAsIG1fc3RhdHVzKEZyYW1lRW1w dHkpCisgICAgLCBtX2R1cmF0aW9uKDApCisgICAgLCBtX2Rpc3Bvc2FsTWV0aG9kKERpc3Bvc2VO b3RTcGVjaWZpZWQpCit7Cit9IAorCit2b2lkIFJHQkEzMkJ1ZmZlcjo6Y2xlYXIoKQoreworICAg IG1fYnl0ZXMuY2xlYXIoKTsKKyAgICBtX3N0YXR1cyA9IEZyYW1lRW1wdHk7CisgICAgLy8gTk9U RTogRG8gbm90IHJlc2V0IG90aGVyIG1lbWJlcnMgaGVyZTsgY2xlYXJGcmFtZUJ1ZmZlckNhY2hl KCkKKyAgICAvLyBjYWxscyB0aGlzIHRvIGZyZWUgdGhlIGJpdG1hcCBkYXRhLCBidXQgb3RoZXIg ZnVuY3Rpb25zIGxpa2UKKyAgICAvLyBpbml0RnJhbWVCdWZmZXIoKSBhbmQgZnJhbWVDb21wbGV0 ZSgpIG1heSBzdGlsbCBuZWVkIHRvIHJlYWQKKyAgICAvLyBvdGhlciBtZXRhZGF0YSBvdXQgb2Yg dGhpcyBmcmFtZSBsYXRlci4KK30KKwordm9pZCBSR0JBMzJCdWZmZXI6Onplcm9GaWxsKCkKK3sK KyAgICBtX2J5dGVzLmZpbGwoMCk7CisgICAgbV9oYXNBbHBoYSA9IHRydWU7Cit9CisKK3ZvaWQg UkdCQTMyQnVmZmVyOjpjb3B5Qml0bWFwRGF0YShjb25zdCBSR0JBMzJCdWZmZXImIG90aGVyKQor eworICAgIGlmICh0aGlzID09ICZvdGhlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9ieXRl cyA9IG90aGVyLm1fYnl0ZXM7CisgICAgc2V0SGFzQWxwaGEob3RoZXIubV9oYXNBbHBoYSk7Cit9 CisKK2Jvb2wgUkdCQTMyQnVmZmVyOjpzZXRTaXplKGludCBuZXdXaWR0aCwgaW50IG5ld0hlaWdo dCkKK3sKKyAgICAvLyBOT1RFOiBUaGlzIGhhcyBubyB3YXkgdG8gY2hlY2sgZm9yIGFsbG9jYXRp b24gZmFpbHVyZSBpZiB0aGUKKyAgICAvLyByZXF1ZXN0ZWQgc2l6ZSB3YXMgdG9vIGJpZy4uLgor ICAgIG1fYnl0ZXMucmVzaXplKG5ld1dpZHRoICogbmV3SGVpZ2h0KTsKKyAgICBtX3NpemUgPSBJ bnRTaXplKG5ld1dpZHRoLCBuZXdIZWlnaHQpOworCisgICAgLy8gWmVybyB0aGUgaW1hZ2UuCisg ICAgemVyb0ZpbGwoKTsKKworICAgIHJldHVybiB0cnVlOworfQorCisjaWYgUExBVEZPUk0oQ0FJ Uk8pCitOYXRpdmVJbWFnZVB0ciBSR0JBMzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UoKSBjb25z dAoreworICAgIHJldHVybiBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0ZV9mb3JfZGF0YSgKKyAg ICAgICAgcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oY29uc3RfY2FzdDxQaXhlbERh dGEqPigKKyAgICAgICAgICAgIG1fYnl0ZXMuZGF0YSgpKSksIENBSVJPX0ZPUk1BVF9BUkdCMzIs IHdpZHRoKCksIGhlaWdodCgpLAorICAgICAgICB3aWR0aCgpICogc2l6ZW9mKFBpeGVsRGF0YSkp OworfQorI2VuZGlmCisKK2Jvb2wgUkdCQTMyQnVmZmVyOjpoYXNBbHBoYSgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1faGFzQWxwaGE7Cit9CisKK3ZvaWQgUkdCQTMyQnVmZmVyOjpzZXRIYXNBbHBo YShib29sIGFscGhhKQoreworICAgIG1faGFzQWxwaGEgPSBhbHBoYTsKK30KKwordm9pZCBSR0JB MzJCdWZmZXI6OnNldFN0YXR1cyhGcmFtZVN0YXR1cyBzdGF0dXMpCit7CisgICAgbV9zdGF0dXMg PSBzdGF0dXM7Cit9CisKK1JHQkEzMkJ1ZmZlciYgUkdCQTMyQnVmZmVyOjpvcGVyYXRvcj0oY29u c3QgUkdCQTMyQnVmZmVyJiBvdGhlcikKK3sKKyAgICBpZiAodGhpcyA9PSAmb3RoZXIpCisgICAg ICAgIHJldHVybiAqdGhpczsKKworICAgIG1fYnl0ZXMgPSBvdGhlci5tX2J5dGVzOworICAgIG1f c2l6ZSA9IG90aGVyLm1fc2l6ZTsKKyAgICBzZXRIYXNBbHBoYShvdGhlci5oYXNBbHBoYSgpKTsK KyAgICBzZXRSZWN0KG90aGVyLnJlY3QoKSk7CisgICAgc2V0U3RhdHVzKG90aGVyLnN0YXR1cygp KTsKKyAgICBzZXREdXJhdGlvbihvdGhlci5kdXJhdGlvbigpKTsKKyAgICBzZXREaXNwb3NhbE1l dGhvZChvdGhlci5kaXNwb3NhbE1ldGhvZCgpKTsKKyAgICByZXR1cm4gKnRoaXM7Cit9CisKK2lu dCBSR0JBMzJCdWZmZXI6OndpZHRoKCkgY29uc3QgeworICAgIHJldHVybiBtX3NpemUud2lkdGgo KTsKK30KKworaW50IFJHQkEzMkJ1ZmZlcjo6aGVpZ2h0KCkgY29uc3QgeworICAgIHJldHVybiBt X3NpemUuaGVpZ2h0KCk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvY2Fpcm8vSW1hZ2VEZWNvZGVyQ2Fpcm8u Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9jYWlyby9JbWFnZURlY29kZXJD YWlyby5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDBjODYwYzguLjAwMDAwMDAK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9jYWlyby9JbWFnZURlY29kZXJD YWlyby5jcHAKKysrIC9kZXYvbnVsbApAQCAtMSwxMjUgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdo dCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAq Ci0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0g KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVS LCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIs IElOQy4gT1IKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAotICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogUFJPQ1VSRU1FTlQg T0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCi0g KiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCi0g Ki8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIkltYWdlRGVjb2Rlci5oIgotCi0j aW5jbHVkZSA8Y2Fpcm8uaD4KLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1SR0JBMzJCdWZmZXI6 OlJHQkEzMkJ1ZmZlcigpCi0gICAgOiBtX2hhc0FscGhhKGZhbHNlKQotICAgICwgbV9zdGF0dXMo RnJhbWVFbXB0eSkKLSAgICAsIG1fZHVyYXRpb24oMCkKLSAgICAsIG1fZGlzcG9zYWxNZXRob2Qo RGlzcG9zZU5vdFNwZWNpZmllZCkKLXsKLX0gCi0KLXZvaWQgUkdCQTMyQnVmZmVyOjpjbGVhcigp Ci17Ci0gICAgbV9ieXRlcy5jbGVhcigpOwotICAgIG1fc3RhdHVzID0gRnJhbWVFbXB0eTsKLSAg ICAvLyBOT1RFOiBEbyBub3QgcmVzZXQgb3RoZXIgbWVtYmVycyBoZXJlOyBjbGVhckZyYW1lQnVm ZmVyQ2FjaGUoKQotICAgIC8vIGNhbGxzIHRoaXMgdG8gZnJlZSB0aGUgYml0bWFwIGRhdGEsIGJ1 dCBvdGhlciBmdW5jdGlvbnMgbGlrZQotICAgIC8vIGluaXRGcmFtZUJ1ZmZlcigpIGFuZCBmcmFt ZUNvbXBsZXRlKCkgbWF5IHN0aWxsIG5lZWQgdG8gcmVhZAotICAgIC8vIG90aGVyIG1ldGFkYXRh IG91dCBvZiB0aGlzIGZyYW1lIGxhdGVyLgotfQotCi12b2lkIFJHQkEzMkJ1ZmZlcjo6emVyb0Zp bGwoKQotewotICAgIG1fYnl0ZXMuZmlsbCgwKTsKLSAgICBtX2hhc0FscGhhID0gdHJ1ZTsKLX0K LQotdm9pZCBSR0JBMzJCdWZmZXI6OmNvcHlCaXRtYXBEYXRhKGNvbnN0IFJHQkEzMkJ1ZmZlciYg b3RoZXIpCi17Ci0gICAgaWYgKHRoaXMgPT0gJm90aGVyKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBtX2J5dGVzID0gb3RoZXIubV9ieXRlczsKLSAgICBzZXRIYXNBbHBoYShvdGhlci5tX2hhc0Fs cGhhKTsKLX0KLQotYm9vbCBSR0JBMzJCdWZmZXI6OnNldFNpemUoaW50IG5ld1dpZHRoLCBpbnQg bmV3SGVpZ2h0KQotewotICAgIC8vIE5PVEU6IFRoaXMgaGFzIG5vIHdheSB0byBjaGVjayBmb3Ig YWxsb2NhdGlvbiBmYWlsdXJlIGlmIHRoZQotICAgIC8vIHJlcXVlc3RlZCBzaXplIHdhcyB0b28g YmlnLi4uCi0gICAgbV9ieXRlcy5yZXNpemUobmV3V2lkdGggKiBuZXdIZWlnaHQpOwotICAgIG1f c2l6ZSA9IEludFNpemUobmV3V2lkdGgsIG5ld0hlaWdodCk7Ci0KLSAgICAvLyBaZXJvIHRoZSBp bWFnZS4KLSAgICB6ZXJvRmlsbCgpOwotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLU5hdGl2ZUlt YWdlUHRyIFJHQkEzMkJ1ZmZlcjo6YXNOZXdOYXRpdmVJbWFnZSgpIGNvbnN0Ci17Ci0gICAgcmV0 dXJuIGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zvcl9kYXRhKAotICAgICAgICByZWludGVy cHJldF9jYXN0PHVuc2lnbmVkIGNoYXIqPihjb25zdF9jYXN0PFBpeGVsRGF0YSo+KAotICAgICAg ICAgICAgbV9ieXRlcy5kYXRhKCkpKSwgQ0FJUk9fRk9STUFUX0FSR0IzMiwgd2lkdGgoKSwgaGVp Z2h0KCksCi0gICAgICAgIHdpZHRoKCkgKiBzaXplb2YoUGl4ZWxEYXRhKSk7Ci19Ci0KLWJvb2wg UkdCQTMyQnVmZmVyOjpoYXNBbHBoYSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1faGFzQWxwaGE7 Ci19Ci0KLXZvaWQgUkdCQTMyQnVmZmVyOjpzZXRIYXNBbHBoYShib29sIGFscGhhKQotewotICAg IG1faGFzQWxwaGEgPSBhbHBoYTsKLX0KLQotdm9pZCBSR0JBMzJCdWZmZXI6OnNldFN0YXR1cyhG cmFtZVN0YXR1cyBzdGF0dXMpCi17Ci0gICAgbV9zdGF0dXMgPSBzdGF0dXM7Ci19Ci0KLVJHQkEz MkJ1ZmZlciYgUkdCQTMyQnVmZmVyOjpvcGVyYXRvcj0oY29uc3QgUkdCQTMyQnVmZmVyJiBvdGhl cikKLXsKLSAgICBpZiAodGhpcyA9PSAmb3RoZXIpCi0gICAgICAgIHJldHVybiAqdGhpczsKLQot ICAgIG1fYnl0ZXMgPSBvdGhlci5tX2J5dGVzOwotICAgIG1fc2l6ZSA9IG90aGVyLm1fc2l6ZTsK LSAgICBzZXRIYXNBbHBoYShvdGhlci5oYXNBbHBoYSgpKTsKLSAgICBzZXRSZWN0KG90aGVyLnJl Y3QoKSk7Ci0gICAgc2V0U3RhdHVzKG90aGVyLnN0YXR1cygpKTsKLSAgICBzZXREdXJhdGlvbihv dGhlci5kdXJhdGlvbigpKTsKLSAgICBzZXREaXNwb3NhbE1ldGhvZChvdGhlci5kaXNwb3NhbE1l dGhvZCgpKTsKLSAgICByZXR1cm4gKnRoaXM7Ci19Ci0KLWludCBSR0JBMzJCdWZmZXI6OndpZHRo KCkgY29uc3QgewotICAgIHJldHVybiBtX3NpemUud2lkdGgoKTsKLX0KLQotaW50IFJHQkEzMkJ1 ZmZlcjo6aGVpZ2h0KCkgY29uc3QgewotICAgIHJldHVybiBtX3NpemUuaGVpZ2h0KCk7Ci19Ci0K LX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLS0gCjEuNi4zLjEKCg== 31260 2009-06-14 06:43:40 -0700 2009-06-18 10:20:27 -0700 Move the secret how to create a cairo_surface_t back to ImageSourceCairo.cpp 0003-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 4359 zecke RnJvbSAwYmE1NTg0ZWI1Njk2NTk2NmVjZDZkMjdmZTQxZWY5ODlkNmE4MjI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6Mzc6MTggKzAyMDAKU3ViamVjdDog W1BBVENIIDMvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIE1vdmUgdGhlIHNlY3JldCBvbiBob3cgdG8gZ2VuZXJhdGUgYSBuYXRpdmUgaW1hZ2UgZnJv bQogICAgICAgIGEgcmdiYTg4OCBidWZmZXIgYmFjayB0byBJbWFnZVNvdXJjZUNhaXJvIGFuZCBt YWtlIEltYWdlRGVjb2Rlci5jcHAKICAgICAgICB0cnVseSBjcm9zcyBwbGF0Zm9ybS4KCiAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZVNvdXJjZUNhaXJvLmNwcDoKICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OmNyZWF0ZUZyYW1lQXRJbmRleCk6CiAgICAgICAgKiBw bGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwOgogICAgICAgICogcGxhdGZv cm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmg6Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKysrKysrKysrKysKIC4u Li9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZVNvdXJjZUNhaXJvLmNwcCAgIHwgICAgNiAr KysrKy0KIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcCAg IHwgICAxNCAtLS0tLS0tLS0tLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9J bWFnZURlY29kZXIuaCAgICAgfCAgICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlv bnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RkZGY4Yi4uM2NjNjQwMCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwxOSBAQAog CiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIE1vdmUgdGhl IHNlY3JldCBvbiBob3cgdG8gZ2VuZXJhdGUgYSBuYXRpdmUgaW1hZ2UgZnJvbQorICAgICAgICBh IHJnYmE4ODggYnVmZmVyIGJhY2sgdG8gSW1hZ2VTb3VyY2VDYWlybyBhbmQgbWFrZSBJbWFnZURl Y29kZXIuY3BwCisgICAgICAgIHRydWx5IGNyb3NzIHBsYXRmb3JtLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VTb3VyY2VDYWlyby5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbWFnZVNvdXJjZTo6Y3JlYXRlRnJhbWVBdEluZGV4KToKKyAgICAgICAgKiBwbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2lt YWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oOgorCisyMDA5LTA2LTE0ICBIb2xnZXIgSGFucyBQ ZXRlciBGcmV5dGhlciAgPHplY2tlQHNlbGZpc2gub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIE1ha2UgSW1hZ2VEZWNvZGVyLmNwcCBjcm9zcyBw bGF0Zm9ybS4gRm9yIG5vdyAjaWZkZWYKICAgICAgICAgdGhlIG9ubHkgY2Fpcm8gc3BlY2lmaWMg ZnVuY3Rpb24uIFRoaXMgZmlsZSBzaG91bGQgYmUKICAgICAgICAgYWRkZWQgYnkgcG9ydHMgdXNp bmcgdGhlIGdlbmVyaWMgV2ViQ29yZSBpbWFnZSBkZWNvZGVycy4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VTb3VyY2VDYWlyby5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ltYWdlU291cmNlQ2Fpcm8uY3BwCmluZGV4IGRlMTZk ZWEuLjZjNzNkNWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v SW1hZ2VTb3VyY2VDYWlyby5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWly by9JbWFnZVNvdXJjZUNhaXJvLmNwcApAQCAtMTg4LDcgKzE4OCwxMSBAQCBOYXRpdmVJbWFnZVB0 ciBJbWFnZVNvdXJjZTo6Y3JlYXRlRnJhbWVBdEluZGV4KHNpemVfdCBpbmRleCkKICAgICBpZiAo IXNpemUoKS5oZWlnaHQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gYnVmZmVy LT5hc05ld05hdGl2ZUltYWdlKCk7CisgICAgcmV0dXJuIGNhaXJvX2ltYWdlX3N1cmZhY2VfY3Jl YXRlX2Zvcl9kYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgY2hhcio+KGJ1ZmZlci0+Ynl0 ZXMoKS5kYXRhKCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBDQUlST19GT1JNQVRfQVJHQjMyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzaXplKCkud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZSgpLmhlaWdodCgpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplKCkud2lkdGgoKSogc2l6ZW9mKFJH QkEzMkJ1ZmZlcjo6UGl4ZWxEYXRhKSk7CiB9CiAKIGJvb2wgSW1hZ2VTb3VyY2U6OmZyYW1lSXND b21wbGV0ZUF0SW5kZXgoc2l6ZV90IGluZGV4KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCmluZGV4IDUzMDU1YjcuLmUyNzAxMzYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAKQEAg LTI2LDEwICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSW1hZ2VEZWNv ZGVyLmgiCiAKLSNpZiBQTEFURk9STShDQUlSTykKLSNpbmNsdWRlIDxjYWlyby5oPgotI2VuZGlm Ci0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUkdCQTMyQnVmZmVyOjpSR0JBMzJCdWZmZXIoKQpA QCAtNzgsMTYgKzc0LDYgQEAgYm9vbCBSR0JBMzJCdWZmZXI6OnNldFNpemUoaW50IG5ld1dpZHRo LCBpbnQgbmV3SGVpZ2h0KQogICAgIHJldHVybiB0cnVlOwogfQogCi0jaWYgUExBVEZPUk0oQ0FJ Uk8pCi1OYXRpdmVJbWFnZVB0ciBSR0JBMzJCdWZmZXI6OmFzTmV3TmF0aXZlSW1hZ2UoKSBjb25z dAotewotICAgIHJldHVybiBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0ZV9mb3JfZGF0YSgKLSAg ICAgICAgcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oY29uc3RfY2FzdDxQaXhlbERh dGEqPigKLSAgICAgICAgICAgIG1fYnl0ZXMuZGF0YSgpKSksIENBSVJPX0ZPUk1BVF9BUkdCMzIs IHdpZHRoKCksIGhlaWdodCgpLAotICAgICAgICB3aWR0aCgpICogc2l6ZW9mKFBpeGVsRGF0YSkp OwotfQotI2VuZGlmCi0KIGJvb2wgUkdCQTMyQnVmZmVyOjpoYXNBbHBoYSgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1faGFzQWxwaGE7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdl LWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy9JbWFnZURlY29kZXIuaAppbmRleCA2NDc3M2M1Li44ZjBhZDY2IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmgKQEAgLTEwMSw3ICsxMDEsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIGxlYWsgbWVtb3J5LgogICAgICAgICBi b29sIHNldFNpemUoaW50IG5ld1dpZHRoLCBpbnQgbmV3SGVpZ2h0KTsKIAotI2lmIFBMQVRGT1JN KFNLSUEpIHx8IFBMQVRGT1JNKENBSVJPKSB8fCBQTEFURk9STShXWCkKKyNpZiBQTEFURk9STShT S0lBKSB8fCBQTEFURk9STShXWCkKICAgICAgICAgLy8gVG8gYmUgdXNlZCBieSBJbWFnZVNvdXJj ZTo6Y3JlYXRlRnJhbWVBdEluZGV4KCkuICBSZXR1cm5zIGEgcG9pbnRlcgogICAgICAgICAvLyB0 byB0aGUgdW5kZXJseWluZyBuYXRpdmUgaW1hZ2UgZGF0YS4gIFRoaXMgcG9pbnRlciB3aWxsIGJl IG93bmVkIGJ5CiAgICAgICAgIC8vIHRoZSBCaXRtYXBJbWFnZSBhbmQgZnJlZWQgaW4gRnJhbWVE YXRhOjpjbGVhcigpLgotLSAKMS42LjMuMQoK 31261 2009-06-14 06:45:04 -0700 2009-06-18 10:20:48 -0700 Unfork the WX, no need to have an exact copy of the RGBA32Buffer... use the common code 0004-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 10724 zecke RnJvbSBkZGM0ZTdkNTYzM2QwY2EzMzFhN2FhNDM2ZjAwMmE5ZDIyNWI3MGJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTU6MDc6MzQgKzAyMDAKU3ViamVjdDog W1BBVENIIDQvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIFVzZSB0aGUgc2hhcmVkIGNvZGUgYW5kIG1vdmUgdGhlIHNlY3JldCBvZiBjcmVhdGluZwog ICAgICAgIGEgbmF0aXZlIGltYWdlIGJhY2sgdG8gSW1hZ2VTb3VyY2UuCgogICAgICAgICogV2Vi Q29yZVNvdXJjZXMuYmtsOgogICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvSW1hZ2VTb3Vy Y2VXeC5jcHA6CiAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5k ZXgpOgogICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvd3gvSW1hZ2VEZWNvZGVyV3gu Y3BwOiBSZW1vdmVkLgogICAgICAgICogd2ViY29yZS13eC5ia2w6Ci0tLQogV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrCiBXZWJDb3Jl L1dlYkNvcmVTb3VyY2VzLmJrbCAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgKwogV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9JbWFnZVNvdXJjZVd4LmNwcCAgICAgfCAgIDUxICsr KysrKy0KIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmggICAg IHwgICAgMiArLQogLi4uL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4 LmNwcCAgfCAgMTczIC0tLS0tLS0tLS0tLS0tLS0tLS0tCiBXZWJDb3JlL3dlYmNvcmUtd3guYmts ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgLQogNiBmaWxlcyBjaGFuZ2VkLCA2 NSBpbnNlcnRpb25zKCspLCAxNzcgZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgV2Vi Q29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5jcHAKCmRpZmYg LS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDNjYzY0 MDAuLjU1MmI2YmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0yLDYgKzIsMTkgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KIAorICAgICAgICBVc2UgdGhlIHNoYXJlZCBjb2RlIGFuZCBtb3ZlIHRoZSBzZWNy ZXQgb2YgY3JlYXRpbmcKKyAgICAgICAgYSBuYXRpdmUgaW1hZ2UgYmFjayB0byBJbWFnZVNvdXJj ZS4KKworICAgICAgICAqIFdlYkNvcmVTb3VyY2VzLmJrbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy93eC9JbWFnZVNvdXJjZVd4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291 cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiB3ZWJjb3JlLXd4 LmJrbDoKKworMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBz ZWxmaXNoLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAg ICAgICBNb3ZlIHRoZSBzZWNyZXQgb24gaG93IHRvIGdlbmVyYXRlIGEgbmF0aXZlIGltYWdlIGZy b20KICAgICAgICAgYSByZ2JhODg4IGJ1ZmZlciBiYWNrIHRvIEltYWdlU291cmNlQ2Fpcm8gYW5k IG1ha2UgSW1hZ2VEZWNvZGVyLmNwcAogICAgICAgICB0cnVseSBjcm9zcyBwbGF0Zm9ybS4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZVNvdXJjZXMuYmtsIGIvV2ViQ29yZS9XZWJDb3JlU291 cmNlcy5ia2wKaW5kZXggZmRjMzJmMC4uNzhkMjZjNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJD b3JlU291cmNlcy5ia2wKKysrIGIvV2ViQ29yZS9XZWJDb3JlU291cmNlcy5ia2wKQEAgLTgwMyw2 ICs4MDMsNyBAQCBUaGlzIGZpbGUgY29udGFpbnMgdGhlIGxpc3Qgb2YgZmlsZXMgbmVlZGVkIHRv IGJ1aWxkIFdlYkNvcmUuCiAgICAgICAgIHBsYXRmb3JtL1RocmVhZFRpbWVycy5jcHAKICAgICAg ICAgcGxhdGZvcm0vVGltZXIuY3BwCiAgICAgICAgIHBsYXRmb3JtL1dpZGdldC5jcHAKKyAgICAg ICAgcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVycy5jcHAKICAgICAgICAgcGxh dGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNz L0NvbG9yLmNwcAogICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmNwcApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9JbWFnZVNvdXJjZVd4LmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvSW1hZ2VTb3VyY2VXeC5jcHAKaW5kZXggOTEw NWIxYy4uMGMwNDAyMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9J bWFnZVNvdXJjZVd4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0ltYWdl U291cmNlV3guY3BwCkBAIC0xODUsNyArMTg1LDU2IEBAIE5hdGl2ZUltYWdlUHRyIEltYWdlU291 cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoc2l6ZV90IGluZGV4KQogICAgIGlmICghYnVmZmVyIHx8 IGJ1ZmZlci0+c3RhdHVzKCkgPT0gUkdCQTMyQnVmZmVyOjpGcmFtZUVtcHR5KQogICAgICAgICBy ZXR1cm4gMDsKICAgICAKLSAgICByZXR1cm4gYnVmZmVyLT5hc05ld05hdGl2ZUltYWdlKCk7Cisg ICAgSW50UmVjdCBpbWFnZVJlY3QgPSBidWZmZXItPnJlY3QoKTsKKyAgICB1bnNpZ25lZCBjaGFy KiBieXRlcyA9ICh1bnNpZ25lZCBjaGFyKilidWZmZXItPmJ5dGVzKCkuZGF0YSgpOworICAgIGxv bmcgY29sb3JTaXplID0gYnVmZmVyLT5ieXRlcygpLnNpemUoKTsKKyAgICAKKyAgICB0eXBlZGVm IHd4UGl4ZWxEYXRhPHd4Qml0bWFwLCB3eEFscGhhUGl4ZWxGb3JtYXQ+IFBpeGVsRGF0YTsKKwor ICAgIGludCB3aWR0aCA9IHNpemUoKS53aWR0aCgpOworICAgIGludCBoZWlnaHQgPSBzaXplKCku aGVpZ2h0KCk7CisKKyAgICB3eEJpdG1hcCogYm1wID0gbmV3IHd4Qml0bWFwKHdpZHRoLCBoZWln aHQsIDMyKTsKKyAgICBQaXhlbERhdGEgZGF0YSgqYm1wKTsKKyAgICAKKyAgICBpbnQgcm93Q291 bnRlciA9IDA7CisgICAgbG9uZyBwaXhlbENvdW50ZXIgPSAwOworICAgIAorICAgIFBpeGVsRGF0 YTo6SXRlcmF0b3IgcChkYXRhKTsKKyAgICAKKyAgICBQaXhlbERhdGE6Okl0ZXJhdG9yIHJvd1N0 YXJ0ID0gcDsgCisgICAgCisgICAgLy8gTkI6IEl0IGFwcGVhcnMgdGhhdCB0aGUgZGF0YSBpcyBp biBCR1JBIGZvcm1hdCBpbnN0ZWFkIG9mIFJHQkEgZm9ybWF0LgorICAgIC8vIFRoaXMgY29kZSB3 b3JrcyBwcm9wZXJseSBvbiBib3RoIHBwYyBhbmQgaW50ZWwsIG1lYW5pbmcgdGhlIGlzc3VlIGlz CisgICAgLy8gbGlrZWx5IG5vdCBhbiBpc3N1ZSBvZiBieXRlIG9yZGVyIGdldHRpbmcgbWl4ZWQg dXAgb24gZGlmZmVyZW50IGFyY2hzLiAKKyAgICBmb3IgKGxvbmcgaSA9IDA7IGkgPCBidWZmZXIt PmJ5dGVzKCkuc2l6ZSgpKjQ7IGkrPTQpIHsKKyAgICAgICAgcC5SZWQoKSA9IGJ5dGVzW2krMl07 CisgICAgICAgIHAuR3JlZW4oKSA9IGJ5dGVzW2krMV07CisgICAgICAgIHAuQmx1ZSgpID0gYnl0 ZXNbaSswXTsKKyAgICAgICAgcC5BbHBoYSgpID0gYnl0ZXNbaSszXTsKKyAgICAgICAgCisgICAg ICAgIHArKzsKKworICAgICAgICBwaXhlbENvdW50ZXIrKzsKKyAgICAgICAgaWYgKCAocGl4ZWxD b3VudGVyICUgd2lkdGggKSA9PSAwICkgeworICAgICAgICAgICAgcm93Q291bnRlcisrOworICAg ICAgICAgICAgcCA9IHJvd1N0YXJ0OworICAgICAgICAgICAgcC5Nb3ZlVG8oZGF0YSwgMCwgcm93 Q291bnRlcik7CisgICAgICAgIH0KKworICAgIH0KKyNpZiAhd3hDSEVDS19WRVJTSU9OKDIsOSww KQorICAgIGJtcC0+VXNlQWxwaGEoKTsKKyNlbmRpZgorICAgIEFTU0VSVChibXAtPklzT2soKSk7 CisKKyNpZiBVU0UoV1hHQykKKyAgICB3eEdyYXBoaWNzQml0bWFwKiBiaXRtYXAgPSAgbmV3IHd4 R3JhcGhpY3NCaXRtYXAod3hHcmFwaGljc1JlbmRlcmVyOjpHZXREZWZhdWx0UmVuZGVyZXIoKS0+ Q3JlYXRlQml0bWFwKCpibXApKTsKKyAgICBkZWxldGUgYm1wOworICAgIHJldHVybiBiaXRtYXA7 CisjZWxzZQorICAgIHJldHVybiBibXA7CisjZW5kaWYKIH0KIAogZmxvYXQgSW1hZ2VTb3VyY2U6 OmZyYW1lRHVyYXRpb25BdEluZGV4KHNpemVfdCBpbmRleCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmggYi9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oCmluZGV4IDhmMGFkNjYuLmIxZDQwYzQgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmgK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuaApAQCAt MTAxLDcgKzEwMSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gbGVhayBtZW1v cnkuCiAgICAgICAgIGJvb2wgc2V0U2l6ZShpbnQgbmV3V2lkdGgsIGludCBuZXdIZWlnaHQpOwog Ci0jaWYgUExBVEZPUk0oU0tJQSkgfHwgUExBVEZPUk0oV1gpCisjaWYgUExBVEZPUk0oU0tJQSkK ICAgICAgICAgLy8gVG8gYmUgdXNlZCBieSBJbWFnZVNvdXJjZTo6Y3JlYXRlRnJhbWVBdEluZGV4 KCkuICBSZXR1cm5zIGEgcG9pbnRlcgogICAgICAgICAvLyB0byB0aGUgdW5kZXJseWluZyBuYXRp dmUgaW1hZ2UgZGF0YS4gIFRoaXMgcG9pbnRlciB3aWxsIGJlIG93bmVkIGJ5CiAgICAgICAgIC8v IHRoZSBCaXRtYXBJbWFnZSBhbmQgZnJlZWQgaW4gRnJhbWVEYXRhOjpjbGVhcigpLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93eC9JbWFnZURlY29kZXJXeC5j cHAgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNw cApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTNlZGI1NC4uMDAwMDAwMAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3d4L0ltYWdlRGVjb2Rlcld4LmNwcAorKysg L2Rldi9udWxsCkBAIC0xLDE3MyArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA2IEFw cGxlIENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJ UycnIEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCi0gKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgotICog Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkK LSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKLSAqLwotCi0jaW5jbHVk ZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiSW1hZ2VEZWNvZGVyLmgiCi0KLS8vIEZJWE1FOiBBcmUg YWxsIHRoZXNlIG5lZWRlZD8KLSNpbmNsdWRlIDx3eC9kZWZzLmg+Ci0jaW5jbHVkZSA8d3gvYml0 bWFwLmg+Ci0jaWYgVVNFKFdYR0MpCi0jaW5jbHVkZSA8d3gvZ3JhcGhpY3MuaD4KLSNlbmRpZgot I2luY2x1ZGUgPHd4L2ltYWdlLmg+Ci0jaW5jbHVkZSA8d3gvcmF3Ym1wLmg+Ci0KLW5hbWVzcGFj ZSBXZWJDb3JlIHsKLQotUkdCQTMyQnVmZmVyOjpSR0JBMzJCdWZmZXIoKQotICAgIDogbV9oYXNB bHBoYShmYWxzZSkKLSAgICAsIG1fc3RhdHVzKEZyYW1lRW1wdHkpCi0gICAgLCBtX2R1cmF0aW9u KDApCi0gICAgLCBtX2Rpc3Bvc2FsTWV0aG9kKERpc3Bvc2VOb3RTcGVjaWZpZWQpCi17Ci19IAot Ci12b2lkIFJHQkEzMkJ1ZmZlcjo6Y2xlYXIoKQotewotICAgIG1fYnl0ZXMuY2xlYXIoKTsKLSAg ICBtX3N0YXR1cyA9IEZyYW1lRW1wdHk7Ci0gICAgLy8gTk9URTogRG8gbm90IHJlc2V0IG90aGVy IG1lbWJlcnMgaGVyZTsgY2xlYXJGcmFtZUJ1ZmZlckNhY2hlKCkKLSAgICAvLyBjYWxscyB0aGlz IHRvIGZyZWUgdGhlIGJpdG1hcCBkYXRhLCBidXQgb3RoZXIgZnVuY3Rpb25zIGxpa2UKLSAgICAv LyBpbml0RnJhbWVCdWZmZXIoKSBhbmQgZnJhbWVDb21wbGV0ZSgpIG1heSBzdGlsbCBuZWVkIHRv IHJlYWQKLSAgICAvLyBvdGhlciBtZXRhZGF0YSBvdXQgb2YgdGhpcyBmcmFtZSBsYXRlci4KLX0K LQotdm9pZCBSR0JBMzJCdWZmZXI6Onplcm9GaWxsKCkKLXsKLSAgICBtX2J5dGVzLmZpbGwoMCk7 Ci0gICAgbV9oYXNBbHBoYSA9IHRydWU7Ci19Ci0KLXZvaWQgUkdCQTMyQnVmZmVyOjpjb3B5Qml0 bWFwRGF0YShjb25zdCBSR0JBMzJCdWZmZXImIG90aGVyKQotewotICAgIGlmICh0aGlzID09ICZv dGhlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9ieXRlcyA9IG90aGVyLm1fYnl0ZXM7Ci0g ICAgc2V0SGFzQWxwaGEob3RoZXIubV9oYXNBbHBoYSk7Ci19Ci0KLWJvb2wgUkdCQTMyQnVmZmVy OjpzZXRTaXplKGludCBuZXdXaWR0aCwgaW50IG5ld0hlaWdodCkKLXsKLSAgICAvLyBOT1RFOiBU aGlzIGhhcyBubyB3YXkgdG8gY2hlY2sgZm9yIGFsbG9jYXRpb24gZmFpbHVyZSBpZiB0aGUKLSAg ICAvLyByZXF1ZXN0ZWQgc2l6ZSB3YXMgdG9vIGJpZy4uLgotICAgIG1fYnl0ZXMucmVzaXplKG5l d1dpZHRoICogbmV3SGVpZ2h0KTsKLSAgICBtX3NpemUgPSBJbnRTaXplKG5ld1dpZHRoLCBuZXdI ZWlnaHQpOwotCi0gICAgLy8gWmVybyB0aGUgaW1hZ2UuCi0gICAgemVyb0ZpbGwoKTsKLQotICAg IHJldHVybiB0cnVlOwotfQotCi1OYXRpdmVJbWFnZVB0ciBSR0JBMzJCdWZmZXI6OmFzTmV3TmF0 aXZlSW1hZ2UoKSBjb25zdAotewotICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIqIGJ5dGVzID0gKGNv bnN0IHVuc2lnbmVkIGNoYXIqKW1fYnl0ZXMuZGF0YSgpOwotICAgIAotICAgIHR5cGVkZWYgd3hQ aXhlbERhdGE8d3hCaXRtYXAsIHd4QWxwaGFQaXhlbEZvcm1hdD4gV3hQaXhlbERhdGE7Ci0KLSAg ICB3eEJpdG1hcCogYm1wID0gbmV3IHd4Qml0bWFwKHdpZHRoKCksIGhlaWdodCgpLCAzMik7Ci0g ICAgV3hQaXhlbERhdGEgZGF0YSgqYm1wKTsKLSAgICAKLSAgICBpbnQgcm93Q291bnRlciA9IDA7 Ci0gICAgbG9uZyBwaXhlbENvdW50ZXIgPSAwOwotICAgIAotICAgIFd4UGl4ZWxEYXRhOjpJdGVy YXRvciBwKGRhdGEpOwotICAgIAotICAgIFd4UGl4ZWxEYXRhOjpJdGVyYXRvciByb3dTdGFydCA9 IHA7IAotICAgIAotICAgIC8vIE5COiBJdCBhcHBlYXJzIHRoYXQgdGhlIGRhdGEgaXMgaW4gQkdS QSBmb3JtYXQgaW5zdGVhZCBvZiBSR0JBIGZvcm1hdC4KLSAgICAvLyBUaGlzIGNvZGUgd29ya3Mg cHJvcGVybHkgb24gYm90aCBwcGMgYW5kIGludGVsLCBtZWFuaW5nIHRoZSBpc3N1ZSBpcwotICAg IC8vIGxpa2VseSBub3QgYW4gaXNzdWUgb2YgYnl0ZSBvcmRlciBnZXR0aW5nIG1peGVkIHVwIG9u IGRpZmZlcmVudCBhcmNocy4gCi0gICAgZm9yIChsb25nIGkgPSAwOyBpIDwgbV9ieXRlcy5zaXpl KCkgKiBzaXplb2YoUGl4ZWxEYXRhKTsgaSArPSBzaXplb2YoUGl4ZWxEYXRhKSkgewotICAgICAg ICBwLlJlZCgpID0gYnl0ZXNbaSsyXTsKLSAgICAgICAgcC5HcmVlbigpID0gYnl0ZXNbaSsxXTsK LSAgICAgICAgcC5CbHVlKCkgPSBieXRlc1tpKzBdOwotICAgICAgICBwLkFscGhhKCkgPSBieXRl c1tpKzNdOwotICAgICAgICAKLSAgICAgICAgcCsrOwotCi0gICAgICAgIHBpeGVsQ291bnRlcisr OwotICAgICAgICBpZiAoIChwaXhlbENvdW50ZXIgJSB3aWR0aCgpICkgPT0gMCApIHsKLSAgICAg ICAgICAgIHJvd0NvdW50ZXIrKzsKLSAgICAgICAgICAgIHAgPSByb3dTdGFydDsKLSAgICAgICAg ICAgIHAuTW92ZVRvKGRhdGEsIDAsIHJvd0NvdW50ZXIpOwotICAgICAgICB9Ci0KLSAgICB9Ci0j aWYgIXd4Q0hFQ0tfVkVSU0lPTigyLDksMCkKLSAgICBibXAtPlVzZUFscGhhKCk7Ci0jZW5kaWYK LSAgICBBU1NFUlQoYm1wLT5Jc09rKCkpOwotCi0jaWYgVVNFKFdYR0MpCi0gICAgd3hHcmFwaGlj c0JpdG1hcCogYml0bWFwID0gIG5ldyB3eEdyYXBoaWNzQml0bWFwKHd4R3JhcGhpY3NSZW5kZXJl cjo6R2V0RGVmYXVsdFJlbmRlcmVyKCktPkNyZWF0ZUJpdG1hcCgqYm1wKSk7Ci0gICAgZGVsZXRl IGJtcDsKLSAgICByZXR1cm4gYml0bWFwOwotI2Vsc2UKLSAgICByZXR1cm4gYm1wOwotI2VuZGlm Ci19Ci0KLWJvb2wgUkdCQTMyQnVmZmVyOjpoYXNBbHBoYSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJu IG1faGFzQWxwaGE7Ci19Ci0KLXZvaWQgUkdCQTMyQnVmZmVyOjpzZXRIYXNBbHBoYShib29sIGFs cGhhKQotewotICAgIG1faGFzQWxwaGEgPSBhbHBoYTsKLX0KLQotdm9pZCBSR0JBMzJCdWZmZXI6 OnNldFN0YXR1cyhGcmFtZVN0YXR1cyBzdGF0dXMpCi17Ci0gICAgbV9zdGF0dXMgPSBzdGF0dXM7 Ci19Ci0KLVJHQkEzMkJ1ZmZlciYgUkdCQTMyQnVmZmVyOjpvcGVyYXRvcj0oY29uc3QgUkdCQTMy QnVmZmVyJiBvdGhlcikKLXsKLSAgICBpZiAodGhpcyA9PSAmb3RoZXIpCi0gICAgICAgIHJldHVy biAqdGhpczsKLQotICAgIG1fYnl0ZXMgPSBvdGhlci5tX2J5dGVzOwotICAgIG1fc2l6ZSA9IG90 aGVyLm1fc2l6ZTsKLSAgICBzZXRIYXNBbHBoYShvdGhlci5oYXNBbHBoYSgpKTsKLSAgICBzZXRS ZWN0KG90aGVyLnJlY3QoKSk7Ci0gICAgc2V0U3RhdHVzKG90aGVyLnN0YXR1cygpKTsKLSAgICBz ZXREdXJhdGlvbihvdGhlci5kdXJhdGlvbigpKTsKLSAgICBzZXREaXNwb3NhbE1ldGhvZChvdGhl ci5kaXNwb3NhbE1ldGhvZCgpKTsKLSAgICByZXR1cm4gKnRoaXM7Ci19Ci0KLWludCBSR0JBMzJC dWZmZXI6OndpZHRoKCkgY29uc3QgewotICAgIHJldHVybiBtX3NpemUud2lkdGgoKTsKLX0KLQot aW50IFJHQkEzMkJ1ZmZlcjo6aGVpZ2h0KCkgY29uc3QgewotICAgIHJldHVybiBtX3NpemUuaGVp Z2h0KCk7Ci19Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUv d2ViY29yZS13eC5ia2wgYi9XZWJDb3JlL3dlYmNvcmUtd3guYmtsCmluZGV4IGIzMWExNzguLmVm MGU2MjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvd2ViY29yZS13eC5ia2wKKysrIGIvV2ViQ29yZS93 ZWJjb3JlLXd4LmJrbApAQCAtNjUsOCArNjUsNiBAQCB3eFdlYkNvcmUgcG9ydCBCYWtlZmlsZSBw cm9qZWN0IGZpbGUuCiAgICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvUGF0aFd4LmNwcAog ICAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3d4L1Blbld4LmNwcAogCi0gICAgICAgICAgcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvd3gvSW1hZ2VEZWNvZGVyV3guY3BwCi0KICAgICAgICAgICBw bGF0Zm9ybS93eC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCiAgICAgICAgICAgcGxhdGZvcm0vd3gv Q2xpcGJvYXJkV3guY3BwCiAgICAgICAgICAgcGxhdGZvcm0vd3gvQ3Vyc29yV3guY3BwCi0tIAox LjYuMy4xCgo= 31262 2009-06-14 06:46:14 -0700 2009-06-18 10:21:07 -0700 Call the thing by its name and rename ImageDecoder.cpp to RGBA32Buffer.cpp 0005-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 11064 zecke RnJvbSBiOWY3NTgyYzg0NTczY2FlNDY0MmY2ZDExMTM0ZWIxZTMxODYzMWViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6Mzg6NDIgKzAyMDAKU3ViamVjdDog W1BBVENIIDUvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIFJlbmFtZSBJbWFnZURlY29kZXIuY3BwIHRvIFJHQkEzMkJ1ZmZlci5jcHAgYXMgaXQgb25s eSBjb250YWlucwogICAgICAgIFJHQkEzMkJ1ZmZlciBzeW1ib2xzLgoKICAgICAgICAqIEdOVW1h a2VmaWxlLmFtOgogICAgICAgICogV2ViQ29yZVNvdXJjZXMuYmtsOgogICAgICAgICogcGxhdGZv cm0vaW1hZ2UtZGVjb2RlcnMvUkdCQTMyQnVmZmVyLmNwcDogUmVuYW1lZCBmcm9tIFdlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcC4KICAgICAgICAoV2ViQ29y ZTo6UkdCQTMyQnVmZmVyOjpSR0JBMzJCdWZmZXIpOgogICAgICAgIChXZWJDb3JlOjpSR0JBMzJC dWZmZXI6OmNsZWFyKToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjp6ZXJvRmlsbCk6 CiAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6Y29weUJpdG1hcERhdGEpOgogICAgICAg IChXZWJDb3JlOjpSR0JBMzJCdWZmZXI6OnNldFNpemUpOgogICAgICAgIChXZWJDb3JlOjpSR0JB MzJCdWZmZXI6Omhhc0FscGhhKToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpzZXRI YXNBbHBoYSk6CiAgICAgICAgKFdlYkNvcmU6OnNldFN0YXR1cyk6CiAgICAgICAgKFdlYkNvcmU6 OlJHQkEzMkJ1ZmZlcjo6b3BlcmF0b3I9KToKICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVy Ojp3aWR0aCk6CiAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6aGVpZ2h0KToKLS0tCiBX ZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIxICsr KysKIFdlYkNvcmUvR05VbWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg IDIgKy0KIFdlYkNvcmUvV2ViQ29yZVNvdXJjZXMuYmtsICAgICAgICAgICAgICAgICAgICAgICB8 ICAgIDIgKy0KIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNw cCB8ICAxMTUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1k ZWNvZGVycy9SR0JBMzJCdWZmZXIuY3BwIHwgIDExNSArKysrKysrKysrKysrKysrKysrKysrCiA1 IGZpbGVzIGNoYW5nZWQsIDEzOCBpbnNlcnRpb25zKCspLCAxMTcgZGVsZXRpb25zKC0pCiBkZWxl dGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29k ZXIuY3BwCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy9SR0JBMzJCdWZmZXIuY3BwCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA1NTJiNmJmLi4wYmUzZDRhIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMTUsNiArMTUsMjcgQEAKIAog ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgSW1h Z2VEZWNvZGVyLmNwcCB0byBSR0JBMzJCdWZmZXIuY3BwIGFzIGl0IG9ubHkgY29udGFpbnMKKyAg ICAgICAgUkdCQTMyQnVmZmVyIHN5bWJvbHMuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToK KyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9SR0JBMzJCdWZmZXIuY3BwOiBSZW5h bWVkIGZyb20gV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3Bw LgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpSR0JBMzJCdWZmZXIpOgorICAgICAg ICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpSR0JB MzJCdWZmZXI6Onplcm9GaWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6Y29w eUJpdG1hcERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpzZXRTaXplKToK KyAgICAgICAgKFdlYkNvcmU6OlJHQkEzMkJ1ZmZlcjo6aGFzQWxwaGEpOgorICAgICAgICAoV2Vi Q29yZTo6UkdCQTMyQnVmZmVyOjpzZXRIYXNBbHBoYSk6CisgICAgICAgIChXZWJDb3JlOjpzZXRT dGF0dXMpOgorICAgICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjpvcGVyYXRvcj0pOgorICAg ICAgICAoV2ViQ29yZTo6UkdCQTMyQnVmZmVyOjp3aWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpS R0JBMzJCdWZmZXI6OmhlaWdodCk6CisKKzIwMDktMDYtMTQgIEhvbGdlciBIYW5zIFBldGVyIEZy ZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKICAgICAgICAgTW92ZSB0aGUgc2VjcmV0IG9uIGhvdyB0byBnZW5lcmF0ZSBh IG5hdGl2ZSBpbWFnZSBmcm9tCiAgICAgICAgIGEgcmdiYTg4OCBidWZmZXIgYmFjayB0byBJbWFn ZVNvdXJjZUNhaXJvIGFuZCBtYWtlIEltYWdlRGVjb2Rlci5jcHAKICAgICAgICAgdHJ1bHkgY3Jv c3MgcGxhdGZvcm0uCmRpZmYgLS1naXQgYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvV2ViQ29y ZS9HTlVtYWtlZmlsZS5hbQppbmRleCBjODE0NGI3Li5iYTg0NTQ5IDEwMDY0NAotLS0gYS9XZWJD b3JlL0dOVW1ha2VmaWxlLmFtCisrKyBiL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTE4NjAs NyArMTg2MCw3IEBAIHdlYmNvcmVndGtfc291cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9n dGsvZ3RrMmRyYXdpbmcuYyBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrZHJhd2luZy5oIFwK IAlXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oIFwKLQlXZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5jcHAgXAorCVdlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvUkdCQTMyQnVmZmVyLmNwcCBcCiAJV2ViQ29yZS9wbGF0 Zm9ybS9pbWFnZS1kZWNvZGVycy9ibXAvQk1QSW1hZ2VEZWNvZGVyLmNwcCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9ibXAvQk1QSW1hZ2VEZWNvZGVyLmggXAogCVdlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvYm1wL0JNUEltYWdlUmVhZGVyLmNwcCBcCmRpZmYgLS1n aXQgYS9XZWJDb3JlL1dlYkNvcmVTb3VyY2VzLmJrbCBiL1dlYkNvcmUvV2ViQ29yZVNvdXJjZXMu YmtsCmluZGV4IDc4ZDI2YzcuLjUzYzM1YWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZVNv dXJjZXMuYmtsCisrKyBiL1dlYkNvcmUvV2ViQ29yZVNvdXJjZXMuYmtsCkBAIC04MDMsNyArODAz LDcgQEAgVGhpcyBmaWxlIGNvbnRhaW5zIHRoZSBsaXN0IG9mIGZpbGVzIG5lZWRlZCB0byBidWls ZCBXZWJDb3JlLgogICAgICAgICBwbGF0Zm9ybS9UaHJlYWRUaW1lcnMuY3BwCiAgICAgICAgIHBs YXRmb3JtL1RpbWVyLmNwcAogICAgICAgICBwbGF0Zm9ybS9XaWRnZXQuY3BwCi0gICAgICAgIHBs YXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2RlcnMuY3BwCisgICAgICAgIHBsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL1JHQkEzMkJ1ZmZlci5jcHAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhp Y3MvQml0bWFwSW1hZ2UuY3BwCiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAog ICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmNwcApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwIGIvV2ViQ29yZS9w bGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuY3BwCmRlbGV0ZWQgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCBlMjcwMTM2Li4wMDAwMDAwCi0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vaW1h Z2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDExNSArMCww IEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUg bWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKLSAqIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhF Ci0gKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgotICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCi0gKiBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF Ci0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLiAKLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAi SW1hZ2VEZWNvZGVyLmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotUkdCQTMyQnVmZmVyOjpS R0JBMzJCdWZmZXIoKQotICAgIDogbV9oYXNBbHBoYShmYWxzZSkKLSAgICAsIG1fc3RhdHVzKEZy YW1lRW1wdHkpCi0gICAgLCBtX2R1cmF0aW9uKDApCi0gICAgLCBtX2Rpc3Bvc2FsTWV0aG9kKERp c3Bvc2VOb3RTcGVjaWZpZWQpCi17Ci19IAotCi12b2lkIFJHQkEzMkJ1ZmZlcjo6Y2xlYXIoKQot ewotICAgIG1fYnl0ZXMuY2xlYXIoKTsKLSAgICBtX3N0YXR1cyA9IEZyYW1lRW1wdHk7Ci0gICAg Ly8gTk9URTogRG8gbm90IHJlc2V0IG90aGVyIG1lbWJlcnMgaGVyZTsgY2xlYXJGcmFtZUJ1ZmZl ckNhY2hlKCkKLSAgICAvLyBjYWxscyB0aGlzIHRvIGZyZWUgdGhlIGJpdG1hcCBkYXRhLCBidXQg b3RoZXIgZnVuY3Rpb25zIGxpa2UKLSAgICAvLyBpbml0RnJhbWVCdWZmZXIoKSBhbmQgZnJhbWVD b21wbGV0ZSgpIG1heSBzdGlsbCBuZWVkIHRvIHJlYWQKLSAgICAvLyBvdGhlciBtZXRhZGF0YSBv dXQgb2YgdGhpcyBmcmFtZSBsYXRlci4KLX0KLQotdm9pZCBSR0JBMzJCdWZmZXI6Onplcm9GaWxs KCkKLXsKLSAgICBtX2J5dGVzLmZpbGwoMCk7Ci0gICAgbV9oYXNBbHBoYSA9IHRydWU7Ci19Ci0K LXZvaWQgUkdCQTMyQnVmZmVyOjpjb3B5Qml0bWFwRGF0YShjb25zdCBSR0JBMzJCdWZmZXImIG90 aGVyKQotewotICAgIGlmICh0aGlzID09ICZvdGhlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAg bV9ieXRlcyA9IG90aGVyLm1fYnl0ZXM7Ci0gICAgc2V0SGFzQWxwaGEob3RoZXIubV9oYXNBbHBo YSk7Ci19Ci0KLWJvb2wgUkdCQTMyQnVmZmVyOjpzZXRTaXplKGludCBuZXdXaWR0aCwgaW50IG5l d0hlaWdodCkKLXsKLSAgICAvLyBOT1RFOiBUaGlzIGhhcyBubyB3YXkgdG8gY2hlY2sgZm9yIGFs bG9jYXRpb24gZmFpbHVyZSBpZiB0aGUKLSAgICAvLyByZXF1ZXN0ZWQgc2l6ZSB3YXMgdG9vIGJp Zy4uLgotICAgIG1fYnl0ZXMucmVzaXplKG5ld1dpZHRoICogbmV3SGVpZ2h0KTsKLSAgICBtX3Np emUgPSBJbnRTaXplKG5ld1dpZHRoLCBuZXdIZWlnaHQpOwotCi0gICAgLy8gWmVybyB0aGUgaW1h Z2UuCi0gICAgemVyb0ZpbGwoKTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCi1ib29sIFJHQkEz MkJ1ZmZlcjo6aGFzQWxwaGEoKSBjb25zdAotewotICAgIHJldHVybiBtX2hhc0FscGhhOwotfQot Ci12b2lkIFJHQkEzMkJ1ZmZlcjo6c2V0SGFzQWxwaGEoYm9vbCBhbHBoYSkKLXsKLSAgICBtX2hh c0FscGhhID0gYWxwaGE7Ci19Ci0KLXZvaWQgUkdCQTMyQnVmZmVyOjpzZXRTdGF0dXMoRnJhbWVT dGF0dXMgc3RhdHVzKQotewotICAgIG1fc3RhdHVzID0gc3RhdHVzOwotfQotCi1SR0JBMzJCdWZm ZXImIFJHQkEzMkJ1ZmZlcjo6b3BlcmF0b3I9KGNvbnN0IFJHQkEzMkJ1ZmZlciYgb3RoZXIpCi17 Ci0gICAgaWYgKHRoaXMgPT0gJm90aGVyKQotICAgICAgICByZXR1cm4gKnRoaXM7Ci0KLSAgICBt X2J5dGVzID0gb3RoZXIubV9ieXRlczsKLSAgICBtX3NpemUgPSBvdGhlci5tX3NpemU7Ci0gICAg c2V0SGFzQWxwaGEob3RoZXIuaGFzQWxwaGEoKSk7Ci0gICAgc2V0UmVjdChvdGhlci5yZWN0KCkp OwotICAgIHNldFN0YXR1cyhvdGhlci5zdGF0dXMoKSk7Ci0gICAgc2V0RHVyYXRpb24ob3RoZXIu ZHVyYXRpb24oKSk7Ci0gICAgc2V0RGlzcG9zYWxNZXRob2Qob3RoZXIuZGlzcG9zYWxNZXRob2Qo KSk7Ci0gICAgcmV0dXJuICp0aGlzOwotfQotCi1pbnQgUkdCQTMyQnVmZmVyOjp3aWR0aCgpIGNv bnN0IHsKLSAgICByZXR1cm4gbV9zaXplLndpZHRoKCk7Ci19Ci0KLWludCBSR0JBMzJCdWZmZXI6 OmhlaWdodCgpIGNvbnN0IHsKLSAgICByZXR1cm4gbV9zaXplLmhlaWdodCgpOwotfQotCi19IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL1JHQkEzMkJ1ZmZlci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJz L1JHQkEzMkJ1ZmZlci5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTI3 MDEzNgotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv UkdCQTMyQnVmZmVyLmNwcApAQCAtMCwwICsxLDExNSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMu IGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4g T1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKi8KKwor I2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkltYWdlRGVjb2Rlci5oIgorCituYW1lc3Bh Y2UgV2ViQ29yZSB7CisKK1JHQkEzMkJ1ZmZlcjo6UkdCQTMyQnVmZmVyKCkKKyAgICA6IG1faGFz QWxwaGEoZmFsc2UpCisgICAgLCBtX3N0YXR1cyhGcmFtZUVtcHR5KQorICAgICwgbV9kdXJhdGlv bigwKQorICAgICwgbV9kaXNwb3NhbE1ldGhvZChEaXNwb3NlTm90U3BlY2lmaWVkKQoreworfSAK Kwordm9pZCBSR0JBMzJCdWZmZXI6OmNsZWFyKCkKK3sKKyAgICBtX2J5dGVzLmNsZWFyKCk7Cisg ICAgbV9zdGF0dXMgPSBGcmFtZUVtcHR5OworICAgIC8vIE5PVEU6IERvIG5vdCByZXNldCBvdGhl ciBtZW1iZXJzIGhlcmU7IGNsZWFyRnJhbWVCdWZmZXJDYWNoZSgpCisgICAgLy8gY2FsbHMgdGhp cyB0byBmcmVlIHRoZSBiaXRtYXAgZGF0YSwgYnV0IG90aGVyIGZ1bmN0aW9ucyBsaWtlCisgICAg Ly8gaW5pdEZyYW1lQnVmZmVyKCkgYW5kIGZyYW1lQ29tcGxldGUoKSBtYXkgc3RpbGwgbmVlZCB0 byByZWFkCisgICAgLy8gb3RoZXIgbWV0YWRhdGEgb3V0IG9mIHRoaXMgZnJhbWUgbGF0ZXIuCit9 CisKK3ZvaWQgUkdCQTMyQnVmZmVyOjp6ZXJvRmlsbCgpCit7CisgICAgbV9ieXRlcy5maWxsKDAp OworICAgIG1faGFzQWxwaGEgPSB0cnVlOworfQorCit2b2lkIFJHQkEzMkJ1ZmZlcjo6Y29weUJp dG1hcERhdGEoY29uc3QgUkdCQTMyQnVmZmVyJiBvdGhlcikKK3sKKyAgICBpZiAodGhpcyA9PSAm b3RoZXIpCisgICAgICAgIHJldHVybjsKKworICAgIG1fYnl0ZXMgPSBvdGhlci5tX2J5dGVzOwor ICAgIHNldEhhc0FscGhhKG90aGVyLm1faGFzQWxwaGEpOworfQorCitib29sIFJHQkEzMkJ1ZmZl cjo6c2V0U2l6ZShpbnQgbmV3V2lkdGgsIGludCBuZXdIZWlnaHQpCit7CisgICAgLy8gTk9URTog VGhpcyBoYXMgbm8gd2F5IHRvIGNoZWNrIGZvciBhbGxvY2F0aW9uIGZhaWx1cmUgaWYgdGhlCisg ICAgLy8gcmVxdWVzdGVkIHNpemUgd2FzIHRvbyBiaWcuLi4KKyAgICBtX2J5dGVzLnJlc2l6ZShu ZXdXaWR0aCAqIG5ld0hlaWdodCk7CisgICAgbV9zaXplID0gSW50U2l6ZShuZXdXaWR0aCwgbmV3 SGVpZ2h0KTsKKworICAgIC8vIFplcm8gdGhlIGltYWdlLgorICAgIHplcm9GaWxsKCk7CisKKyAg ICByZXR1cm4gdHJ1ZTsKK30KKworYm9vbCBSR0JBMzJCdWZmZXI6Omhhc0FscGhhKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9oYXNBbHBoYTsKK30KKwordm9pZCBSR0JBMzJCdWZmZXI6OnNldEhh c0FscGhhKGJvb2wgYWxwaGEpCit7CisgICAgbV9oYXNBbHBoYSA9IGFscGhhOworfQorCit2b2lk IFJHQkEzMkJ1ZmZlcjo6c2V0U3RhdHVzKEZyYW1lU3RhdHVzIHN0YXR1cykKK3sKKyAgICBtX3N0 YXR1cyA9IHN0YXR1czsKK30KKworUkdCQTMyQnVmZmVyJiBSR0JBMzJCdWZmZXI6Om9wZXJhdG9y PShjb25zdCBSR0JBMzJCdWZmZXImIG90aGVyKQoreworICAgIGlmICh0aGlzID09ICZvdGhlcikK KyAgICAgICAgcmV0dXJuICp0aGlzOworCisgICAgbV9ieXRlcyA9IG90aGVyLm1fYnl0ZXM7Cisg ICAgbV9zaXplID0gb3RoZXIubV9zaXplOworICAgIHNldEhhc0FscGhhKG90aGVyLmhhc0FscGhh KCkpOworICAgIHNldFJlY3Qob3RoZXIucmVjdCgpKTsKKyAgICBzZXRTdGF0dXMob3RoZXIuc3Rh dHVzKCkpOworICAgIHNldER1cmF0aW9uKG90aGVyLmR1cmF0aW9uKCkpOworICAgIHNldERpc3Bv c2FsTWV0aG9kKG90aGVyLmRpc3Bvc2FsTWV0aG9kKCkpOworICAgIHJldHVybiAqdGhpczsKK30K KworaW50IFJHQkEzMkJ1ZmZlcjo6d2lkdGgoKSBjb25zdCB7CisgICAgcmV0dXJuIG1fc2l6ZS53 aWR0aCgpOworfQorCitpbnQgUkdCQTMyQnVmZmVyOjpoZWlnaHQoKSBjb25zdCB7CisgICAgcmV0 dXJuIG1fc2l6ZS5oZWlnaHQoKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotLSAKMS42 LjMuMQoK 31263 2009-06-14 06:47:23 -0700 2009-06-18 10:24:46 -0700 Unfork the various ImageSource*.cpp copies 0006-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 27698 zecke RnJvbSAzYzc3ZGJlM2E5ZjE2ODkwMDJlYzA1ZmFiNTFmMjI4MTJkNGE3OTEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6NTM6MzggKzAyMDAKU3ViamVjdDog W1BBVENIIDYvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIFVuaWZ5IHRoZSB2YXJpb3VzIGNvcGllcyBvZiB0aGUgSW1hZ2VTb3VyY2UuY3BwIHRoYXQK ICAgICAgICB1dGlsaXplIHRoZSBXZWJDb3JlIGltYWdlIGRlY29kZXJzLiBUaGUgb25seSB0aGlu ZyBsZWZ0CiAgICAgICAgaW4gdGhlIHBvcnQgc3BlY2lmaWMgSW1hZ2VTb3VyY2UgZmlsZXMgaXMg dGhlIHNlY3JldAogICAgICAgIG9uIGhvdyB0byB0dXJuIHRoZSBvdXRwdXQgb2YgdGhlIGRlY29k ZXIgaW50byBhIGltYWdlLgoKICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOgogICAgICAgICogV2Vi Q29yZVNvdXJjZXMuYmtsOgogICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2Uu Y3BwOiBBZGRlZC4KICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlRGVjb2Rlcik6CiAgICAgICAgKFdl YkNvcmU6OkltYWdlU291cmNlOjpJbWFnZVNvdXJjZSk6CiAgICAgICAgKFdlYkNvcmU6OkltYWdl U291cmNlOjp+SW1hZ2VTb3VyY2UpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6Y2xl YXIpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6aW5pdGlhbGl6ZWQpOgogICAgICAg IChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6c2V0RGF0YSk6CiAgICAgICAgKFdlYkNvcmU6OkltYWdl U291cmNlOjpmaWxlbmFtZUV4dGVuc2lvbik6CiAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNl Ojppc1NpemVBdmFpbGFibGUpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6c2l6ZSk6 CiAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjpmcmFtZVNpemVBdEluZGV4KToKICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OnJlcGV0aXRpb25Db3VudCk6CiAgICAgICAgKFdlYkNv cmU6OkltYWdlU291cmNlOjpmcmFtZUNvdW50KToKICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3Vy Y2U6OmZyYW1lSXNDb21wbGV0ZUF0SW5kZXgpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJj ZTo6ZnJhbWVEdXJhdGlvbkF0SW5kZXgpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6 ZnJhbWVIYXNBbHBoYUF0SW5kZXgpOgogICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v SW1hZ2VTb3VyY2VDYWlyby5jcHA6CiAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0lt YWdlU291cmNlU2tpYS5jcHA6CiAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93eC9JbWFnZVNv dXJjZVd4LmNwcDoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMzEgKysrCiBXZWJDb3JlL0dOVW1ha2VmaWxlLmFtICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgIDEgKwogV2ViQ29yZS9XZWJDb3JlU291cmNlcy5ia2wgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv SW1hZ2VTb3VyY2UuY3BwICAgICAgICAgIHwgIDIxMiArKysrKysrKysrKysrKysrKysrKwogLi4u L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ltYWdlU291cmNlQ2Fpcm8uY3BwICAgfCAgMTgyICst LS0tLS0tLS0tLS0tLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291 cmNlU2tpYS5jcHAgfCAgMTkwICstLS0tLS0tLS0tLS0tLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93eC9JbWFnZVNvdXJjZVd4LmNwcCAgICAgfCAgMTcwICstLS0tLS0tLS0tLS0tLS0t CiA3IGZpbGVzIGNoYW5nZWQsIDI0OCBpbnNlcnRpb25zKCspLCA1MzkgZGVsZXRpb25zKC0pCiBj cmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5j cHAKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDBiZTNkNGEuLjJkNjcxZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xNSw2ICsxNSwzNyBAQAogCiAgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFVuaWZ5IHRoZSB2YXJpb3VzIGNvcGllcyBv ZiB0aGUgSW1hZ2VTb3VyY2UuY3BwIHRoYXQKKyAgICAgICAgdXRpbGl6ZSB0aGUgV2ViQ29yZSBp bWFnZSBkZWNvZGVycy4gVGhlIG9ubHkgdGhpbmcgbGVmdAorICAgICAgICBpbiB0aGUgcG9ydCBz cGVjaWZpYyBJbWFnZVNvdXJjZSBmaWxlcyBpcyB0aGUgc2VjcmV0CisgICAgICAgIG9uIGhvdyB0 byB0dXJuIHRoZSBvdXRwdXQgb2YgdGhlIGRlY29kZXIgaW50byBhIGltYWdlLgorCisgICAgICAg ICogR05VbWFrZWZpbGUuYW06CisgICAgICAgICogV2ViQ29yZVNvdXJjZXMuYmtsOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmNwcDogQWRkZWQuCisgICAgICAgIChX ZWJDb3JlOjpjcmVhdGVEZWNvZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjpJ bWFnZVNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6fkltYWdlU291cmNl KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjpjbGVhcik6CisgICAgICAgIChXZWJD b3JlOjpJbWFnZVNvdXJjZTo6aW5pdGlhbGl6ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VT b3VyY2U6OnNldERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OmZpbGVuYW1l RXh0ZW5zaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjppc1NpemVBdmFpbGFi bGUpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OnNpemUpOgorICAgICAgICAoV2Vi Q29yZTo6SW1hZ2VTb3VyY2U6OmZyYW1lU2l6ZUF0SW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6 SW1hZ2VTb3VyY2U6OnJlcGV0aXRpb25Db3VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZVNv dXJjZTo6ZnJhbWVDb3VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6ZnJhbWVJ c0NvbXBsZXRlQXRJbmRleCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6ZnJhbWVE dXJhdGlvbkF0SW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OmZyYW1lSGFz QWxwaGFBdEluZGV4KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZVNv dXJjZUNhaXJvLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291 cmNlU2tpYS5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvSW1hZ2VTb3VyY2VX eC5jcHA6CisKKzIwMDktMDYtMTQgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VA c2VsZmlzaC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAg ICAgICAgUmVuYW1lIEltYWdlRGVjb2Rlci5jcHAgdG8gUkdCQTMyQnVmZmVyLmNwcCBhcyBpdCBv bmx5IGNvbnRhaW5zCiAgICAgICAgIFJHQkEzMkJ1ZmZlciBzeW1ib2xzLgogCmRpZmYgLS1naXQg YS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQppbmRleCBi YTg0NTQ5Li42Mzk3Y2RjIDEwMDY0NAotLS0gYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCisrKyBi L1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTE0MTgsNiArMTQxOCw3IEBAIHdlYmNvcmVfc291 cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJ1ZmZlci5oIFwKIAlX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlT2JzZXJ2ZXIuaCBcCiAJV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5oIFwKKwlXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ltYWdlU291cmNlLmNwcCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRQb2ludC5o IFwKIAlXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuY3BwIFwKIAlXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuaCBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmVT b3VyY2VzLmJrbCBiL1dlYkNvcmUvV2ViQ29yZVNvdXJjZXMuYmtsCmluZGV4IDUzYzM1YWUuLjQz NDFhYmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZVNvdXJjZXMuYmtsCisrKyBiL1dlYkNv cmUvV2ViQ29yZVNvdXJjZXMuYmtsCkBAIC04MTUsNiArODE1LDcgQEAgVGhpcyBmaWxlIGNvbnRh aW5zIHRoZSBsaXN0IG9mIGZpbGVzIG5lZWRlZCB0byBidWlsZCBXZWJDb3JlLgogICAgICAgICBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCiAgICAgICAgIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzVHlwZXMuY3BwCiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdl LmNwcAorICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5jcHAKICAgICAgICAg cGxhdGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5jcHAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mv UGF0aC5jcHAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aFRyYXZlcnNhbFN0YXRlLmNw cApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZjkzYjI4Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5jcHAKQEAgLTAsMCArMSwyMTIgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMDYgQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxwIFRva2VyIDxhbHAudG9rZXJAY29s bGFib3JhLmNvLnVrPgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0 OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisg KiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s CisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisg KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJJbWFn ZVNvdXJjZS5oIgorCisjaW5jbHVkZSAiQk1QSW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSAiR0lG SW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSAiSUNPSW1hZ2VEZWNvZGVyLmgiCisjaW5jbHVkZSAi SlBFR0ltYWdlRGVjb2Rlci5oIgorI2luY2x1ZGUgIlBOR0ltYWdlRGVjb2Rlci5oIgorI2luY2x1 ZGUgIlhCTUltYWdlRGVjb2Rlci5oIgorI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgorCituYW1l c3BhY2UgV2ViQ29yZSB7CisKK0ltYWdlRGVjb2RlciogY3JlYXRlRGVjb2Rlcihjb25zdCBWZWN0 b3I8Y2hhcj4mIGRhdGEpCit7CisgICAgLy8gV2UgbmVlZCBhdCBsZWFzdCA0IGJ5dGVzIHRvIGZp Z3VyZSBvdXQgd2hhdCBraW5kIG9mIGltYWdlIHdlJ3JlIGRlYWxpbmcgd2l0aC4KKyAgICBpbnQg bGVuZ3RoID0gZGF0YS5zaXplKCk7CisgICAgaWYgKGxlbmd0aCA8IDQpCisgICAgICAgIHJldHVy biAwOworCisgICAgY29uc3QgdW5zaWduZWQgY2hhciogdUNvbnRlbnRzID0gKGNvbnN0IHVuc2ln bmVkIGNoYXIqKWRhdGEuZGF0YSgpOworICAgIGNvbnN0IGNoYXIqIGNvbnRlbnRzID0gZGF0YS5k YXRhKCk7CisKKyAgICAvLyBHSUZzIGJlZ2luIHdpdGggR0lGOCg3IG9yIDkpLgorICAgIGlmIChz dHJuY21wKGNvbnRlbnRzLCAiR0lGOCIsIDQpID09IDApCisgICAgICAgIHJldHVybiBuZXcgR0lG SW1hZ2VEZWNvZGVyKCk7CisKKyAgICAvLyBUZXN0IGZvciBQTkcuCisgICAgaWYgKHVDb250ZW50 c1swXT09MHg4OSAmJgorICAgICAgICB1Q29udGVudHNbMV09PTB4NTAgJiYKKyAgICAgICAgdUNv bnRlbnRzWzJdPT0weDRFICYmCisgICAgICAgIHVDb250ZW50c1szXT09MHg0NykKKyAgICAgICAg cmV0dXJuIG5ldyBQTkdJbWFnZURlY29kZXIoKTsKKworICAgIC8vIEpQRUcKKyAgICBpZiAodUNv bnRlbnRzWzBdPT0weEZGICYmCisgICAgICAgIHVDb250ZW50c1sxXT09MHhEOCAmJgorICAgICAg ICB1Q29udGVudHNbMl09PTB4RkYpCisgICAgICAgIHJldHVybiBuZXcgSlBFR0ltYWdlRGVjb2Rl cigpOworCisgICAgLy8gQk1QCisgICAgaWYgKHN0cm5jbXAoY29udGVudHMsICJCTSIsIDIpID09 IDApCisgICAgICAgIHJldHVybiBuZXcgQk1QSW1hZ2VEZWNvZGVyKCk7CisKKyAgICAvLyBJQ09z IGFsd2F5cyBiZWdpbiB3aXRoIGEgMi1ieXRlIDAgZm9sbG93ZWQgYnkgYSAyLWJ5dGUgMS4KKyAg ICAvLyBDVVJzIGJlZ2luIHdpdGggMi1ieXRlIDAgZm9sbG93ZWQgYnkgMi1ieXRlIDIuCisgICAg aWYgKCFtZW1jbXAoY29udGVudHMsICJcMDAwXDAwMFwwMDFcMDAwIiwgNCkgfHwKKyAgICAgICAg IW1lbWNtcChjb250ZW50cywgIlwwMDBcMDAwXDAwMlwwMDAiLCA0KSkKKyAgICAgICAgcmV0dXJu IG5ldyBJQ09JbWFnZURlY29kZXIoSW50U2l6ZSgpKTsKKworICAgIC8vIFhCTXMgcmVxdWlyZSA4 IGJ5dGVzIG9mIGluZm8uCisgICAgaWYgKGxlbmd0aCA+PSA4ICYmIHN0cm5jbXAoY29udGVudHMs ICIjZGVmaW5lICIsIDgpID09IDApCisgICAgICAgIHJldHVybiBuZXcgWEJNSW1hZ2VEZWNvZGVy KCk7CisKKyAgICAvLyBHaXZlIHVwLiBXZSBkb24ndCBrbm93IHdoYXQgdGhlIGhlY2sgdGhpcyBp cy4KKyAgICByZXR1cm4gMDsKK30KKworSW1hZ2VTb3VyY2U6OkltYWdlU291cmNlKCkKKyAgICA6 IG1fZGVjb2RlcigwKQoreworfQorCitJbWFnZVNvdXJjZTo6fkltYWdlU291cmNlKCkKK3sKKyAg ICBjbGVhcih0cnVlKTsKK30KKwordm9pZCBJbWFnZVNvdXJjZTo6Y2xlYXIoYm9vbCBkZXN0cm95 QWxsLCBzaXplX3QgY2xlYXJCZWZvcmVGcmFtZSwgU2hhcmVkQnVmZmVyKiBkYXRhLCBib29sIGFs bERhdGFSZWNlaXZlZCkKK3sKKyAgICBpZiAoIWRlc3Ryb3lBbGwpIHsKKyAgICAgICAgaWYgKG1f ZGVjb2RlcikKKyAgICAgICAgICAgIG1fZGVjb2Rlci0+Y2xlYXJGcmFtZUJ1ZmZlckNhY2hlKGNs ZWFyQmVmb3JlRnJhbWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZGVsZXRlIG1f ZGVjb2RlcjsKKyAgICBtX2RlY29kZXIgPSAwOworICAgIGlmIChkYXRhKQorICAgICAgICBzZXRE YXRhKGRhdGEsIGFsbERhdGFSZWNlaXZlZCk7Cit9CisKK2Jvb2wgSW1hZ2VTb3VyY2U6OmluaXRp YWxpemVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9kZWNvZGVyOworfQorCit2b2lkIEltYWdl U291cmNlOjpzZXREYXRhKFNoYXJlZEJ1ZmZlciogZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQp Cit7CisgICAgLy8gTWFrZSB0aGUgZGVjb2RlciBieSBzbmlmZmluZyB0aGUgYnl0ZXMuCisgICAg Ly8gVGhpcyBtZXRob2Qgd2lsbCBleGFtaW5lIHRoZSBkYXRhIGFuZCBpbnN0YW50aWF0ZSBhbiBp bnN0YW5jZSBvZiB0aGUgYXBwcm9wcmlhdGUgZGVjb2RlciBwbHVnaW4uCisgICAgLy8gSWYgaW5z dWZmaWNpZW50IGJ5dGVzIGFyZSBhdmFpbGFibGUgdG8gZGV0ZXJtaW5lIHRoZSBpbWFnZSB0eXBl LCBubyBkZWNvZGVyIHBsdWdpbiB3aWxsIGJlCisgICAgLy8gbWFkZS4KKyAgICBpZiAoIW1fZGVj b2RlcikKKyAgICAgICAgbV9kZWNvZGVyID0gY3JlYXRlRGVjb2RlcihkYXRhLT5idWZmZXIoKSk7 CisKKyAgICBpZiAoIW1fZGVjb2RlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9kZWNvZGVy LT5zZXREYXRhKGRhdGEsIGFsbERhdGFSZWNlaXZlZCk7Cit9CisKK1N0cmluZyBJbWFnZVNvdXJj ZTo6ZmlsZW5hbWVFeHRlbnNpb24oKSBjb25zdAoreworICAgIGlmICghbV9kZWNvZGVyKQorICAg ICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICByZXR1cm4gbV9kZWNvZGVyLT5maWxlbmFtZUV4 dGVuc2lvbigpOworfQorCitib29sIEltYWdlU291cmNlOjppc1NpemVBdmFpbGFibGUoKQorewor ICAgIGlmICghbV9kZWNvZGVyKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4g bV9kZWNvZGVyLT5pc1NpemVBdmFpbGFibGUoKTsKK30KKworSW50U2l6ZSBJbWFnZVNvdXJjZTo6 c2l6ZSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX2RlY29kZXIpCisgICAgICAgIHJldHVybiBJbnRT aXplKCk7CisKKyAgICByZXR1cm4gbV9kZWNvZGVyLT5zaXplKCk7Cit9CisKK0ludFNpemUgSW1h Z2VTb3VyY2U6OmZyYW1lU2l6ZUF0SW5kZXgoc2l6ZV90KSBjb25zdAoreworICAgIHJldHVybiBz aXplKCk7Cit9CisKK2ludCBJbWFnZVNvdXJjZTo6cmVwZXRpdGlvbkNvdW50KCkKK3sKKyAgICBp ZiAoIW1fZGVjb2RlcikKKyAgICAgICAgcmV0dXJuIGNBbmltYXRpb25Ob25lOworCisgICAgcmV0 dXJuIG1fZGVjb2Rlci0+cmVwZXRpdGlvbkNvdW50KCk7Cit9CisKK3NpemVfdCBJbWFnZVNvdXJj ZTo6ZnJhbWVDb3VudCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZGVjb2RlciA/IG1fZGVjb2Rl ci0+ZnJhbWVDb3VudCgpIDogMDsKK30KKworYm9vbCBJbWFnZVNvdXJjZTo6ZnJhbWVJc0NvbXBs ZXRlQXRJbmRleChzaXplX3QgaW5kZXgpCit7CisgICAgaWYgKCFtX2RlY29kZXIpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIFJHQkEzMkJ1ZmZlciogYnVmZmVyID0gbV9kZWNvZGVyLT5m cmFtZUJ1ZmZlckF0SW5kZXgoaW5kZXgpOworICAgIHJldHVybiBidWZmZXIgJiYgYnVmZmVyLT5z dGF0dXMoKSA9PSBSR0JBMzJCdWZmZXI6OkZyYW1lQ29tcGxldGU7Cit9CisKK2Zsb2F0IEltYWdl U291cmNlOjpmcmFtZUR1cmF0aW9uQXRJbmRleChzaXplX3QgaW5kZXgpCit7CisgICAgaWYgKCFt X2RlY29kZXIpCisgICAgICAgIHJldHVybiAwOworCisgICAgUkdCQTMyQnVmZmVyKiBidWZmZXIg PSBtX2RlY29kZXItPmZyYW1lQnVmZmVyQXRJbmRleChpbmRleCk7CisgICAgaWYgKCFidWZmZXIg fHwgYnVmZmVyLT5zdGF0dXMoKSA9PSBSR0JBMzJCdWZmZXI6OkZyYW1lRW1wdHkpCisgICAgICAg IHJldHVybiAwOworCisgICAgLy8gTWFueSBhbm5veWluZyBhZHMgc3BlY2lmeSBhIDAgZHVyYXRp b24gdG8gbWFrZSBhbiBpbWFnZSBmbGFzaCBhcyBxdWlja2x5CisgICAgLy8gYXMgcG9zc2libGUu ICBXZSBmb2xsb3cgV2luSUUncyBiZWhhdmlvciBhbmQgdXNlIGEgZHVyYXRpb24gb2YgMTAwIG1z CisgICAgLy8gZm9yIGFueSBmcmFtZXMgdGhhdCBzcGVjaWZ5IGEgZHVyYXRpb24gb2YgPD0gNTAg bXMuICBTZWUKKyAgICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ0MTM+IG9yIFJhZGFyIDQwNTEzODkgZm9yCisgICAgLy8gbW9yZS4KKyAgICBjb25zdCBmbG9h dCBkdXJhdGlvbiA9IGJ1ZmZlci0+ZHVyYXRpb24oKSAvIDEwMDAuMGY7CisgICAgcmV0dXJuIChk dXJhdGlvbiA8IDAuMDUxZikgPyAwLjEwMGYgOiBkdXJhdGlvbjsKK30KKworYm9vbCBJbWFnZVNv dXJjZTo6ZnJhbWVIYXNBbHBoYUF0SW5kZXgoc2l6ZV90IGluZGV4KQoreworICAgIC8vIFdoZW4g YSBmcmFtZSBoYXMgbm90IGZpbmlzaGVkIGRlY29kaW5nLCBhbHdheXMgbWFyayBpdCBhcyBoYXZp bmcgYWxwaGEsCisgICAgLy8gc28gd2UgZG9uJ3QgZ2V0IGEgYmxhY2sgYmFja2dyb3VuZCBmb3Ig dGhlIHVuZGVjb2RlZCBzZWN0aW9ucy4KKyAgICAvLyBUT0RPOiBBIGJldHRlciBzb2x1dGlvbiBp cyBwcm9iYWJseSB0byBoYXZlIHRoZSB1bmRlcmx5aW5nIGJ1ZmZlcidzCisgICAgLy8gaGFzQWxw aGEoKSByZXR1cm4gdHJ1ZSBpbiB0aGVzZSBjYXNlcywgc2luY2UgaXQgaXMsIGluIGZhY3QsIHRl Y2huaWNhbGx5CisgICAgLy8gdHJ1ZS4KKyAgICBpZiAoIWZyYW1lSXNDb21wbGV0ZUF0SW5kZXgo aW5kZXgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBtX2RlY29kZXItPmZy YW1lQnVmZmVyQXRJbmRleChpbmRleCktPmhhc0FscGhhKCk7Cit9CisKK30KKwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZVNvdXJjZUNhaXJvLmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VTb3VyY2VDYWlyby5jcHAKaW5k ZXggNmM3M2Q1Zi4uNGNhNzFlNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYWlyby9JbWFnZVNvdXJjZUNhaXJvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0ltYWdlU291cmNlQ2Fpcm8uY3BwCkBAIC0yNywxNTAgKzI3LDExIEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSW1hZ2VTb3VyY2UuaCIKIAotI2lmIFBMQVRGT1JN KENBSVJPKQotCi0jaW5jbHVkZSAiQk1QSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVkZSAiR0lGSW1h Z2VEZWNvZGVyLmgiCi0jaW5jbHVkZSAiSUNPSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVkZSAiSlBF R0ltYWdlRGVjb2Rlci5oIgotI2luY2x1ZGUgIlBOR0ltYWdlRGVjb2Rlci5oIgotI2luY2x1ZGUg IlhCTUltYWdlRGVjb2Rlci5oIgotI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgorI2luY2x1ZGUg IkltYWdlRGVjb2Rlci5oIgogI2luY2x1ZGUgPGNhaXJvLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotSW1hZ2VEZWNvZGVyKiBjcmVhdGVEZWNvZGVyKGNvbnN0IFZlY3RvcjxjaGFyPiYgZGF0 YSkKLXsKLSAgICAvLyBXZSBuZWVkIGF0IGxlYXN0IDQgYnl0ZXMgdG8gZmlndXJlIG91dCB3aGF0 IGtpbmQgb2YgaW1hZ2Ugd2UncmUgZGVhbGluZyB3aXRoLgotICAgIGludCBsZW5ndGggPSBkYXRh LnNpemUoKTsKLSAgICBpZiAobGVuZ3RoIDwgNCkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBj b25zdCB1bnNpZ25lZCBjaGFyKiB1Q29udGVudHMgPSAoY29uc3QgdW5zaWduZWQgY2hhciopZGF0 YS5kYXRhKCk7Ci0gICAgY29uc3QgY2hhciogY29udGVudHMgPSBkYXRhLmRhdGEoKTsKLQotICAg IC8vIEdJRnMgYmVnaW4gd2l0aCBHSUY4KDcgb3IgOSkuCi0gICAgaWYgKHN0cm5jbXAoY29udGVu dHMsICJHSUY4IiwgNCkgPT0gMCkKLSAgICAgICAgcmV0dXJuIG5ldyBHSUZJbWFnZURlY29kZXIo KTsKLQotICAgIC8vIFRlc3QgZm9yIFBORy4KLSAgICBpZiAodUNvbnRlbnRzWzBdPT0weDg5ICYm Ci0gICAgICAgIHVDb250ZW50c1sxXT09MHg1MCAmJgotICAgICAgICB1Q29udGVudHNbMl09PTB4 NEUgJiYKLSAgICAgICAgdUNvbnRlbnRzWzNdPT0weDQ3KQotICAgICAgICByZXR1cm4gbmV3IFBO R0ltYWdlRGVjb2RlcigpOwotCi0gICAgLy8gSlBFRwotICAgIGlmICh1Q29udGVudHNbMF09PTB4 RkYgJiYKLSAgICAgICAgdUNvbnRlbnRzWzFdPT0weEQ4ICYmCi0gICAgICAgIHVDb250ZW50c1sy XT09MHhGRikKLSAgICAgICAgcmV0dXJuIG5ldyBKUEVHSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAv LyBCTVAKLSAgICBpZiAoc3RybmNtcChjb250ZW50cywgIkJNIiwgMikgPT0gMCkKLSAgICAgICAg cmV0dXJuIG5ldyBCTVBJbWFnZURlY29kZXIoKTsKLQotICAgIC8vIElDT3MgYWx3YXlzIGJlZ2lu IHdpdGggYSAyLWJ5dGUgMCBmb2xsb3dlZCBieSBhIDItYnl0ZSAxLgotICAgIC8vIENVUnMgYmVn aW4gd2l0aCAyLWJ5dGUgMCBmb2xsb3dlZCBieSAyLWJ5dGUgMi4KLSAgICBpZiAoIW1lbWNtcChj b250ZW50cywgIlwwMDBcMDAwXDAwMVwwMDAiLCA0KSB8fAotICAgICAgICAhbWVtY21wKGNvbnRl bnRzLCAiXDAwMFwwMDBcMDAyXDAwMCIsIDQpKQotICAgICAgICByZXR1cm4gbmV3IElDT0ltYWdl RGVjb2RlcihJbnRTaXplKCkpOwotCi0gICAgLy8gWEJNcyByZXF1aXJlIDggYnl0ZXMgb2YgaW5m by4KLSAgICBpZiAobGVuZ3RoID49IDggJiYgc3RybmNtcChjb250ZW50cywgIiNkZWZpbmUgIiwg OCkgPT0gMCkKLSAgICAgICAgcmV0dXJuIG5ldyBYQk1JbWFnZURlY29kZXIoKTsKLQotICAgIC8v IEdpdmUgdXAuIFdlIGRvbid0IGtub3cgd2hhdCB0aGUgaGVjayB0aGlzIGlzLgotICAgIHJldHVy biAwOwotfQotCi1JbWFnZVNvdXJjZTo6SW1hZ2VTb3VyY2UoKQotICAgIDogbV9kZWNvZGVyKDAp Ci17Ci19Ci0KLUltYWdlU291cmNlOjp+SW1hZ2VTb3VyY2UoKQotewotICAgIGNsZWFyKHRydWUp OwotfQotCi12b2lkIEltYWdlU291cmNlOjpjbGVhcihib29sIGRlc3Ryb3lBbGwsIHNpemVfdCBj bGVhckJlZm9yZUZyYW1lLCBTaGFyZWRCdWZmZXIqIGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVk KQotewotICAgIGlmICghZGVzdHJveUFsbCkgewotICAgICAgICBpZiAobV9kZWNvZGVyKQotICAg ICAgICAgICAgbV9kZWNvZGVyLT5jbGVhckZyYW1lQnVmZmVyQ2FjaGUoY2xlYXJCZWZvcmVGcmFt ZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBkZWxldGUgbV9kZWNvZGVyOwotICAg IG1fZGVjb2RlciA9IDA7Ci0gICAgaWYgKGRhdGEpCi0gICAgICAgIHNldERhdGEoZGF0YSwgYWxs RGF0YVJlY2VpdmVkKTsKLX0KLQotYm9vbCBJbWFnZVNvdXJjZTo6aW5pdGlhbGl6ZWQoKSBjb25z dAotewotICAgIHJldHVybiBtX2RlY29kZXI7Ci19Ci0KLXZvaWQgSW1hZ2VTb3VyY2U6OnNldERh dGEoU2hhcmVkQnVmZmVyKiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKLXsKLSAgICAvLyBN YWtlIHRoZSBkZWNvZGVyIGJ5IHNuaWZmaW5nIHRoZSBieXRlcy4KLSAgICAvLyBUaGlzIG1ldGhv ZCB3aWxsIGV4YW1pbmUgdGhlIGRhdGEgYW5kIGluc3RhbnRpYXRlIGFuIGluc3RhbmNlIG9mIHRo ZSBhcHByb3ByaWF0ZSBkZWNvZGVyIHBsdWdpbi4KLSAgICAvLyBJZiBpbnN1ZmZpY2llbnQgYnl0 ZXMgYXJlIGF2YWlsYWJsZSB0byBkZXRlcm1pbmUgdGhlIGltYWdlIHR5cGUsIG5vIGRlY29kZXIg cGx1Z2luIHdpbGwgYmUKLSAgICAvLyBtYWRlLgotICAgIGlmICghbV9kZWNvZGVyKQotICAgICAg ICBtX2RlY29kZXIgPSBjcmVhdGVEZWNvZGVyKGRhdGEtPmJ1ZmZlcigpKTsKLQotICAgIGlmICgh bV9kZWNvZGVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2RlY29kZXItPnNldERhdGEoZGF0 YSwgYWxsRGF0YVJlY2VpdmVkKTsKLX0KLQotU3RyaW5nIEltYWdlU291cmNlOjpmaWxlbmFtZUV4 dGVuc2lvbigpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVybiBT dHJpbmcoKTsKLQotICAgIHJldHVybiBtX2RlY29kZXItPmZpbGVuYW1lRXh0ZW5zaW9uKCk7Ci19 Ci0KLWJvb2wgSW1hZ2VTb3VyY2U6OmlzU2l6ZUF2YWlsYWJsZSgpCi17Ci0gICAgaWYgKCFtX2Rl Y29kZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBtX2RlY29kZXItPmlz U2l6ZUF2YWlsYWJsZSgpOwotfQotCi1JbnRTaXplIEltYWdlU291cmNlOjpzaXplKCkgY29uc3QK LXsKLSAgICBpZiAoIW1fZGVjb2RlcikKLSAgICAgICAgcmV0dXJuIEludFNpemUoKTsKLQotICAg IHJldHVybiBtX2RlY29kZXItPnNpemUoKTsKLX0KLQotSW50U2l6ZSBJbWFnZVNvdXJjZTo6ZnJh bWVTaXplQXRJbmRleChzaXplX3QpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHNpemUoKTsKLX0KLQot aW50IEltYWdlU291cmNlOjpyZXBldGl0aW9uQ291bnQoKQotewotICAgIGlmICghbV9kZWNvZGVy KQotICAgICAgICByZXR1cm4gY0FuaW1hdGlvbk5vbmU7Ci0KLSAgICByZXR1cm4gbV9kZWNvZGVy LT5yZXBldGl0aW9uQ291bnQoKTsKLX0KLQotc2l6ZV90IEltYWdlU291cmNlOjpmcmFtZUNvdW50 KCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9kZWNvZGVyID8gbV9kZWNvZGVyLT5mcmFtZUNvdW50 KCkgOiAwOwotfQotCiBOYXRpdmVJbWFnZVB0ciBJbWFnZVNvdXJjZTo6Y3JlYXRlRnJhbWVBdElu ZGV4KHNpemVfdCBpbmRleCkKIHsKICAgICBpZiAoIWluaXRpYWxpemVkKCkpCkBAIC0xOTUsNDYg KzU2LDUgQEAgTmF0aXZlSW1hZ2VQdHIgSW1hZ2VTb3VyY2U6OmNyZWF0ZUZyYW1lQXRJbmRleChz aXplX3QgaW5kZXgpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNpemUoKS53aWR0aCgpKiBzaXplb2YoUkdCQTMyQnVmZmVyOjpQaXhlbERhdGEpKTsKIH0K IAotYm9vbCBJbWFnZVNvdXJjZTo6ZnJhbWVJc0NvbXBsZXRlQXRJbmRleChzaXplX3QgaW5kZXgp Ci17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFJH QkEzMkJ1ZmZlciogYnVmZmVyID0gbV9kZWNvZGVyLT5mcmFtZUJ1ZmZlckF0SW5kZXgoaW5kZXgp OwotICAgIHJldHVybiBidWZmZXIgJiYgYnVmZmVyLT5zdGF0dXMoKSA9PSBSR0JBMzJCdWZmZXI6 OkZyYW1lQ29tcGxldGU7Ci19Ci0KLWZsb2F0IEltYWdlU291cmNlOjpmcmFtZUR1cmF0aW9uQXRJ bmRleChzaXplX3QgaW5kZXgpCi17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVy biAwOwotCi0gICAgUkdCQTMyQnVmZmVyKiBidWZmZXIgPSBtX2RlY29kZXItPmZyYW1lQnVmZmVy QXRJbmRleChpbmRleCk7Ci0gICAgaWYgKCFidWZmZXIgfHwgYnVmZmVyLT5zdGF0dXMoKSA9PSBS R0JBMzJCdWZmZXI6OkZyYW1lRW1wdHkpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgLy8gTWFu eSBhbm5veWluZyBhZHMgc3BlY2lmeSBhIDAgZHVyYXRpb24gdG8gbWFrZSBhbiBpbWFnZSBmbGFz aCBhcyBxdWlja2x5Ci0gICAgLy8gYXMgcG9zc2libGUuICBXZSBmb2xsb3cgV2luSUUncyBiZWhh dmlvciBhbmQgdXNlIGEgZHVyYXRpb24gb2YgMTAwIG1zCi0gICAgLy8gZm9yIGFueSBmcmFtZXMg dGhhdCBzcGVjaWZ5IGEgZHVyYXRpb24gb2YgPD0gNTAgbXMuICBTZWUKLSAgICAvLyA8aHR0cDov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0MTM+IG9yIFJhZGFyIDQwNTEzODkg Zm9yCi0gICAgLy8gbW9yZS4KLSAgICBjb25zdCBmbG9hdCBkdXJhdGlvbiA9IGJ1ZmZlci0+ZHVy YXRpb24oKSAvIDEwMDAuMGY7Ci0gICAgcmV0dXJuIChkdXJhdGlvbiA8IDAuMDUxZikgPyAwLjEw MGYgOiBkdXJhdGlvbjsKLX0KLQotYm9vbCBJbWFnZVNvdXJjZTo6ZnJhbWVIYXNBbHBoYUF0SW5k ZXgoc2l6ZV90IGluZGV4KQotewotICAgIC8vIFdoZW4gYSBmcmFtZSBoYXMgbm90IGZpbmlzaGVk IGRlY29kaW5nLCBhbHdheXMgbWFyayBpdCBhcyBoYXZpbmcgYWxwaGEsCi0gICAgLy8gc28gd2Ug ZG9uJ3QgZ2V0IGEgYmxhY2sgYmFja2dyb3VuZCBmb3IgdGhlIHVuZGVjb2RlZCBzZWN0aW9ucy4K LSAgICAvLyBUT0RPOiBBIGJldHRlciBzb2x1dGlvbiBpcyBwcm9iYWJseSB0byBoYXZlIHRoZSB1 bmRlcmx5aW5nIGJ1ZmZlcidzCi0gICAgLy8gaGFzQWxwaGEoKSByZXR1cm4gdHJ1ZSBpbiB0aGVz ZSBjYXNlcywgc2luY2UgaXQgaXMsIGluIGZhY3QsIHRlY2huaWNhbGx5Ci0gICAgLy8gdHJ1ZS4K LSAgICBpZiAoIWZyYW1lSXNDb21wbGV0ZUF0SW5kZXgoaW5kZXgpKQotICAgICAgICByZXR1cm4g dHJ1ZTsKLQotICAgIHJldHVybiBtX2RlY29kZXItPmZyYW1lQnVmZmVyQXRJbmRleChpbmRleCkt Pmhhc0FscGhhKCk7Ci19Ci0KIH0KIAotI2VuZGlmIC8vIFBMQVRGT1JNKENBSVJPKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291cmNlU2tpYS5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTb3VyY2VTa2lhLmNwcAppbmRl eCBhYjk3N2ViLi43YzRjNTQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvSW1hZ2VTb3VyY2VTa2lhLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvSW1hZ2VTb3VyY2VTa2lhLmNwcApAQCAtMzEsMTQ2ICszMSwxMiBAQAogCiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSW1hZ2VTb3VyY2VTa2lhLmgiCi0jaW5jbHVkZSAiU2hh cmVkQnVmZmVyLmgiCi0KLSNpbmNsdWRlICJHSUZJbWFnZURlY29kZXIuaCIKLSNpbmNsdWRlICJJ Q09JbWFnZURlY29kZXIuaCIKLSNpbmNsdWRlICJKUEVHSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVk ZSAiUE5HSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVkZSAiQk1QSW1hZ2VEZWNvZGVyLmgiCi0jaW5j bHVkZSAiWEJNSW1hZ2VEZWNvZGVyLmgiCiAKKyNpbmNsdWRlICJJbWFnZURlY29kZXIuaCIKICNp bmNsdWRlICJTa0JpdG1hcC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUltYWdlRGVjb2Rl ciogY3JlYXRlRGVjb2Rlcihjb25zdCBWZWN0b3I8Y2hhcj4mIGRhdGEsIGNvbnN0IEludFNpemUm IHByZWZlcnJlZEljb25TaXplKQotewotICAgIC8vIFdlIG5lZWQgYXQgbGVhc3QgNCBieXRlcyB0 byBmaWd1cmUgb3V0IHdoYXQga2luZCBvZiBpbWFnZSB3ZSdyZSBkZWFsaW5nIHdpdGguCi0gICAg aW50IGxlbmd0aCA9IGRhdGEuc2l6ZSgpOwotICAgIGlmIChsZW5ndGggPCA0KQotICAgICAgICBy ZXR1cm4gMDsKLQotICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIqIHVDb250ZW50cyA9IChjb25zdCB1 bnNpZ25lZCBjaGFyKilkYXRhLmRhdGEoKTsKLSAgICBjb25zdCBjaGFyKiBjb250ZW50cyA9IGRh dGEuZGF0YSgpOwotCi0gICAgLy8gR0lGcyBiZWdpbiB3aXRoIEdJRjgoNyBvciA5KS4KLSAgICBp ZiAoc3RybmNtcChjb250ZW50cywgIkdJRjgiLCA0KSA9PSAwKQotICAgICAgICByZXR1cm4gbmV3 IEdJRkltYWdlRGVjb2RlcigpOwotCi0gICAgLy8gVGVzdCBmb3IgUE5HLgotICAgIGlmICh1Q29u dGVudHNbMF09PTB4ODkgJiYKLSAgICAgICAgdUNvbnRlbnRzWzFdPT0weDUwICYmCi0gICAgICAg IHVDb250ZW50c1syXT09MHg0RSAmJgotICAgICAgICB1Q29udGVudHNbM109PTB4NDcpCi0gICAg ICAgIHJldHVybiBuZXcgUE5HSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAvLyBKUEVHCi0gICAgaWYg KHVDb250ZW50c1swXT09MHhGRiAmJgotICAgICAgICB1Q29udGVudHNbMV09PTB4RDggJiYKLSAg ICAgICAgdUNvbnRlbnRzWzJdPT0weEZGKQotICAgICAgICByZXR1cm4gbmV3IEpQRUdJbWFnZURl Y29kZXIoKTsKLQotICAgIC8vIEJNUAotICAgIGlmIChzdHJuY21wKGNvbnRlbnRzLCAiQk0iLCAy KSA9PSAwKQotICAgICAgICByZXR1cm4gbmV3IEJNUEltYWdlRGVjb2RlcigpOwotCi0gICAgLy8g SUNPcyBhbHdheXMgYmVnaW4gd2l0aCBhIDItYnl0ZSAwIGZvbGxvd2VkIGJ5IGEgMi1ieXRlIDEu Ci0gICAgLy8gQ1VScyBiZWdpbiB3aXRoIDItYnl0ZSAwIGZvbGxvd2VkIGJ5IDItYnl0ZSAyLgot ICAgIGlmICghbWVtY21wKGNvbnRlbnRzLCAiXDAwMFwwMDBcMDAxXDAwMCIsIDQpIHx8Ci0gICAg ICAgICFtZW1jbXAoY29udGVudHMsICJcMDAwXDAwMFwwMDJcMDAwIiwgNCkpCi0gICAgICAgIHJl dHVybiBuZXcgSUNPSW1hZ2VEZWNvZGVyKHByZWZlcnJlZEljb25TaXplKTsKLSAgIAotICAgIC8v IFhCTXMgcmVxdWlyZSA4IGJ5dGVzIG9mIGluZm8uCi0gICAgaWYgKGxlbmd0aCA+PSA4ICYmIHN0 cm5jbXAoY29udGVudHMsICIjZGVmaW5lICIsIDgpID09IDApCi0gICAgICAgIHJldHVybiBuZXcg WEJNSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAvLyBHaXZlIHVwLiBXZSBkb24ndCBrbm93IHdoYXQg dGhlIGhlY2sgdGhpcyBpcy4KLSAgICByZXR1cm4gMDsKLX0KLQotSW1hZ2VTb3VyY2U6OkltYWdl U291cmNlKCkKLSAgICA6IG1fZGVjb2RlcigwKQote30KLQotSW1hZ2VTb3VyY2U6On5JbWFnZVNv dXJjZSgpCi17Ci0gICAgY2xlYXIodHJ1ZSk7Ci19Ci0KLXZvaWQgSW1hZ2VTb3VyY2U6OmNsZWFy KGJvb2wgZGVzdHJveUFsbCwgc2l6ZV90IGNsZWFyQmVmb3JlRnJhbWUsIFNoYXJlZEJ1ZmZlciog ZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCi17Ci0gICAgaWYgKCFkZXN0cm95QWxsKSB7Ci0g ICAgICAgIGlmIChtX2RlY29kZXIpCi0gICAgICAgICAgICBtX2RlY29kZXItPmNsZWFyRnJhbWVC dWZmZXJDYWNoZShjbGVhckJlZm9yZUZyYW1lKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQot ICAgIGRlbGV0ZSBtX2RlY29kZXI7Ci0gICAgbV9kZWNvZGVyID0gMDsKLSAgICBpZiAoZGF0YSkK LSAgICAgICAgc2V0RGF0YShkYXRhLCBhbGxEYXRhUmVjZWl2ZWQpOwotfQotCi1ib29sIEltYWdl U291cmNlOjppbml0aWFsaXplZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fZGVjb2RlcjsKLX0K LQotdm9pZCBJbWFnZVNvdXJjZTo6c2V0RGF0YShTaGFyZWRCdWZmZXIqIGRhdGEsIGJvb2wgYWxs RGF0YVJlY2VpdmVkKQotewotICAgIC8vIE1ha2UgdGhlIGRlY29kZXIgYnkgc25pZmZpbmcgdGhl IGJ5dGVzLgotICAgIC8vIFRoaXMgbWV0aG9kIHdpbGwgZXhhbWluZSB0aGUgZGF0YSBhbmQgaW5z dGFudGlhdGUgYW4gaW5zdGFuY2Ugb2YgdGhlIGFwcHJvcHJpYXRlIGRlY29kZXIgcGx1Z2luLgot ICAgIC8vIElmIGluc3VmZmljaWVudCBieXRlcyBhcmUgYXZhaWxhYmxlIHRvIGRldGVybWluZSB0 aGUgaW1hZ2UgdHlwZSwgbm8gZGVjb2RlciBwbHVnaW4gd2lsbCBiZQotICAgIC8vIG1hZGUuCi0g ICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIG1fZGVjb2RlciA9IGNyZWF0ZURlY29kZXIoZGF0 YS0+YnVmZmVyKCksIEludFNpemUoKSk7Ci0KLSAgICAvLyBDcmVhdGVEZWNvZGVyIHdpbGwgcmV0 dXJuIE5VTEwgaWYgdGhlIGRlY29kZXIgY291bGQgbm90IGJlIGNyZWF0ZWQuIFBsdXMsCi0gICAg Ly8gd2Ugc2hvdWxkIG5vdCBzZW5kIG1vcmUgZGF0YSB0byBhIGRlY29kZXIgd2hpY2ggaGFzIGFs cmVhZHkgZGVjaWRlZCBpdAotICAgIC8vIGhhcyBmYWlsZWQuCi0gICAgaWYgKCFtX2RlY29kZXIg fHwgbV9kZWNvZGVyLT5mYWlsZWQoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIG1fZGVjb2Rlci0+ c2V0RGF0YShkYXRhLCBhbGxEYXRhUmVjZWl2ZWQpOwotfQotCi1ib29sIEltYWdlU291cmNlOjpp c1NpemVBdmFpbGFibGUoKQotewotICAgIGlmICghbV9kZWNvZGVyKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICByZXR1cm4gbV9kZWNvZGVyLT5pc1NpemVBdmFpbGFibGUoKTsKLX0KLQot SW50U2l6ZSBJbWFnZVNvdXJjZTo6c2l6ZSgpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX2RlY29kZXIp Ci0gICAgICAgIHJldHVybiBJbnRTaXplKCk7Ci0KLSAgICByZXR1cm4gbV9kZWNvZGVyLT5zaXpl KCk7Ci19Ci0KLUludFNpemUgSW1hZ2VTb3VyY2U6OmZyYW1lU2l6ZUF0SW5kZXgoc2l6ZV90KSBj b25zdAotewotICAgIC8vIFRPRE8oYnJldHR3KSBkbyB3ZSBuZWVkIGFueXRoaW5nIGhlcmU/Ci0g ICAgcmV0dXJuIHNpemUoKTsKLX0KLQotaW50IEltYWdlU291cmNlOjpyZXBldGl0aW9uQ291bnQo KQotewotICAgIGlmICghbV9kZWNvZGVyKQotICAgICAgICByZXR1cm4gY0FuaW1hdGlvbk5vbmU7 Ci0KLSAgICByZXR1cm4gbV9kZWNvZGVyLT5yZXBldGl0aW9uQ291bnQoKTsKLX0KLQotc2l6ZV90 IEltYWdlU291cmNlOjpmcmFtZUNvdW50KCkgY29uc3QKLXsKLSAgICBpZiAoIW1fZGVjb2RlcikK LSAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIG1fZGVjb2Rlci0+ZmFpbGVkKCkgPyAwIDog bV9kZWNvZGVyLT5mcmFtZUNvdW50KCk7Ci19Ci0KIE5hdGl2ZUltYWdlUHRyIEltYWdlU291cmNl OjpjcmVhdGVGcmFtZUF0SW5kZXgoc2l6ZV90IGluZGV4KQogewogICAgIGlmICghbV9kZWNvZGVy KQpAQCAtMTg5LDU4ICs1NSw0IEBAIE5hdGl2ZUltYWdlUHRyIEltYWdlU291cmNlOjpjcmVhdGVG cmFtZUF0SW5kZXgoc2l6ZV90IGluZGV4KQogICAgIHJldHVybiBidWZmZXItPmFzTmV3TmF0aXZl SW1hZ2UoKTsKIH0KIAotYm9vbCBJbWFnZVNvdXJjZTo6ZnJhbWVJc0NvbXBsZXRlQXRJbmRleChz aXplX3QgaW5kZXgpCi17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIFJHQkEzMkJ1ZmZlciogYnVmZmVyID0gbV9kZWNvZGVyLT5mcmFtZUJ1ZmZlckF0 SW5kZXgoaW5kZXgpOwotICAgIHJldHVybiBidWZmZXIgJiYgYnVmZmVyLT5zdGF0dXMoKSA9PSBS R0JBMzJCdWZmZXI6OkZyYW1lQ29tcGxldGU7Ci19Ci0KLWZsb2F0IEltYWdlU291cmNlOjpmcmFt ZUR1cmF0aW9uQXRJbmRleChzaXplX3QgaW5kZXgpCi17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0g ICAgICAgIHJldHVybiAwOwotCi0gICAgUkdCQTMyQnVmZmVyKiBidWZmZXIgPSBtX2RlY29kZXIt PmZyYW1lQnVmZmVyQXRJbmRleChpbmRleCk7Ci0gICAgaWYgKCFidWZmZXIgfHwgYnVmZmVyLT5z dGF0dXMoKSA9PSBSR0JBMzJCdWZmZXI6OkZyYW1lRW1wdHkpCi0gICAgICAgIHJldHVybiAwOwot Ci0gICAgLy8gTWFueSBhbm5veWluZyBhZHMgc3BlY2lmeSBhIDAgZHVyYXRpb24gdG8gbWFrZSBh biBpbWFnZSBmbGFzaCBhcyBxdWlja2x5Ci0gICAgLy8gYXMgcG9zc2libGUuICBXZSBmb2xsb3cg V2luSUUncyBiZWhhdmlvciBhbmQgdXNlIGEgZHVyYXRpb24gb2YgMTAwIG1zCi0gICAgLy8gZm9y IGFueSBmcmFtZXMgdGhhdCBzcGVjaWZ5IGEgZHVyYXRpb24gb2YgPD0gNTAgbXMuICBTZWUKLSAg ICAvLyA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0MTM+IG9yIFJh ZGFyIDQwNTEzODkgZm9yCi0gICAgLy8gbW9yZS4KLSAgICBjb25zdCBmbG9hdCBkdXJhdGlvbiA9 IGJ1ZmZlci0+ZHVyYXRpb24oKSAvIDEwMDAuMGY7Ci0gICAgcmV0dXJuIChkdXJhdGlvbiA8IDAu MDUxZikgPyAwLjEwMGYgOiBkdXJhdGlvbjsKLX0KLQotYm9vbCBJbWFnZVNvdXJjZTo6ZnJhbWVI YXNBbHBoYUF0SW5kZXgoc2l6ZV90IGluZGV4KQotewotICAgIGlmICghbV9kZWNvZGVyIHx8ICFt X2RlY29kZXItPnN1cHBvcnRzQWxwaGEoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg UkdCQTMyQnVmZmVyKiBidWZmZXIgPSBtX2RlY29kZXItPmZyYW1lQnVmZmVyQXRJbmRleChpbmRl eCk7Ci0gICAgaWYgKCFidWZmZXIgfHwgYnVmZmVyLT5zdGF0dXMoKSA9PSBSR0JBMzJCdWZmZXI6 OkZyYW1lRW1wdHkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBidWZmZXIt Pmhhc0FscGhhKCk7Ci19Ci0KLXZvaWQgSW1hZ2VTb3VyY2VTa2lhOjpzZXREYXRhKFNoYXJlZEJ1 ZmZlciogZGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgYWxsRGF0YVJl Y2VpdmVkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSW50U2l6ZSYgcHJl ZmVycmVkSWNvblNpemUpCi17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIG1fZGVjb2Rl ciA9IGNyZWF0ZURlY29kZXIoZGF0YS0+YnVmZmVyKCksIHByZWZlcnJlZEljb25TaXplKTsKLQot ICAgIEltYWdlU291cmNlOjpzZXREYXRhKGRhdGEsIGFsbERhdGFSZWNlaXZlZCk7Ci19Ci0KLVN0 cmluZyBJbWFnZVNvdXJjZTo6ZmlsZW5hbWVFeHRlbnNpb24oKSBjb25zdAotewotICAgIHJldHVy biBtX2RlY29kZXIgPyBtX2RlY29kZXItPmZpbGVuYW1lRXh0ZW5zaW9uKCkgOiBTdHJpbmcoKTsK LX0KLQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9JbWFnZVNv dXJjZVd4LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvSW1hZ2VTb3VyY2VXeC5j cHAKaW5kZXggMGMwNDAyMS4uZTQ1M2IyNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93eC9JbWFnZVNvdXJjZVd4LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3d4L0ltYWdlU291cmNlV3guY3BwCkBAIC0yNiwxNCArMjYsNyBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIkltYWdlU291cmNlLmgiCiAKLSNpbmNsdWRlICJCTVBJbWFnZURl Y29kZXIuaCIKLSNpbmNsdWRlICJHSUZJbWFnZURlY29kZXIuaCIKLSNpbmNsdWRlICJJQ09JbWFn ZURlY29kZXIuaCIKLSNpbmNsdWRlICJKUEVHSW1hZ2VEZWNvZGVyLmgiCi0jaW5jbHVkZSAiTm90 SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlICJQTkdJbWFnZURlY29kZXIuaCIKLSNpbmNsdWRlICJT aGFyZWRCdWZmZXIuaCIKLSNpbmNsdWRlICJYQk1JbWFnZURlY29kZXIuaCIKKyNpbmNsdWRlICJJ bWFnZURlY29kZXIuaCIKIAogI2luY2x1ZGUgPHd4L2RlZnMuaD4KICNpbmNsdWRlIDx3eC9iaXRt YXAuaD4KQEAgLTQ1LDEzNyArMzgsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUltYWdl RGVjb2RlciogY3JlYXRlRGVjb2Rlcihjb25zdCBTaGFyZWRCdWZmZXImIGRhdGEpCi17Ci0gICAg Ly8gV2UgbmVlZCBhdCBsZWFzdCA0IGJ5dGVzIHRvIGZpZ3VyZSBvdXQgd2hhdCBraW5kIG9mIGlt YWdlIHdlJ3JlIGRlYWxpbmcgd2l0aC4KLSAgICBpbnQgbGVuZ3RoID0gZGF0YS5zaXplKCk7Ci0g ICAgaWYgKGxlbmd0aCA8IDQpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgY29uc3QgdW5zaWdu ZWQgY2hhciogdUNvbnRlbnRzID0gKGNvbnN0IHVuc2lnbmVkIGNoYXIqKWRhdGEuZGF0YSgpOwot ICAgIGNvbnN0IGNoYXIqIGNvbnRlbnRzID0gZGF0YS5kYXRhKCk7Ci0KLSAgICAvLyBHSUZzIGJl Z2luIHdpdGggR0lGOCg3IG9yIDkpLgotICAgIGlmIChzdHJuY21wKGNvbnRlbnRzLCAiR0lGOCIs IDQpID09IDApCi0gICAgICAgIHJldHVybiBuZXcgR0lGSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAv LyBUZXN0IGZvciBQTkcuCi0gICAgaWYgKHVDb250ZW50c1swXT09MHg4OSAmJgotICAgICAgICB1 Q29udGVudHNbMV09PTB4NTAgJiYKLSAgICAgICAgdUNvbnRlbnRzWzJdPT0weDRFICYmCi0gICAg ICAgIHVDb250ZW50c1szXT09MHg0NykKLSAgICAgICAgcmV0dXJuIG5ldyBQTkdJbWFnZURlY29k ZXIoKTsKLQotICAgIC8vIEpQRUcKLSAgICBpZiAodUNvbnRlbnRzWzBdPT0weEZGICYmCi0gICAg ICAgIHVDb250ZW50c1sxXT09MHhEOCAmJgotICAgICAgICB1Q29udGVudHNbMl09PTB4RkYpCi0g ICAgICAgIHJldHVybiBuZXcgSlBFR0ltYWdlRGVjb2RlcigpOwotCi0gICAgLy8gQk1QCi0gICAg aWYgKHN0cm5jbXAoY29udGVudHMsICJCTSIsIDIpID09IDApCi0gICAgICAgIHJldHVybiBuZXcg Qk1QSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAvLyBJQ09zIGFsd2F5cyBiZWdpbiB3aXRoIGEgMi1i eXRlIDAgZm9sbG93ZWQgYnkgYSAyLWJ5dGUgMS4KLSAgICAvLyBDVVJzIGJlZ2luIHdpdGggMi1i eXRlIDAgZm9sbG93ZWQgYnkgMi1ieXRlIDIuCi0gICAgaWYgKCFtZW1jbXAoY29udGVudHMsICJc MDAwXDAwMFwwMDFcMDAwIiwgNCkgfHwKLSAgICAgICAgIW1lbWNtcChjb250ZW50cywgIlwwMDBc MDAwXDAwMlwwMDAiLCA0KSkKLSAgICAgICAgcmV0dXJuIG5ldyBJQ09JbWFnZURlY29kZXIoSW50 U2l6ZSgpKTsKLSAgIAotICAgIC8vIFhCTXMgcmVxdWlyZSA4IGJ5dGVzIG9mIGluZm8uCi0gICAg aWYgKGxlbmd0aCA+PSA4ICYmIHN0cm5jbXAoY29udGVudHMsICIjZGVmaW5lICIsIDgpID09IDAp Ci0gICAgICAgIHJldHVybiBuZXcgWEJNSW1hZ2VEZWNvZGVyKCk7Ci0KLSAgICAvLyBHaXZlIHVw LiBXZSBkb24ndCBrbm93IHdoYXQgdGhlIGhlY2sgdGhpcyBpcy4KLSAgICByZXR1cm4gMDsKLX0K LQotSW1hZ2VTb3VyY2U6OkltYWdlU291cmNlKCkKLSAgOiBtX2RlY29kZXIoMCkKLXt9Ci0KLUlt YWdlU291cmNlOjp+SW1hZ2VTb3VyY2UoKQotewotICAgIGNsZWFyKHRydWUpOwotfQotCi1ib29s IEltYWdlU291cmNlOjppbml0aWFsaXplZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fZGVjb2Rl cjsKLX0KLQotdm9pZCBJbWFnZVNvdXJjZTo6c2V0RGF0YShTaGFyZWRCdWZmZXIqIGRhdGEsIGJv b2wgYWxsRGF0YVJlY2VpdmVkKQotewotICAgIC8vIE1ha2UgdGhlIGRlY29kZXIgYnkgc25pZmZp bmcgdGhlIGJ5dGVzLgotICAgIC8vIFRoaXMgbWV0aG9kIHdpbGwgZXhhbWluZSB0aGUgZGF0YSBh bmQgaW5zdGFudGlhdGUgYW4gaW5zdGFuY2Ugb2YgdGhlIGFwcHJvcHJpYXRlIGRlY29kZXIgcGx1 Z2luLgotICAgIC8vIElmIGluc3VmZmljaWVudCBieXRlcyBhcmUgYXZhaWxhYmxlIHRvIGRldGVy bWluZSB0aGUgaW1hZ2UgdHlwZSwgbm8gZGVjb2RlciBwbHVnaW4gd2lsbCBiZQotICAgIC8vIG1h ZGUuCi0gICAgbV9kZWNvZGVyID0gY3JlYXRlRGVjb2RlcigqZGF0YSk7Ci0gICAgaWYgKCFtX2Rl Y29kZXIpCi0gICAgICAgIHJldHVybjsKLSAgICBtX2RlY29kZXItPnNldERhdGEoZGF0YSwgYWxs RGF0YVJlY2VpdmVkKTsKLX0KLQotYm9vbCBJbWFnZVNvdXJjZTo6aXNTaXplQXZhaWxhYmxlKCkK LXsKLSAgICBpZiAoIW1fZGVjb2RlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcmV0 dXJuIG1fZGVjb2Rlci0+aXNTaXplQXZhaWxhYmxlKCk7Ci19Ci0KLUludFNpemUgSW1hZ2VTb3Vy Y2U6OnNpemUoKSBjb25zdAotewotICAgIGlmICghbV9kZWNvZGVyKQotICAgICAgICByZXR1cm4g SW50U2l6ZSgpOwotCi0gICAgcmV0dXJuIG1fZGVjb2Rlci0+c2l6ZSgpOwotfQotCi1JbnRTaXpl IEltYWdlU291cmNlOjpmcmFtZVNpemVBdEluZGV4KHNpemVfdCkgY29uc3QKLXsKLSAgICByZXR1 cm4gc2l6ZSgpOwotfQotCi1pbnQgSW1hZ2VTb3VyY2U6OnJlcGV0aXRpb25Db3VudCgpCi17Ci0g ICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVybiBjQW5pbWF0aW9uTm9uZTsKLQotICAg IHJldHVybiBtX2RlY29kZXItPnJlcGV0aXRpb25Db3VudCgpOwotfQotCi1TdHJpbmcgSW1hZ2VT b3VyY2U6OmZpbGVuYW1lRXh0ZW5zaW9uKCkgY29uc3QKLXsKLSAgICBub3RJbXBsZW1lbnRlZCgp OwotICAgIHJldHVybiBTdHJpbmcoKTsKLX0KLQotc2l6ZV90IEltYWdlU291cmNlOjpmcmFtZUNv dW50KCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9kZWNvZGVyID8gbV9kZWNvZGVyLT5mcmFtZUNv dW50KCkgOiAwOwotfQotCi1ib29sIEltYWdlU291cmNlOjpmcmFtZUlzQ29tcGxldGVBdEluZGV4 KHNpemVfdCBpbmRleCkKLXsKLSAgICAvLyBGSVhNRTogc2hvdWxkIHdlIGJlIHRlc3RpbmcgdGhl IFJHQkEzMkJ1ZmZlcidzIHN0YXR1cyBhcyB3ZWxsPwotICAgIHJldHVybiAobV9kZWNvZGVyICYm IG1fZGVjb2Rlci0+ZnJhbWVCdWZmZXJBdEluZGV4KGluZGV4KSAhPSAwKTsKLX0KLQotdm9pZCBJ bWFnZVNvdXJjZTo6Y2xlYXIoYm9vbCBkZXN0cm95QWxsLCBzaXplX3QgY2xlYXJCZWZvcmVGcmFt ZSwgU2hhcmVkQnVmZmVyKiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKLXsKLSAgICBpZiAo IWRlc3Ryb3lBbGwpIHsKLSAgICAgICAgaWYgKG1fZGVjb2RlcikKLSAgICAgICAgICAgIG1fZGVj b2Rlci0+Y2xlYXJGcmFtZUJ1ZmZlckNhY2hlKGNsZWFyQmVmb3JlRnJhbWUpOwotICAgICAgICBy ZXR1cm47Ci0gICAgfQotCi0gICAgZGVsZXRlIG1fZGVjb2RlcjsKLSAgICBtX2RlY29kZXIgPSAw OwotICAgIGlmIChkYXRhKQotICAgICAgICBzZXREYXRhKGRhdGEsIGFsbERhdGFSZWNlaXZlZCk7 Ci19Ci0KIE5hdGl2ZUltYWdlUHRyIEltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoc2l6 ZV90IGluZGV4KQogewogICAgIGlmICghbV9kZWNvZGVyKQpAQCAtMjM3LDM0ICs5OSw0IEBAIE5h dGl2ZUltYWdlUHRyIEltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoc2l6ZV90IGluZGV4 KQogI2VuZGlmCiB9CiAKLWZsb2F0IEltYWdlU291cmNlOjpmcmFtZUR1cmF0aW9uQXRJbmRleChz aXplX3QgaW5kZXgpCi17Ci0gICAgaWYgKCFtX2RlY29kZXIpCi0gICAgICAgIHJldHVybiAwOwot Ci0gICAgUkdCQTMyQnVmZmVyKiBidWZmZXIgPSBtX2RlY29kZXItPmZyYW1lQnVmZmVyQXRJbmRl eChpbmRleCk7Ci0gICAgaWYgKCFidWZmZXIgfHwgYnVmZmVyLT5zdGF0dXMoKSA9PSBSR0JBMzJC dWZmZXI6OkZyYW1lRW1wdHkpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgZmxvYXQgZHVyYXRp b24gPSBidWZmZXItPmR1cmF0aW9uKCkgLyAxMDAwLjBmOwotCi0gICAgLy8gRm9sbG93IG90aGVy IHBvcnRzIChhbmQgV2luSUUncykgYmVoYXZpb3IgdG8gc2xvdyBhbm5veWluZyBhZHMgdGhhdAot ICAgIC8vIHNwZWNpZnkgYSAwIGR1cmF0aW9uLgotICAgIGlmIChkdXJhdGlvbiA8IDAuMDUxZikK LSAgICAgICAgcmV0dXJuIDAuMTAwZjsKLSAgICByZXR1cm4gZHVyYXRpb247Ci19Ci0KLWJvb2wg SW1hZ2VTb3VyY2U6OmZyYW1lSGFzQWxwaGFBdEluZGV4KHNpemVfdCBpbmRleCkKLXsKLSAgICBp ZiAoIW1fZGVjb2RlciB8fCAhbV9kZWNvZGVyLT5zdXBwb3J0c0FscGhhKCkpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQotICAgIFJHQkEzMkJ1ZmZlciogYnVmZmVyID0gbV9kZWNvZGVyLT5mcmFt ZUJ1ZmZlckF0SW5kZXgoaW5kZXgpOwotICAgIGlmICghYnVmZmVyIHx8IGJ1ZmZlci0+c3RhdHVz KCkgPT0gUkdCQTMyQnVmZmVyOjpGcmFtZUVtcHR5KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICByZXR1cm4gYnVmZmVyLT5oYXNBbHBoYSgpOwotfQotCiB9Ci0tIAoxLjYuMy4xCgo= 31264 2009-06-14 06:51:11 -0700 2009-06-18 10:21:24 -0700 Take out asNativeImagePtr 0007-2009-06-14-Holger-Hans-Peter-Freyther-zecke-selfish..patch text/plain 5416 zecke RnJvbSBmYWViZTYxZTY4NjBkNGQwZTAyNWU2M2Q4MjJmMmI0OTQxZDA0MTY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTI6MzE6NDEgKzAyMDAKU3ViamVjdDog W1BBVENIIDcvN10gMjAwOS0wNi0xNCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNr ZUBzZWxmaXNoLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIFJlbW92ZSB0aGUgcmVjZW50bHkgYWRkZWQgcGxhdGZvcm0gc3BlY2lmaWNzIGZyb20KICAg ICAgICBSR0JBMzJCdWZmZXIgYWdhaW4gYW5kIG1vdmUgdGhlbSBpbnRvIHRoZSBOYXRpdmVJbWFn ZVNraWEuCgogICAgICAgIE5hdGl2ZUltYWdlU2tpYSBpcyBhIGZyaWVuZCBvZiBSR0JBMzJCdWZm ZXIgYW5kIGlzIGF3YXJlCiAgICAgICAgb2YgdGhlIE5hdGl2ZUltYWdlU2tpYSBpbnNpZGUgaXQg YW5kIHdpbGwgYWNjZXNzIGl0LgoKICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1h Z2VTb3VyY2VTa2lhLmNwcDoKICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3VyY2U6OmNyZWF0ZUZy YW1lQXRJbmRleCk6CiAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdl U2tpYS5jcHA6CiAgICAgICAgKE5hdGl2ZUltYWdlU2tpYTo6TmF0aXZlSW1hZ2VTa2lhKToKICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmg6CiAgICAgICAg KiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuaDoKLS0tCiBXZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTcgKysrKysrKysr KysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNvdXJjZVNraWEu Y3BwIHwgICAgMiArLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdl U2tpYS5jcHAgfCAgICA4ICsrKysrKystCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv TmF0aXZlSW1hZ2VTa2lhLmggICB8ICAgIDUgKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmggICAgIHwgICAgOCArLS0tLS0tLQogNSBmaWxlcyBjaGFu Z2VkLCAzMSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNv cmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ2NzFmYS4uMTk1YThkNyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTE1LDYgKzE1LDIzIEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAK KyAgICAgICAgUmVtb3ZlIHRoZSByZWNlbnRseSBhZGRlZCBwbGF0Zm9ybSBzcGVjaWZpY3MgZnJv bQorICAgICAgICBSR0JBMzJCdWZmZXIgYWdhaW4gYW5kIG1vdmUgdGhlbSBpbnRvIHRoZSBOYXRp dmVJbWFnZVNraWEuCisKKyAgICAgICAgTmF0aXZlSW1hZ2VTa2lhIGlzIGEgZnJpZW5kIG9mIFJH QkEzMkJ1ZmZlciBhbmQgaXMgYXdhcmUKKyAgICAgICAgb2YgdGhlIE5hdGl2ZUltYWdlU2tpYSBp bnNpZGUgaXQgYW5kIHdpbGwgYWNjZXNzIGl0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9JbWFnZVNvdXJjZVNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VTb3Vy Y2U6OmNyZWF0ZUZyYW1lQXRJbmRleCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9OYXRpdmVJbWFnZVNraWEuY3BwOgorICAgICAgICAoTmF0aXZlSW1hZ2VTa2lhOjpOYXRpdmVJ bWFnZVNraWEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VT a2lhLmg6CisgICAgICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmg6 CisKKzIwMDktMDYtMTQgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlz aC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAg VW5pZnkgdGhlIHZhcmlvdXMgY29waWVzIG9mIHRoZSBJbWFnZVNvdXJjZS5jcHAgdGhhdAogICAg ICAgICB1dGlsaXplIHRoZSBXZWJDb3JlIGltYWdlIGRlY29kZXJzLiBUaGUgb25seSB0aGluZyBs ZWZ0CiAgICAgICAgIGluIHRoZSBwb3J0IHNwZWNpZmljIEltYWdlU291cmNlIGZpbGVzIGlzIHRo ZSBzZWNyZXQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFn ZVNvdXJjZVNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291 cmNlU2tpYS5jcHAKaW5kZXggN2M0YzU0OS4uNGRiMTliMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291cmNlU2tpYS5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU291cmNlU2tpYS5jcHAKQEAgLTUyLDcgKzUyLDcg QEAgTmF0aXZlSW1hZ2VQdHIgSW1hZ2VTb3VyY2U6OmNyZWF0ZUZyYW1lQXRJbmRleChzaXplX3Qg aW5kZXgpCiAKICAgICAvLyBDb3B5IHRoZSBiaXRtYXAuICBUaGUgcGl4ZWwgZGF0YSBpcyByZWZj b3VudGVkIGludGVybmFsbHkgYnkgU2tCaXRtYXAsIHNvCiAgICAgLy8gdGhpcyBkb2Vzbid0IGNv c3QgbXVjaC4gIAotICAgIHJldHVybiBidWZmZXItPmFzTmV3TmF0aXZlSW1hZ2UoKTsKKyAgICBy ZXR1cm4gbmV3IE5hdGl2ZUltYWdlU2tpYSgqYnVmZmVyKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNwcAppbmRleCBlNTlk MWUyLi5iM2Q3YjJlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv TmF0aXZlSW1hZ2VTa2lhLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv TmF0aXZlSW1hZ2VTa2lhLmNwcApAQCAtMjksMTAgKzI5LDExIEBACiAgKi8KIAogI2luY2x1ZGUg ImNvbmZpZy5oIgorI2luY2x1ZGUgIk5hdGl2ZUltYWdlU2tpYS5oIgogCisjaW5jbHVkZSAiSW1h Z2VEZWNvZGVyLmgiCiAjaW5jbHVkZSAic2tpYS9leHQvaW1hZ2Vfb3BlcmF0aW9ucy5oIgogCi0j aW5jbHVkZSAiTmF0aXZlSW1hZ2VTa2lhLmgiCiAjaW5jbHVkZSAiU2tpYVV0aWxzLmgiCiAKIE5h dGl2ZUltYWdlU2tpYTo6TmF0aXZlSW1hZ2VTa2lhKCkKQEAgLTQyLDYgKzQzLDExIEBAIE5hdGl2 ZUltYWdlU2tpYTo6TmF0aXZlSW1hZ2VTa2lhKCkKIHsKIH0KIAorTmF0aXZlSW1hZ2VTa2lhOjpO YXRpdmVJbWFnZVNraWEoY29uc3QgUkdCQTMyQnVmZmVyJiBidWZmZXIpCit7CisgICAgKnRoaXMg PSBidWZmZXIubV9iaXRtYXA7Cit9CisKIGludCBOYXRpdmVJbWFnZVNraWE6OmRlY29kZWRTaXpl KCkgY29uc3QKIHsKICAgICByZXR1cm4gZ2V0U2l6ZSgpICsgbV9yZXNpemVkSW1hZ2UuZ2V0U2l6 ZSgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUlt YWdlU2tpYS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tp YS5oCmluZGV4IDU5NDcyMzguLjA1ZDZhODEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmgKQEAgLTM0LDEyICszNCwxNyBAQAogI2luY2x1 ZGUgIlNrQml0bWFwLmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogCituYW1lc3BhY2UgV2ViQ29y ZSB7CisgICAgY2xhc3MgUkdCQTMyQnVmZmVyOworfQorCiAvLyBUaGlzIG9iamVjdCBpcyB1c2Vk IGFzIHRoZSAibmF0aXZlIGltYWdlIiBpbiBvdXIgcG9ydC4gV2hlbiBXZWJLaXQgdXNlcwogLy8g Ik5hdGl2ZUltYWdlUHRyIiwgaXQgaXMgYSBwb2ludGVyIHRvIHRoaXMgdHlwZS4gSXQgaXMgYW4g U2tCaXRtYXAsIGJ1dCBhbHNvCiAvLyBzdG9yZXMgYSBjYWNoZWQgcmVzaXplZCBpbWFnZS4KIGNs YXNzIE5hdGl2ZUltYWdlU2tpYSA6IHB1YmxpYyBTa0JpdG1hcCB7CiBwdWJsaWM6CiAgICAgTmF0 aXZlSW1hZ2VTa2lhKCk7CisgICAgTmF0aXZlSW1hZ2VTa2lhKGNvbnN0IFJHQkEzMkJ1ZmZlciYp OwogCiAgICAgLy8gUmV0dXJucyB0aGUgbnVtYmVyIG9mIGJ5dGVzIG9mIGltYWdlIGRhdGEuIFRo aXMgaW5jbHVkZXMgdGhlIGNhY2hlZAogICAgIC8vIHJlc2l6ZWQgdmVyc2lvbiBpZiB0aGVyZSBp cyBvbmUuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdl RGVjb2Rlci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIu aAppbmRleCBiMWQ0MGM0Li42NDJhYmYyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvSW1hZ2VEZWNvZGVyLmgKQEAgLTEwMSwxNCArMTAxLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICAvLyBsZWFrIG1lbW9yeS4KICAgICAgICAgYm9vbCBzZXRTaXplKGlu dCBuZXdXaWR0aCwgaW50IG5ld0hlaWdodCk7CiAKLSNpZiBQTEFURk9STShTS0lBKQotICAgICAg ICAvLyBUbyBiZSB1c2VkIGJ5IEltYWdlU291cmNlOjpjcmVhdGVGcmFtZUF0SW5kZXgoKS4gIFJl dHVybnMgYSBwb2ludGVyCi0gICAgICAgIC8vIHRvIHRoZSB1bmRlcmx5aW5nIG5hdGl2ZSBpbWFn ZSBkYXRhLiAgVGhpcyBwb2ludGVyIHdpbGwgYmUgb3duZWQgYnkKLSAgICAgICAgLy8gdGhlIEJp dG1hcEltYWdlIGFuZCBmcmVlZCBpbiBGcmFtZURhdGE6OmNsZWFyKCkuCi0gICAgICAgIE5hdGl2 ZUltYWdlUHRyIGFzTmV3TmF0aXZlSW1hZ2UoKSBjb25zdDsKLSNlbHNlCiAgICAgICAgIFZlY3Rv cjxQaXhlbERhdGE+JiBieXRlcygpIHsgcmV0dXJuIG1fYnl0ZXM7IH0KLSNlbmRpZgogCiAgICAg ICAgIGJvb2wgaGFzQWxwaGEoKSBjb25zdDsKICAgICAgICAgY29uc3QgSW50UmVjdCYgcmVjdCgp IGNvbnN0IHsgcmV0dXJuIG1fcmVjdDsgfQpAQCAtMTU5LDYgKzE1Miw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgfQogCiAjaWYgUExBVEZPUk0oU0tJQSkKKyAgICAgICAgZnJpZW5k IGNsYXNzIE5hdGl2ZUltYWdlU2tpYTsKICAgICAgICAgTmF0aXZlSW1hZ2VTa2lhIG1fYml0bWFw OwogI2Vsc2UKICAgICAgICAgVmVjdG9yPFBpeGVsRGF0YT4gbV9ieXRlczsKLS0gCjEuNi4zLjEK Cg==