From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Pieter van Prooijen Newsgroups: gmane.emacs.bugs Subject: bug#54564: 29.0.50; [PATCH] Use gsettings font rendering entries for pgtk builds Date: Fri, 08 Apr 2022 20:44:47 +0200 Message-ID: <04ae2baf0a2a974bb411820c4d294b82d86ddc92.camel@teloden.nl> References: <165c1dab82dbf3233ed5f9f481a008eb724aff31.camel@teloden.nl> <87o81t5x9o.fsf@yahoo.com> <83fsn5b6cj.fsf@gnu.org> <8735j55js6.fsf@yahoo.com> <83czi9b5gh.fsf@gnu.org> <87v8w143h6.fsf@yahoo.com> <87o81s2osr.fsf@yahoo.com> <88d833f72df4f4cbb5769f1a75057d3f957a812c.camel@teloden.nl> <87bkxnx1co.fsf@yahoo.com> <211c08916190ef05cc1677956a77fca0c6122eda.camel@teloden.nl> <87k0c9imvp.fsf@yahoo.com> <66a9a7d83ca545dd23c890d4aa97717f1796579f.camel@teloden.nl> <8735ioxy5e.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-/bTr7EmZFZdoOnWtRsD7" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31275"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.40.4-1ubuntu2 Cc: 54564@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Apr 08 20:46:14 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 1nctca-0007v1-0P for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 08 Apr 2022 20:46:13 +0200 Original-Received: from localhost ([::1]:38896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nctcY-0003r6-7K for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 08 Apr 2022 14:46:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nctcQ-0003qw-4j for bug-gnu-emacs@gnu.org; Fri, 08 Apr 2022 14:46:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nctcP-0005Nj-S0 for bug-gnu-emacs@gnu.org; Fri, 08 Apr 2022 14:46:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nctcP-0004DP-Ol for bug-gnu-emacs@gnu.org; Fri, 08 Apr 2022 14:46:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Pieter van Prooijen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 08 Apr 2022 18:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54564 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 54564-submit@debbugs.gnu.org id=B54564.164944350216125 (code B ref 54564); Fri, 08 Apr 2022 18:46:01 +0000 Original-Received: (at 54564) by debbugs.gnu.org; 8 Apr 2022 18:45:02 +0000 Original-Received: from localhost ([127.0.0.1]:35974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctbN-0004BP-UF for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:45:02 -0400 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctbM-0004BB-5x for 54564@debbugs.gnu.org; Fri, 08 Apr 2022 14:44:56 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 07EB25C00E5; Fri, 8 Apr 2022 14:44:51 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 08 Apr 2022 14:44:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=teloden.nl; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm3; bh=XmPmLuq+M6OBlT5zYiPIzrXB0h9sIo/rrxNO4N 5HO+M=; b=Ph/Gumv+4+o48QuR44qdtXckXHidTkAonxKpZVLNsz6UcOuw1xDagt PvWfGXWLwmGtliKooIxDRmuxTrTn+GwH/89HoIC8b5w4fFPMNASTE7sZhwk4PEab j7VLoO/CU4t2oDZaJufj46oQVTLid9BCkLg9l1upIkWZwbZvYbVH4Ps3f6ACAMwi JI2rHz1xDyMP2B8vdyoVg1TtauPAMqeXbED8LqBeVYJ/t4rgNFGrbI9HEyy8RAKH 71O7wMnOsySzzAwE0o6BZZmoXjhIwc7wLPeN7/kW5qZA5hm5yHOhNkqj5OEgO3Ap TD0/Mab6tBEgE5/OSVLmiQJXq7UjuxpQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=XmPmLuq+M6OBlT5zY iPIzrXB0h9sIo/rrxNO4N5HO+M=; b=fTpDuJZDcMyAu2gb0zHWwzArc4RGbgwGq Kf4TE5nuBvWX+piYYQMh8IYux2vzHMYoHrsElRJG6llZPoJ8lji1foijs+8HCh0G +ok3OvziyacqSa75VyFwluV8Eg+rcqW5Y9TGDXh3n8mlbhL0uQPcfKOMmY8IKCHG abMakpuzfa56gSSU2CkLHyGgQ1MvB3PCgq7DbdwXONM/J7I3SA1NJ/5QuiRqoEew Ooc1MRPDU17eY9FDKefrtOEyGwmOMWJ0nVo5WeykPa9em+8AJRIL3hg5K17vHsMh JRf+eJz4vNqSzU39nHC8OtcP71qG+4phOLFs2GcLPzURdM1J9NZnA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudektddguddvkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkuffhvfffjghftggfggesmhdtreertderjeenucfhrhhomheprfhivght vghruchvrghnucfrrhhoohhijhgvnhcuoehpihgvthgvrhdrvhgrnhdrphhrohhoihhjvg hnsehtvghlohguvghnrdhnlheqnecuggftrfgrthhtvghrnhepffekuefhjeffgeejffdt iedukeeutdfftdetvdffffeffeehiefgudelhfffheelnecuffhomhgrihhnpegtohhlrd hrvggupdgtohhlrdhgrhgvvghnpdgtohhlrdgslhhuvgdpghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpihgvthgvrhdrvh grnhdrphhrohhoihhjvghnsehtvghlohguvghnrdhnlh X-ME-Proxy: Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 8 Apr 2022 14:44:49 -0400 (EDT) In-Reply-To: <8735ioxy5e.fsf@yahoo.com> 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:229587 Archived-At: --=-/bTr7EmZFZdoOnWtRsD7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Hi, Yes, your patch fixes the problem as well, and I don't see any other side effects at a first glance. I've changed my patch to incorporate it and revert the changes to ftcrfont_draw. Thanks, Pieter On Fri, 2022-04-08 at 07:38 +0800, Po Lu wrote: > Pieter van Prooijen writes: > > > Hi All,  > > > > It took a fair bit of digging, but sub-pixel anti-aliasing on pgtk > > now > > seems to work correctly. > > > > The problem lies with the "source" operator set by pgtk when > > drawing a > > font, this will take a particular execution path in the cairo glyph > > compositor (using a mask image) which converts the colors created > > by > > freetype for the sub pixel effect to greys-cale. Using the default > > "over" operator takes a different path which preserves the colors. > > Note > > that on small screens the difference between sub-pixel and grey- > > scale > > rendering is hard to see, it's more pronounced on larger displays) > > Ah thanks.  Does this fix the problem as well? > > diff --git a/src/pgtkterm.c b/src/pgtkterm.c > index b2816aa04a..5fbc56ae81 100644 > --- a/src/pgtkterm.c > +++ b/src/pgtkterm.c > @@ -7037,8 +7037,11 @@ pgtk_set_cr_source_with_color (struct frame > *f, unsigned long color, >    pgtk_query_color (f, &col); >   >    if (!respects_alpha_background) > -    cairo_set_source_rgb (FRAME_CR_CONTEXT (f), col.red / 65535.0, > -                         col.green / 65535.0, col.blue / 65535.0); > +    { > +      cairo_set_source_rgb (FRAME_CR_CONTEXT (f), col.red / 65535.0, > +                           col.green / 65535.0, col.blue / 65535.0); > +      cairo_set_operator (FRAME_CR_CONTEXT (f), > CAIRO_OPERATOR_OVER); > +    } >    else >      { >        cairo_set_source_rgba (FRAME_CR_CONTEXT (f), col.red / > 65535.0, > > > I've also fixed the indent error, but couldn't find the non- > > breaking > > space in the patch, it's perhaps caused by the mail program. > > It was previously filled with non-breaking spaces, but the patch you > attached looks fine now. > > > Regarding the copyright assignment, I've had no response after > > sending > > in the questionnaire at > > https://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/Copyright/re > > quest-assign.future > > to assign@gnu.org > > It takes a while; if you don't get a response in 2 weeks, you should > contact Eli or Lars, and they will ask the folks at the FSF to > expedite > things. > > > Do you get sent a paper form of some kind which has to be filled > > in? > > (I'm not at my home address atm so I will have missed that) > > You get sent a document you have to print and fill in, I think, but > that > depends on the country you're in. > > Thanks. --=-/bTr7EmZFZdoOnWtRsD7 Content-Disposition: attachment; filename*0=0001-Use-gsettings-font-rendering-entries-for-pgtk-builds.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-Use-gsettings-font-rendering-entries-for-pgtk-builds.patch"; charset="UTF-8" RnJvbSA3Y2I0NTg5NDRlODI1MjgxZGY1OWE2ZGQzNjBlMGU0MGZmMzEyZDI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaWV0ZXIgdmFuIFByb29pamVuIDxwaWV0ZXIudmFuLnByb29p amVuQHRlbG9kZW4ubmw+CkRhdGU6IFRodSwgNyBBcHIgMjAyMiAxODo1MjoxNCArMDIwMApTdWJq ZWN0OiBbUEFUQ0hdIFVzZSBnc2V0dGluZ3MgZm9udCByZW5kZXJpbmcgZW50cmllcyBmb3IgcGd0 ayBidWlsZHMKCklmIHByZXNlbnQsIGFwcGx5IHRoZSBnc2V0dGluZ3MgZm9udCBoaW50aW5nIGFu ZCBhbnRpYWxpYXNpbmcKZW50cmllcyB3aGVuIGNyZWF0aW5nIGEgZm9udCBpbiBjYWlyby4gIERv IHRoaXMgYXQKaW5pdGlhbGl6YXRpb24gYW5kIHdoZW4gdGhlIGVudHJpZXMgY2hhbmdlLCByZS1y ZW5kZXJpbmcgdGhlCmZyYW1lcy4KCiogc3JjL2Z0Y3Jmb250LmMgKGZ0Y3Jmb250X29wZW4pOiBV c2UgdGhlIGZvbnRfb3B0aW9ucyBkZXJpdmVkCmZyb20gZ3NldHRpbmdzIHdoZW4gb3BlbmluZyBh IGZvbnQuCihmdGNyZm9udF9jYWNoZWRfZm9udF9vayk6IFJlcG9ydCBhIGNhY2hlZCBmb250IGFz IGludmFsaWQgaWYKaXRzIGZvbnQgb3B0aW9ucyBkaWZmZXIgZnJvbSB0aGUgY3VycmVudCBvcHRp b25zIGluc2lkZQpnc2V0dGluZ3MuCiogc3JjL3hzZXR0aW5ncy5jIChhcHBseV9nc2V0dGluZ3Nf Zm9udF9oaW50aW5nKQooYXBwbHlfZ3NldHRpbmdzX2ZvbnRfYWxpYXMsIGFwcGx5X2dzZXR0aW5n c19mb250X3JnYmFfb3JkZXIpOgpDb252ZXJ0IHRoZSBzZXR0aW5ncyBmcm9tIEdTZXR0aW5ncyB0 byB0aGUgY2Fpcm9fZm9udF9vcHRpb25zX3QKb2JqZWN0LgooaW5pdF9nc2V0dGluZ3MsIHNvbWV0 aGluZ19jaGFuZ2VkX2dzZXR0aW5nc0NCKTogSW52b2tlIHRoZQphcHBseSBmdW5jdGlvbnMgaWYg dGhlIHJlbGV2YW50IHNldHRpbmdzIGNoYW5nZWQuCihzdG9yZV9mb250X29wdGlvbnNfY2hhbmdl ZCk6IFN0b3JlIGFuIGV2ZW50IHRvIHJlLXJlbmRlciB0aGUKZm9udHMuCih4c2V0dGluZ19nZXRf Zm9udF9vcHRpb25zKQoqIHNyYy94c2V0dGluZ3MuaCAoeHNldHRpbmdzX2dldF9mb250X29wdGlv bnMpOiBOZXcgZnVuY3Rpb24uCiogc3JjL3BndGt0ZXJtLmMgKHBndGtfc2V0X2NyX3NvdXJjZV93 aXRoX2NvbG9yKTogVXNlIHRoZQpkZWZhdWx0IENBSVJPX09QRVJBVE9SX09WRVIgZm9yIG5vbi1y ZXNwZWN0c19hbHBoYV9iYWNrZ3JvdW5kCmNhbGxzIHRvIHByZXNlcnZlIHRoZSBjb2xvciBpbmZv cm1hdGlvbiBhZGRlZCBieSBzdWItcGl4ZWwKYW50aS1hbGlhc2VkIHJlbmRlcmVkIGZvbnRzLgot LS0KIHNyYy9mdGNyZm9udC5jICB8ICAzMyArKysrKysrKysrKwogc3JjL3BndGt0ZXJtLmMgIHwg ICA1ICstCiBzcmMveHNldHRpbmdzLmMgfCAxNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrCiBzcmMveHNldHRpbmdzLmggfCAgIDUgKysKIDQgZmlsZXMg Y2hhbmdlZCwgMTg5IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9z cmMvZnRjcmZvbnQuYyBiL3NyYy9mdGNyZm9udC5jCmluZGV4IDk4YTI4YWY1ZjIuLjZiYjQxMTEw ZDUgMTAwNjQ0Ci0tLSBhL3NyYy9mdGNyZm9udC5jCisrKyBiL3NyYy9mdGNyZm9udC5jCkBAIC0z Nyw2ICszNyw5IEBACiAjaW5jbHVkZSAiZm9udC5oIgogI2luY2x1ZGUgImZ0Zm9udC5oIgogI2lu Y2x1ZGUgInBkdW1wZXIuaCIKKyNpZmRlZiBIQVZFX1BHVEsKKyNpbmNsdWRlICJ4c2V0dGluZ3Mu aCIKKyNlbmRpZgogCiAjaWZkZWYgVVNFX0JFX0NBSVJPCiAjZGVmaW5lIFJFRF9GUk9NX1VMT05H KGNvbG9yKQkoKChjb2xvcikgPj4gMTYpICYgMHhmZikKQEAgLTE2OCw3ICsxNzEsMTIgQEAgZnRj cmZvbnRfb3BlbiAoc3RydWN0IGZyYW1lICpmLCBMaXNwX09iamVjdCBlbnRpdHksIGludCBwaXhl bF9zaXplKQogICBjYWlyb19tYXRyaXhfdCBmb250X21hdHJpeCwgY3RtOwogICBjYWlyb19tYXRy aXhfaW5pdF9zY2FsZSAoJmZvbnRfbWF0cml4LCBwaXhlbF9zaXplLCBwaXhlbF9zaXplKTsKICAg Y2Fpcm9fbWF0cml4X2luaXRfaWRlbnRpdHkgKCZjdG0pOworCisjaWZkZWYgSEFWRV9QR1RLCisg IGNhaXJvX2ZvbnRfb3B0aW9uc190ICpvcHRpb25zID0geHNldHRpbmdzX2dldF9mb250X29wdGlv bnMgKCk7CisjZWxzZQogICBjYWlyb19mb250X29wdGlvbnNfdCAqb3B0aW9ucyA9IGNhaXJvX2Zv bnRfb3B0aW9uc19jcmVhdGUgKCk7CisjZW5kaWYKICNpZmRlZiBVU0VfQkVfQ0FJUk8KICAgaWYg KGJlX3VzZV9zdWJwaXhlbF9hbnRpYWxpYXNpbmcgKCkpCiAgICAgY2Fpcm9fZm9udF9vcHRpb25z X3NldF9hbnRpYWxpYXMgKG9wdGlvbnMsIENBSVJPX0FOVElBTElBU19TVUJQSVhFTCk7CkBAIC02 MjQsNiArNjMyLDI4IEBAIGZ0Y3Jmb250X2RyYXcgKHN0cnVjdCBnbHlwaF9zdHJpbmcgKnMsCiAg IHJldHVybiBsZW47CiB9CiAKKyNpZmRlZiBIQVZFX1BHVEsKKy8qIERldGVybWluZSBpZiBGT05U X09CSkVDVCBpcyBhIHZhbGlkIGNhY2hlZCBmb250IGZvciBFTlRJVFkgYnkKKyAgIGNvbXBhcmlu ZyB0aGUgb3B0aW9ucyB1c2VkIHRvIG9wZW4gaXQgd2l0aCB0aGUgdXNlcidzIGN1cnJlbnQKKyAg IHByZWZlcmVuY2VzIHNwZWNpZmllZCB2aWEgR1NldHRpbmdzLiAgKi8KK3N0YXRpYyBib29sCitm dGNyZm9udF9jYWNoZWRfZm9udF9vayAoc3RydWN0IGZyYW1lICpmLCBMaXNwX09iamVjdCBmb250 X29iamVjdCwKKwkJCSBMaXNwX09iamVjdCBlbnRpdHkpCit7CisgIHN0cnVjdCBmb250X2luZm8g KmluZm8gPSAoc3RydWN0IGZvbnRfaW5mbyAqKSBYRk9OVF9PQkpFQ1QgKGZvbnRfb2JqZWN0KTsK KworICBjYWlyb19mb250X29wdGlvbnNfdCAqb3B0aW9ucyA9IGNhaXJvX2ZvbnRfb3B0aW9uc19j cmVhdGUgKCk7CisgIGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X29wdGlvbnMgKGluZm8tPmNy X3NjYWxlZF9mb250LCBvcHRpb25zKTsKKyAgY2Fpcm9fZm9udF9vcHRpb25zX3QgKmdzZXR0aW5n c19vcHRpb25zID0geHNldHRpbmdzX2dldF9mb250X29wdGlvbnMgKCk7CisKKyAgYm9vbCBlcXVh bCA9IGNhaXJvX2ZvbnRfb3B0aW9uc19lcXVhbCAob3B0aW9ucywgZ3NldHRpbmdzX29wdGlvbnMp OworICBjYWlyb19mb250X29wdGlvbnNfZGVzdHJveSAob3B0aW9ucyk7CisgIGNhaXJvX2ZvbnRf b3B0aW9uc19kZXN0cm95IChnc2V0dGluZ3Nfb3B0aW9ucyk7CisKKyAgcmV0dXJuIGVxdWFsOwor fQorI2VuZGlmCisKICNpZmRlZiBIQVZFX0hBUkZCVVpaCiAKIHN0YXRpYyBMaXNwX09iamVjdApA QCAtNjk0LDYgKzcyNCw5IEBAIGZ0Y3JoYmZvbnRfZW5kX2hiX2ZvbnQgKHN0cnVjdCBmb250ICpm b250LCBoYl9mb250X3QgKmhiX2ZvbnQpCiAjZW5kaWYKICAgLmZpbHRlcl9wcm9wZXJ0aWVzID0g ZnRmb250X2ZpbHRlcl9wcm9wZXJ0aWVzLAogICAuY29tYmluaW5nX2NhcGFiaWxpdHkgPSBmdGZv bnRfY29tYmluaW5nX2NhcGFiaWxpdHksCisjaWZkZWYgSEFWRV9QR1RLCisgIC5jYWNoZWRfZm9u dF9vayA9IGZ0Y3Jmb250X2NhY2hlZF9mb250X29rCisjZW5kaWYKICAgfTsKICNpZmRlZiBIQVZF X0hBUkZCVVpaCiBzdHJ1Y3QgZm9udF9kcml2ZXIgZnRjcmhiZm9udF9kcml2ZXI7CmRpZmYgLS1n aXQgYS9zcmMvcGd0a3Rlcm0uYyBiL3NyYy9wZ3RrdGVybS5jCmluZGV4IGIyODE2YWEwNGEuLjli YzJkZGZkNzkgMTAwNjQ0Ci0tLSBhL3NyYy9wZ3RrdGVybS5jCisrKyBiL3NyYy9wZ3RrdGVybS5j CkBAIC03MDM3LDggKzcwMzcsMTEgQEAgcGd0a19zZXRfY3Jfc291cmNlX3dpdGhfY29sb3IgKHN0 cnVjdCBmcmFtZSAqZiwgdW5zaWduZWQgbG9uZyBjb2xvciwKICAgcGd0a19xdWVyeV9jb2xvciAo ZiwgJmNvbCk7CiAKICAgaWYgKCFyZXNwZWN0c19hbHBoYV9iYWNrZ3JvdW5kKQotICAgIGNhaXJv X3NldF9zb3VyY2VfcmdiIChGUkFNRV9DUl9DT05URVhUIChmKSwgY29sLnJlZCAvIDY1NTM1LjAs CisgICAgeworICAgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2IgKEZSQU1FX0NSX0NPTlRFWFQgKGYp LCBjb2wucmVkIC8gNjU1MzUuMCwKIAkJCSAgY29sLmdyZWVuIC8gNjU1MzUuMCwgY29sLmJsdWUg LyA2NTUzNS4wKTsKKyAgICAgIGNhaXJvX3NldF9vcGVyYXRvciAoRlJBTUVfQ1JfQ09OVEVYVCAo ZiksIENBSVJPX09QRVJBVE9SX09WRVIpOworICAgIH0KICAgZWxzZQogICAgIHsKICAgICAgIGNh aXJvX3NldF9zb3VyY2VfcmdiYSAoRlJBTUVfQ1JfQ09OVEVYVCAoZiksIGNvbC5yZWQgLyA2NTUz NS4wLApkaWZmIC0tZ2l0IGEvc3JjL3hzZXR0aW5ncy5jIGIvc3JjL3hzZXR0aW5ncy5jCmluZGV4 IDcxZDAyZTYxNTIuLmU3MTg4N2UwM2QgMTAwNjQ0Ci0tLSBhL3NyYy94c2V0dGluZ3MuYworKysg Yi9zcmMveHNldHRpbmdzLmMKQEAgLTIxNSwxMSArMjE1LDExNiBAQCAjZGVmaW5lIEdTRVRUSU5H U19NT05PX0ZPTlQgICJtb25vc3BhY2UtZm9udC1uYW1lIgogI2RlZmluZSBHU0VUVElOR1NfRk9O VF9OQU1FICAiZm9udC1uYW1lIgogI2VuZGlmCiAKKyNpZmRlZiBIQVZFX1BHVEsKKyNkZWZpbmUg R1NFVFRJTkdTX0ZPTlRfQU5USUFMSUFTSU5HICAiZm9udC1hbnRpYWxpYXNpbmciCisjZGVmaW5l IEdTRVRUSU5HU19GT05UX1JHQkFfT1JERVIgICAgImZvbnQtcmdiYS1vcmRlciIKKyNkZWZpbmUg R1NFVFRJTkdTX0ZPTlRfSElOVElORyAgICAgICAiZm9udC1oaW50aW5nIgorI2VuZGlmCiAKIC8q IFRoZSBzaW5nbGUgR1NldHRpbmdzIGluc3RhbmNlLCBvciBOVUxMIGlmIG5vdCBjb25uZWN0ZWQg dG8gR1NldHRpbmdzLiAgKi8KIAogc3RhdGljIEdTZXR0aW5ncyAqZ3NldHRpbmdzX2NsaWVudDsK IAorI2lmZGVmIEhBVkVfUEdUSworCisvKiBUaGUgY2Fpcm8gZm9udF9vcHRpb25zIGFzIG9idGFp bmVkIHVzaW5nIGdzZXR0aW5ncy4gICovCitzdGF0aWMgY2Fpcm9fZm9udF9vcHRpb25zX3QgKmZv bnRfb3B0aW9uczsKKworLyogU3RvcmUgYW4gZXZlbnQgZm9yIHJlLXJlbmRlcmluZyBvZiB0aGUg Zm9udHMuICAqLworc3RhdGljIHZvaWQKK3N0b3JlX2ZvbnRfb3B0aW9uc19jaGFuZ2VkICh2b2lk KQoreworICBpZiAoZHB5aW5mb192YWxpZCAoZmlyc3RfZHB5aW5mbykpCisgICAgc3RvcmVfY29u ZmlnX2NoYW5nZWRfZXZlbnQgKFFmb250X3JlbmRlciwKKwkJCQlYQ0FSIChmaXJzdF9kcHlpbmZv LT5uYW1lX2xpc3RfZWxlbWVudCkpOworfQorCisvKiBBcHBseSBjaGFuZ2VzIGluIHRoZSBoaW50 aW5nIHN5c3RlbSBzZXR0aW5nLiAgKi8KK3N0YXRpYyB2b2lkCithcHBseV9nc2V0dGluZ3NfZm9u dF9oaW50aW5nIChHU2V0dGluZ3MgKnNldHRpbmdzKQoreworICBHVmFyaWFudCAqdmFsID0gZ19z ZXR0aW5nc19nZXRfdmFsdWUgKHNldHRpbmdzLCBHU0VUVElOR1NfRk9OVF9ISU5USU5HKTsKKyAg aWYgKHZhbCkKKyAgICB7CisgICAgICBnX3ZhcmlhbnRfcmVmX3NpbmsgKHZhbCk7CisgICAgICBp ZiAoZ192YXJpYW50X2lzX29mX3R5cGUgKHZhbCwgR19WQVJJQU5UX1RZUEVfU1RSSU5HKSkKKwl7 CisJICBjb25zdCBjaGFyICpoaW50aW5nID0gZ192YXJpYW50X2dldF9zdHJpbmcgKHZhbCwgTlVM TCk7CisKKwkgIGlmICghc3RyY21wIChoaW50aW5nLCAiZnVsbCIpKQorCSAgICBjYWlyb19mb250 X29wdGlvbnNfc2V0X2hpbnRfc3R5bGUgKGZvbnRfb3B0aW9ucywKKwkJCQkJICAgICAgIENBSVJP X0hJTlRfU1RZTEVfRlVMTCk7CisJICBlbHNlIGlmICghc3RyY21wIChoaW50aW5nLCAibWVkaXVt IikpCisJICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19zZXRfaGludF9zdHlsZSAoZm9udF9vcHRpb25z LAorCQkJCQkgICAgICAgQ0FJUk9fSElOVF9TVFlMRV9NRURJVU0pOworCSAgZWxzZSBpZiAoIXN0 cmNtcCAoaGludGluZywgInNsaWdodCIpKQorCSAgICBjYWlyb19mb250X29wdGlvbnNfc2V0X2hp bnRfc3R5bGUgKGZvbnRfb3B0aW9ucywKKwkJCQkJICAgICAgIENBSVJPX0hJTlRfU1RZTEVfU0xJ R0hUKTsKKwkgIGVsc2UgaWYgKCFzdHJjbXAgKGhpbnRpbmcsICJub25lIikpCisJICAgIGNhaXJv X2ZvbnRfb3B0aW9uc19zZXRfaGludF9zdHlsZSAoZm9udF9vcHRpb25zLAorCQkJCQkgICAgICAg Q0FJUk9fSElOVF9TVFlMRV9OT05FKTsKKwl9CisgICAgICBnX3ZhcmlhbnRfdW5yZWYgKHZhbCk7 CisgICAgfQorfQorCisvKiBBcHBseSBjaGFuZ2VzIGluIHRoZSBhbnRpYWxpYXNpbmcgc3lzdGVt IHNldHRpbmcuICAqLworc3RhdGljIHZvaWQKK2FwcGx5X2dzZXR0aW5nc19mb250X2FudGlhbGlh cyAoR1NldHRpbmdzICpzZXR0aW5ncykKK3sKKyAgR1ZhcmlhbnQgKnZhbCA9IGdfc2V0dGluZ3Nf Z2V0X3ZhbHVlIChzZXR0aW5ncywgR1NFVFRJTkdTX0ZPTlRfQU5USUFMSUFTSU5HKTsKKyAgaWYg KHZhbCkKKyAgICB7CisgICAgICBnX3ZhcmlhbnRfcmVmX3NpbmsgKHZhbCk7CisgICAgICBpZiAo Z192YXJpYW50X2lzX29mX3R5cGUgKHZhbCwgR19WQVJJQU5UX1RZUEVfU1RSSU5HKSkKKwl7CisJ ICBjb25zdCBjaGFyICphbnRpYWxpYXMgPSBnX3ZhcmlhbnRfZ2V0X3N0cmluZyAodmFsLCBOVUxM KTsKKworCSAgaWYgKCFzdHJjbXAgKGFudGlhbGlhcywgIm5vbmUiKSkKKwkgICAgY2Fpcm9fZm9u dF9vcHRpb25zX3NldF9hbnRpYWxpYXMgKGZvbnRfb3B0aW9ucywKKwkJCQkJICAgICAgQ0FJUk9f QU5USUFMSUFTX05PTkUpOworCSAgZWxzZSBpZiAoIXN0cmNtcCAoYW50aWFsaWFzLCAiZ3JheXNj YWxlIikpCisJICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19zZXRfYW50aWFsaWFzIChmb250X29wdGlv bnMsCisJCQkJCSAgICAgIENBSVJPX0FOVElBTElBU19HUkFZKTsKKwkgIGVsc2UgaWYgKCFzdHJj bXAgKGFudGlhbGlhcywgInJnYmEiKSkKKwkgICAgY2Fpcm9fZm9udF9vcHRpb25zX3NldF9hbnRp YWxpYXMgKGZvbnRfb3B0aW9ucywKKwkJCQkJICAgICAgQ0FJUk9fQU5USUFMSUFTX1NVQlBJWEVM KTsKKwl9CisgICAgICBnX3ZhcmlhbnRfdW5yZWYgKHZhbCk7CisgICAgfQorfQorCisvKiBBcHBs eSB0aGUgc2V0dGluZ3MgZm9yIHRoZSByZ2IgZWxlbWVudCBvcmRlcmluZy4gICovCitzdGF0aWMg dm9pZAorYXBwbHlfZ3NldHRpbmdzX2ZvbnRfcmdiYV9vcmRlciAoR1NldHRpbmdzICpzZXR0aW5n cykKK3sKKyAgR1ZhcmlhbnQgKnZhbCA9IGdfc2V0dGluZ3NfZ2V0X3ZhbHVlIChzZXR0aW5ncywK KwkJCQkJR1NFVFRJTkdTX0ZPTlRfUkdCQV9PUkRFUik7CisgIGlmICh2YWwpCisgICAgeworICAg ICAgZ192YXJpYW50X3JlZl9zaW5rICh2YWwpOworICAgICAgaWYgKGdfdmFyaWFudF9pc19vZl90 eXBlICh2YWwsIEdfVkFSSUFOVF9UWVBFX1NUUklORykpCisJeworCSAgY29uc3QgY2hhciAqcmdi YV9vcmRlciA9IGdfdmFyaWFudF9nZXRfc3RyaW5nICh2YWwsIE5VTEwpOworCisJICBpZiAoIXN0 cmNtcCAocmdiYV9vcmRlciwgInJnYiIpKQorCSAgICBjYWlyb19mb250X29wdGlvbnNfc2V0X3N1 YnBpeGVsX29yZGVyIChmb250X29wdGlvbnMsCisJCQkJCQkgICBDQUlST19TVUJQSVhFTF9PUkRF Ul9SR0IpOworCSAgZWxzZSBpZiAoIXN0cmNtcCAocmdiYV9vcmRlciwgImJnciIpKQorCSAgICBj YWlyb19mb250X29wdGlvbnNfc2V0X3N1YnBpeGVsX29yZGVyIChmb250X29wdGlvbnMsCisJCQkJ CQkgICBDQUlST19TVUJQSVhFTF9PUkRFUl9CR1IpOworCSAgZWxzZSBpZiAoIXN0cmNtcCAocmdi YV9vcmRlciwgInZyZ2IiKSkKKwkgICAgY2Fpcm9fZm9udF9vcHRpb25zX3NldF9zdWJwaXhlbF9v cmRlciAoZm9udF9vcHRpb25zLAorCQkJCQkJICAgQ0FJUk9fU1VCUElYRUxfT1JERVJfVlJHQik7 CisJICBlbHNlIGlmICghc3RyY21wIChyZ2JhX29yZGVyLCAidmJnciIpKQorCSAgICBjYWlyb19m b250X29wdGlvbnNfc2V0X3N1YnBpeGVsX29yZGVyIChmb250X29wdGlvbnMsCisJCQkJCQkgICBD QUlST19TVUJQSVhFTF9PUkRFUl9WQkdSKTsKKwl9CisgICAgICBnX3ZhcmlhbnRfdW5yZWYgKHZh bCk7CisgICAgfQorfQorI2VuZGlmIC8qIEhBVkVfUEdUSyAqLworCiAvKiBDYWxsYmFjayBjYWxs ZWQgd2hlbiBzb21ldGhpbmcgY2hhbmdlZCBpbiBHU2V0dGluZ3MuICAqLwogCiBzdGF0aWMgdm9p ZApAQCAtMjczLDYgKzM3OCwyMyBAQCBzb21ldGhpbmdfY2hhbmdlZF9nc2V0dGluZ3NDQiAoR1Nl dHRpbmdzICpzZXR0aW5ncywKICAgICAgICAgfQogICAgIH0KICNlbmRpZiAvKiBVU0VfQ0FJUk8g fHwgSEFWRV9YRlQgKi8KKyNpZmRlZiBIQVZFX1BHVEsKKyAgZWxzZSBpZiAoIXN0cmNtcCAoa2V5 LCBHU0VUVElOR1NfRk9OVF9BTlRJQUxJQVNJTkcpKQorICAgIHsKKyAgICAgIGFwcGx5X2dzZXR0 aW5nc19mb250X2FudGlhbGlhcyAoc2V0dGluZ3MpOworICAgICAgc3RvcmVfZm9udF9vcHRpb25z X2NoYW5nZWQgKCk7CisgICAgfQorICBlbHNlIGlmICghc3RyY21wIChrZXksIEdTRVRUSU5HU19G T05UX0hJTlRJTkcpKQorICAgIHsKKyAgICAgIGFwcGx5X2dzZXR0aW5nc19mb250X2hpbnRpbmcg KHNldHRpbmdzKTsKKyAgICAgIHN0b3JlX2ZvbnRfb3B0aW9uc19jaGFuZ2VkICgpOworICAgIH0K KyAgZWxzZSBpZiAoIXN0cmNtcCAoa2V5LCBHU0VUVElOR1NfRk9OVF9SR0JBX09SREVSKSkKKyAg ICB7CisgICAgICBhcHBseV9nc2V0dGluZ3NfZm9udF9yZ2JhX29yZGVyIChzZXR0aW5ncyk7Cisg ICAgICBzdG9yZV9mb250X29wdGlvbnNfY2hhbmdlZCAoKTsKKyAgICB9CisjZW5kaWYgLyogSEFW RV9QR1RLICovCiB9CiAKICNlbmRpZiAvKiBIQVZFX0dTRVRUSU5HUyAqLwpAQCAtOTAwLDYgKzEw MjIsMTYgQEAgaW5pdF9nc2V0dGluZ3MgKHZvaWQpCiAgICAgICAgIGR1cHN0cmluZyAoJmN1cnJl bnRfZm9udCwgZ192YXJpYW50X2dldF9zdHJpbmcgKHZhbCwgTlVMTCkpOwogICAgICAgZ192YXJp YW50X3VucmVmICh2YWwpOwogICAgIH0KKworICAvKiBPbmx5IHVzZSB0aGUgZ3NldHRpbmdzIGZv bnQgZW50cmllcyBmb3IgdGhlIENhaXJvIGJhY2tlbmQKKyAgICAgcnVubmluZyBvbiBQR1RLLiAg Ki8KKyNpZmRlZiBIQVZFX1BHVEsKKyAgZm9udF9vcHRpb25zID0gY2Fpcm9fZm9udF9vcHRpb25z X2NyZWF0ZSAoKTsKKyAgYXBwbHlfZ3NldHRpbmdzX2ZvbnRfYW50aWFsaWFzIChnc2V0dGluZ3Nf Y2xpZW50KTsKKyAgYXBwbHlfZ3NldHRpbmdzX2ZvbnRfaGludGluZyAoZ3NldHRpbmdzX2NsaWVu dCk7CisgIGFwcGx5X2dzZXR0aW5nc19mb250X3JnYmFfb3JkZXIgKGdzZXR0aW5nc19jbGllbnQp OworI2VuZGlmIC8qIEhBVkVfUEdUSyAqLworCiAjZW5kaWYgLyogVVNFX0NBSVJPIHx8IEhBVkVf WEZUICovCiAKICNlbmRpZiAvKiBIQVZFX0dTRVRUSU5HUyAqLwpAQCAtMTAyMSw2ICsxMTUzLDE3 IEBAIHhzZXR0aW5nc19nZXRfc3lzdGVtX25vcm1hbF9mb250ICh2b2lkKQogfQogI2VuZGlmCiAK KyNpZmRlZiBIQVZFX1BHVEsKKy8qIFJldHVybiB0aGUgY2Fpcm8gZm9udCBvcHRpb25zLCB1cGRh dGVkIGZyb20gdGhlIGdzZXR0aW5ncyBmb250CisgICBjb25maWcgZW50cmllcy4gIFRoZSBjYWxs ZXIgc2hvdWxkIGNhbGwgY2Fpcm9fZm9udF9vcHRpb25zX2Rlc3Ryb3kKKyAgIG9uIHRoZSByZXN1 bHQuICAqLworY2Fpcm9fZm9udF9vcHRpb25zX3QgKgoreHNldHRpbmdzX2dldF9mb250X29wdGlv bnMgKHZvaWQpCit7CisgIHJldHVybiBjYWlyb19mb250X29wdGlvbnNfY29weSAoZm9udF9vcHRp b25zKTsKK30KKyNlbmRpZgorCiBERUZVTiAoImZvbnQtZ2V0LXN5c3RlbS1ub3JtYWwtZm9udCIs IEZmb250X2dldF9zeXN0ZW1fbm9ybWFsX2ZvbnQsCiAgICAgICAgU2ZvbnRfZ2V0X3N5c3RlbV9u b3JtYWxfZm9udCwKICAgICAgICAwLCAwLCAwLApAQCAtMTA3Myw2ICsxMjE2LDEwIEBAIHN5bXNf b2ZfeHNldHRpbmdzICh2b2lkKQogICBnY29uZl9jbGllbnQgPSBOVUxMOwogICBQRFVNUEVSX0lH Tk9SRSAoZ2NvbmZfY2xpZW50KTsKICNlbmRpZgorI2lmZGVmIEhBVkVfUEdUSworICBmb250X29w dGlvbnMgPSBOVUxMOworICBQRFVNUEVSX0lHTk9SRSAoZm9udF9vcHRpb25zKTsKKyNlbmRpZgog CiAgIERFRlNZTSAoUW1vbm9zcGFjZV9mb250X25hbWUsICJtb25vc3BhY2UtZm9udC1uYW1lIik7 CiAgIERFRlNZTSAoUWZvbnRfbmFtZSwgImZvbnQtbmFtZSIpOwpkaWZmIC0tZ2l0IGEvc3JjL3hz ZXR0aW5ncy5oIGIvc3JjL3hzZXR0aW5ncy5oCmluZGV4IGNjYWEzNjQ4OWQuLjVlNWRmMzcwNjIg MTAwNjQ0Ci0tLSBhL3NyYy94c2V0dGluZ3MuaAorKysgYi9zcmMveHNldHRpbmdzLmgKQEAgLTIz LDYgKzIzLDggQEAgI2RlZmluZSBYU0VUVElOR1NfSAogI2lmbmRlZiBIQVZFX1BHVEsKICNpbmNs dWRlICJkaXNwZXh0ZXJuLmgiCiAjaW5jbHVkZSA8WDExL1hsaWIuaD4KKyNlbHNlCisjaW5jbHVk ZSA8Y2Fpcm8uaD4KICNlbmRpZgogCiBzdHJ1Y3QgeF9kaXNwbGF5X2luZm87CkBAIC00MSw1ICs0 Myw4IEBAICNkZWZpbmUgWFNFVFRJTkdTX0gKIGV4dGVybiBjb25zdCBjaGFyICp4c2V0dGluZ3Nf Z2V0X3N5c3RlbV9ub3JtYWxfZm9udCAodm9pZCk7CiAjZW5kaWYKIAorI2lmZGVmIEhBVkVfUEdU SworZXh0ZXJuIGNhaXJvX2ZvbnRfb3B0aW9uc190ICp4c2V0dGluZ3NfZ2V0X2ZvbnRfb3B0aW9u cyAodm9pZCk7CisjZW5kaWYKIAogI2VuZGlmIC8qIFhTRVRUSU5HU19IICovCi0tIAoyLjMyLjAK Cg== --=-/bTr7EmZFZdoOnWtRsD7--