From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#52493: 29.0.50; Setting Inconsolata up in init.el makes default face rendered wrong Date: Thu, 5 Jan 2023 10:47:44 +0100 Message-ID: <21a55a64-541d-345c-33d3-7c8eac182e83@gmx.at> References: <80e7f515-e16f-5ce8-86a3-e5f47cd2d2f5@yandex.ru> <92bbfa58-b920-04b9-078b-474fd917daf6@yandex.ru> <0c2d9115-8cec-0870-2ac3-38b8c17a0575@gmx.at> <83abf08e-44d9-8a05-f746-5f6a8469ab02@yandex.ru> <503acc7f-8b06-3ce2-71b0-9f97e8de1966@gmx.at> <66cb788c-6b49-c408-0168-0492e7f8d7ad@gmx.at> <266ad500-da74-13a5-2434-81bd3d5b3554@yandex.ru> <66499633-3283-3cb2-2322-77a357a3c1b7@gmx.at> <1c8f744b-2c71-d6b3-39be-86185ea3650b@yandex.ru> <9bc9f6fe-4fe6-1f75-42db-3a9c3e84d851@gmx.at> <8bca33d8-55a5-9a96-2adf-cc751eed22e5@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------WoEcRvA0yWU2yzKUEhy10pJG" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20718"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, 52493@debbugs.gnu.org To: Dmitry Gutov , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 05 10:50:17 2023 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 1pDMt7-0005G9-17 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Jan 2023 10:50:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDMr9-0003Sz-Dj; Thu, 05 Jan 2023 04:48:15 -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 1pDMqw-0003O5-7A for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 04:48:07 -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 1pDMqv-0003bp-PY for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 04:48:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDMqv-0004pT-KF for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 04:48:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Jan 2023 09:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52493 X-GNU-PR-Package: emacs Original-Received: via spool by 52493-submit@debbugs.gnu.org id=B52493.167291207918542 (code B ref 52493); Thu, 05 Jan 2023 09:48:01 +0000 Original-Received: (at 52493) by debbugs.gnu.org; 5 Jan 2023 09:47:59 +0000 Original-Received: from localhost ([127.0.0.1]:50300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDMqs-0004ou-6n for submit@debbugs.gnu.org; Thu, 05 Jan 2023 04:47:59 -0500 Original-Received: from mout.gmx.net ([212.227.15.19]:47397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDMqq-0004o4-4u for 52493@debbugs.gnu.org; Thu, 05 Jan 2023 04:47:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1672912069; bh=aSydd1ab+h6Xob+Wk3p6Vjv4pEnOQlg53ZExkQkw9fQ=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=W4hDL9oUpBBC1/tKNugUPEDzQnmR9MJcDX0e6En3Zi8upbQZbD9wLbr9abz0RzVkl BIsvyYK+M38loU0rl8DZecOjOX5/PnIxtOV83DzlrMGDAgs6RS6UXRy+gogGUiQczS Q2S8UMwlF0Bi1wZ5L0VI8thc6lYT2PJvC2GO2PZaf/a7HKMiOqfl9Mk8IIcjQdVMpG Dc9J9dx5NZK5RCOpYS849JVbTG/1iZz6HVFaER4ZZcpALD4MjO45D8B5fwbIoahy7Z JvPmqJmyNnq0ob6i7+vqFkcu0NBCKs0hWE+I6TwOGfwkoQaeIxS72X11MgYkbnprf9 2LC5ZWIjck9pA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.1.100] ([213.162.80.218]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M3UUy-1pCosx0Cmo-000dZV; Thu, 05 Jan 2023 10:47:49 +0100 Content-Language: en-US In-Reply-To: <8bca33d8-55a5-9a96-2adf-cc751eed22e5@yandex.ru> X-Provags-ID: V03:K1:/yS8zTPzjdJpcFLVYqCPB9FTIxfBh8BW/8H2Ml7aWsUJT/lYjkz J6w6fbXGBIckngNwphNdzKehMFy7WgaVev4pJJj77yO0ifFjpgwIoRZUdy9p4uUKx0Uaifa NLJwK/7nH6R//e1Gw4IJ17vY0ls9bK2xHxk//zJ0/45jr2uec19tYRRa7Bv/cnzAG2u4lZl uxG4SBTfPdF60oqNxaaqw== UI-OutboundReport: notjunk:1;M01:P0:J8tIYgdgR2U=;bkaJwUXx74DWNzZx9OIZ3dlI8FP twzhrK6CXuEFm9CIJEOMGusezeQqvzDb2H86EEVbHInp5rRoC5kiVBVneeL00yiYQYO0NIbD4 dnCZjUA+ChmQZ+j0tbaIAHb/jbuh9OjQwxdcmyn8selraci3Qbdek6H5ljzNbGQyoMm4nGd3D gn8DZMcqPTC05OQhezENvmz02WhH2Gfj5zdb4usSesp1CfVJRtPaoD3W/ntwa3FzlRVVdUyiN 8Yl73p9CJsRg8/gjWjeHAzxcVKqHGKniQg/cdR8MBu1LHD/Bo9Ij5a27uAgJHs88vsABMfHM8 9oKd53svwx6f0O+PH1vfMTvTxGci2j4vsED/aUSD8m3GbIFWZYmI+CgVqZ9V3OCKS0Z3dCpd2 32NyGbmskmUkU0er7SGcoC6nT03AhRfJcIAvZCC0qi0eVllbs7tPkSgHc8jMwXbp3tl5WIWkV L85P5ZEI9D8aYFaDxJt0/Mr+AKAJQ55472dQAFiWlFdUHuBN/xyD0C13P7GhfG94tk1hneVkG T+2d2D+NGRPb35V5n8di4bz5Rkhby7V28zD3fCjt7CZrQOwbtL+l5HQrs0V+adZDYo9mX5oXX TuqZKjfm32LnL9+2SqaEuweziVrHdDKCxlRF2/8XzvM+o++aFCoDF+d53C+yleAwvTy6O03g3 uJm8U38Pazf037LWxTIChO46hQaiTpL80LXUzULapPk5EXCnx/2Gju7MEEfrA/S/J8bF0qLQa bOLmlH2CMQw4H8zc/cNnRHQ/6h67vUEEAuXbu2Ba0GGEKCSJUsDes20VOcwyNytA6Wll9yBU 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:252586 Archived-At: This is a multi-part message in MIME format. --------------WoEcRvA0yWU2yzKUEhy10pJG Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > xg_wm_set_size_hint scale 2 char width 18 vscroll 32 fringes 16 borders 0 base width 33 width inc 9 > char height 36 menubar 50 toolbar 82 hscroll 0 borders 0 base height 84 height inc 18 > xg_frame_set_char_size old native pixels 1488x1296 new native pixels 1491x1296 outer pixels 745x714 outer rest 1x0 Apparently, rounding the native pixels doesn't make sense. Let's round just the outer pixels instead. Patch attached. martin --------------WoEcRvA0yWU2yzKUEhy10pJG Content-Type: text/x-patch; charset=UTF-8; name="x_scale_font.diff" Content-Disposition: attachment; filename="x_scale_font.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3Avd2luZG93LmVsIGIvbGlzcC93aW5kb3cuZWwKaW5kZXggYTEx MjkzZDM3Mi4uNzA2Yzk4OGIyZSAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTEwNTk2LDYgKzEwNTk2LDIxIEBAIHdpbmRvdy1wcmVmaXgt bWFwCiAgICIwIiAjJ2RlbGV0ZS13aW5kb3dzLW9uKQogKGRlZmluZS1rZXkgY3RsLXgtbWFw ICJ3IiB3aW5kb3ctcHJlZml4LW1hcCkKIAorKGRlZnVuIGZvby1pdCAoJnJlc3QgcmVzdCkK KyAgKHdpdGgtY3VycmVudC1idWZmZXIgKGdldC1idWZmZXItY3JlYXRlICIqZm9vKiIpCisg ICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAgICAod2hlbiByZXN0CisgICAgICAoaWYg KGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAgKGluc2VydCAoZm9ybWF0ICIlc3glcyIg KGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQorICAgICAgICAoaW5zZXJ0IChmb3JtYXQgIiVz IiAoY2FyIHJlc3QpKSkpCisgICAgICAoc2V0cSByZXN0IChjZHIgcmVzdCkpCisgICAgICAo d2hpbGUgcmVzdAorICAgICAgICAoaWYgKGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAg ICAoaW5zZXJ0IChmb3JtYXQgIiAlc3glcyIgKGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQor CSAgKGluc2VydCAoZm9ybWF0ICIgJXMiIChjYXIgcmVzdCkpKSkKKwkoc2V0cSByZXN0IChj ZHIgcmVzdCkpKQorICAgICAgKGluc2VydCAiXG4iKSkpKQorCiAocHJvdmlkZSAnd2luZG93 KQogCiA7Ozsgd2luZG93LmVsIGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEvc3JjL2ZyYW1lLmMg Yi9zcmMvZnJhbWUuYwppbmRleCBiNTdiMjk2YmU1Li5kN2QwNjlkOTA4IDEwMDY0NAotLS0g YS9zcmMvZnJhbWUuYworKysgYi9zcmMvZnJhbWUuYwpAQCAtOTA2LDYgKzkwNiwzMiBAQCBh ZGp1c3RfZnJhbWVfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgbmV3X3RleHRfd2lkdGgs IGludCBuZXdfdGV4dF9oZWlnaHQsCiAKICAgdW5ibG9ja19pbnB1dCAoKTsKIAorICBpZiAo b2xkX25hdGl2ZV93aWR0aCAhPSBuZXdfbmF0aXZlX3dpZHRoCisgICAgICB8fCBvbGRfbmF0 aXZlX2hlaWdodCAhPSBuZXdfbmF0aXZlX2hlaWdodAorICAgICAgfHwgb2xkX3RleHRfd2lk dGggIT0gbmV3X3RleHRfd2lkdGgKKyAgICAgIHx8IG9sZF90ZXh0X2hlaWdodCAhPSBuZXdf dGV4dF9oZWlnaHQKKyAgICAgIHx8IG9sZF90ZXh0X2NvbHMgIT0gbmV3X3RleHRfY29scwor ICAgICAgfHwgb2xkX3RleHRfbGluZXMgIT0gbmV3X3RleHRfbGluZXMpCisgICAgQ0FMTE4g KEZmdW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCJhZGp1c3RfZnJhbWVfc2l6ZSIpLAorCSAg IGludGVybiAoIm9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVt IChvbGRfbmF0aXZlX3dpZHRoKSwKKwkJICBtYWtlX2ZpeG51bSAob2xkX25hdGl2ZV9oZWln aHQpKSwKKwkgICBpbnRlcm4gKCJuZXcgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZjb25zICht YWtlX2ZpeG51bSAobmV3X25hdGl2ZV93aWR0aCksCisJCSAgbWFrZV9maXhudW0gKG5ld19u YXRpdmVfaGVpZ2h0KSksCisJICAgaW50ZXJuICgib2xkIHRleHQgcGl4ZWxzIiksCisJICAg RmNvbnMgKG1ha2VfZml4bnVtIChvbGRfdGV4dF93aWR0aCksCisJCSAgbWFrZV9maXhudW0g KG9sZF90ZXh0X2hlaWdodCkpLAorCSAgIGludGVybiAoIm5ldyB0ZXh0IHBpeGVscyIpLAor CSAgIEZjb25zIChtYWtlX2ZpeG51bSAobmV3X3RleHRfd2lkdGgpLAorCQkgIG1ha2VfZml4 bnVtIChuZXdfdGV4dF9oZWlnaHQpKSwKKwkgICBpbnRlcm4gKCJvbGQgdGV4dCBjaGFycyIp LAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAob2xkX3RleHRfY29scyksCisJCSAgbWFrZV9m aXhudW0gKG9sZF90ZXh0X2xpbmVzKSksCisJICAgaW50ZXJuICgibmV3IHRleHQgY2hhcnMi KSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKG5ld190ZXh0X2NvbHMpLAorCQkgIG1ha2Vf Zml4bnVtIChuZXdfdGV4dF9saW5lcykpKTsKKwogI2lmZGVmIEhBVkVfV0lORE9XX1NZU1RF TQogICB7CiAgICAgLyogQWRqdXN0IHNpemUgb2YgRidzIGNoaWxkIGZyYW1lcy4gICovCmRp ZmYgLS1naXQgYS9zcmMvZ3RrdXRpbC5jIGIvc3JjL2d0a3V0aWwuYwppbmRleCBhNmJiYTA5 NmE0Li5lYmNjOTUwN2Q1IDEwMDY0NAotLS0gYS9zcmMvZ3RrdXRpbC5jCisrKyBiL3NyYy9n dGt1dGlsLmMKQEAgLTExNDksNiArMTE0OSwxNCBAQCB4Z19mcmFtZV9yZXNpemVkIChzdHJ1 Y3QgZnJhbWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAkgICBmLT5uZXdfc2l6ZV9w ID8gZi0+bmV3X2hlaWdodCA6IC0xKTsKIAogICAgICAgRlJBTUVfUklGIChmKS0+Y2xlYXJf dW5kZXJfaW50ZXJuYWxfYm9yZGVyIChmKTsKKworICAgICAgQ0FMTE4gKEZmdW5jYWxsLCBR Zm9vX2l0LCBpbnRlcm4gKCJ4Z19mcmFtZV9yZXNpemVkIiksCisJICAgICBpbnRlcm4gKCJv bGQgbmF0aXZlIHBpeGVscyIpLAorCSAgICAgRmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9Q SVhFTF9XSURUSCAoZikpLAorCQkgICAgbWFrZV9maXhudW0gKEZSQU1FX1BJWEVMX0hFSUdI VCAoZikpKSwKKwkgICAgIGludGVybiAoIm5ldyBuYXRpdmUgcGl4ZWxzIiksCisJICAgICBG Y29ucyAobWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdodCkpKTsKKwog ICAgICAgY2hhbmdlX2ZyYW1lX3NpemUgKGYsIHdpZHRoLCBoZWlnaHQsIGZhbHNlLCB0cnVl LCBmYWxzZSk7CiAgICAgICBTRVRfRlJBTUVfR0FSQkFHRUQgKGYpOwogICAgICAgY2FuY2Vs X21vdXNlX2ZhY2UgKGYpOwpAQCAtMTE3NCw2ICsxMTgyLDggQEAgeGdfZnJhbWVfc2V0X2No YXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIGlu dCBvdXRlcl93aWR0aCA9IHdpZHRoICsgRlJBTUVfVE9PTEJBUl9XSURUSCAoZik7CiAgIGJv b2wgd2FzX3Zpc2libGUgPSBmYWxzZTsKICAgYm9vbCBoaWRlX2NoaWxkX2ZyYW1lOworICBp bnQgc2NhbGUgPSB4Z19nZXRfc2NhbGUgKGYpOworICBHZGtHZW9tZXRyeSBzaXplX2hpbnRz OwogCiAjaWZuZGVmIEhBVkVfUEdUSwogICBndGtfd2luZG93X2dldF9zaXplIChHVEtfV0lO RE9XIChGUkFNRV9HVEtfT1VURVJfV0lER0VUIChmKSksCkBAIC0xMTk2LDggKzEyMDYsMTYg QEAgeGdfZnJhbWVfc2V0X2NoYXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgs IGludCBoZWlnaHQpCiAgIC8qIERvIHRoaXMgYmVmb3JlIHJlc2l6ZSwgYXMgd2UgZG9uJ3Qg a25vdyB5ZXQgaWYgd2Ugd2lsbCBiZSByZXNpemVkLiAgKi8KICAgRlJBTUVfUklGIChmKS0+ Y2xlYXJfdW5kZXJfaW50ZXJuYWxfYm9yZGVyIChmKTsKIAotICBvdXRlcl9oZWlnaHQgLz0g eGdfZ2V0X3NjYWxlIChmKTsKLSAgb3V0ZXJfd2lkdGggLz0geGdfZ2V0X3NjYWxlIChmKTsK KyAgb3V0ZXJfaGVpZ2h0IC89IHNjYWxlOworICBvdXRlcl93aWR0aCAvPSBzY2FsZTsKKwor ICBpZiAoc2NhbGUgIT0gMSAmJiAhZnJhbWVfcmVzaXplX3BpeGVsd2lzZSkKKyAgICB7Cisg ICAgICBvdXRlcl93aWR0aAorCT0gb3V0ZXJfd2lkdGggKyAob3V0ZXJfd2lkdGggJSAoRlJB TUVfQ09MVU1OX1dJRFRIIChmKSAvIHNjYWxlKSk7CisgICAgICBvdXRlcl9oZWlnaHQKKwk9 IG91dGVyX2hlaWdodCArIChvdXRlcl9oZWlnaHQgJSAoRlJBTUVfTElORV9IRUlHSFQgKGYp IC8gc2NhbGUpKTsKKyAgICB9CiAKICAgeGdfd21fc2V0X3NpemVfaGludCAoZiwgMCwgMCk7 CiAKQEAgLTEzMTcsNiArMTMzNSwzMCBAQCB4Z19mcmFtZV9zZXRfY2hhcl9zaXplIChzdHJ1 Y3QgZnJhbWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKICAgU0VUX0ZSQU1FX0dBUkJB R0VEIChmKTsKICAgY2FuY2VsX21vdXNlX2ZhY2UgKGYpOwogCisgIHNpemVfaGludHMgPSBm LT5vdXRwdXRfZGF0YS54cC0+c2l6ZV9oaW50czsKKyAgaWYgKG91dGVyX3dpZHRoID4gMCAm JiBzaXplX2hpbnRzLmJhc2Vfd2lkdGggPiAwICYmIHNpemVfaGludHMud2lkdGhfaW5jID4g MAorICAgICAgJiYgb3V0ZXJfaGVpZ2h0ID4gMCAmJiBzaXplX2hpbnRzLmJhc2VfaGVpZ2h0 ID4gMCAmJiBzaXplX2hpbnRzLmhlaWdodF9pbmMgPiAwKQorICAgIENBTExOIChGZnVuY2Fs bCwgUWZvb19pdCwgaW50ZXJuICgieGdfZnJhbWVfc2V0X2NoYXJfc2l6ZSIpLAorCSAgIGlu dGVybiAoIm9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVtIChG UkFNRV9QSVhFTF9XSURUSCAoZikpLAorCQkgIG1ha2VfZml4bnVtIChGUkFNRV9QSVhFTF9I RUlHSFQgKGYpKSksCisJICAgaW50ZXJuICgibmV3IG5hdGl2ZSBwaXhlbHMiKSwKKwkgICBG Y29ucyAobWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdodCkpLAorCSAg IGludGVybiAoIm91dGVyIHBpeGVscyIpLAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAob3V0 ZXJfd2lkdGgpLCBtYWtlX2ZpeG51bSAob3V0ZXJfaGVpZ2h0KSksCisJICAgaW50ZXJuICgi b3V0ZXIgcmVzdCIpLAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAoKG91dGVyX3dpZHRoIC0g c2l6ZV9oaW50cy5iYXNlX3dpZHRoKSAlIHNpemVfaGludHMud2lkdGhfaW5jKSwKKwkJICBt YWtlX2ZpeG51bSAoKG91dGVyX2hlaWdodCAtIHNpemVfaGludHMuYmFzZV9oZWlnaHQpICUg c2l6ZV9oaW50cy5oZWlnaHRfaW5jKSkpOworICBlbHNlCisgICAgQ0FMTE4gKEZmdW5jYWxs LCBRZm9vX2l0LCBpbnRlcm4gKCJ4Z19mcmFtZV9zZXRfY2hhcl9zaXplIiksCisJICAgaW50 ZXJuICgib2xkIG5hdGl2ZSBwaXhlbHMiKSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKEZS QU1FX1BJWEVMX1dJRFRIIChmKSksCisJCSAgbWFrZV9maXhudW0gKEZSQU1FX1BJWEVMX0hF SUdIVCAoZikpKSwKKwkgICBpbnRlcm4gKCJuZXcgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZj b25zIChtYWtlX2ZpeG51bSAod2lkdGgpLCBtYWtlX2ZpeG51bSAoaGVpZ2h0KSksCisJICAg aW50ZXJuICgib3V0ZXIgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVtIChvdXRl cl93aWR0aCksIG1ha2VfZml4bnVtIChvdXRlcl9oZWlnaHQpKSk7CisKICAgLyogV2UgY2Fu IG5vdCBjYWxsIGNoYW5nZV9mcmFtZV9zaXplIGZvciBhIG1hcHBlZCBmcmFtZSwKICAgICAg d2UgY2FuIG5vdCBzZXQgcGl4ZWwgd2lkdGgvaGVpZ2h0IGVpdGhlci4gIFRoZSB3aW5kb3cg bWFuYWdlciBtYXkKICAgICAgb3ZlcnJpZGUgb3VyIHJlc2l6ZSByZXF1ZXN0LCBYTW9uYWQg ZG9lcyB0aGlzIGFsbCB0aGUgdGltZS4KQEAgLTIwMjgsNiArMjA3MCwyMyBAQCB4Z193bV9z ZXRfc2l6ZV9oaW50IChzdHJ1Y3QgZnJhbWUgKmYsIGxvbmcgaW50IGZsYWdzLCBib29sIHVz ZXJfcG9zaXRpb24pCiAJCSAmZi0+b3V0cHV0X2RhdGEueHAtPnNpemVfaGludHMsCiAJCSBz aXplb2YgKHNpemVfaGludHMpKSAhPSAwKQogICAgIHsKKyAgICAgIENBTExOIChGZnVuY2Fs bCwgUWZvb19pdCwgaW50ZXJuICgieGdfd21fc2V0X3NpemVfaGludCIpLAorCSAgICAgaW50 ZXJuICgic2NhbGUiKSwgbWFrZV9maXhudW0gKHNjYWxlKSwKKwkgICAgIGludGVybiAoImNo YXIgd2lkdGgiKSwgbWFrZV9maXhudW0gKEZSQU1FX0NPTFVNTl9XSURUSCAoZikpLAorCSAg ICAgaW50ZXJuICgidnNjcm9sbCIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfU0NST0xMX0JBUl9B UkVBX1dJRFRIIChmKSksCisJICAgICBpbnRlcm4gKCJmcmluZ2VzIiksIG1ha2VfZml4bnVt IChGUkFNRV9UT1RBTF9GUklOR0VfV0lEVEggKGYpKSwKKwkgICAgIGludGVybiAoImJvcmRl cnMiKSwgbWFrZV9maXhudW0gKDIgKiBGUkFNRV9JTlRFUk5BTF9CT1JERVJfV0lEVEggKGYp KSwKKwkgICAgIGludGVybiAoImJhc2Ugd2lkdGgiKSwgbWFrZV9maXhudW0gKHNpemVfaGlu dHMuYmFzZV93aWR0aCksCisJICAgICBpbnRlcm4gKCJ3aWR0aCBpbmMiKSwgbWFrZV9maXhu dW0gKHNpemVfaGludHMud2lkdGhfaW5jKSk7CisgICAgICBDQUxMTiAoRmZ1bmNhbGwsIFFm b29faXQsIGludGVybiAoIiAgICIpLAorCSAgICAgaW50ZXJuICgiY2hhciBoZWlnaHQiKSwg bWFrZV9maXhudW0gKEZSQU1FX0xJTkVfSEVJR0hUIChmKSksCisJICAgICBpbnRlcm4gKCJt ZW51YmFyIiksIG1ha2VfZml4bnVtIChGUkFNRV9NRU5VQkFSX0hFSUdIVCAoZikpLAorCSAg ICAgaW50ZXJuICgidG9vbGJhciIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfVE9PTEJBUl9IRUlH SFQgKGYpKSwKKwkgICAgIGludGVybiAoImhzY3JvbGwiKSwgbWFrZV9maXhudW0gKEZSQU1F X1NDUk9MTF9CQVJfQVJFQV9IRUlHSFQgKGYpKSwKKwkgICAgIGludGVybiAoImJvcmRlcnMi KSwgbWFrZV9maXhudW0gKDIgKiBGUkFNRV9JTlRFUk5BTF9CT1JERVJfV0lEVEggKGYpKSwK KwkgICAgIGludGVybiAoImJhc2UgaGVpZ2h0IiksIG1ha2VfZml4bnVtIChzaXplX2hpbnRz LmJhc2VfaGVpZ2h0KSwKKwkgICAgIGludGVybiAoImhlaWdodCBpbmMiKSwgbWFrZV9maXhu dW0gKHNpemVfaGludHMuaGVpZ2h0X2luYykpOworCiAgICAgICBibG9ja19pbnB1dCAoKTsK ICAgICAgIGd0a193aW5kb3dfc2V0X2dlb21ldHJ5X2hpbnRzIChHVEtfV0lORE9XIChGUkFN RV9HVEtfT1VURVJfV0lER0VUIChmKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTlVMTCwgJnNpemVfaGludHMsIGhpbnRfZmxhZ3MpOwpkaWZmIC0tZ2l0IGEv c3JjL3dpbmRvdy5jIGIvc3JjL3dpbmRvdy5jCmluZGV4IGYxMTZiOWE5ZDcuLmMwOTBmMjk0 NjEgMTAwNjQ0Ci0tLSBhL3NyYy93aW5kb3cuYworKysgYi9zcmMvd2luZG93LmMKQEAgLTgz OTQsNiArODM5NCw3IEBAIHN5bXNfb2Zfd2luZG93ICh2b2lkKQogICBERUZTWU0gKFFoZWFk ZXJfbGluZV9mb3JtYXQsICJoZWFkZXItbGluZS1mb3JtYXQiKTsKICAgREVGU1lNIChRdGFi X2xpbmVfZm9ybWF0LCAidGFiLWxpbmUtZm9ybWF0Iik7CiAgIERFRlNZTSAoUW5vX290aGVy X3dpbmRvdywgIm5vLW90aGVyLXdpbmRvdyIpOworICBERUZTWU0gKFFmb29faXQsICJmb28t aXQiKTsKIAogICBERUZWQVJfTElTUCAoInRlbXAtYnVmZmVyLXNob3ctZnVuY3Rpb24iLCBW dGVtcF9idWZmZXJfc2hvd19mdW5jdGlvbiwKIAkgICAgICAgZG9jOiAvKiBOb24tbmlsIG1l YW5zIGNhbGwgYXMgZnVuY3Rpb24gdG8gZGlzcGxheSBhIGhlbHAgYnVmZmVyLgpkaWZmIC0t Z2l0IGEvc3JjL3h0ZXJtLmMgYi9zcmMveHRlcm0uYwppbmRleCA3ZWFmNTlkNTRiLi5iMmU2 ODlmZTg0IDEwMDY0NAotLS0gYS9zcmMveHRlcm0uYworKysgYi9zcmMveHRlcm0uYwpAQCAt MjYxNjAsNiArMjYxNjAsOCBAQCB4X25ld19mb250IChzdHJ1Y3QgZnJhbWUgKmYsIExpc3Bf T2JqZWN0IGZvbnRfb2JqZWN0LCBpbnQgZm9udHNldCkKIHsKICAgc3RydWN0IGZvbnQgKmZv bnQgPSBYRk9OVF9PQkpFQ1QgKGZvbnRfb2JqZWN0KTsKICAgaW50IHVuaXQsIGZvbnRfYXNj ZW50LCBmb250X2Rlc2NlbnQ7CisgIGludCBvbGRfd2lkdGggPSBGUkFNRV9DT0xVTU5fV0lE VEggKGYpOworICBpbnQgb2xkX2hlaWdodCA9IEZSQU1FX0xJTkVfSEVJR0hUIChmKTsKIAog ICBpZiAoZm9udHNldCA8IDApCiAgICAgZm9udHNldCA9IGZvbnRzZXRfZnJvbV9mb250IChm b250X29iamVjdCk7CkBAIC0yNjE5Nyw5ICsyNjE5OSwyNyBAQCB4X25ld19mb250IChzdHJ1 Y3QgZnJhbWUgKmYsIExpc3BfT2JqZWN0IGZvbnRfb2JqZWN0LCBpbnQgZm9udHNldCkKICAg ICAgYmVjYXVzZSBpdCdzIGRvbmUgaW4gRnhfc2hvd190aXAsIGFuZCBpdCBsZWFkcyB0byBw cm9ibGVtcyBiZWNhdXNlCiAgICAgIHRoZSB0aXAgZnJhbWUgaGFzIG5vIHdpZGdldC4gICov CiAgIGlmIChGUkFNRV9YX1dJTkRPVyAoZikgIT0gMCAmJiAhRlJBTUVfVE9PTFRJUF9QIChm KSkKLSAgICBhZGp1c3RfZnJhbWVfc2l6ZQotICAgICAgKGYsIEZSQU1FX0NPTFMgKGYpICog RlJBTUVfQ09MVU1OX1dJRFRIIChmKSwKLSAgICAgICBGUkFNRV9MSU5FUyAoZikgKiBGUkFN RV9MSU5FX0hFSUdIVCAoZiksIDMsIGZhbHNlLCBRZm9udCk7CisgICAgeworICAgICAgQ0FM TE4gKEZmdW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCJcbnhfbmV3X2ZvbnQiKSwKKwkgICAg IGludGVybiAoIm9sZCBjaGFyIHNpemUiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAo b2xkX3dpZHRoKSwgbWFrZV9maXhudW0gKG9sZF9oZWlnaHQpKSwKKwkgICAgIGludGVybiAo Im5ldyBjaGFyIHNpemUiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAoRlJBTUVfQ09M VU1OX1dJRFRIIChmKSksCisJCSAgICBtYWtlX2ZpeG51bSAoRlJBTUVfTElORV9IRUlHSFQg KGYpKSksCisJICAgICBpbnRlcm4gKCJ0ZXh0IGNoYXJzIiksCisJICAgICBGY29ucyAobWFr ZV9maXhudW0gKEZSQU1FX0NPTFMgKGYpKSwKKwkJICAgIG1ha2VfZml4bnVtIChGUkFNRV9M SU5FUyAoZikpKSwKKwkgICAgIGludGVybiAoIm9sZCB0ZXh0IHBpeGVscyIpLAorCSAgICAg RmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9URVhUX1dJRFRIIChmKSksCisJCSAgICBtYWtl X2ZpeG51bSAoRlJBTUVfVEVYVF9IRUlHSFQgKGYpKSksCisJICAgICBpbnRlcm4gKCJuZXcg dGV4dCBwaXhlbHMiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAoRlJBTUVfQ09MUyAo ZikgKiBGUkFNRV9DT0xVTU5fV0lEVEggKGYpKSwKKwkJICAgIG1ha2VfZml4bnVtIChGUkFN RV9MSU5FUyAoZikgKiBGUkFNRV9MSU5FX0hFSUdIVCAoZikpKSk7CisKKyAgICAgIGFkanVz dF9mcmFtZV9zaXplCisJKGYsIEZSQU1FX0NPTFMgKGYpICogRlJBTUVfQ09MVU1OX1dJRFRI IChmKSwKKwkgRlJBTUVfTElORVMgKGYpICogRlJBTUVfTElORV9IRUlHSFQgKGYpLCAzLCBm YWxzZSwgUWZvbnQpOworICAgIH0KIAogI2lmZGVmIEhBVkVfWF9JMThOCiAgIGlmIChGUkFN RV9YSUMgKGYpCg== --------------WoEcRvA0yWU2yzKUEhy10pJG--