aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/image.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 158c5ff5330..cb535bad8a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 * image.c (clear_image_cache): Now static. 3 * image.c (clear_image_cache): Now static.
4 (DIM, HAVE_STDLIB_H_1): Remove unused macros. 4 (DIM, HAVE_STDLIB_H_1): Remove unused macros.
5 (xpm_load): Redo to avoid "discards qualifiers" gcc warning. 5 (xpm_load): Redo to avoid "discards qualifiers" gcc warning.
6 (x_edge_detection): Remove unnecessary cast that
7 gcc -Wbad-function-cast diagnoses.
6 8
72011-03-11 Paul Eggert <eggert@cs.ucla.edu> 92011-03-11 Paul Eggert <eggert@cs.ucla.edu>
8 10
diff --git a/src/image.c b/src/image.c
index 4befadd44ef..810bd4be989 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4687,7 +4687,7 @@ x_edge_detection (struct frame *f, struct image *img, Lisp_Object matrix,
4687 color_adjust = make_number (0xffff / 2); 4687 color_adjust = make_number (0xffff / 2);
4688 4688
4689 if (i == 9 && NUMBERP (color_adjust)) 4689 if (i == 9 && NUMBERP (color_adjust))
4690 x_detect_edges (f, img, trans, (int) XFLOATINT (color_adjust)); 4690 x_detect_edges (f, img, trans, XFLOATINT (color_adjust));
4691} 4691}
4692 4692
4693 4693