changeset 67454:939281029286

(init_image) [MAC_OS]: Don't call EnterMovies. [!HAVE_GIF && MAC_OS] (gif_load): Call EnterMovies.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Sat, 10 Dec 2005 01:49:15 +0000
parents b37c81827b00
children 9bf079216f0e
files src/image.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/image.c	Sat Dec 10 01:49:06 2005 +0000
+++ b/src/image.c	Sat Dec 10 01:49:15 2005 +0000
@@ -7778,6 +7778,9 @@
   specified_file = image_spec_value (img->spec, QCfile, NULL);
   specified_data = image_spec_value (img->spec, QCdata, NULL);
 
+  /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
+  EnterMovies ();
+
   if (NILP (specified_data))
     {
       /* Read from a file */
@@ -8500,14 +8503,9 @@
 void
 init_image ()
 {
-#ifdef MAC_OS
-  /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
-  if (!inhibit_window_system)
-    EnterMovies ();
-#ifdef MAC_OSX
+#if defined (MAC_OSX) && TARGET_API_MAC_CARBON
   init_image_func_pointer ();
 #endif
-#endif
 }
 
 /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9