Fix last change.

* image.c (valid_image_p, make_image): Fix caller to lookup_image_type.

diff --git a/src/ChangeLog b/src/ChangeLog
index d35092e277f8d783e5789f05ba501224b802a78d..d03e208354d81662f460b1eada3f8a0d86ad37e7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -17,6 +17,7 @@
        (init_tiff_functions, init_gif_functions, init_svg_functions):
        Arglist and w32_delayed_load calling convention changed.
        (gs_type): Remove init_gs_functions; there is no such function.
+       (valid_image_p, make_image): Fix caller to lookup_image_type.
 
 2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/src/image.c b/src/image.c
index 7c74df5457f08902078bded022fbe0b6411c8f4d..c5bed6f12ed2ee181deb10dec39833bfde99eba3 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -562,7 +562,7 @@ static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
 /* Function prototypes.  */
 
 static struct image_type *define_image_type (struct image_type *, Lisp_Object);
-static struct image_type *lookup_image_type (Lisp_Object, Lisp_Object);
+static struct image_type *lookup_image_type (Lisp_Object);
 static void image_error (const char *format, Lisp_Object, Lisp_Object);
 static void x_laplace (struct frame *, struct image *);
 static void x_emboss (struct frame *, struct image *);
@@ -648,7 +648,7 @@ valid_image_p (Lisp_Object object)
            if (CONSP (tem) && SYMBOLP (XCAR (tem)))
              {
                struct image_type *type;
-               type = lookup_image_type (XCAR (tem), Qnil);
+               type = lookup_image_type (XCAR (tem));
                if (type)
                  valid_p = type->valid_p (object);
              }
@@ -981,7 +981,7 @@ make_image (Lisp_Object spec, EMACS_UINT hash)
 
   eassert (valid_image_p (spec));
   img->dependencies = NILP (file) ? Qnil : list1 (file);
-  img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL), Qnil);
+  img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL));
   eassert (img->type != NULL);
   img->spec = spec;
   img->lisp_data = Qnil;