From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: imagemmagick patch 5 Date: Wed, 03 Mar 2010 21:41:03 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1267822813 18564 80.91.229.12 (5 Mar 2010 21:00:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 5 Mar 2010 21:00:13 +0000 (UTC) Cc: Emacs development discussions To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 05 22:00:09 2010 connect(): Connection refused Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nneco-0005CY-8B for ged-emacs-devel@m.gmane.org; Fri, 05 Mar 2010 21:59:58 +0100 Original-Received: from localhost ([127.0.0.1]:44878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nnecn-0004mh-PH for ged-emacs-devel@m.gmane.org; Fri, 05 Mar 2010 15:59:57 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nneci-0004lq-UD for emacs-devel@gnu.org; Fri, 05 Mar 2010 15:59:52 -0500 Original-Received: from [140.186.70.92] (port=36134 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nnech-0004l7-QT for emacs-devel@gnu.org; Fri, 05 Mar 2010 15:59:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nnech-0000A1-3b for emacs-devel@gnu.org; Fri, 05 Mar 2010 15:59:51 -0500 Original-Received: from tomts5.bellnexxia.net ([209.226.175.25]:33682 helo=tomts5-srv.bellnexxia.net) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nnecg-00009m-Rm for emacs-devel@gnu.org; Fri, 05 Mar 2010 15:59:51 -0500 Original-Received: from toip5.srvr.bell.ca ([209.226.175.88]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20100305205949.TIUP2554.tomts5-srv.bellnexxia.net@toip5.srvr.bell.ca> for ; Fri, 5 Mar 2010 15:59:49 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ai4GAHj6kEtGN5E3/2dsb2JhbAAxmxd0t0OEdwSDFw Original-Received: from bas1-montreal42-1178046775.dsl.bell.ca (HELO ceviche.home) ([70.55.145.55]) by toip5.srvr.bell.ca with ESMTP; 05 Mar 2010 15:59:07 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 7F526B4267; Wed, 3 Mar 2010 21:41:03 -0500 (EST) In-Reply-To: (joakim@verona.se's message of "Wed, 03 Mar 2010 08:39:53 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:121660 Archived-At: > The Imagemagick patch allows Emacs to use the Imagemagick libraries to > load images. This support can be used in parallell with the existing > image loading support. There is support for asking your imagemagick > installation which image types it supports, and registering them in > Emacs selectively. Thanks. Looks pretty good. Feel free to install it in the `pending' branch, but please see the comments below first, and don't forget to add a good NEWS entry when you install this change. > +HAVE_IMAGEMAGICK=no > +if test "${HAVE_X11}" = "yes" ; then Do I understand it right that this X11-only restriction could be lifted at some point in the future? > diff --git a/src/dbusbind.c b/src/dbusbind.c > index 7c0be49..7a47730 100644 > --- a/src/dbusbind.c > +++ b/src/dbusbind.c > @@ -773,6 +773,7 @@ xd_add_watch (watch, data) > if (fd == -1) > return FALSE; > > + > /* Add the file descriptor to input_wait_mask. */ > add_keyboard_wait_descriptor (fd); > } Please drop this gratuitous change. > +/*********************************************************************** > + imagemagick > + ***********************************************************************/ > +#if defined (HAVE_IMAGEMAGICK) > +Lisp_Object Vimagemagick_render_type; > +/* Function prototypes. */ > + > +static int imagemagick_image_p P_ ((Lisp_Object object)); > +static int imagemagick_load P_ ((struct frame *f, struct image *img)); > + > +static int imagemagick_load_image P_ ((struct frame *, struct image *, > + unsigned char *, unsigned int, unsigned char *)); Please don't use the P_ macro in new code: just use prototypes. > +//#include "/home/joakim/current/unison/data/ImageMagick-6.5.4-7/magick/xwindow-private.h" This should be removed as well. > + //try if magicexportimage is any faster than pixelpushing [...] > + //oddly, the below code doesnt seem to work: We currently only use /*...*/ comments, so I'd rather we don't introduce // comments for now. Stefan