From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud Newsgroups: gmane.emacs.bugs Subject: bug#59802: 30.0.50; Checkbox button not rendered Date: Mon, 12 Dec 2022 13:33:46 +0100 Message-ID: <877cywer85.fsf@ledu-giraud.fr> References: <87v8mshit6.fsf@ledu-giraud.fr> <838rjoendw.fsf@gnu.org> <87r0xgh7c3.fsf@ledu-giraud.fr> <83zgc4crg6.fsf@gnu.org> <87ilisgxbi.fsf@ledu-giraud.fr> <83lenocoge.fsf@gnu.org> <87edtggol3.fsf@ledu-giraud.fr> <83359vd535.fsf@gnu.org> <87cz8s3gq7.fsf@ledu-giraud.fr> <83sfhozreh.fsf@gnu.org> <87ilik8zjs.fsf@gmx.net> <83v8mjweqm.fsf@gnu.org> <87h6y3447l.fsf@gmx.net> <83cz8rw5pq.fsf@gnu.org> <874ju2qe3a.fsf@gmx.net> <83k02yszqf.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33698"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Stephen Berman , 59802@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 12 13:34:45 2022 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 1p4i16-0008T3-SC for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Dec 2022 13:34:44 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4i0j-0005Lg-3R; Mon, 12 Dec 2022 07:34:21 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4i0Q-0005Hp-JH for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 07:34:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4i0Q-0003tT-7Q for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 07:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4i0P-0003s2-Sz for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 07:34:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Dec 2022 12:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59802 X-GNU-PR-Package: emacs Original-Received: via spool by 59802-submit@debbugs.gnu.org id=B59802.167084843214861 (code B ref 59802); Mon, 12 Dec 2022 12:34:01 +0000 Original-Received: (at 59802) by debbugs.gnu.org; 12 Dec 2022 12:33:52 +0000 Original-Received: from localhost ([127.0.0.1]:52690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4i0G-0003rd-Di for submit@debbugs.gnu.org; Mon, 12 Dec 2022 07:33:52 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:33344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4i0D-0003rV-4A for 59802@debbugs.gnu.org; Mon, 12 Dec 2022 07:33:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=g4GhaSzIbaAcWZbA kr7HYsl4iU3TWt5/lYOq8mZN0eo=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=U1fZjYC/GObuMBdYunHLVMIX0wh8BPESIxgUGc 1sH3aKwAAVklGo4ZioO6TMZDdTTyFw3vEmPoVQOaEV+q85A4+vr8UXkfinw2PDgWD7r1Va KGTtJU/ZBotExUW27kZtJMoEk38i/i6ZwmI03iVk+OokGWjHD1t17PiSaMWXDgKUAUw+0G JQYSw8ruEZi5a/mXWFXJrFjPrTZ8VKXkpPmLUkssAskO5+NNDhj5TTxkkyTdM8cYKG41sl jp8SblxCFISXLsGGu05NgJTzreI4kUcB5WO6xLcn3WDfwPlXfWJB6lMgf/h0dBMPWkc+xC YQuAwCn7WmNnafy719O7H/7w== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id fe84b013 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 12 Dec 2022 13:33:47 +0100 (CET) In-Reply-To: <83k02yszqf.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 11 Dec 2022 17:54:00 +0200") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250701 Archived-At: --=-=-= Content-Type: text/plain Hi Eli and Stephen, I tried to understand the different librsvg APIs (which is quite a mess) and AFAIU, rsvg_handle_get_geometry_for_layer use a viewport as input to render the SVG. See, here: https://gnome.pages.gitlab.gnome.org/librsvg/Rsvg-2.0/method.Handle.get_geometry_for_layer.html So in the case we have already read a viewbox, I'm using it as the viewport rectangle. I don't know if it is the best way but at least it works for me (i.e the image does not disappear below the baseline) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-SVG-scaling-for-certain-files-with-librsvg-2.52-.patch >From 3531a0e8515bc7499fa1e1f123b46841c7f2e9fc Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Mon, 12 Dec 2022 11:56:25 +0100 Subject: [PATCH] Fix SVG scaling for certain files with librsvg > 2.52 (bug#59802) * src/image.c (svg_load_image): Initialize viewport before calling rsvg_handle_get_geometry_for_layer. --- src/image.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/image.c b/src/image.c index 2436f78ac3..7db6c9d2fc 100644 --- a/src/image.c +++ b/src/image.c @@ -11290,7 +11290,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, } else { - RsvgRectangle zero_rect, viewbox, out_logical_rect; + RsvgRectangle viewport, viewbox, out_logical_rect; /* Try the intrinsic dimensions first. */ gboolean has_width, has_height; @@ -11332,10 +11332,19 @@ svg_load_image (struct frame *f, struct image *img, char *contents, if (! (0 < viewbox_width && 0 < viewbox_height)) { + /* Computed viewbox sizes are not correct but we may have + read a correct viewbox so use it as the viewport. */ + if (has_viewbox) { + viewport.x = viewbox.x; + viewport.y = viewbox.y; + viewport.width = viewbox.width; + viewport.height = viewbox.height; + } + /* We haven't found a usable set of sizes, so try working out the visible area. */ rsvg_handle_get_geometry_for_layer (rsvg_handle, NULL, - &zero_rect, &viewbox, + &viewport, &viewbox, &out_logical_rect, NULL); viewbox_width = viewbox.x + viewbox.width; viewbox_height = viewbox.y + viewbox.height; -- 2.38.1 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--