From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Newsgroups: gmane.emacs.bugs Subject: bug#14798: 24.3.50; Enable Imagemagick for Nextstep Date: Mon, 8 Jul 2013 15:26:58 +0200 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1373290094 14685 80.91.229.3 (8 Jul 2013 13:28:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 8 Jul 2013 13:28:14 +0000 (UTC) Cc: 14798-done@debbugs.gnu.org To: Magnus Henoch Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 08 15:28:14 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UwBUD-0007G7-Hh for geb-bug-gnu-emacs@m.gmane.org; Mon, 08 Jul 2013 15:28:13 +0200 Original-Received: from localhost ([::1]:59526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwBUD-0005D0-4j for geb-bug-gnu-emacs@m.gmane.org; Mon, 08 Jul 2013 09:28:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwBU6-0005CR-SA for bug-gnu-emacs@gnu.org; Mon, 08 Jul 2013 09:28:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwBU4-00035L-1x for bug-gnu-emacs@gnu.org; Mon, 08 Jul 2013 09:28:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwBU3-00035H-Uq for bug-gnu-emacs@gnu.org; Mon, 08 Jul 2013 09:28:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1UwBU3-0001PF-9U for bug-gnu-emacs@gnu.org; Mon, 08 Jul 2013 09:28:03 -0400 Resent-From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 08 Jul 2013 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 14798 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 14798@debbugs.gnu.org, jan.h.d@swipnet.se, magnus.henoch@gmail.com Original-Received: via spool by 14798-done@debbugs.gnu.org id=D14798.13732900305292 (code D ref 14798); Mon, 08 Jul 2013 13:28:02 +0000 Original-Received: (at 14798-done) by debbugs.gnu.org; 8 Jul 2013 13:27:10 +0000 Original-Received: from localhost ([127.0.0.1]:38947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1UwBTB-0001NE-4F for submit@debbugs.gnu.org; Mon, 08 Jul 2013 09:27:09 -0400 Original-Received: from mailout.melmac.se ([62.20.26.67]:56439) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1UwBT6-0001Lz-J6 for 14798-done@debbugs.gnu.org; Mon, 08 Jul 2013 09:27:06 -0400 Original-Received: from mail01.melmac.se (mail01.melmac.se [62.20.26.80]) by mailout.melmac.se (Postfix) with ESMTP id B89D49264 for <14798-done@debbugs.gnu.org>; Mon, 8 Jul 2013 15:26:57 +0200 (CEST) Original-Received: (qmail 26347 invoked by uid 89); 8 Jul 2013 13:26:57 -0000 Original-Received: from h-46-59-42-57.na.cust.bahnhof.se (HELO coolsville.localdomain) (boel.djarv@bdtv.se@46.59.42.57) by mail01.melmac.se with ESMTPA; 8 Jul 2013 13:26:57 -0000 Original-Received: from [172.20.199.13] (unknown [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 6805A1A0227; Mon, 8 Jul 2013 13:26:57 +0000 (UTC) In-Reply-To: X-Mailer: Apple Mail (2.1508) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:76059 Archived-At: Hello. Checked in into trunk. Thanks, Jan D. 5 jul 2013 kl. 02:05 skrev Magnus Henoch : > Severity: wishlist > Tags: patch >=20 > As I'd like to be able to resize images in Emacs on Nextstep, I had a > look at what needs to be changed to enable Imagemagick on Nextstep. = Not > very much, it turns out; see diff below. >=20 > I'm not sure what it would take to support MagickExportImagePixels. = The > code tries to pass ximg->data as a parameter, but ximg is of type > XImagePtr, and on Nextstep the types are: >=20 > typedef Pixmap XImagePtr; > typedef void *Pixmap; >=20 > Nevertheless, it seems to work without that part. >=20 > Regards, > Magnus >=20 > diff --git a/configure.ac b/configure.ac > index baf8aab..0333898 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2041,7 +2041,7 @@ if test "${HAVE_X11}" =3D "yes" || test = "${HAVE_NS}" =3D "yes" || test "${opsys}" =3D > fi >=20 > HAVE_IMAGEMAGICK=3Dno > -if test "${HAVE_X11}" =3D "yes"; then > +if test "${HAVE_X11}" =3D "yes" || test "${HAVE_NS}" =3D "yes"; then > if test "${with_imagemagick}" !=3D "no"; then > ## 6.2.8 is the earliest version known to work, but earlier = versions > ## might work - let us know if you find one. > diff --git a/src/image.c b/src/image.c > index a3e103f..a2328dc 100644 > --- a/src/image.c > +++ b/src/image.c > @@ -8054,7 +8054,9 @@ imagemagick_load_image (struct frame *f, struct = image *img, >=20 > init_color_table (); >=20 > -#ifdef HAVE_MAGICKEXPORTIMAGEPIXELS > + /* XXX: it might be easy to get this to work for NS as well. > + Since ximg is void*, ximg->data is not defined. */ > +#if defined(HAVE_MAGICKEXPORTIMAGEPIXELS) && !defined(HAVE_NS) > if (imagemagick_render_type !=3D 0) > { > /* Magicexportimage is normally faster than pixelpushing. This >=20 >=20