Changeset 3377

Timestamp:

08/07/04 08:12:35 (4 years ago)

Author:

miyoshi

Message:

(pget_image_magick_t): New type definition.
(pget_image_magick): New static variable.
(magick_get_image_magick): New function.
(Fmw32_get_image_magick): Ditto.
(syms_of_mw32fns): Define the above function.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/mw32fns.c (modified) (6 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-08-07  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32fns.c (pget_image_magick_t): New type definition.
+        (pget_image_magick): New static variable.
+        (magick_get_image_magick): New function.
+        (Fmw32_get_image_magick): Ditto.
+        (syms_of_mw32fns): Define the above function.
+
-2004-07-25  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/mw32fns.c

@@ -6033 +6033 @@
-typedef void *(*prelinquish_magick_memory_t) (void **memory);
-typedef void *(*pacquire_string_t) (const char *);
+typedef const char *(*pget_image_magick_t) (const unsigned char *,
+                                            const size_t);
-
-static HINSTANCE hmagick = NULL;
@@ -6068 +6070 @@
-static prelinquish_magick_memory_t prelinquish_magick_memory;
-static pacquire_string_t pacquire_string;
+static pget_image_magick_t pget_image_magick;
-
-/* ImageMagick function wrappers.  */
@@ -6347 +6350 @@
-    return NULL;
-  return (*pacquire_string) (source);
+}
+
+static const char *
+magick_get_image_magick (const unsigned char *magick, const size_t length)
+{
+  if (pget_image_magick == NULL)
+    return NULL;
+  return (*pget_image_magick) (magick, length);
-}
-
@@ -6415 +6426 @@
-                       "RelinquishMagickMemory");
-  MAGICK_RESOLVE_FUNC (pacquire_string, pacquire_string_t, "AcquireString");
+  MAGICK_RESOLVE_FUNC (pget_image_magick, pget_image_magick_t,
+                       "GetImageMagick");
-
-#undef MAGICK_RESOLVE_FUNC
@@ -7811 +7824 @@
-  return ret;
-}
+
+DEFUN ("mw32-get-image-magick", Fmw32_get_image_magick,
+       Smw32_get_image_magick, 1, 1, 0,
+  "Searches for an image format that matches the specified magick string.")
+     (string)
+     Lisp_Object string;
+{
+  const char *format = magick_get_image_magick (SDATA (string),
+                                                SBYTES (string));
+
+  if (format == NULL)
+    return Qnil;
+  else
+    return *imagemagick_image_type_lisp_symbol (format);
+}
+
-
-/***********************************************************************
@@ -9585 +9614 @@
-
-  defsubr (&Smw32_file_dialog);
+
+  defsubr (&Smw32_get_image_magick);
-}
-