From: joakim@verona.se
To: 7955@debbugs.gnu.org, rgm@gnu.org
Subject: bug#7955: patch for imagemagick header rename
Date: Sat, 12 Feb 2011 00:38:30 +0100 [thread overview]
Message-ID: <m3r5bedtvt.fsf@verona.se> (raw)
In-Reply-To: <2evd137anm.fsf@fencepost.gnu.org>
I have a patch attempt now. I was going to test it and push it to the
imagemagick branch but experienced some infuriating setbacks.
If you could help me test and commit that would be spectacular.
=== modified file 'src/image.c'
--- src/image.c 2011-02-01 19:46:21 +0000
+++ src/image.c 2011-02-11 23:23:42 +0000
@@ -7452,7 +7452,12 @@
/* The GIF library also defines DrawRectangle, but its never used in Emacs.
Therefore rename the function so it doesnt collide with ImageMagick. */
#define DrawRectangle DrawRectangleGif
+#if defined (HAVE_WAND_MAGICKWAND_H)
#include <wand/MagickWand.h>
+#else
+#include <wand/magick_wand.h>
+#endif /* HAVE_MAGICKWAND_H */
+
/* imagemagick_load_image is a helper function for imagemagick_load,
which does the actual loading given contents and size, apart from
=== modified file 'configure.in'
--- configure.in 2011-01-31 23:54:50 +0000
+++ configure.in 2011-02-11 23:20:24 +0000
@@ -1832,6 +1832,7 @@
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
AC_CHECK_FUNCS(MagickExportImagePixels)
+ AC_CHECK_HEADERS(wand/MagickWand.h)
fi
fi
fi
--
Joakim Verona
next prev parent reply other threads:[~2011-02-11 23:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-01 20:38 bug#7955: configure does not thoroughly test for ImageMagick includes Glenn Morris
2011-02-02 2:48 ` Chong Yidong
2011-02-02 9:30 ` joakim
2011-02-02 19:32 ` Glenn Morris
2011-02-03 8:16 ` bug#7955: reply from the IM team joakim
2011-02-08 19:19 ` Glenn Morris
2011-02-11 23:38 ` joakim [this message]
2011-02-12 1:11 ` bug#7955: patch for imagemagick header rename Glenn Morris
2011-02-12 22:39 ` Chong Yidong
2011-02-13 0:28 ` joakim
2011-02-12 23:37 ` Glenn Morris
2011-02-14 20:13 ` Glenn Morris
2011-02-14 20:37 ` joakim
2011-02-15 2:51 ` Glenn Morris
2011-04-07 21:00 ` Glenn Morris
2011-04-12 3:56 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3r5bedtvt.fsf@verona.se \
--to=joakim@verona.se \
--cc=7955@debbugs.gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.