aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2012-09-23 17:22:38 +0800
committerChong Yidong2012-09-23 17:22:38 +0800
commit641cfd145e8d17956c3bf5d357c09fecb24f8e58 (patch)
tree10ed4601b9e6fcd4ebafe28763b6292908aa2248 /src
parentc462dda8c848d24cf84dd673b93d7ee8c8143b4e (diff)
downloademacs-641cfd145e8d17956c3bf5d357c09fecb24f8e58.tar.gz
emacs-641cfd145e8d17956c3bf5d357c09fecb24f8e58.zip
Fix last change.
* image.c (valid_image_p, make_image): Fix caller to lookup_image_type.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/image.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d35092e277f..d03e208354d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -17,6 +17,7 @@
17 (init_tiff_functions, init_gif_functions, init_svg_functions): 17 (init_tiff_functions, init_gif_functions, init_svg_functions):
18 Arglist and w32_delayed_load calling convention changed. 18 Arglist and w32_delayed_load calling convention changed.
19 (gs_type): Remove init_gs_functions; there is no such function. 19 (gs_type): Remove init_gs_functions; there is no such function.
20 (valid_image_p, make_image): Fix caller to lookup_image_type.
20 21
212012-09-23 Paul Eggert <eggert@cs.ucla.edu> 222012-09-23 Paul Eggert <eggert@cs.ucla.edu>
22 23
diff --git a/src/image.c b/src/image.c
index 7c74df5457f..c5bed6f12ed 100644
--- a/src/image.c
+++ b/src/image.c
@@ -562,7 +562,7 @@ static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
562/* Function prototypes. */ 562/* Function prototypes. */
563 563
564static struct image_type *define_image_type (struct image_type *, Lisp_Object); 564static struct image_type *define_image_type (struct image_type *, Lisp_Object);
565static struct image_type *lookup_image_type (Lisp_Object, Lisp_Object); 565static struct image_type *lookup_image_type (Lisp_Object);
566static void image_error (const char *format, Lisp_Object, Lisp_Object); 566static void image_error (const char *format, Lisp_Object, Lisp_Object);
567static void x_laplace (struct frame *, struct image *); 567static void x_laplace (struct frame *, struct image *);
568static void x_emboss (struct frame *, struct image *); 568static void x_emboss (struct frame *, struct image *);
@@ -648,7 +648,7 @@ valid_image_p (Lisp_Object object)
648 if (CONSP (tem) && SYMBOLP (XCAR (tem))) 648 if (CONSP (tem) && SYMBOLP (XCAR (tem)))
649 { 649 {
650 struct image_type *type; 650 struct image_type *type;
651 type = lookup_image_type (XCAR (tem), Qnil); 651 type = lookup_image_type (XCAR (tem));
652 if (type) 652 if (type)
653 valid_p = type->valid_p (object); 653 valid_p = type->valid_p (object);
654 } 654 }
@@ -981,7 +981,7 @@ make_image (Lisp_Object spec, EMACS_UINT hash)
981 981
982 eassert (valid_image_p (spec)); 982 eassert (valid_image_p (spec));
983 img->dependencies = NILP (file) ? Qnil : list1 (file); 983 img->dependencies = NILP (file) ? Qnil : list1 (file);
984 img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL), Qnil); 984 img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL));
985 eassert (img->type != NULL); 985 eassert (img->type != NULL);
986 img->spec = spec; 986 img->spec = spec;
987 img->lisp_data = Qnil; 987 img->lisp_data = Qnil;