aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c70db2ad69a..ce5e139f49c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-09-04 Andreas Schwab <schwab@linux-m68k.org>
2
3 * image.c (imagemagick_image_p): Replace bcopy by memcpy.
4
12010-09-02 Jan Djärv <jan.h.d@swipnet.se> 52010-09-02 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * xterm.h (struct dpyinfo): Remove cut_buffers_initialized. 7 * xterm.h (struct dpyinfo): Remove cut_buffers_initialized.
diff --git a/src/image.c b/src/image.c
index ae4bf2fd937..e6e1605b024 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7413,7 +7413,7 @@ static int
7413imagemagick_image_p (Lisp_Object object) 7413imagemagick_image_p (Lisp_Object object)
7414{ 7414{
7415 struct image_keyword fmt[IMAGEMAGICK_LAST]; 7415 struct image_keyword fmt[IMAGEMAGICK_LAST];
7416 bcopy (imagemagick_format, fmt, sizeof fmt); 7416 memcpy (fmt, imagemagick_format, sizeof fmt);
7417 7417
7418 if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick)) 7418 if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick))
7419 return 0; 7419 return 0;