From unknown Mon Aug 18 21:50:46 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11399: 24.1.50; [PATCH] image-mode scaling fix Resent-From: Wolfgang Jenkner Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 May 2012 17:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11399 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 11399@debbugs.gnu.org Cc: Glenn Morris X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.133606637717751 (code B ref -1); Thu, 03 May 2012 17:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2012 17:32:57 +0000 Received: from localhost ([127.0.0.1]:35102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SPztg-0004cF-WA for submit@debbugs.gnu.org; Thu, 03 May 2012 13:32:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43927) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SPzte-0004c3-L9 for submit@debbugs.gnu.org; Thu, 03 May 2012 13:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPzrw-0000QC-O0 for submit@debbugs.gnu.org; Thu, 03 May 2012 13:31:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:56775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzrw-0000Q7-Kz for submit@debbugs.gnu.org; Thu, 03 May 2012 13:31:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzru-0001yO-SG for bug-gnu-emacs@gnu.org; Thu, 03 May 2012 13:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPzro-0000PI-Kf for bug-gnu-emacs@gnu.org; Thu, 03 May 2012 13:31:06 -0400 Received: from mx21.lb01.inode.at ([62.99.145.23]:51263 helo=mx.inode.at) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzro-0000Oj-Dt; Thu, 03 May 2012 13:31:00 -0400 Received: from [85.127.92.132] (port=4089 helo=iznogoud.viz) by smartmx-21.inode.at with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1SPzrl-0007o9-JG; Thu, 03 May 2012 19:30:57 +0200 Received: from wolfgang by iznogoud.viz with local (Exim 4.77 (FreeBSD)) (envelope-from ) id 1SPzrk-00058e-Aa; Thu, 03 May 2012 19:30:56 +0200 From: Wolfgang Jenkner Date: Thu, 03 May 2012 18:53:58 +0200 Mail-Followup-To: bug-gnu-emacs@gnu.org, Glenn Morris Message-ID: <85wr4t18a8.fsf@iznogoud.viz> User-Agent: Gnus/5.130004 (Ma Gnus v0.4) Emacs/24.1.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) This takes care of a FIXME in image-mode.el, viz. "2 works, but eg 1.9 or 0.5 don't?". To expand on this a bit: Make sure some image format, say jpg, is really handled by ImageMagick. Visit a jpg file and do M-x i m a g e - t r a n s f o r m - s e t - s c a l e 1 . 9 2012-05-03 Wolfgang Jenkner * image-mode.el (image-transform-resize): Doc fix. (image-transform-properties): Default scale is 1 and height should be an integer. === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2012-02-08 03:45:27 +0000 +++ lisp/image-mode.el 2012-05-03 15:48:02 +0000 @@ -634,7 +634,7 @@ - nil, meaning no resizing. - `fit-height', meaning to fit the image to the window height. - `fit-width', meaning to fit the image to the window width. - - A number, which is a scale factor (the default size is 100).") + - A number, which is a scale factor (the default size is 1).") (defvar image-transform-rotation 0.0 "Rotation angle for the image in the current Image mode buffer.") @@ -655,8 +655,8 @@ (height (cond ((numberp image-transform-resize) - (unless (= image-transform-resize 100) - (* image-transform-resize (cdr size)))) + (unless (= image-transform-resize 1) + (floor (* image-transform-resize (cdr size))))) ((eq image-transform-resize 'fit-height) (- (nth 3 (window-inside-pixel-edges)) (nth 1 (window-inside-pixel-edges)))))) @@ -669,7 +669,6 @@ ,@(if (not (equal 0.0 image-transform-rotation)) (list :rotation image-transform-rotation)))))) -;; FIXME 2 works, but eg 1.9 or 0.5 don't? (defun image-transform-set-scale (scale) "Prompt for a number, and resize the current image by that amount. This command has no effect unless Emacs is compiled with From unknown Mon Aug 18 21:50:46 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Wolfgang Jenkner Subject: bug#11399: closed (Re: 24.1.50; [PATCH] image-mode scaling fix) Message-ID: References: <85wr4t18a8.fsf@iznogoud.viz> X-Gnu-PR-Message: they-closed 11399 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 11399@debbugs.gnu.org Date: Mon, 14 May 2012 05:18:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1336972682-9901-1" This is a multi-part message in MIME format... ------------=_1336972682-9901-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11399: 24.1.50; [PATCH] image-mode scaling fix which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 11399@debbugs.gnu.org. --=20 11399: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11399 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1336972682-9901-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 11399-done) by debbugs.gnu.org; 14 May 2012 05:17:29 +0000 Received: from localhost ([127.0.0.1]:51953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1STnez-0002Yv-Du for submit@debbugs.gnu.org; Mon, 14 May 2012 01:17:29 -0400 Received: from ironport-out.teksavvy.com ([206.248.143.162]:17226) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1STney-0002Yk-4E for 11399-done@debbugs.gnu.org; Mon, 14 May 2012 01:17:28 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtINACxOgk/O+IOn/2dsb2JhbABDgnwJtRkEAQOBDIEIggVhPjQmGA2FfwcBgigWnWiYSothgVWDJASkRYFdgwM X-IronPort-AV: E=Sophos;i="4.75,391,1330923600"; d="scan'208";a="180049336" Received: from 206-248-131-167.dsl.teksavvy.com (HELO pastel.home) ([206.248.131.167]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 14 May 2012 01:17:02 -0400 Received: by pastel.home (Postfix, from userid 20848) id E389459652; Mon, 14 May 2012 01:17:01 -0400 (EDT) From: Stefan Monnier To: 11399-done@debbugs.gnu.org Subject: Re: 24.1.50; [PATCH] image-mode scaling fix Message-ID: Date: Mon, 14 May 2012 01:17:01 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 11399-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -0.4 (/) Thank you Wolfgang, I installed your patch, Stefan ------------=_1336972682-9901-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 May 2012 17:32:57 +0000 Received: from localhost ([127.0.0.1]:35102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SPztg-0004cF-WA for submit@debbugs.gnu.org; Thu, 03 May 2012 13:32:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43927) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SPzte-0004c3-L9 for submit@debbugs.gnu.org; Thu, 03 May 2012 13:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPzrw-0000QC-O0 for submit@debbugs.gnu.org; Thu, 03 May 2012 13:31:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:56775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzrw-0000Q7-Kz for submit@debbugs.gnu.org; Thu, 03 May 2012 13:31:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzru-0001yO-SG for bug-gnu-emacs@gnu.org; Thu, 03 May 2012 13:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPzro-0000PI-Kf for bug-gnu-emacs@gnu.org; Thu, 03 May 2012 13:31:06 -0400 Received: from mx21.lb01.inode.at ([62.99.145.23]:51263 helo=mx.inode.at) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPzro-0000Oj-Dt; Thu, 03 May 2012 13:31:00 -0400 Received: from [85.127.92.132] (port=4089 helo=iznogoud.viz) by smartmx-21.inode.at with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1SPzrl-0007o9-JG; Thu, 03 May 2012 19:30:57 +0200 Received: from wolfgang by iznogoud.viz with local (Exim 4.77 (FreeBSD)) (envelope-from ) id 1SPzrk-00058e-Aa; Thu, 03 May 2012 19:30:56 +0200 From: Wolfgang Jenkner To: bug-gnu-emacs@gnu.org Subject: 24.1.50; [PATCH] image-mode scaling fix Date: Thu, 03 May 2012 18:53:58 +0200 Mail-Followup-To: bug-gnu-emacs@gnu.org, Glenn Morris Message-ID: <85wr4t18a8.fsf@iznogoud.viz> User-Agent: Gnus/5.130004 (Ma Gnus v0.4) Emacs/24.1.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit Cc: Glenn Morris X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) This takes care of a FIXME in image-mode.el, viz. "2 works, but eg 1.9 or 0.5 don't?". To expand on this a bit: Make sure some image format, say jpg, is really handled by ImageMagick. Visit a jpg file and do M-x i m a g e - t r a n s f o r m - s e t - s c a l e 1 . 9 2012-05-03 Wolfgang Jenkner * image-mode.el (image-transform-resize): Doc fix. (image-transform-properties): Default scale is 1 and height should be an integer. === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2012-02-08 03:45:27 +0000 +++ lisp/image-mode.el 2012-05-03 15:48:02 +0000 @@ -634,7 +634,7 @@ - nil, meaning no resizing. - `fit-height', meaning to fit the image to the window height. - `fit-width', meaning to fit the image to the window width. - - A number, which is a scale factor (the default size is 100).") + - A number, which is a scale factor (the default size is 1).") (defvar image-transform-rotation 0.0 "Rotation angle for the image in the current Image mode buffer.") @@ -655,8 +655,8 @@ (height (cond ((numberp image-transform-resize) - (unless (= image-transform-resize 100) - (* image-transform-resize (cdr size)))) + (unless (= image-transform-resize 1) + (floor (* image-transform-resize (cdr size))))) ((eq image-transform-resize 'fit-height) (- (nth 3 (window-inside-pixel-edges)) (nth 1 (window-inside-pixel-edges)))))) @@ -669,7 +669,6 @@ ,@(if (not (equal 0.0 image-transform-rotation)) (list :rotation image-transform-rotation)))))) -;; FIXME 2 works, but eg 1.9 or 0.5 don't? (defun image-transform-set-scale (scale) "Prompt for a number, and resize the current image by that amount. This command has no effect unless Emacs is compiled with ------------=_1336972682-9901-1--