212106 2009-10-27 21:17:51 +0000 Unable to export original file to Flickr [patch] 2018-01-30 21:25:40 +0000 1 1 2 Applications digikam Plugin-WebService-Flickr 5.6.0 Compiled Sources Linux RESOLVED FIXED NOR wishlist --- 0 sochotnicky digikam-bugs-null caulier.gilles esby lure p.edelman 2.2.0 0 oldest_to_newest 851709 0 sochotnicky 2009-10-27 21:17:51 +0000 Version: (using Devel) OS: Linux Installed from: Compiled sources Flickr export plugin currently doesn't enable exporting of original non-resized/non-recompressed image. Even when resizing of image is disabled, the image is still recompressed and thus quality suffers. Provide a way to upload original photos to flickr. 851711 1 37919 sochotnicky 2009-10-27 21:19:14 +0000 Created attachment 37919 Patch adding requested feature This is by no means perfect I am sure. I can see a problem with filetypes that flickr doesn't support (e.g. trying to upload original RAW photo). 861025 2 lure 2009-11-13 12:46:29 +0000 There is no reason to resize if user did not select to resize at all. For RAW, we will extract preview image anyhow. I will try to factorize this code (as we have the same/similar in other plugins) 861048 3 sochotnicky 2009-11-13 13:16:14 +0000 Just to clarify: If user doesn't select "resize" then no resizing is done by flickr plugin. What it does is recompress that same image (preserving dimensions, etc) thus adding jpeg artifacts (and possibly making the image bigger). So I guess what you wanted to write was: "There is no reason to recompress if user did not select to resize at all." 861050 4 lure 2009-11-13 13:21:07 +0000 yes! thanks for correcting me. 1010712 5 sochotnicky 2010-08-28 22:19:21 +0000 Just checking...is there any progress on this? I have recently updated kipi-plugins and my patch still works even for 1.4.0 and trunk versions. I am attaching a bit improved patch (whitespace cleanup & resize/recompress options are hidden when "send original" checkbox is selected). Can someone with permissions change this bug to version from 0.8.0 to 1.4.0 please? 1010714 6 51068 sochotnicky 2010-08-28 22:21:18 +0000 Created attachment 51068 Support for exporting original file to flickr 1012480 7 caulier.gilles 2010-09-01 09:55:45 +0000 Thanks for your patch. We will try to review your patch for next stable release 1.5.0 Gilles Caulier 1162261 8 petri.damsten 2011-09-13 07:31:42 +0000 Git commit 3a7c87884d84d8e531f36c1e287805b96c0e87eb by Petri Damstén. Committed on 12/09/2011 at 11:00. Pushed by pdamsten into branch 'master'. Unable to export original file to Flickr BUG: 212106 M +12 -6 flickrexport/flickrtalker.cpp M +1 -1 flickrexport/flickrtalker.h M +26 -8 flickrexport/flickrwidget.cpp M +5 -0 flickrexport/flickrwidget.h M +4 -0 flickrexport/flickrwindow.cpp M +1 -0 flickrexport/flickrwindow.h http://commits.kde.org/kipi-plugins/3a7c87884d84d8e531f36c1e287805b96c0e87eb 1162284 9 sochotnicky 2011-09-13 08:54:35 +0000 Thank you. It's great that I won't have to patch kipi-plugins anymore :-) 1203207 10 caulier.gilles 2011-12-21 18:11:45 +0000 *** Bug 241587 has been marked as a duplicate of this bug. *** 37919 2009-10-27 21:19:14 +0000 2010-08-28 22:21:18 +0000 Patch adding requested feature kipi-plugins-flickexport-sendoriginal.patch text/plain 9755 sochotnicky ZGlmZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuY3BwIGIvZmxpY2tyZXhwb3J0 L2ZsaWNrcnRhbGtlci5jcHAKaW5kZXggNjkyOWI1YS4uOGE3ZTc1YyAxMDA2NDQKLS0tIGEvZmxp Y2tyZXhwb3J0L2ZsaWNrcnRhbGtlci5jcHAKKysrIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcnRhbGtl ci5jcHAKQEAgLTUzNSw3ICs1MzUsNyBAQCB2b2lkIEZsaWNrclRhbGtlcjo6YWRkUGhvdG9Ub1Bo b3RvU2V0KGNvbnN0IFFTdHJpbmcmIHBob3RvSWQsCiB9CiAKIGJvb2wgRmxpY2tyVGFsa2VyOjph ZGRQaG90byhjb25zdCBRU3RyaW5nJiBwaG90b1BhdGgsIGNvbnN0IEZQaG90b0luZm8mIGluZm8s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCByZXNjYWxlLCBpbnQgbWF4RGltLCBp bnQgaW1hZ2VRdWFsaXR5KQorCQkJICAgIGJvb2wgc2VuZE9yaWdpbmFsLCBib29sIHJlc2NhbGUs IGludCBtYXhEaW0sIGludCBpbWFnZVF1YWxpdHkpCiB7CiAgICAgaWYgKG1fam9iKQogICAgIHsK QEAgLTYxNSwxMiArNjE1LDE4IEBAIGJvb2wgRmxpY2tyVGFsa2VyOjphZGRQaG90byhjb25zdCBR U3RyaW5nJiBwaG90b1BhdGgsIGNvbnN0IEZQaG90b0luZm8mIGluZm8sCiAgICAgewogICAgICAg ICBwYXRoID0gS1N0YW5kYXJkRGlyczo6bG9jYXRlTG9jYWwoInRtcCIsIFFGaWxlSW5mbyhwaG90 b1BhdGgpLmJhc2VOYW1lKCkudHJpbW1lZCgpICsgIi5qcGciKTsKIAotICAgICAgICBpZiAocmVz Y2FsZSAmJiAoaW1hZ2Uud2lkdGgoKSA+IG1heERpbSB8fCBpbWFnZS5oZWlnaHQoKSA+IG1heERp bSkpCi0gICAgICAgICAgICBpbWFnZSA9IGltYWdlLnNjYWxlZChtYXhEaW0sIG1heERpbSwgUXQ6 OktlZXBBc3BlY3RSYXRpbywKKyAgICAgICAgaWYgKHNlbmRPcmlnaW5hbCkKKyAgICAgICAgewor ICAgICAgICAgICAgUUZpbGUgaW1nRmlsZShwaG90b1BhdGgpOworICAgICAgICAgICAgaW1nRmls ZS5jb3B5KHBhdGgpOworICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgeworICAgICAg ICAgICAgaWYgKHJlc2NhbGUgJiYgKGltYWdlLndpZHRoKCkgPiBtYXhEaW0gfHwgaW1hZ2UuaGVp Z2h0KCkgPiBtYXhEaW0pKQorICAgICAgICAgICAgICAgIGltYWdlID0gaW1hZ2Uuc2NhbGVkKG1h eERpbSwgbWF4RGltLCBRdDo6S2VlcEFzcGVjdFJhdGlvLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFF0OjpTbW9vdGhUcmFuc2Zvcm1hdGlvbik7Ci0K LSAgICAgICAgaW1hZ2Uuc2F2ZShwYXRoLCAiSlBFRyIsIGltYWdlUXVhbGl0eSk7Ci0KKyAgICAg ICAgICAgIGltYWdlLnNhdmUocGF0aCwgIkpQRUciLCBpbWFnZVF1YWxpdHkpOworICAgICAgICB9 CiAgICAgICAgIC8vIFJlc3RvcmUgYWxsIG1ldGFkYXRhLgogCiAgICAgICAgIEtFeGl2MklmYWNl OjpLRXhpdjIgZXhpdjJJZmFjZTsKZGlmZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J0YWxr ZXIuaCBiL2ZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuaAppbmRleCA2MjI5MDZlLi5jMGMyZGYx IDEwMDY0NAotLS0gYS9mbGlja3JleHBvcnQvZmxpY2tydGFsa2VyLmgKKysrIGIvZmxpY2tyZXhw b3J0L2ZsaWNrcnRhbGtlci5oCkBAIC05Miw3ICs5Miw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg ICAgYWRkUGhvdG9Ub1Bob3RvU2V0KGNvbnN0IFFTdHJpbmcmIHBob3RvSWQsIGNvbnN0IFFTdHJp bmcmIHBob3RvU2V0SWQpOwogICAgIGJvb2wgICAgYWRkUGhvdG8oY29uc3QgUVN0cmluZyYgcGhv dG9QYXRoLCBjb25zdCBGUGhvdG9JbmZvJiBpbmZvLAotICAgICAgICAgICAgICAgICAgICAgYm9v bCByZXNjYWxlPWZhbHNlLCBpbnQgbWF4RGltPTYwMCwgaW50IGltYWdlUXVhbGl0eT04NSk7Cisg ICAgICAgICAgICAgICAgICAgICBib29sIHNlbmRPcmlnaW5hbCA9IGZhbHNlLCBib29sIHJlc2Nh bGU9ZmFsc2UsIGludCBtYXhEaW09NjAwLCBpbnQgaW1hZ2VRdWFsaXR5PTg1KTsKIAogcHVibGlj OgogCmRpZmYgLS1naXQgYS9mbGlja3JleHBvcnQvZmxpY2tyd2lkZ2V0LmNwcCBiL2ZsaWNrcmV4 cG9ydC9mbGlja3J3aWRnZXQuY3BwCmluZGV4IGRjNzE2YmMuLmFkOWM3ZDEgMTAwNjQ0Ci0tLSBh L2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuY3BwCisrKyBiL2ZsaWNrcmV4cG9ydC9mbGlja3J3 aWRnZXQuY3BwCkBAIC0yOTQsMTUgKzI5NCwyMCBAQCBGbGlja3JXaWRnZXQ6OkZsaWNrcldpZGdl dChRV2lkZ2V0KiBwYXJlbnQsIEtJUEk6OkludGVyZmFjZSAqaWZhY2UsIGNvbnN0IFFTdHJpbgog CiAgICAgLy8gLS0gTGF5b3V0IGZvciB0aGUgcmVzaXppbmcgb3B0aW9ucyAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICBRR3JvdXBCb3gqICAgcmVzaXppbmdCb3gg ICAgICAgPSBuZXcgUUdyb3VwQm94KGkxOG4oIlJlc2l6aW5nIE9wdGlvbnMiKSwgc2V0dGluZ3NC b3gpOworICAgIG1fcmVzaXppbmdCb3ggID0gbmV3IFFHcm91cEJveChpMThuKCJSZXNpemluZyBP cHRpb25zIiksIHNldHRpbmdzQm94KTsKICAgICBRR3JpZExheW91dCAqcmVzaXppbmdCb3hMYXlv dXQgPSBuZXcgUUdyaWRMYXlvdXQ7Ci0gICAgcmVzaXppbmdCb3gtPnNldExheW91dChyZXNpemlu Z0JveExheW91dCk7CisgICAgbV9yZXNpemluZ0JveC0+c2V0TGF5b3V0KHJlc2l6aW5nQm94TGF5 b3V0KTsKIAotICAgIG1fcmVzaXplQ2hlY2tCb3ggICA9IG5ldyBRQ2hlY2tCb3gocmVzaXppbmdC b3gpOworICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3ggPSBuZXcgUUNoZWNrQm94KG1fcmVzaXpp bmdCb3gpOworICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gtPnNldFRleHQoaTE4bigiU2VuZCBv cmlnaW5hbCBmaWxlIikpOworICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gtPnNldENoZWNrZWQo ZmFsc2UpOworCisgICAgbV9yZXNpemVDaGVja0JveCAgID0gbmV3IFFDaGVja0JveChtX3Jlc2l6 aW5nQm94KTsKICAgICBtX3Jlc2l6ZUNoZWNrQm94LT5zZXRUZXh0KGkxOG4oIlJlc2l6ZSBwaG90 b3MgYmVmb3JlIHVwbG9hZGluZyIpKTsKICAgICBtX3Jlc2l6ZUNoZWNrQm94LT5zZXRDaGVja2Vk KGZhbHNlKTsKIAotICAgIG1fZGltZW5zaW9uU3BpbkJveCA9IG5ldyBRU3BpbkJveChyZXNpemlu Z0JveCk7CisKKyAgICBtX2RpbWVuc2lvblNwaW5Cb3ggPSBuZXcgUVNwaW5Cb3gobV9yZXNpemlu Z0JveCk7CiAgICAgbV9kaW1lbnNpb25TcGluQm94LT5zZXRNaW5pbXVtKDApOwogICAgIG1fZGlt ZW5zaW9uU3BpbkJveC0+c2V0TWF4aW11bSg1MDAwKTsKICAgICBtX2RpbWVuc2lvblNwaW5Cb3gt PnNldFNpbmdsZVN0ZXAoMTApOwpAQCAtMzEwLDkgKzMxNSw5IEBAIEZsaWNrcldpZGdldDo6Rmxp Y2tyV2lkZ2V0KFFXaWRnZXQqIHBhcmVudCwgS0lQSTo6SW50ZXJmYWNlICppZmFjZSwgY29uc3Qg UVN0cmluCiAgICAgbV9kaW1lbnNpb25TcGluQm94LT5zZXRTaXplUG9saWN5KFFTaXplUG9saWN5 OjpGaXhlZCwgUVNpemVQb2xpY3k6OkZpeGVkKTsKICAgICBtX2RpbWVuc2lvblNwaW5Cb3gtPnNl dEVuYWJsZWQoZmFsc2UpOwogCi0gICAgUUxhYmVsKiByZXNpemVMYWJlbCAgID0gbmV3IFFMYWJl bChpMThuKCJNYXhpbXVtIGRpbWVuc2lvbiAocGl4ZWxzKToiKSwgcmVzaXppbmdCb3gpOworICAg IFFMYWJlbCogcmVzaXplTGFiZWwgICA9IG5ldyBRTGFiZWwoaTE4bigiTWF4aW11bSBkaW1lbnNp b24gKHBpeGVscyk6IiksIG1fcmVzaXppbmdCb3gpOwogCi0gICAgbV9pbWFnZVF1YWxpdHlTcGlu Qm94ID0gbmV3IFFTcGluQm94KHJlc2l6aW5nQm94KTsKKyAgICBtX2ltYWdlUXVhbGl0eVNwaW5C b3ggPSBuZXcgUVNwaW5Cb3gobV9yZXNpemluZ0JveCk7CiAgICAgbV9pbWFnZVF1YWxpdHlTcGlu Qm94LT5zZXRNaW5pbXVtKDApOwogICAgIG1faW1hZ2VRdWFsaXR5U3BpbkJveC0+c2V0TWF4aW11 bSgxMDApOwogICAgIG1faW1hZ2VRdWFsaXR5U3BpbkJveC0+c2V0U2luZ2xlU3RlcCgxKTsKQEAg LTMyMCw3ICszMjUsNyBAQCBGbGlja3JXaWRnZXQ6OkZsaWNrcldpZGdldChRV2lkZ2V0KiBwYXJl bnQsIEtJUEk6OkludGVyZmFjZSAqaWZhY2UsIGNvbnN0IFFTdHJpbgogICAgIG1faW1hZ2VRdWFs aXR5U3BpbkJveC0+c2V0U2l6ZVBvbGljeShRU2l6ZVBvbGljeTo6Rml4ZWQsIFFTaXplUG9saWN5 OjpGaXhlZCk7CiAKICAgICAvLyBOT1RFOiBUaGUgdGVybSBDb21wcmVzc2lvbiBmYWN0b3IgbWF5 IGJlIHRvIHRlY2huaWNhbCB0byB3cml0ZSBpbiB0aGUgbGFiZWwKLSAgICBRTGFiZWwqIGltYWdl UXVhbGl0eUxhYmVsID0gbmV3IFFMYWJlbChpMThuKCJKUEVHIEltYWdlIFF1YWxpdHkgKGhpZ2hl ciBpcyBiZXR0ZXIpOiIpLCByZXNpemluZ0JveCk7CisgICAgUUxhYmVsKiBpbWFnZVF1YWxpdHlM YWJlbCA9IG5ldyBRTGFiZWwoaTE4bigiSlBFRyBJbWFnZSBRdWFsaXR5IChoaWdoZXIgaXMgYmV0 dGVyKToiKSwgbV9yZXNpemluZ0JveCk7CiAKICAgICByZXNpemluZ0JveExheW91dC0+YWRkV2lk Z2V0KGltYWdlUXVhbGl0eUxhYmVsLCAgICAgMCwgMCwgMSwgMyk7CiAgICAgcmVzaXppbmdCb3hM YXlvdXQtPmFkZFdpZGdldChtX2ltYWdlUXVhbGl0eVNwaW5Cb3gsIDAsIDMsIDEsIDEpOwpAQCAt MzM3LDcgKzM0Miw4IEBAIEZsaWNrcldpZGdldDo6RmxpY2tyV2lkZ2V0KFFXaWRnZXQqIHBhcmVu dCwgS0lQSTo6SW50ZXJmYWNlICppZmFjZSwgY29uc3QgUVN0cmluCiAgICAgc2V0dGluZ3NCb3hM YXlvdXQtPmFkZFdpZGdldChhY2NvdW50Qm94KTsKICAgICBzZXR0aW5nc0JveExheW91dC0+YWRk V2lkZ2V0KHRhZ3NCb3gpOwogICAgIHNldHRpbmdzQm94TGF5b3V0LT5hZGRXaWRnZXQocHVibGlj YXRpb25Cb3gpOwotICAgIHNldHRpbmdzQm94TGF5b3V0LT5hZGRXaWRnZXQocmVzaXppbmdCb3gp OworICAgIHNldHRpbmdzQm94TGF5b3V0LT5hZGRXaWRnZXQobV9zZW5kT3JpZ2luYWxDaGVja0Jv eCk7CisgICAgc2V0dGluZ3NCb3hMYXlvdXQtPmFkZFdpZGdldChtX3Jlc2l6aW5nQm94KTsKICAg ICBzZXR0aW5nc0JveExheW91dC0+YWRkU3RyZXRjaCgxMCk7CiAgICAgc2V0dGluZ3NCb3hMYXlv dXQtPnNldFNwYWNpbmcoS0RpYWxvZzo6c3BhY2luZ0hpbnQoKSk7CiAgICAgc2V0dGluZ3NCb3hM YXlvdXQtPnNldE1hcmdpbihLRGlhbG9nOjpzcGFjaW5nSGludCgpKTsKQEAgLTM1Miw2ICszNTgs OCBAQCBGbGlja3JXaWRnZXQ6OkZsaWNrcldpZGdldChRV2lkZ2V0KiBwYXJlbnQsIEtJUEk6Oklu dGVyZmFjZSAqaWZhY2UsIGNvbnN0IFFTdHJpbgogICAgIG1fdGFiLT5pbnNlcnRUYWIoVVBMT0FE LCAgIHNldHRpbmdzU2Nyb2xsQXJlYSwgaTE4bigiVXBsb2FkIE9wdGlvbnMiKSk7CiAKICAgICAv LyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KKyAgICBjb25uZWN0KG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gsIFNJ R05BTChjbGlja2VkKCkpLAorICAgICAgICAgICAgdGhpcywgU0xPVChzbG90T3JpZ2luYWxDaGVj a2VkKCkpKTsKIAogICAgIGNvbm5lY3QobV9yZXNpemVDaGVja0JveCwgU0lHTkFMKGNsaWNrZWQo KSksCiAgICAgICAgICAgICB0aGlzLCBTTE9UKHNsb3RSZXNpemVDaGVja2VkKCkpKTsKQEAgLTQy NSw2ICs0MzMsMTEgQEAgRmxpY2tyV2lkZ2V0Ojp+RmxpY2tyV2lkZ2V0KCkKIHsKIH0KIAordm9p ZCBGbGlja3JXaWRnZXQ6OnNsb3RPcmlnaW5hbENoZWNrZWQoKQoreworICBtX3Jlc2l6aW5nQm94 LT5zZXRFbmFibGVkKCFtX3NlbmRPcmlnaW5hbENoZWNrQm94LT5pc0NoZWNrZWQoKSk7Cit9CisK IHZvaWQgRmxpY2tyV2lkZ2V0OjpzbG90UmVzaXplQ2hlY2tlZCgpCiB7CiAgICAgbV9kaW1lbnNp b25TcGluQm94LT5zZXRFbmFibGVkKG1fcmVzaXplQ2hlY2tCb3gtPmlzQ2hlY2tlZCgpKTsKZGlm ZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuaCBiL2ZsaWNrcmV4cG9ydC9mbGlj a3J3aWRnZXQuaAppbmRleCAyYjg0ZTA3Li44MWU0YzdiIDEwMDY0NAotLS0gYS9mbGlja3JleHBv cnQvZmxpY2tyd2lkZ2V0LmgKKysrIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcndpZGdldC5oCkBAIC03 NSw2ICs3NSw3IEBAIHB1YmxpYzoKIHByaXZhdGUgUV9TTE9UUzoKIAogICAgIHZvaWQgc2xvdFJl c2l6ZUNoZWNrZWQoKTsKKyAgICB2b2lkIHNsb3RPcmlnaW5hbENoZWNrZWQoKTsKICAgICB2b2lk IHNsb3RQZXJtaXNzaW9uQ2hhbmdlZChGbGlja3JMaXN0OjpGaWVsZFR5cGUsIFF0OjpDaGVja1N0 YXRlKTsKICAgICB2b2lkIHNsb3RTYWZldHlMZXZlbENoYW5nZWQoRmxpY2tyTGlzdDo6U2FmZXR5 TGV2ZWwpOwogICAgIHZvaWQgc2xvdENvbnRlbnRUeXBlQ2hhbmdlZChGbGlja3JMaXN0OjpDb250 ZW50VHlwZSk7CkBAIC0xMTMsOSArMTE0LDExIEBAIHByaXZhdGU6IC8vIERhdGEKICAgICBRQ2hl Y2tCb3gqICAgICAgICAgICAgICAgICAgICAgICAgICBtX2ZyaWVuZHNDaGVja0JveDsKICAgICBR Q2hlY2tCb3gqICAgICAgICAgICAgICAgICAgICAgICAgICBtX3B1YmxpY0NoZWNrQm94OwogICAg IFFDaGVja0JveCogICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVzaXplQ2hlY2tCb3g7Cisg ICAgUUNoZWNrQm94KiAgICAgICAgICAgICAgICAgICAgICAgICAgbV9zZW5kT3JpZ2luYWxDaGVj a0JveDsKIAogICAgIFFHcm91cEJveCogICAgICAgICAgICAgICAgICAgICAgICAgIG1fZXh0ZW5k ZWRUYWdzQm94OwogICAgIFFHcm91cEJveCogICAgICAgICAgICAgICAgICAgICAgICAgIG1fZXh0 ZW5kZWRQdWJsaWNhdGlvbkJveDsKKyAgICBRR3JvdXBCb3gqICAgICAgICAgICAgICAgICAgICAg ICAgICBtX3Jlc2l6aW5nQm94OwogCiAgICAgS0xpbmVFZGl0KiAgICAgICAgICAgICAgICAgICAg ICAgICAgbV90YWdzTGluZUVkaXQ7CiAKZGlmZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J3 aW5kb3cuY3BwIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5jcHAKaW5kZXggZDFjODcwZS4u ZjUyMGU4MCAxMDA2NDQKLS0tIGEvZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5jcHAKKysrIGIv ZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5jcHAKQEAgLTk5LDYgKzk5LDcgQEAgRmxpY2tyV2lu ZG93OjpGbGlja3JXaW5kb3coS0lQSTo6SW50ZXJmYWNlKiBpbnRlcmZhY2UsIGNvbnN0IFFTdHJp bmcmIHRtcEZvbGRlciwKICAgICBtX3Bob3RvVmlldyAgICAgICAgICAgICAgICAgPSBtX3dpZGdl dC0+bV9waG90b1ZpZXc7CiAgICAgbV9hbGJ1bXNMaXN0Q29tYm9Cb3ggICAgICAgID0gbV93aWRn ZXQtPm1fYWxidW1zTGlzdENvbWJvQm94OwogICAgIG1fbmV3QWxidW1CdG4gICAgICAgICAgICAg ICA9IG1fd2lkZ2V0LT5tX25ld0FsYnVtQnRuOworICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gg ICAgICA9IG1fd2lkZ2V0LT5tX3NlbmRPcmlnaW5hbENoZWNrQm94OwogICAgIG1fcmVzaXplQ2hl Y2tCb3ggICAgICAgICAgICA9IG1fd2lkZ2V0LT5tX3Jlc2l6ZUNoZWNrQm94OwogICAgIG1fcHVi bGljQ2hlY2tCb3ggICAgICAgICAgICA9IG1fd2lkZ2V0LT5tX3B1YmxpY0NoZWNrQm94OwogICAg IG1fZmFtaWx5Q2hlY2tCb3ggICAgICAgICAgICA9IG1fd2lkZ2V0LT5tX2ZhbWlseUNoZWNrQm94 OwpAQCAtMzIyLDYgKzMyMyw3IEBAIHZvaWQgRmxpY2tyV2luZG93OjpyZWFkU2V0dGluZ3MoKQog ICAgICAgICBtX3Jlc2l6ZUNoZWNrQm94LT5zZXRDaGVja2VkKGZhbHNlKTsKICAgICAgICAgbV9k aW1lbnNpb25TcGluQm94LT5zZXRFbmFibGVkKGZhbHNlKTsKICAgICB9CisgICAgbV9zZW5kT3Jp Z2luYWxDaGVja0JveC0+c2V0Q2hlY2tlZChncnAucmVhZEVudHJ5KCJTZW5kIG9yaWdpbmFsIiwg ZmFsc2UpKTsKIAogICAgIG1fZGltZW5zaW9uU3BpbkJveC0+c2V0VmFsdWUoZ3JwLnJlYWRFbnRy eSgiTWF4aW11bSBXaWR0aCIsIDE2MDApKTsKICAgICBtX2ltYWdlUXVhbGl0eVNwaW5Cb3gtPnNl dFZhbHVlKGdycC5yZWFkRW50cnkoIkltYWdlIFF1YWxpdHkiLCA4NSkpOwpAQCAtMzQ4LDYgKzM1 MCw3IEBAIHZvaWQgRmxpY2tyV2luZG93Ojp3cml0ZVNldHRpbmdzKCkKICAgICBpbnQgY29udGVu dFR5cGUgPSBtX2NvbnRlbnRUeXBlQ29tYm9Cb3gtPml0ZW1EYXRhKG1fY29udGVudFR5cGVDb21i b0JveC0+Y3VycmVudEluZGV4KCkpLnRvSW50KCk7CiAgICAgZ3JwLndyaXRlRW50cnkoIkNvbnRl bnQgVHlwZSIsICAgICAgICAgICAgICAgICAgICAgIGNvbnRlbnRUeXBlKTsKICAgICBncnAud3Jp dGVFbnRyeSgiUmVzaXplIiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9yZXNpemVDaGVj a0JveC0+aXNDaGVja2VkKCkpOworICAgIGdycC53cml0ZUVudHJ5KCJTZW5kIG9yaWdpbmFsIiwg ICAgICAgICAgICAgICAgICAgICBtX3NlbmRPcmlnaW5hbENoZWNrQm94LT5pc0NoZWNrZWQoKSk7 CiAgICAgZ3JwLndyaXRlRW50cnkoIk1heGltdW0gV2lkdGgiLCAgICAgICAgICAgICAgICAgICAg IG1fZGltZW5zaW9uU3BpbkJveC0+dmFsdWUoKSk7CiAgICAgZ3JwLndyaXRlRW50cnkoIkltYWdl IFF1YWxpdHkiLCAgICAgICAgICAgICAgICAgICAgIG1faW1hZ2VRdWFsaXR5U3BpbkJveC0+dmFs dWUoKSk7CiAgICAgS0NvbmZpZ0dyb3VwIGRpYWxvZ0dyb3VwID0gY29uZmlnLmdyb3VwKFFTdHJp bmcoIiUxRXhwb3J0IERpYWxvZyIpLmFyZyhtX3NlcnZpY2VOYW1lKSk7CkBAIC02NTAsNiArNjUz LDcgQEAgdm9pZCBGbGlja3JXaW5kb3c6OnNsb3RBZGRQaG90b05leHQoKQogCiAgICAgYm9vbCBy ZXMgPSBtX3RhbGtlci0+YWRkUGhvdG8ocGF0aENvbW1lbnRzLmZpcnN0LnBhdGgoKSwgLy90aGUg ZmlsZSBwYXRoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mbywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3NlbmRPcmlnaW5hbENoZWNrQm94LT5pc0No ZWNrZWQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3Jlc2l6ZUNoZWNr Qm94LT5pc0NoZWNrZWQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2Rp bWVuc2lvblNwaW5Cb3gtPnZhbHVlKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbV9pbWFnZVF1YWxpdHlTcGluQm94LT52YWx1ZSgpKTsKZGlmZiAtLWdpdCBhL2ZsaWNrcmV4 cG9ydC9mbGlja3J3aW5kb3cuaCBiL2ZsaWNrcmV4cG9ydC9mbGlja3J3aW5kb3cuaAppbmRleCBi MTUyNTM1Li4wYmNmN2VlIDEwMDY0NAotLS0gYS9mbGlja3JleHBvcnQvZmxpY2tyd2luZG93LmgK KysrIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5oCkBAIC0xNDgsNiArMTQ4LDcgQEAgcHJp dmF0ZToKICAgICBRQ2hlY2tCb3ggICAgICAgICAgICAgICAgICAgICAgICAgICAgICptX3N0cmlw U3BhY2VUYWdzQ2hlY2tCb3g7CiAgICAgUUNoZWNrQm94ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAqbV9hZGRFeHRyYVRhZ3NDaGVja0JveDsKICAgICBRQ2hlY2tCb3ggICAgICAgICAgICAg ICAgICAgICAgICAgICAgICptX3Jlc2l6ZUNoZWNrQm94OworICAgIFFDaGVja0JveCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKm1fc2VuZE9yaWdpbmFsQ2hlY2tCb3g7CiAKICAgICBRU3Bp bkJveCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICptX2RpbWVuc2lvblNwaW5Cb3g7CiAg ICAgUVNwaW5Cb3ggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqbV9pbWFnZVF1YWxpdHlT cGluQm94Owo= 51068 2010-08-28 22:21:18 +0000 2010-08-28 22:21:18 +0000 Support for exporting original file to flickr 0001-Support-for-exporting-original-file-in-flickr.patch text/plain 10839 sochotnicky RnJvbSAzZDViZjc3YTgyM2JiNjJmNDk1MmQ1Y2I2OTVlYTIzOTg2YzBiOWFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGFuaXNsYXYgT2Nob3RuaWNreSA8c29jaG90bmlja3lAZ21h aWwuY29tPgpEYXRlOiBUdWUsIDI3IE9jdCAyMDA5IDIwOjQ1OjE4ICswMTAwClN1YmplY3Q6IFtQ QVRDSF0gU3VwcG9ydCBmb3IgZXhwb3J0aW5nIG9yaWdpbmFsIGZpbGUgaW4gZmxpY2tyCgpubyBy ZXNpemluZywgbm8gcmVjb21wcmVzc2luZywganVzdCByZW1vdmVkIElQVEMgdXRmLTggdGFncwot LS0KIGZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuY3BwIHwgICAxOCArKysrKysrKysrKystLS0t LS0KIGZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuaCAgIHwgICAgMiArLQogZmxpY2tyZXhwb3J0 L2ZsaWNrcndpZGdldC5jcHAgfCAgIDM0ICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0KIGZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuaCAgIHwgICAgNSArKysrKwogZmxpY2tyZXhw b3J0L2ZsaWNrcndpbmRvdy5jcHAgfCAgICA0ICsrKysKIGZsaWNrcmV4cG9ydC9mbGlja3J3aW5k b3cuaCAgIHwgICAgMSArCiA2IGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDE1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuY3BwIGIv ZmxpY2tyZXhwb3J0L2ZsaWNrcnRhbGtlci5jcHAKaW5kZXggMjBkNjY5NS4uMmUwMjY5OCAxMDA2 NDQKLS0tIGEvZmxpY2tyZXhwb3J0L2ZsaWNrcnRhbGtlci5jcHAKKysrIGIvZmxpY2tyZXhwb3J0 L2ZsaWNrcnRhbGtlci5jcHAKQEAgLTUzMSw3ICs1MzEsNyBAQCB2b2lkIEZsaWNrclRhbGtlcjo6 YWRkUGhvdG9Ub1Bob3RvU2V0KGNvbnN0IFFTdHJpbmcmIHBob3RvSWQsCiB9CiAKIGJvb2wgRmxp Y2tyVGFsa2VyOjphZGRQaG90byhjb25zdCBRU3RyaW5nJiBwaG90b1BhdGgsIGNvbnN0IEZQaG90 b0luZm8mIGluZm8sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCByZXNjYWxlLCBp bnQgbWF4RGltLCBpbnQgaW1hZ2VRdWFsaXR5KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJvb2wgc2VuZE9yaWdpbmFsLCBib29sIHJlc2NhbGUsIGludCBtYXhEaW0sIGludCBpbWFnZVF1 YWxpdHkpCiB7CiAgICAgaWYgKG1fam9iKQogICAgIHsKQEAgLTYwNywxMiArNjA3LDE4IEBAIGJv b2wgRmxpY2tyVGFsa2VyOjphZGRQaG90byhjb25zdCBRU3RyaW5nJiBwaG90b1BhdGgsIGNvbnN0 IEZQaG90b0luZm8mIGluZm8sCiAgICAgewogICAgICAgICBwYXRoID0gS1N0YW5kYXJkRGlyczo6 bG9jYXRlTG9jYWwoInRtcCIsIFFGaWxlSW5mbyhwaG90b1BhdGgpLmJhc2VOYW1lKCkudHJpbW1l ZCgpICsgIi5qcGciKTsKIAotICAgICAgICBpZiAocmVzY2FsZSAmJiAoaW1hZ2Uud2lkdGgoKSA+ IG1heERpbSB8fCBpbWFnZS5oZWlnaHQoKSA+IG1heERpbSkpCi0gICAgICAgICAgICBpbWFnZSA9 IGltYWdlLnNjYWxlZChtYXhEaW0sIG1heERpbSwgUXQ6OktlZXBBc3BlY3RSYXRpbywKKyAgICAg ICAgaWYgKHNlbmRPcmlnaW5hbCkKKyAgICAgICAgeworICAgICAgICAgICAgUUZpbGUgaW1nRmls ZShwaG90b1BhdGgpOworICAgICAgICAgICAgaW1nRmlsZS5jb3B5KHBhdGgpOworICAgICAgICB9 CisgICAgICAgIGVsc2UKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHJlc2NhbGUgJiYgKGlt YWdlLndpZHRoKCkgPiBtYXhEaW0gfHwgaW1hZ2UuaGVpZ2h0KCkgPiBtYXhEaW0pKQorICAgICAg ICAgICAgICAgIGltYWdlID0gaW1hZ2Uuc2NhbGVkKG1heERpbSwgbWF4RGltLCBRdDo6S2VlcEFz cGVjdFJhdGlvLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFF0OjpTbW9vdGhUcmFuc2Zvcm1hdGlvbik7Ci0KLSAgICAgICAgaW1hZ2Uuc2F2ZShwYXRo LCAiSlBFRyIsIGltYWdlUXVhbGl0eSk7Ci0KKyAgICAgICAgICAgIGltYWdlLnNhdmUocGF0aCwg IkpQRUciLCBpbWFnZVF1YWxpdHkpOworICAgICAgICB9CiAgICAgICAgIC8vIFJlc3RvcmUgYWxs IG1ldGFkYXRhLgogCiAgICAgICAgIEtFeGl2MklmYWNlOjpLRXhpdjIgZXhpdjJJZmFjZTsKZGlm ZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9mbGlja3J0YWxrZXIuaCBiL2ZsaWNrcmV4cG9ydC9mbGlj a3J0YWxrZXIuaAppbmRleCA2MjI5MDZlLi5jMGMyZGYxIDEwMDY0NAotLS0gYS9mbGlja3JleHBv cnQvZmxpY2tydGFsa2VyLmgKKysrIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcnRhbGtlci5oCkBAIC05 Miw3ICs5Miw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgICAgYWRkUGhvdG9Ub1Bob3RvU2V0KGNv bnN0IFFTdHJpbmcmIHBob3RvSWQsIGNvbnN0IFFTdHJpbmcmIHBob3RvU2V0SWQpOwogICAgIGJv b2wgICAgYWRkUGhvdG8oY29uc3QgUVN0cmluZyYgcGhvdG9QYXRoLCBjb25zdCBGUGhvdG9JbmZv JiBpbmZvLAotICAgICAgICAgICAgICAgICAgICAgYm9vbCByZXNjYWxlPWZhbHNlLCBpbnQgbWF4 RGltPTYwMCwgaW50IGltYWdlUXVhbGl0eT04NSk7CisgICAgICAgICAgICAgICAgICAgICBib29s IHNlbmRPcmlnaW5hbCA9IGZhbHNlLCBib29sIHJlc2NhbGU9ZmFsc2UsIGludCBtYXhEaW09NjAw LCBpbnQgaW1hZ2VRdWFsaXR5PTg1KTsKIAogcHVibGljOgogCmRpZmYgLS1naXQgYS9mbGlja3Jl eHBvcnQvZmxpY2tyd2lkZ2V0LmNwcCBiL2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuY3BwCmlu ZGV4IDczODljNzIuLmFkMjk5NDcgMTAwNjQ0Ci0tLSBhL2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRn ZXQuY3BwCisrKyBiL2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuY3BwCkBAIC0yOTQsMTUgKzI5 NCwyMCBAQCBGbGlja3JXaWRnZXQ6OkZsaWNrcldpZGdldChRV2lkZ2V0KiBwYXJlbnQsIEtJUEk6 OkludGVyZmFjZSAqaWZhY2UsIGNvbnN0IFFTdHJpbgogCiAgICAgLy8gLS0gTGF5b3V0IGZvciB0 aGUgcmVzaXppbmcgb3B0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAKLSAgICBRR3JvdXBCb3gqICAgcmVzaXppbmdCb3ggICAgICAgPSBuZXcgUUdyb3VwQm94KGkx OG4oIlJlc2l6aW5nIE9wdGlvbnMiKSwgc2V0dGluZ3NCb3gpOworICAgIG1fcmVzaXppbmdCb3gg ID0gbmV3IFFHcm91cEJveChpMThuKCJSZXNpemluZyBPcHRpb25zIiksIHNldHRpbmdzQm94KTsK ICAgICBRR3JpZExheW91dCAqcmVzaXppbmdCb3hMYXlvdXQgPSBuZXcgUUdyaWRMYXlvdXQ7Ci0g ICAgcmVzaXppbmdCb3gtPnNldExheW91dChyZXNpemluZ0JveExheW91dCk7CisgICAgbV9yZXNp emluZ0JveC0+c2V0TGF5b3V0KHJlc2l6aW5nQm94TGF5b3V0KTsKIAotICAgIG1fcmVzaXplQ2hl Y2tCb3ggICA9IG5ldyBRQ2hlY2tCb3gocmVzaXppbmdCb3gpOworICAgIG1fc2VuZE9yaWdpbmFs Q2hlY2tCb3ggPSBuZXcgUUNoZWNrQm94KG1fcmVzaXppbmdCb3gpOworICAgIG1fc2VuZE9yaWdp bmFsQ2hlY2tCb3gtPnNldFRleHQoaTE4bigiU2VuZCBvcmlnaW5hbCBmaWxlIChubyByZXNpemlu ZykiKSk7CisgICAgbV9zZW5kT3JpZ2luYWxDaGVja0JveC0+c2V0Q2hlY2tlZChmYWxzZSk7CisK KyAgICBtX3Jlc2l6ZUNoZWNrQm94ICAgPSBuZXcgUUNoZWNrQm94KG1fcmVzaXppbmdCb3gpOwog ICAgIG1fcmVzaXplQ2hlY2tCb3gtPnNldFRleHQoaTE4bigiUmVzaXplIHBob3RvcyBiZWZvcmUg dXBsb2FkaW5nIikpOwogICAgIG1fcmVzaXplQ2hlY2tCb3gtPnNldENoZWNrZWQoZmFsc2UpOwog Ci0gICAgbV9kaW1lbnNpb25TcGluQm94ID0gbmV3IFFTcGluQm94KHJlc2l6aW5nQm94KTsKKwor ICAgIG1fZGltZW5zaW9uU3BpbkJveCA9IG5ldyBRU3BpbkJveChtX3Jlc2l6aW5nQm94KTsKICAg ICBtX2RpbWVuc2lvblNwaW5Cb3gtPnNldE1pbmltdW0oMCk7CiAgICAgbV9kaW1lbnNpb25TcGlu Qm94LT5zZXRNYXhpbXVtKDUwMDApOwogICAgIG1fZGltZW5zaW9uU3BpbkJveC0+c2V0U2luZ2xl U3RlcCgxMCk7CkBAIC0zMTAsOSArMzE1LDkgQEAgRmxpY2tyV2lkZ2V0OjpGbGlja3JXaWRnZXQo UVdpZGdldCogcGFyZW50LCBLSVBJOjpJbnRlcmZhY2UgKmlmYWNlLCBjb25zdCBRU3RyaW4KICAg ICBtX2RpbWVuc2lvblNwaW5Cb3gtPnNldFNpemVQb2xpY3koUVNpemVQb2xpY3k6OkZpeGVkLCBR U2l6ZVBvbGljeTo6Rml4ZWQpOwogICAgIG1fZGltZW5zaW9uU3BpbkJveC0+c2V0RW5hYmxlZChm YWxzZSk7CiAKLSAgICBRTGFiZWwqIHJlc2l6ZUxhYmVsICAgPSBuZXcgUUxhYmVsKGkxOG4oIk1h eGltdW0gZGltZW5zaW9uIChwaXhlbHMpOiIpLCByZXNpemluZ0JveCk7CisgICAgUUxhYmVsKiBy ZXNpemVMYWJlbCAgID0gbmV3IFFMYWJlbChpMThuKCJNYXhpbXVtIGRpbWVuc2lvbiAocGl4ZWxz KToiKSwgbV9yZXNpemluZ0JveCk7CiAKLSAgICBtX2ltYWdlUXVhbGl0eVNwaW5Cb3ggPSBuZXcg UVNwaW5Cb3gocmVzaXppbmdCb3gpOworICAgIG1faW1hZ2VRdWFsaXR5U3BpbkJveCA9IG5ldyBR U3BpbkJveChtX3Jlc2l6aW5nQm94KTsKICAgICBtX2ltYWdlUXVhbGl0eVNwaW5Cb3gtPnNldE1p bmltdW0oMCk7CiAgICAgbV9pbWFnZVF1YWxpdHlTcGluQm94LT5zZXRNYXhpbXVtKDEwMCk7CiAg ICAgbV9pbWFnZVF1YWxpdHlTcGluQm94LT5zZXRTaW5nbGVTdGVwKDEpOwpAQCAtMzIwLDcgKzMy NSw3IEBAIEZsaWNrcldpZGdldDo6RmxpY2tyV2lkZ2V0KFFXaWRnZXQqIHBhcmVudCwgS0lQSTo6 SW50ZXJmYWNlICppZmFjZSwgY29uc3QgUVN0cmluCiAgICAgbV9pbWFnZVF1YWxpdHlTcGluQm94 LT5zZXRTaXplUG9saWN5KFFTaXplUG9saWN5OjpGaXhlZCwgUVNpemVQb2xpY3k6OkZpeGVkKTsK IAogICAgIC8vIE5PVEU6IFRoZSB0ZXJtIENvbXByZXNzaW9uIGZhY3RvciBtYXkgYmUgdG8gdGVj aG5pY2FsIHRvIHdyaXRlIGluIHRoZSBsYWJlbAotICAgIFFMYWJlbCogaW1hZ2VRdWFsaXR5TGFi ZWwgPSBuZXcgUUxhYmVsKGkxOG4oIkpQRUcgSW1hZ2UgUXVhbGl0eSAoaGlnaGVyIGlzIGJldHRl cik6IiksIHJlc2l6aW5nQm94KTsKKyAgICBRTGFiZWwqIGltYWdlUXVhbGl0eUxhYmVsID0gbmV3 IFFMYWJlbChpMThuKCJKUEVHIEltYWdlIFF1YWxpdHkgKGhpZ2hlciBpcyBiZXR0ZXIpOiIpLCBt X3Jlc2l6aW5nQm94KTsKIAogICAgIHJlc2l6aW5nQm94TGF5b3V0LT5hZGRXaWRnZXQoaW1hZ2VR dWFsaXR5TGFiZWwsICAgICAwLCAwLCAxLCAzKTsKICAgICByZXNpemluZ0JveExheW91dC0+YWRk V2lkZ2V0KG1faW1hZ2VRdWFsaXR5U3BpbkJveCwgMCwgMywgMSwgMSk7CkBAIC0zMzcsNyArMzQy LDggQEAgRmxpY2tyV2lkZ2V0OjpGbGlja3JXaWRnZXQoUVdpZGdldCogcGFyZW50LCBLSVBJOjpJ bnRlcmZhY2UgKmlmYWNlLCBjb25zdCBRU3RyaW4KICAgICBzZXR0aW5nc0JveExheW91dC0+YWRk V2lkZ2V0KGFjY291bnRCb3gpOwogICAgIHNldHRpbmdzQm94TGF5b3V0LT5hZGRXaWRnZXQodGFn c0JveCk7CiAgICAgc2V0dGluZ3NCb3hMYXlvdXQtPmFkZFdpZGdldChwdWJsaWNhdGlvbkJveCk7 Ci0gICAgc2V0dGluZ3NCb3hMYXlvdXQtPmFkZFdpZGdldChyZXNpemluZ0JveCk7CisgICAgc2V0 dGluZ3NCb3hMYXlvdXQtPmFkZFdpZGdldChtX3NlbmRPcmlnaW5hbENoZWNrQm94KTsKKyAgICBz ZXR0aW5nc0JveExheW91dC0+YWRkV2lkZ2V0KG1fcmVzaXppbmdCb3gpOwogICAgIHNldHRpbmdz Qm94TGF5b3V0LT5hZGRTdHJldGNoKDEwKTsKICAgICBzZXR0aW5nc0JveExheW91dC0+c2V0U3Bh Y2luZyhLRGlhbG9nOjpzcGFjaW5nSGludCgpKTsKICAgICBzZXR0aW5nc0JveExheW91dC0+c2V0 TWFyZ2luKEtEaWFsb2c6OnNwYWNpbmdIaW50KCkpOwpAQCAtMzUyLDYgKzM1OCw4IEBAIEZsaWNr cldpZGdldDo6RmxpY2tyV2lkZ2V0KFFXaWRnZXQqIHBhcmVudCwgS0lQSTo6SW50ZXJmYWNlICpp ZmFjZSwgY29uc3QgUVN0cmluCiAgICAgbV90YWItPmluc2VydFRhYihVUExPQUQsICAgc2V0dGlu Z3NTY3JvbGxBcmVhLCBpMThuKCJVcGxvYWQgT3B0aW9ucyIpKTsKIAogICAgIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQorICAgIGNvbm5lY3QobV9zZW5kT3JpZ2luYWxDaGVja0JveCwgU0lHTkFMKGNsaWNr ZWQoKSksCisgICAgICAgICAgICB0aGlzLCBTTE9UKHNsb3RPcmlnaW5hbENoZWNrZWQoKSkpOwog CiAgICAgY29ubmVjdChtX3Jlc2l6ZUNoZWNrQm94LCBTSUdOQUwoY2xpY2tlZCgpKSwKICAgICAg ICAgICAgIHRoaXMsIFNMT1Qoc2xvdFJlc2l6ZUNoZWNrZWQoKSkpOwpAQCAtNDI1LDYgKzQzMywx MSBAQCBGbGlja3JXaWRnZXQ6On5GbGlja3JXaWRnZXQoKQogewogfQogCit2b2lkIEZsaWNrcldp ZGdldDo6c2xvdE9yaWdpbmFsQ2hlY2tlZCgpCit7CisgICAgbV9yZXNpemluZ0JveC0+c2V0Vmlz aWJsZSghbV9zZW5kT3JpZ2luYWxDaGVja0JveC0+aXNDaGVja2VkKCkpOworfQorCiB2b2lkIEZs aWNrcldpZGdldDo6c2xvdFJlc2l6ZUNoZWNrZWQoKQogewogICAgIG1fZGltZW5zaW9uU3BpbkJv eC0+c2V0RW5hYmxlZChtX3Jlc2l6ZUNoZWNrQm94LT5pc0NoZWNrZWQoKSk7CkBAIC01OTIsNCAr NjA1LDkgQEAgdm9pZCBGbGlja3JXaWRnZXQ6OnNsb3RBZGRFeHRyYVRhZ3NUb2dnbGVkKGJvb2wg c3RhdHVzKQogICAgIH0KIH0KIAordm9pZCBGbGlja3JXaWRnZXQ6OnNob3dFdmVudChRU2hvd0V2 ZW50KiBldmVudCkKK3sKKyAgICBzbG90T3JpZ2luYWxDaGVja2VkKCk7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIEtJUElGbGlja3JFeHBvcnRQbHVnaW4KZGlmZiAtLWdpdCBhL2ZsaWNrcmV4cG9ydC9m bGlja3J3aWRnZXQuaCBiL2ZsaWNrcmV4cG9ydC9mbGlja3J3aWRnZXQuaAppbmRleCAyYjg0ZTA3 Li5iMjg5OTQ1IDEwMDY0NAotLS0gYS9mbGlja3JleHBvcnQvZmxpY2tyd2lkZ2V0LmgKKysrIGIv ZmxpY2tyZXhwb3J0L2ZsaWNrcndpZGdldC5oCkBAIC03MSwxMCArNzEsMTMgQEAgcHVibGljOgog CiAgICAgRmxpY2tyV2lkZ2V0KFFXaWRnZXQqIHBhcmVudCwgS0lQSTo6SW50ZXJmYWNlKiBpZmFj ZSwgY29uc3QgUVN0cmluZyYgc2VydmljZU5hbWUpOwogICAgIH5GbGlja3JXaWRnZXQoKTsKK3By b3RlY3RlZDoKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0V2ZW50KFFTaG93RXZlbnQqIGV2ZW50KTsK IAogcHJpdmF0ZSBRX1NMT1RTOgogCiAgICAgdm9pZCBzbG90UmVzaXplQ2hlY2tlZCgpOworICAg IHZvaWQgc2xvdE9yaWdpbmFsQ2hlY2tlZCgpOwogICAgIHZvaWQgc2xvdFBlcm1pc3Npb25DaGFu Z2VkKEZsaWNrckxpc3Q6OkZpZWxkVHlwZSwgUXQ6OkNoZWNrU3RhdGUpOwogICAgIHZvaWQgc2xv dFNhZmV0eUxldmVsQ2hhbmdlZChGbGlja3JMaXN0OjpTYWZldHlMZXZlbCk7CiAgICAgdm9pZCBz bG90Q29udGVudFR5cGVDaGFuZ2VkKEZsaWNrckxpc3Q6OkNvbnRlbnRUeXBlKTsKQEAgLTExMyw5 ICsxMTYsMTEgQEAgcHJpdmF0ZTogLy8gRGF0YQogICAgIFFDaGVja0JveCogICAgICAgICAgICAg ICAgICAgICAgICAgIG1fZnJpZW5kc0NoZWNrQm94OwogICAgIFFDaGVja0JveCogICAgICAgICAg ICAgICAgICAgICAgICAgIG1fcHVibGljQ2hlY2tCb3g7CiAgICAgUUNoZWNrQm94KiAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9yZXNpemVDaGVja0JveDsKKyAgICBRQ2hlY2tCb3gqICAgICAg ICAgICAgICAgICAgICAgICAgICBtX3NlbmRPcmlnaW5hbENoZWNrQm94OwogCiAgICAgUUdyb3Vw Qm94KiAgICAgICAgICAgICAgICAgICAgICAgICAgbV9leHRlbmRlZFRhZ3NCb3g7CiAgICAgUUdy b3VwQm94KiAgICAgICAgICAgICAgICAgICAgICAgICAgbV9leHRlbmRlZFB1YmxpY2F0aW9uQm94 OworICAgIFFHcm91cEJveCogICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVzaXppbmdCb3g7 CiAKICAgICBLTGluZUVkaXQqICAgICAgICAgICAgICAgICAgICAgICAgICBtX3RhZ3NMaW5lRWRp dDsKIApkaWZmIC0tZ2l0IGEvZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5jcHAgYi9mbGlja3Jl eHBvcnQvZmxpY2tyd2luZG93LmNwcAppbmRleCBiZmM2YjdmLi4xMTVlYzFkIDEwMDY0NAotLS0g YS9mbGlja3JleHBvcnQvZmxpY2tyd2luZG93LmNwcAorKysgYi9mbGlja3JleHBvcnQvZmxpY2ty d2luZG93LmNwcApAQCAtMTAzLDYgKzEwMyw3IEBAIEZsaWNrcldpbmRvdzo6RmxpY2tyV2luZG93 KEtJUEk6OkludGVyZmFjZSogaW50ZXJmYWNlLCBjb25zdCBRU3RyaW5nJiB0bXBGb2xkZXIsCiAg ICAgbV9waG90b1ZpZXcgICAgICAgICAgICAgICAgID0gbV93aWRnZXQtPm1fcGhvdG9WaWV3Owog ICAgIG1fYWxidW1zTGlzdENvbWJvQm94ICAgICAgICA9IG1fd2lkZ2V0LT5tX2FsYnVtc0xpc3RD b21ib0JveDsKICAgICBtX25ld0FsYnVtQnRuICAgICAgICAgICAgICAgPSBtX3dpZGdldC0+bV9u ZXdBbGJ1bUJ0bjsKKyAgICBtX3NlbmRPcmlnaW5hbENoZWNrQm94ICAgICAgPSBtX3dpZGdldC0+ bV9zZW5kT3JpZ2luYWxDaGVja0JveDsKICAgICBtX3Jlc2l6ZUNoZWNrQm94ICAgICAgICAgICAg PSBtX3dpZGdldC0+bV9yZXNpemVDaGVja0JveDsKICAgICBtX3B1YmxpY0NoZWNrQm94ICAgICAg ICAgICAgPSBtX3dpZGdldC0+bV9wdWJsaWNDaGVja0JveDsKICAgICBtX2ZhbWlseUNoZWNrQm94 ICAgICAgICAgICAgPSBtX3dpZGdldC0+bV9mYW1pbHlDaGVja0JveDsKQEAgLTMyNiw2ICszMjcs NyBAQCB2b2lkIEZsaWNrcldpbmRvdzo6cmVhZFNldHRpbmdzKCkKICAgICAgICAgbV9yZXNpemVD aGVja0JveC0+c2V0Q2hlY2tlZChmYWxzZSk7CiAgICAgICAgIG1fZGltZW5zaW9uU3BpbkJveC0+ c2V0RW5hYmxlZChmYWxzZSk7CiAgICAgfQorICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gtPnNl dENoZWNrZWQoZ3JwLnJlYWRFbnRyeSgiU2VuZCBvcmlnaW5hbCIsIGZhbHNlKSk7CiAKICAgICBt X2RpbWVuc2lvblNwaW5Cb3gtPnNldFZhbHVlKGdycC5yZWFkRW50cnkoIk1heGltdW0gV2lkdGgi LCAxNjAwKSk7CiAgICAgbV9pbWFnZVF1YWxpdHlTcGluQm94LT5zZXRWYWx1ZShncnAucmVhZEVu dHJ5KCJJbWFnZSBRdWFsaXR5IiwgODUpKTsKQEAgLTM1Miw2ICszNTQsNyBAQCB2b2lkIEZsaWNr cldpbmRvdzo6d3JpdGVTZXR0aW5ncygpCiAgICAgaW50IGNvbnRlbnRUeXBlID0gbV9jb250ZW50 VHlwZUNvbWJvQm94LT5pdGVtRGF0YShtX2NvbnRlbnRUeXBlQ29tYm9Cb3gtPmN1cnJlbnRJbmRl eCgpKS50b0ludCgpOwogICAgIGdycC53cml0ZUVudHJ5KCJDb250ZW50IFR5cGUiLCAgICAgICAg ICAgICAgICAgICAgICBjb250ZW50VHlwZSk7CiAgICAgZ3JwLndyaXRlRW50cnkoIlJlc2l6ZSIs ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVzaXplQ2hlY2tCb3gtPmlzQ2hlY2tlZCgp KTsKKyAgICBncnAud3JpdGVFbnRyeSgiU2VuZCBvcmlnaW5hbCIsICAgICAgICAgICAgICAgICAg ICAgbV9zZW5kT3JpZ2luYWxDaGVja0JveC0+aXNDaGVja2VkKCkpOwogICAgIGdycC53cml0ZUVu dHJ5KCJNYXhpbXVtIFdpZHRoIiwgICAgICAgICAgICAgICAgICAgICBtX2RpbWVuc2lvblNwaW5C b3gtPnZhbHVlKCkpOwogICAgIGdycC53cml0ZUVudHJ5KCJJbWFnZSBRdWFsaXR5IiwgICAgICAg ICAgICAgICAgICAgICBtX2ltYWdlUXVhbGl0eVNwaW5Cb3gtPnZhbHVlKCkpOwogICAgIEtDb25m aWdHcm91cCBkaWFsb2dHcm91cCA9IGNvbmZpZy5ncm91cChRU3RyaW5nKCIlMUV4cG9ydCBEaWFs b2ciKS5hcmcobV9zZXJ2aWNlTmFtZSkpOwpAQCAtNjU0LDYgKzY1Nyw3IEBAIHZvaWQgRmxpY2ty V2luZG93OjpzbG90QWRkUGhvdG9OZXh0KCkKIAogICAgIGJvb2wgcmVzID0gbV90YWxrZXItPmFk ZFBob3RvKHBhdGhDb21tZW50cy5maXJzdC50b0xvY2FsRmlsZSgpLCAvL3RoZSBmaWxlIHBhdGgK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1fc2VuZE9yaWdpbmFsQ2hlY2tCb3gtPmlzQ2hlY2tlZCgpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVzaXplQ2hlY2tCb3gtPmlzQ2hl Y2tlZCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZGltZW5zaW9uU3Bp bkJveC0+dmFsdWUoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2ltYWdl UXVhbGl0eVNwaW5Cb3gtPnZhbHVlKCkpOwpkaWZmIC0tZ2l0IGEvZmxpY2tyZXhwb3J0L2ZsaWNr cndpbmRvdy5oIGIvZmxpY2tyZXhwb3J0L2ZsaWNrcndpbmRvdy5oCmluZGV4IGIxNTI1MzUuLjBi Y2Y3ZWUgMTAwNjQ0Ci0tLSBhL2ZsaWNrcmV4cG9ydC9mbGlja3J3aW5kb3cuaAorKysgYi9mbGlj a3JleHBvcnQvZmxpY2tyd2luZG93LmgKQEAgLTE0OCw2ICsxNDgsNyBAQCBwcml2YXRlOgogICAg IFFDaGVja0JveCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKm1fc3RyaXBTcGFjZVRhZ3ND aGVja0JveDsKICAgICBRQ2hlY2tCb3ggICAgICAgICAgICAgICAgICAgICAgICAgICAgICptX2Fk ZEV4dHJhVGFnc0NoZWNrQm94OwogICAgIFFDaGVja0JveCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKm1fcmVzaXplQ2hlY2tCb3g7CisgICAgUUNoZWNrQm94ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAqbV9zZW5kT3JpZ2luYWxDaGVja0JveDsKIAogICAgIFFTcGluQm94ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKm1fZGltZW5zaW9uU3BpbkJveDsKICAgICBRU3BpbkJv eCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICptX2ltYWdlUXVhbGl0eVNwaW5Cb3g7Ci0t IAoxLjcuMQoK