Changeset 3390
- Timestamp:
- 08/11/04 07:09:50 (4 years ago)
- Files:
-
- branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
- branches/2.1/src/mw32fns.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2.1/src/ChangeLog.Meadow
r3387 r3390 1 2004-08-11 MIYOSHI Masanori <miyoshi@meadowy.org> 2 3 * mw32fns.c (Fmw32_get_image_magick_extensions): Use Vimage_types 4 instead of magick_get_magick_list() to avoid initialization of 5 MagickInfos. 6 1 7 2004-08-10 Masayuki FUJII <boochang@m4.kcn.ne.jp> 2 8 branches/2.1/src/mw32fns.c
r3387 r3390 7859 7859 () 7860 7860 { 7861 unsigned long nformats; 7862 char **formats = magick_get_magick_list ("*", &nformats); 7861 Lisp_Object tail = Vimage_types; 7863 7862 Lisp_Object result = Qnil; 7864 int i; 7865 7866 if (formats == NULL) 7867 return Qnil; 7868 7869 for (i = 0; i < nformats; i++) 7870 { 7871 const MagickInfo *info = magick_get_magick_info (formats[i], 7872 &magick_exception); 7873 7874 if (info && info->magick) 7863 Lisp_Object type; 7864 7865 while (tail != Qnil) 7866 { 7867 type = XCAR (tail); 7868 7869 if (SYMBOLP (type)) 7875 7870 { 7876 Lisp_Object str = build_string (formats[i]); 7877 7878 str = Fdowncase (str); 7879 result = Fcons (str, result); 7871 char *format = XSYMBOL (type)->name->data; 7872 const MagickInfo *info = magick_get_magick_info (format, 7873 &magick_exception); 7874 7875 if (info && info->magick) 7876 { 7877 type = Fdowncase (Fsymbol_name (type)); 7878 if (NILP (Fmember (type, result))) 7879 result = Fcons (type, result); 7880 } 7880 7881 } 7881 magick_relinquish_magick_memory ((void **) formats[i]); 7882 } 7883 magick_relinquish_magick_memory ((void **) formats); 7884 7882 tail = XCDR (tail); 7883 } 7885 7884 return result; 7886 7885 }
