Changeset 3386

Timestamp:

08/10/04 23:22:13 (4 years ago)

Author:

miyoshi

Message:

* mw32fns.c (Fmw32_get_image_magick_extensions): New function.

* international/meadow.el (before-init-hook): Don't append extra
extensions which ImageMagick? cannot handle.

Files:

• branches/2.1/lisp/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/lisp/international/meadow.el (modified) (1 diff)
• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/mw32fns.c (modified) (2 diffs)

branches/2.1/lisp/ChangeLog.Meadow

@@ +1 @@
+2004-08-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * international/meadow.el (before-init-hook): Don't append extra
+        extensions which ImageMagick cannot handle.
+
-2004-08-09  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/lisp/international/meadow.el

@@ -47 +47 @@
-   (mapcar
-    (lambda (type)
-
-
-
+
+
-        (setq image-file-name-extensions
-              (cons type image-file-name-extensions))))
-image-types
+(mw32-get-image-magick-extensions)
-
-;;;

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-08-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32fns.c (Fmw32_get_image_magick_extensions): New function.
+
-2004-08-09  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

branches/2.1/src/mw32fns.c

@@ -7838 +7838 @@
-  else
-    return *imagemagick_image_type_lisp_symbol (format);
+}
+
+DEFUN ("mw32-get-image-magick-extensions", Fmw32_get_image_magick_extensions,
+       Smw32_get_image_magick_extensions, 0, 0, 0,
+  "Return a list of all image extensions which ImageMagick can handle.")
+     ()
+{
+  unsigned long nformats;
+  char **formats = magick_get_magick_list ("*", &nformats);
+  Lisp_Object result = Qnil;
+  int i;
+
+  if (formats == NULL)
+    return Qnil;
+      
+  for (i = 0; i < nformats; i++)
+    {
+      const MagickInfo *info = magick_get_magick_info (formats[i],
+                                                       &magick_exception);
+
+      if (info && info->magick)
+        {
+          Lisp_Object str = build_string (formats[i]);
+
+          str = Fdowncase (str);
+          result = Fcons (str, result);   
+        }
+      magick_relinquish_magick_memory ((void **) formats[i]);      
+    }
+  magick_relinquish_magick_memory ((void **) formats);
+
+  return result;
-}
-
@@ -9616 +9648 @@
-
-  defsubr (&Smw32_get_image_magick);
+  defsubr (&Smw32_get_image_magick_extensions);
-}
-