From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#51596: image-transform-resize has inconsistent semantics wrt scaling up/down Date: Thu, 4 Nov 2021 21:07:33 -0700 Message-ID: References: <87fssbu7wh.fsf@gnus.org> <87ee7vpm87.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000062e18d05d002c8f5" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5521"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 51596@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 05 05:08:13 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1miqWS-0001DF-5l for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Nov 2021 05:08:12 +0100 Original-Received: from localhost ([::1]:48174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miqWQ-0003tg-MB for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Nov 2021 00:08:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miqWJ-0003rR-6S for bug-gnu-emacs@gnu.org; Fri, 05 Nov 2021 00:08:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miqWI-0003ZF-VE for bug-gnu-emacs@gnu.org; Fri, 05 Nov 2021 00:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1miqWI-0003Z4-Hb for bug-gnu-emacs@gnu.org; Fri, 05 Nov 2021 00:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Nov 2021 04:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51596 X-GNU-PR-Package: emacs Original-Received: via spool by 51596-submit@debbugs.gnu.org id=B51596.163608526413675 (code B ref 51596); Fri, 05 Nov 2021 04:08:02 +0000 Original-Received: (at 51596) by debbugs.gnu.org; 5 Nov 2021 04:07:44 +0000 Original-Received: from localhost ([127.0.0.1]:44240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miqW0-0003YU-18 for submit@debbugs.gnu.org; Fri, 05 Nov 2021 00:07:44 -0400 Original-Received: from mail-pl1-f173.google.com ([209.85.214.173]:33354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miqVv-0003Y2-Oy for 51596@debbugs.gnu.org; Fri, 05 Nov 2021 00:07:41 -0400 Original-Received: by mail-pl1-f173.google.com with SMTP id s24so10399711plp.0 for <51596@debbugs.gnu.org>; Thu, 04 Nov 2021 21:07:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=PAUSPHllYgCsHquerIBZHnVsWYr3rJ7M10ys3WRTcf0=; b=NJf9dvbMF3Encz2Z1vwPAIaocAcw3VhTsOehasEk+gTfrV5oi0LYTr6pBpBG3Vnmo7 6JYQ6aORXom22b58m814ZOxyG7pOQrYxqfyrC1xAex/e796iWHkwVO+gDqmPrriK+FyK /H8THuxGf7SiFvHvgH9Br6cTeEXKhaDXMBPmjhtVtA4NzGjMEcccC1/55A2IurQ8lGRC dVoHYQfLBKKqphlpl22Wk5zVNHR/Q1dzjllldS3P7aJGs1kgFWwlmes6vUEy1Qp+7qQE iSizhhApr8F5kIA6KhzbKfjBBhXbfwijLjJIxi0QD31+rlp88vgOXmbLDBHkGyR8l+2h i0oA== X-Gm-Message-State: AOAM532dQrztm5/r5lHeZh3a9e9Zn3HLy5SlOmo4vdfaFWvG+QRwefVA TjM7qMMCHB6dEiJq2Vucac7V0uq7okUcx/uQg+8= X-Google-Smtp-Source: ABdhPJxG1RTYM7xD1eAB4/OHvGPfTH5Na8lxO30dXcv2kuUpdPUFRG0tVNhSB+vzCql1fAPNv/5+JDgq1YFUHuhcJhQ= X-Received: by 2002:a17:902:a410:b0:141:be1a:53d1 with SMTP id p16-20020a170902a41000b00141be1a53d1mr38305995plq.71.1636085253981; Thu, 04 Nov 2021 21:07:33 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 4 Nov 2021 21:07:33 -0700 In-Reply-To: <87ee7vpm87.fsf@gnus.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:218967 Archived-At: --00000000000062e18d05d002c8f5 Content-Type: text/plain; charset="UTF-8" tags 51596 + patch thanks Lars Ingebrigtsen writes: > Stefan Kangas writes: > >> Right, and that's a valid use case of course. I still find the >> interface inconsistent, as the naming scheme suggests that these three >> options should behave similarly. I've attached a patch below which implements the behavior I propose. > Yes. I think that, basically, the fit to height/width commands are > pretty useless -- nobody wants that, because it'll inevitably make some > images impossible to view. > > The two cases that make sense are "scale down so I can see the images" > and "both scale down and scale up, because I want to see as much detail > as possible". That's true, now that you mention it. The first patch below therefore obsoletes the old commands, mostly to free up the "s w" binding which gives the new, and strictly better, behavior. We could also leave them unobsoleted and still take over the key. It won't hurt anyone because, as you point out, the current command is only different in the cases where its worse. > Sure, or a "don't scale up more than 200%", perhaps. That's less > finicky, I think. Yes, that's probably better. For this part, see my second patch below, which builds on the first one. --00000000000062e18d05d002c8f5 Content-Type: text/x-diff; charset="US-ASCII"; name="0001-New-command-image-transform-fit-to-window.patch" Content-Disposition: attachment; filename="0001-New-command-image-transform-fit-to-window.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: aaec0f16e38ca2a_0.1 RnJvbSBjNTc2MDg5OGQxZTM5NjY4MmM0Mzg4ZGM4YjQ3NGUwODMwZGQyYjJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogRnJpLCA1IE5vdiAyMDIxIDAzOjI0OjUwICswMTAwClN1YmplY3Q6IFtQQVRDSCAxLzJdIE5l dyBjb21tYW5kIGltYWdlLXRyYW5zZm9ybS1maXQtdG8td2luZG93CgoqIGxpc3AvaW1hZ2UtbW9k ZS5lbCAoaW1hZ2UtYXV0by1yZXNpemUsIGltYWdlLXRyYW5zZm9ybS1yZXNpemUpOgpBZGQgbmV3 IHZhbHVlICdmaXQtd2luZG93JywgbWVhbmluZyB0byBzY2FsZSB0aGUgaW1hZ2UgdXAgb3IgZG93 bgp0byBmaXQgdGhlIHdpbmRvdy4gIChCdWcjKQooaW1hZ2UtdHJhbnNmb3JtLWZpdC10by13aW5k b3cpOiBOZXcgY29tbWFuZC4KKGltYWdlLXRyYW5zZm9ybS1maXQtdG8taGVpZ2h0LCBpbWFnZS10 cmFuc2Zvcm0tZml0LXRvLXdpZHRoKToKTWFrZSBvYnNvbGV0ZSBpbiBmYXZvciBvZiBhYm92ZSBu ZXcgY29tbWFuZC4KKGltYWdlLW1vZGUtbWFwKTogQmluZCAicyB3IiB0byAnaW1hZ2UtdHJhbnNm b3JtLWZpdC10by13aW5kb3cnLgpNb3ZlIGJpbmRpbmcgZm9yIG9ic29sZXRlIGNvbW1hbmQgJ2lt YWdlLXRyYW5zZm9ybS1maXQtdG8td2lkdGgnCnRvICJzIGkiLgooaW1hZ2UtbW9kZS1tYXApOiBB ZGQgbWVudSBlbnRyeSBmb3IKJ2ltYWdlLXRyYW5zZm9ybS1maXQtdG8td2luZG93Jy4gIFJlbW92 ZSBtZW51IGVudHJpZXMgZm9yIGFib3ZlCm9ic29sZXRlIGNvbW1hbmRzLgoqIGRvYy9lbWFjcy9m aWxlcy50ZXhpIChJbWFnZSBNb2RlKTogVXBkYXRlIGRvY3VtZW50YXRpb24uCihpbWFnZS10cmFu c2Zvcm0tZml0LWJvdGgpOiBEb2MgZml4LgotLS0KIGRvYy9lbWFjcy9maWxlcy50ZXhpIHwgIDQg KystLQogZXRjL05FV1MgICAgICAgICAgICAgfCAxOCArKysrKysrKysrKysrKwogbGlzcC9pbWFn ZS1tb2RlLmVsICAgfCA1NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kb2MvZW1hY3MvZmlsZXMudGV4aSBiL2RvYy9lbWFjcy9maWxlcy50ZXhp CmluZGV4IDY1YTU3Y2NkMzEuLjNlMDc4ODMwN2EgMTAwNjQ0Ci0tLSBhL2RvYy9lbWFjcy9maWxl cy50ZXhpCisrKyBiL2RvYy9lbWFjcy9maWxlcy50ZXhpCkBAIC0yMjA1LDExICsyMjA1LDExIEBA IEltYWdlIE1vZGUKIGJlaGF2aW9yIGJ5IHVzaW5nIHRoZSBvcHRpb25zIEBjb2Rle2ltYWdlLWF1 dG8tcmVzaXplfSBhbmQKIEBjb2Rle2ltYWdlLWF1dG8tcmVzaXplLW9uLXdpbmRvdy1yZXNpemV9 LgogCi1AZmluZGV4IGltYWdlLXRyYW5zZm9ybS1maXQtYm90aAorQGZpbmRleCBpbWFnZS10cmFu c2Zvcm0tZml0LXRvLXdpbmRvdwogQGZpbmRleCBpbWFnZS10cmFuc2Zvcm0tc2V0LXNjYWxlCiBA ZmluZGV4IGltYWdlLXRyYW5zZm9ybS1yZXNldAogVG8gcmVzaXplIHRoZSBpbWFnZSBtYW51YWxs eSB5b3UgY2FuIHVzZSB0aGUgY29tbWFuZAotQGNvZGV7aW1hZ2UtdHJhbnNmb3JtLWZpdC1ib3Ro fSBib3VuZCB0byBAa2Jke3MgYn0KK0Bjb2Rle2ltYWdlLXRyYW5zZm9ybS1maXQtdG8td2luZG93 fSBib3VuZCB0byBAa2Jke3Mgd30KIHRoYXQgZml0cyB0aGUgaW1hZ2UgdG8gYm90aCB0aGUgd2lu ZG93IGhlaWdodCBhbmQgd2lkdGguCiBUbyBzY2FsZSB0aGUgaW1hZ2Ugc3BlY2lmeWluZyBhIHNj YWxlIGZhY3RvciwgdXNlIHRoZSBjb21tYW5kCiBAY29kZXtpbWFnZS10cmFuc2Zvcm0tc2V0LXNj YWxlfSBib3VuZCB0byBAa2Jke3Mgc30uCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdT CmluZGV4IDg5OWYzNTY3ZTYuLmZmYjMzNDVhMGMgMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBi L2V0Yy9ORVdTCkBAIC0yNjgsNiArMjY4LDI0IEBAIFRvIGltcHJvdmUgc2VjdXJpdHksIGlmIGFu IHNxbCBwcm9kdWN0IGhhcyAnOnBhc3N3b3JkLWluLWNvbWludCcgc2V0CiB0byB0LCBhIHBhc3N3 b3JkIHN1cHBsaWVkIHZpYSB0aGUgbWluaWJ1ZmZlciB3aWxsIGJlIHNlbnQgaW4tcHJvY2VzcywK IGFzIG9wcG9zZWQgdG8gdmlhIHRoZSBjb21tYW5kLWxpbmUuCiAKKyoqIEltYWdlIE1vZGUKKwor KysrCisqKiogTmV3IGNvbW1hbmQgJ2ltYWdlLXRyYW5zZm9ybS1maXQtdG8td2luZG93Jy4KK1Ro aXMgY29tbWFuZCBmaXRzIHRoZSBpbWFnZSB0byB0aGUgY3VycmVudCB3aW5kb3cgYnkgc2NhbGlu ZyBkb3duIG9yCit1cCBhcyBuZWNlc3NhcnkuICBVbmxpa2UgJ2ltYWdlLXRyYW5zZm9ybS1maXQt Ym90aCcsIHRoaXMgZG9lcyBub3QKK29ubHkgc2NhbGUgdGhlIGltYWdlIGRvd24sIGJ1dCB1cCBh cyB3ZWxsLiAgSXQgaXMgYm91bmQgdG8gInMgdyIgaW4KK0ltYWdlIE1vZGUgYnkgZGVmYXVsdC4K KworKysrCisqKiogJ2ltYWdlLXRyYW5zZm9ybS1maXQtdG8tKGhlaWdodHx3aWR0aCknIGFyZSBu b3cgb2Jzb2xldGUuCitVc2UgdGhlIG5ldyBjb21tYW5kICdpbWFnZS10cmFuc2Zvcm0tZml0LXRv LXdpbmRvdycgaW5zdGVhZC4KK1RoZSBrZXliaW5kaW5nIGZvciAnaW1hZ2UtdHJhbnNmb3JtLWZp dC10by13aWR0aCcgaXMgbm93ICdzIGknLgorCistLS0KKyoqKiBVc2VyIG9wdGlvbiAnaW1hZ2Ut YXV0by1yZXNpemUnIGNhbiBub3cgYmUgc2V0IHRvICdmaXQtd2luZG93Jy4KK1RoaXMgd29ya3Mg bGlrZSAnaW1hZ2UtdHJhbnNmb3JtLWZpdC10by13aW5kb3cnLgorCiAqKiBJbWFnZS1EaXJlZAog CiArKysKZGlmZiAtLWdpdCBhL2xpc3AvaW1hZ2UtbW9kZS5lbCBiL2xpc3AvaW1hZ2UtbW9kZS5l bAppbmRleCA0YTMyNmNkYzY5Li5hOTExMDI3YTlhIDEwMDY0NAotLS0gYS9saXNwL2ltYWdlLW1v ZGUuZWwKKysrIGIvbGlzcC9pbWFnZS1tb2RlLmVsCkBAIC01OCwxNiArNTgsMjAgQEAgaW1hZ2Ut YXV0by1yZXNpemUKICAgIk5vbi1uaWwgdG8gcmVzaXplIHRoZSBpbWFnZSB1cG9uIGZpcnN0IGRp c3BsYXkuCiBJdHMgdmFsdWUgc2hvdWxkIGJlIG9uZSBvZiB0aGUgZm9sbG93aW5nOgogIC0gbmls LCBtZWFuaW5nIG5vIHJlc2l6aW5nLgotIC0gdCwgbWVhbmluZyB0byBmaXQgdGhlIGltYWdlIHRv IHRoZSB3aW5kb3cgaGVpZ2h0IGFuZCB3aWR0aC4KKyAtIHQsIG1lYW5pbmcgdG8gc2NhbGUgdGhl IGltYWdlIGRvd24gdG8gZml0IGluIHRoZSB3aW5kb3cuCisgLSBgZml0LXdpbmRvdycsIG1lYW5p bmcgdG8gZml0IHRoZSBpbWFnZSB0byB0aGUgd2luZG93LgogIC0gYGZpdC1oZWlnaHQnLCBtZWFu aW5nIHRvIGZpdCB0aGUgaW1hZ2UgdG8gdGhlIHdpbmRvdyBoZWlnaHQuCiAgLSBgZml0LXdpZHRo JywgbWVhbmluZyB0byBmaXQgdGhlIGltYWdlIHRvIHRoZSB3aW5kb3cgd2lkdGguCi0gLSBBIG51 bWJlciwgd2hpY2ggaXMgYSBzY2FsZSBmYWN0b3IgKHRoZSBkZWZhdWx0IHNpemUgaXMgMSkuIgor IC0gQSBudW1iZXIsIHdoaWNoIGlzIGEgc2NhbGUgZmFjdG9yICh0aGUgZGVmYXVsdCBzaXplIGlz IDEpLgorCitSZXNpemluZyB3aWxsIGFsd2F5cyBwcmVzZXJ2ZSB0aGUgYXNwZWN0IHJhdGlvIG9m IHRoZSBpbWFnZS4iCiAgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dGFnICJObyByZXNpemluZyIg bmlsKQotICAgICAgICAgICAgICAgICAob3RoZXIgOnRhZyAiRml0IGhlaWdodCBhbmQgd2lkdGgi IHQpCi0gICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJGaXQgaGVpZ2h0IiBmaXQtaGVpZ2h0 KQotICAgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiRml0IHdpZHRoIiBmaXQtd2lkdGgpCisg ICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJGaXQgdG8gd2luZG93IiBmaXQtd2luZG93KQor ICAgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiRml0IHRvIHdpbmRvdyBoZWlnaHQiIGZpdC1o ZWlnaHQpCisgICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJGaXQgdG8gd2luZG93IHdpZHRo IiBmaXQtd2lkdGgpCisgICAgICAgICAgICAgICAgIChvdGhlciA6dGFnICJTY2FsZSBkb3duIHRv IGZpdCB3aW5kb3ciIHQpCiAgICAgICAgICAgICAgICAgIChudW1iZXIgOnRhZyAiU2NhbGUgZmFj dG9yIiAxKSkKLSAgOnZlcnNpb24gIjI3LjEiCisgIDp2ZXJzaW9uICIyOS4xIgogICA6Z3JvdXAg J2ltYWdlKQogCiAoZGVmY3VzdG9tIGltYWdlLWF1dG8tcmVzaXplLW9uLXdpbmRvdy1yZXNpemUg MQpAQCAtODIsMTIgKzg2LDE2IEBAIGltYWdlLWF1dG8tcmVzaXplLW9uLXdpbmRvdy1yZXNpemUK IAogKGRlZnZhci1sb2NhbCBpbWFnZS10cmFuc2Zvcm0tcmVzaXplIG5pbAogICAiVGhlIGltYWdl IHJlc2l6ZSBvcGVyYXRpb24uCitOb24tbmlsIHRvIHJlc2l6ZSB0aGUgaW1hZ2UgdXBvbiBmaXJz dCBkaXNwbGF5LgogSXRzIHZhbHVlIHNob3VsZCBiZSBvbmUgb2YgdGhlIGZvbGxvd2luZzoKICAt IG5pbCwgbWVhbmluZyBubyByZXNpemluZy4KLSAtIHQsIG1lYW5pbmcgdG8gZml0IHRoZSBpbWFn ZSB0byB0aGUgd2luZG93IGhlaWdodCBhbmQgd2lkdGguCisgLSB0LCBtZWFuaW5nIHRvIHNjYWxl IHRoZSBpbWFnZSBkb3duIHRvIGZpdCBpbiB0aGUgd2luZG93LgorIC0gYGZpdC13aW5kb3cnLCBt ZWFuaW5nIHRvIGZpdCB0aGUgaW1hZ2UgdG8gdGhlIHdpbmRvdy4KICAtIGBmaXQtaGVpZ2h0Jywg bWVhbmluZyB0byBmaXQgdGhlIGltYWdlIHRvIHRoZSB3aW5kb3cgaGVpZ2h0LgogIC0gYGZpdC13 aWR0aCcsIG1lYW5pbmcgdG8gZml0IHRoZSBpbWFnZSB0byB0aGUgd2luZG93IHdpZHRoLgotIC0g QSBudW1iZXIsIHdoaWNoIGlzIGEgc2NhbGUgZmFjdG9yICh0aGUgZGVmYXVsdCBzaXplIGlzIDEp LiIpCisgLSBBIG51bWJlciwgd2hpY2ggaXMgYSBzY2FsZSBmYWN0b3IgKHRoZSBkZWZhdWx0IHNp emUgaXMgMSkuCisKK1Jlc2l6aW5nIHdpbGwgYWx3YXlzIHByZXNlcnZlIHRoZSBhc3BlY3QgcmF0 aW8gb2YgdGhlIGltYWdlLiIpCiAKIChkZWZ2YXItbG9jYWwgaW1hZ2UtdHJhbnNmb3JtLXNjYWxl IDEuMAogICAiVGhlIHNjYWxlIGZhY3RvciBvZiB0aGUgaW1hZ2UgYmVpbmcgZGlzcGxheWVkLiIp CkBAIC00NTUsOCArNDYzLDkgQEAgaW1hZ2UtbW9kZS1tYXAKIAogICAgIDs7IFRyYW5zZm9ybWF0 aW9uIGtleXMKICAgICAoZGVmaW5lLWtleSBtYXAgInNmIiAnaW1hZ2UtbW9kZS1maXQtZnJhbWUp CisgICAgKGRlZmluZS1rZXkgbWFwICJzdyIgJ2ltYWdlLXRyYW5zZm9ybS1maXQtdG8td2luZG93 KQogICAgIChkZWZpbmUta2V5IG1hcCAic2giICdpbWFnZS10cmFuc2Zvcm0tZml0LXRvLWhlaWdo dCkKLSAgICAoZGVmaW5lLWtleSBtYXAgInN3IiAnaW1hZ2UtdHJhbnNmb3JtLWZpdC10by13aWR0 aCkKKyAgICAoZGVmaW5lLWtleSBtYXAgInNpIiAnaW1hZ2UtdHJhbnNmb3JtLWZpdC10by13aWR0 aCkKICAgICAoZGVmaW5lLWtleSBtYXAgInNiIiAnaW1hZ2UtdHJhbnNmb3JtLWZpdC1ib3RoKQog ICAgIChkZWZpbmUta2V5IG1hcCAic3MiICdpbWFnZS10cmFuc2Zvcm0tc2V0LXNjYWxlKQogICAg IChkZWZpbmUta2V5IG1hcCAic3IiICdpbWFnZS10cmFuc2Zvcm0tc2V0LXJvdGF0aW9uKQpAQCAt NTExLDEyICs1MjAsMTAgQEAgaW1hZ2UtbW9kZS1tYXAKIAkiLS0iCiAJWyJGaXQgRnJhbWUgdG8g SW1hZ2UiIGltYWdlLW1vZGUtZml0LWZyYW1lIDphY3RpdmUgdAogCSA6aGVscCAiUmVzaXplIGZy YW1lIHRvIG1hdGNoIGltYWdlIl0KLQlbIkZpdCBJbWFnZSB0byBXaW5kb3cgKEJlc3QgRml0KSIg aW1hZ2UtdHJhbnNmb3JtLWZpdC1ib3RoCi0JIDpoZWxwICJSZXNpemUgaW1hZ2UgdG8gbWF0Y2gg dGhlIHdpbmRvdyBoZWlnaHQgYW5kIHdpZHRoIl0KLQlbIkZpdCB0byBXaW5kb3cgSGVpZ2h0IiBp bWFnZS10cmFuc2Zvcm0tZml0LXRvLWhlaWdodAotCSA6aGVscCAiUmVzaXplIGltYWdlIHRvIG1h dGNoIHRoZSB3aW5kb3cgaGVpZ2h0Il0KLQlbIkZpdCB0byBXaW5kb3cgV2lkdGgiIGltYWdlLXRy YW5zZm9ybS1maXQtdG8td2lkdGgKLQkgOmhlbHAgIlJlc2l6ZSBpbWFnZSB0byBtYXRjaCB0aGUg d2luZG93IHdpZHRoIl0KKyAgICAgICAgWyJGaXQgSW1hZ2UgdG8gV2luZG93IiBpbWFnZS10cmFu c2Zvcm0tZml0LXRvLXdpbmRvdworICAgICAgICAgOmhlbHAgIlJlc2l6ZSBpbWFnZSB0byBtYXRj aCB0aGUgd2luZG93IGhlaWdodCBhbmQgd2lkdGgiXQorICAgICAgICBbIkZpdCBJbWFnZSB0byBX aW5kb3cgKFNjYWxlIGRvd24gb25seSkiIGltYWdlLXRyYW5zZm9ybS1maXQtYm90aAorICAgICAg ICAgOmhlbHAgIlNjYWxlIGltYWdlIGRvd24gdG8gbWF0Y2ggdGhlIHdpbmRvdyBoZWlnaHQgYW5k IHdpZHRoIl0KIAlbIlpvb20gSW4iIGltYWdlLWluY3JlYXNlLXNpemUKIAkgOmhlbHAgIkVubGFy Z2UgdGhlIGltYWdlIl0KIAlbIlpvb20gT3V0IiBpbWFnZS1kZWNyZWFzZS1zaXplCkBAIC04Mzcs NyArODQ0LDggQEAgaW1hZ2UtdG9nZ2xlLWRpc3BsYXktaW1hZ2UKIAkgICAgZmlsZW5hbWUpKQog CSA7OyBJZiB3ZSBoYXZlIGEgYGZpdC13aWR0aCcgb3IgYSBgZml0LWhlaWdodCcsIGRvbid0IGxp bWl0CiAJIDs7IHRoZSBzaXplIG9mIHRoZSBpbWFnZSB0byB0aGUgd2luZG93IHNpemUuCi0JIChl ZGdlcyAod2hlbiAoZXEgaW1hZ2UtdHJhbnNmb3JtLXJlc2l6ZSB0KQorICAgICAgICAgKGVkZ2Vz ICh3aGVuIChvciAoZXEgaW1hZ2UtdHJhbnNmb3JtLXJlc2l6ZSB0KQorICAgICAgICAgICAgICAg ICAgICAgICAgICAoZXEgaW1hZ2UtdHJhbnNmb3JtLXJlc2l6ZSAnZml0LXdpbmRvdykpCiAJCSAg KHdpbmRvdy1pbnNpZGUtcGl4ZWwtZWRnZXMgKGdldC1idWZmZXItd2luZG93KSkpKQogCSAobWF4 LXdpZHRoICh3aGVuIGVkZ2VzCiAJCSAgICAgICgtIChudGggMiBlZGdlcykgKG50aCAwIGVkZ2Vz KSkpKQpAQCAtODg0LDYgKzg5MiwxMyBAQCBpbWFnZS10b2dnbGUtZGlzcGxheS1pbWFnZQogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBUeXBlIGhpbnQuCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDpmb3JtYXQgKGFuZCBmaWxlbmFtZSBkYXRhLXApKSkpCiAKKyAg ICA7OyBIYW5kbGUgYGZpdC13aW5kb3cnLgorICAgICh3aGVuIChlcSBpbWFnZS10cmFuc2Zvcm0t cmVzaXplICdmaXQtd2luZG93KQorICAgICAgKHNldHEgaW1hZ2UKKyAgICAgICAgICAgIChjb25z IChjYXIgaW1hZ2UpCisgICAgICAgICAgICAgICAgICAocGxpc3QtcHV0IChjZHIgaW1hZ2UpIDp3 aWR0aAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocGxpc3QtZ2V0IChjZHIgaW1hZ2Up IDptYXgtd2lkdGgpKSkpKQorCiAgICAgOzsgRGlzY2FyZCBhbnkgc3RhbGUgaW1hZ2UgZGF0YSBi ZWZvcmUgbG9va2luZyBpdCB1cCBhZ2Fpbi4KICAgICAoaW1hZ2UtZmx1c2ggaW1hZ2UpCiAgICAg KHNldHEgaW1hZ2UgKGFwcGVuZCBpbWFnZSAoaW1hZ2UtdHJhbnNmb3JtLXByb3BlcnRpZXMgaW1h Z2UpKSkKQEAgLTE0OTQsMjEgKzE1MDksMjkgQEAgaW1hZ2UtdHJhbnNmb3JtLXNldC1zY2FsZQog KGRlZnVuIGltYWdlLXRyYW5zZm9ybS1maXQtdG8taGVpZ2h0ICgpCiAgICJGaXQgdGhlIGN1cnJl bnQgaW1hZ2UgdG8gdGhlIGhlaWdodCBvZiB0aGUgY3VycmVudCB3aW5kb3cuIgogICAoaW50ZXJh Y3RpdmUpCisgIChkZWNsYXJlIChvYnNvbGV0ZSBuaWwgIjI5LjEiKSkKICAgKHNldHEgaW1hZ2Ut dHJhbnNmb3JtLXJlc2l6ZSAnZml0LWhlaWdodCkKICAgKGltYWdlLXRvZ2dsZS1kaXNwbGF5LWlt YWdlKSkKIAogKGRlZnVuIGltYWdlLXRyYW5zZm9ybS1maXQtdG8td2lkdGggKCkKICAgIkZpdCB0 aGUgY3VycmVudCBpbWFnZSB0byB0aGUgd2lkdGggb2YgdGhlIGN1cnJlbnQgd2luZG93LiIKKyAg KGRlY2xhcmUgKG9ic29sZXRlIG5pbCAiMjkuMSIpKQogICAoaW50ZXJhY3RpdmUpCiAgIChzZXRx IGltYWdlLXRyYW5zZm9ybS1yZXNpemUgJ2ZpdC13aWR0aCkKICAgKGltYWdlLXRvZ2dsZS1kaXNw bGF5LWltYWdlKSkKIAogKGRlZnVuIGltYWdlLXRyYW5zZm9ybS1maXQtYm90aCAoKQotICAiRml0 IHRoZSBjdXJyZW50IGltYWdlIGJvdGggdG8gdGhlIGhlaWdodCBhbmQgd2lkdGggb2YgdGhlIGN1 cnJlbnQgd2luZG93LiIKKyAgIlNjYWxlIHRoZSBjdXJyZW50IGltYWdlIGRvd24gdG8gZml0IGlu IHRoZSBjdXJyZW50IHdpbmRvdy4iCiAgIChpbnRlcmFjdGl2ZSkKICAgKHNldHEgaW1hZ2UtdHJh bnNmb3JtLXJlc2l6ZSB0KQogICAoaW1hZ2UtdG9nZ2xlLWRpc3BsYXktaW1hZ2UpKQogCisoZGVm dW4gaW1hZ2UtdHJhbnNmb3JtLWZpdC10by13aW5kb3cgKCkKKyAgIkZpdCB0aGUgY3VycmVudCBp bWFnZSB0byB0aGUgaGVpZ2h0IGFuZCB3aWR0aCBvZiB0aGUgY3VycmVudCB3aW5kb3cuIgorICAo aW50ZXJhY3RpdmUpCisgIChzZXRxIGltYWdlLXRyYW5zZm9ybS1yZXNpemUgJ2ZpdC13aW5kb3cp CisgIChpbWFnZS10b2dnbGUtZGlzcGxheS1pbWFnZSkpCisKIChkZWZ1biBpbWFnZS10cmFuc2Zv cm0tc2V0LXJvdGF0aW9uIChyb3RhdGlvbikKICAgIlByb21wdCBmb3IgYW4gYW5nbGUgUk9UQVRJ T04sIGFuZCByb3RhdGUgdGhlIGltYWdlIGJ5IHRoYXQgYW1vdW50LgogUk9UQVRJT04gc2hvdWxk IGJlIGluIGRlZ3JlZXMuIgotLSAKMi4zMC4yCgo= --00000000000062e18d05d002c8f5 Content-Type: text/x-diff; charset="US-ASCII"; name="0002-New-user-option-image-auto-resize-max-scale-percent.patch" Content-Disposition: attachment; filename="0002-New-user-option-image-auto-resize-max-scale-percent.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: aaec0f16e38ca2a_0.2 RnJvbSA4NWI4Yjk5YjNhMTRiNjJmZTc3MDY3MGJhNzk1YmJhNDA1Mzg0NDdjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogRnJpLCA1IE5vdiAyMDIxIDA0OjIyOjEyICswMTAwClN1YmplY3Q6IFtQQVRDSCAyLzJdIE5l dyB1c2VyIG9wdGlvbiBpbWFnZS1hdXRvLXJlc2l6ZS1tYXgtc2NhbGUtcGVyY2VudAoKKiBsaXNw L2ltYWdlLW1vZGUuZWwgKGltYWdlLWF1dG8tcmVzaXplLW1heC1zY2FsZS1wZXJjZW50KTogTmV3 CnVzZXIgb3B0aW9uIHRvIGxpbWl0IGhvdyBtdWNoICdmaXQtd2luZG93JyB3aWxsIHNjYWxlIHVw IGFuIGltYWdlLgooaW1hZ2UtLXNjYWxlLXdpdGhpbi1saW1pdHMtcCk6IE5ldyBmdW5jdGlvbi4K KGltYWdlLXRvZ2dsZS1kaXNwbGF5LWltYWdlKTogUmVzcGVjdCBhYm92ZSBuZXcgdXNlciBvcHRp b24uCi0tLQogZXRjL05FV1MgICAgICAgICAgIHwgIDQgKysrKwogbGlzcC9pbWFnZS1tb2RlLmVs IHwgMjcgKysrKysrKysrKysrKysrKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDMwIGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9O RVdTCmluZGV4IGZmYjMzNDVhMGMuLmQyYjM0OGQ1YjEgMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisr KyBiL2V0Yy9ORVdTCkBAIC0yODYsNiArMjg2LDEwIEBAIFRoZSBrZXliaW5kaW5nIGZvciAnaW1h Z2UtdHJhbnNmb3JtLWZpdC10by13aWR0aCcgaXMgbm93ICdzIGknLgogKioqIFVzZXIgb3B0aW9u ICdpbWFnZS1hdXRvLXJlc2l6ZScgY2FuIG5vdyBiZSBzZXQgdG8gJ2ZpdC13aW5kb3cnLgogVGhp cyB3b3JrcyBsaWtlICdpbWFnZS10cmFuc2Zvcm0tZml0LXRvLXdpbmRvdycuCiAKKyoqKiBOZXcg dXNlciBvcHRpb24gJ2ltYWdlLWF1dG8tcmVzaXplLW1heC1zY2FsZS1wZXJjZW50Jy4KK1RoZSBu ZXcgJ2ZpdC13aW5kb3cnIG9wdGlvbnMgd2lsbCBuZXZlciBzY2FsZSBhbiBpbWFnZSBtb3JlIHRo YW4gdGhpcworbXVjaCAoaW4gcGVyY2VudCkuICBJdCBpcyBuaWwgYnkgZGVmYXVsdC4KKwogKiog SW1hZ2UtRGlyZWQKIAogKysrCmRpZmYgLS1naXQgYS9saXNwL2ltYWdlLW1vZGUuZWwgYi9saXNw L2ltYWdlLW1vZGUuZWwKaW5kZXggYTkxMTAyN2E5YS4uNjI0Yzg1MmNiOCAxMDA2NDQKLS0tIGEv bGlzcC9pbWFnZS1tb2RlLmVsCisrKyBiL2xpc3AvaW1hZ2UtbW9kZS5lbApAQCAtNzQsNiArNzQs MTUgQEAgaW1hZ2UtYXV0by1yZXNpemUKICAgOnZlcnNpb24gIjI5LjEiCiAgIDpncm91cCAnaW1h Z2UpCiAKKyhkZWZjdXN0b20gaW1hZ2UtYXV0by1yZXNpemUtbWF4LXNjYWxlLXBlcmNlbnQgbmls CisgICJNYXggc2l6ZSAoaW4gcGVyY2VudCkgdG8gc2NhbGUgdXAgdG8gd2hlbiBgaW1hZ2UtYXV0 by1yZXNpemUnIGlzIGBmaXQtd2luZG93Jy4KK0NhbiBiZSBlaXRoZXIgYSBudW1iZXIgbGFyZ2Vy IHRoYW4gMTAwLCBvciBuaWwsIHdoaWNoIG1lYW5zIG5vCittYXggc2l6ZS4iCisgIDp0eXBlICco Y2hvaWNlIChjb25zdCBuaWwgIk5vIG1heCIpCisgICAgICAgICAgICAgICAgIG5hdG51bSkKKyAg OnZlcnNpb24gIjI5LjEiCisgIDpncm91cCAnaW1hZ2UpCisKIChkZWZjdXN0b20gaW1hZ2UtYXV0 by1yZXNpemUtb24td2luZG93LXJlc2l6ZSAxCiAgICJOb24tbmlsIHRvIHJlc2l6ZSB0aGUgaW1h Z2Ugd2hlbmV2ZXIgdGhlIHdpbmRvdydzIGRpbWVuc2lvbnMgY2hhbmdlLgogVGhpcyB3aWxsIGFs d2F5cyBrZWVwIHRoZSBpbWFnZSBmaXQgdG8gdGhlIHdpbmRvdy4KQEAgLTgxMCw2ICs4MTksMjEg QEAgYXJjaGl2ZS1zdXBlcmlvci1idWZmZXIKIChkZWZ2YXIgdGFyLXN1cGVyaW9yLWJ1ZmZlcikK IChkZWNsYXJlLWZ1bmN0aW9uIGltYWdlLWZsdXNoICJpbWFnZS5jIiAoc3BlYyAmb3B0aW9uYWwg ZnJhbWUpKQogCisoZGVmdW4gaW1hZ2UtLXNjYWxlLXdpdGhpbi1saW1pdHMtcCAoaW1hZ2UpCisg ICJSZXR1cm4gdCBpZiBgZml0LXdpbmRvdycgd2lsbCBzY2FsZSBpbWFnZSB3aXRoaW4gdGhlIGN1 c3RvbWl6ZWQgbGltaXRzLgorVGhlIGxpbWl0cyBhcmUgZ2l2ZW4gYnkgdGhlIHVzZXIgb3B0aW9u CitgaW1hZ2UtYXV0by1yZXNpemUtbWF4LXNjYWxlLXBlcmNlbnQnLiIKKyAgKG9yIChub3QgaW1h Z2UtYXV0by1yZXNpemUtbWF4LXNjYWxlLXBlcmNlbnQpCisgICAgICAobGV0ICgoc2NhbGUgKC8g aW1hZ2UtYXV0by1yZXNpemUtbWF4LXNjYWxlLXBlcmNlbnQgMTAwKSkKKyAgICAgICAgICAgICht dyAocGxpc3QtZ2V0IChjZHIgaW1hZ2UpIDptYXgtd2lkdGgpKQorICAgICAgICAgICAgKG1oIChw bGlzdC1nZXQgKGNkciBpbWFnZSkgOm1heC1oZWlnaHQpKQorICAgICAgICAgICAgOzsgTm90ZTog YGltYWdlLXNpemUnIGxvb2tzIHVwIGFuZCB0aHVzIGNhY2hlcyB0aGUKKyAgICAgICAgICAgIDs7 IHVudHJhbnNmb3JtZWQgaW1hZ2UuICBUaGVyZSdzIG5vIGVhc3kgd2F5IHRvCisgICAgICAgICAg ICA7OyBwcmV2ZW50IHRoYXQuCisgICAgICAgICAgICAoc2l6ZSAoaW1hZ2Utc2l6ZSBpbWFnZSB0 KSkpCisgICAgICAgIChvciAoPD0gbXcgKCogKGNhciBzaXplKSBzY2FsZSkpCisgICAgICAgICAg ICAoPD0gbWggKCogKGNkciBzaXplKSBzY2FsZSkpKSkpKQorCiAoZGVmdW4gaW1hZ2UtdG9nZ2xl LWRpc3BsYXktaW1hZ2UgKCkKICAgIlNob3cgdGhlIGltYWdlIG9mIHRoZSBpbWFnZSBmaWxlLgog VHVybiB0aGUgaW1hZ2UgZGF0YSBpbnRvIGEgcmVhbCBpbWFnZSwgYnV0IG9ubHkgaWYgdGhlIHdo b2xlIGZpbGUKQEAgLTg5Myw3ICs5MTcsOCBAQCBpbWFnZS10b2dnbGUtZGlzcGxheS1pbWFnZQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6Zm9ybWF0IChhbmQgZmlsZW5hbWUgZGF0 YS1wKSkpKQogCiAgICAgOzsgSGFuZGxlIGBmaXQtd2luZG93Jy4KLSAgICAod2hlbiAoZXEgaW1h Z2UtdHJhbnNmb3JtLXJlc2l6ZSAnZml0LXdpbmRvdykKKyAgICAod2hlbiAoYW5kIChlcSBpbWFn ZS10cmFuc2Zvcm0tcmVzaXplICdmaXQtd2luZG93KQorICAgICAgICAgICAgICAgKGltYWdlLS1z Y2FsZS13aXRoaW4tbGltaXRzLXAgaW1hZ2UpKQogICAgICAgKHNldHEgaW1hZ2UKICAgICAgICAg ICAgIChjb25zIChjYXIgaW1hZ2UpCiAgICAgICAgICAgICAgICAgICAocGxpc3QtcHV0IChjZHIg aW1hZ2UpIDp3aWR0aAotLSAKMi4zMC4yCgo= --00000000000062e18d05d002c8f5--