From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Alan Third Newsgroups: gmane.emacs.bugs Subject: bug#38109: Updated Emacs to HEAD, consistently not scaling now Date: Fri, 8 Nov 2019 23:03:45 +0000 Message-ID: <20191108230345.GA42932@breton.holly.idiocy.org> References: <87imnvfl3h.fsf@tullinup.koldfront.dk> <87imnvidbi.fsf@tullinup.koldfront.dk> <87o8xn73xi.fsf@gnus.org> <878soric89.fsf@tullinup.koldfront.dk> <87k18b739d.fsf@gnus.org> <87o8xn9vzk.fsf@tullinup.koldfront.dk> <20191108193407.GA42511@breton.holly.idiocy.org> <87h83egjxm.fsf@tullinup.koldfront.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="169842"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mutt/1.12.0 (2019-05-25) Cc: Lars Ingebrigtsen , 38109@debbugs.gnu.org To: Adam =?UTF-8?Q?Sj=C3=B8gren?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 09 00:04:57 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iTDJI-000i5R-9I for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Nov 2019 00:04:56 +0100 Original-Received: from localhost ([::1]:32856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTDJH-0008E1-4u for geb-bug-gnu-emacs@m.gmane.org; Fri, 08 Nov 2019 18:04:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTDIS-0008C1-6y for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2019 18:04:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iTDIQ-0001ND-RB for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2019 18:04:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iTDIQ-0001N0-LJ for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2019 18:04:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iTDIQ-0007qg-CW for bug-gnu-emacs@gnu.org; Fri, 08 Nov 2019 18:04:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Nov 2019 23:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38109 X-GNU-PR-Package: emacs Original-Received: via spool by 38109-submit@debbugs.gnu.org id=B38109.157325423730159 (code B ref 38109); Fri, 08 Nov 2019 23:04:02 +0000 Original-Received: (at 38109) by debbugs.gnu.org; 8 Nov 2019 23:03:57 +0000 Original-Received: from localhost ([127.0.0.1]:47912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTDIK-0007qN-Kz for submit@debbugs.gnu.org; Fri, 08 Nov 2019 18:03:56 -0500 Original-Received: from mail-wm1-f42.google.com ([209.85.128.42]:35100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTDII-0007q7-48 for 38109@debbugs.gnu.org; Fri, 08 Nov 2019 18:03:54 -0500 Original-Received: by mail-wm1-f42.google.com with SMTP id 8so7828294wmo.0 for <38109@debbugs.gnu.org>; Fri, 08 Nov 2019 15:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=G53feHyo7gmnEAf9v7Dr7a1OXzOLWbsf4cci0tKZlW8=; b=IMPfMSrVTrw1F7IM9F6CrAcgFgaZri2UsREkeBDZ4bY1Q3tdzkNMvyVjMk4nPVydOD DGmCaGKr90piARjLB73WYC+WXMjjZOZ0dP1A2sw4iHyu0H6XbbxivOIEhhLDBIE2gmVA 37/zolzSkk/EbH5bhLIjvVdZHKSIw1TG4EGTACVBX9Z1d1BZztEiuCG/Bk/n8yQI33Cj YxtqqcM+0aILDHKQ/0lYZe8SozcZEvx0UizQUF4XYVoM7nQ5UyeLy7B1zX+a2XgnWvZT 5/wxcp4OwfD5fi5phf+Esys7BZeUQckqh91jcLJGzH/Erf0ViyN8XK3ZtCjJmAFdfEvm h4gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=G53feHyo7gmnEAf9v7Dr7a1OXzOLWbsf4cci0tKZlW8=; b=NjdtJRr9S6EovNpNNRHtDDWn0LCh9y404Dh6B2ma6mp9ROh6KJTGsOs4frGnKXsnBM RO0NoMX/o47DqRL1xTlShOYgsgVlWdmReojxlk7k7NG+gBd5VOOiqJnKck69xaDP5sZ7 39UYyu+ftMD1MSvqrB7WMrT87s4EQU7etF7cqS8catINlopobiJ/qmE7tnWcF0oJb8Rq sMqcranKmyC35DfN0/R4o8e/2KoNmqcq45K9wxbMtqoDfWucKnwCtzWuc4ahfJU9F7IA 3mZH7k7Za4JDFmUuhcyS4Z5pBEeMIvgUIQVQiXSqUcjP4yKfQSVhX9mNznrAy+GId/8e r5qg== X-Gm-Message-State: APjAAAUIsRqTeARPKhhkCWUbu8f/Hxa6t8CKBZCFLZcgFH7NYswxhaGB cOV64and7M6L82RRVzwsw1M= X-Google-Smtp-Source: APXvYqxRz3k/ylEgaAxmgQvWFGNlDWca79rLOu6AIY3VXO8rYv22X+bLI20OnaVnDxkStoUBZd8Bow== X-Received: by 2002:a1c:6309:: with SMTP id x9mr9759400wmb.108.1573254227929; Fri, 08 Nov 2019 15:03:47 -0800 (PST) Original-Received: from breton.holly.idiocy.org (ip6-2001-08b0-03f8-8129-1099-0bb9-742d-01c0.holly.idiocy.org. [2001:8b0:3f8:8129:1099:bb9:742d:1c0]) by smtp.gmail.com with ESMTPSA id r5sm7239933wrl.86.2019.11.08.15.03.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Nov 2019 15:03:47 -0800 (PST) Content-Disposition: inline In-Reply-To: <87h83egjxm.fsf@tullinup.koldfront.dk> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:171284 Archived-At: On Fri, Nov 08, 2019 at 10:03:17PM +0100, Adam Sjøgren wrote: > I apparently haven't got Cairo enabled in my build, maybe that's a > problem? No, this should all work without Cairo. > asjo@tullinup:/usr/src/emacs$ grep CAIRO src/config.h > /* #undef USE_CAIRO */ > > An observation: when displaying the colormapped .png, > image_create_x_image_and_pixmap_1() is called twice, the first time > depth is <= 0, and the second time it isn't. Does the RGB png call that function twice? The second time through is for setting the mask, or transparency, and it looks like it sets depth to ‘1’, which image_create_x_image_and_pixmap_1 doesn’t like with xrender. Although your patch should have fixed that. But in addition you might need this: modified src/image.c @@ -2244,6 +2244,13 @@ image_set_transform (struct frame *f, struct image *img) XRenderSetPictureFilter (FRAME_X_DISPLAY (f), img->picture, FilterBest, 0, 0); XRenderSetPictureTransform (FRAME_X_DISPLAY (f), img->picture, &tmat); + + if (img->mask_picture) + { + XRenderSetPictureFilter (FRAME_X_DISPLAY (f), img->mask_picture, FilterBest, + 0, 0); + XRenderSetPictureTransform (FRAME_X_DISPLAY (f), img->mask_picture, &tmat); + } } # elif defined HAVE_NTGUI /* Store the transform matrix for application at draw time. */ As I don’t think we were setting the transform for the mask to match the image. Although I don’t really know for sure if it’s needed. It really wouldn’t surprise me too much if this was all related to masks, I never managed to get a satisfactory test going. OTOH, if XPMs don’t even use these functions then that would certainly cause scaling to fail. I’ll have to have a look at the XPM code to find out what they’re doing instead. -- Alan Third