(init_image) [MAC_OS]: Don't call EnterMovies.

[!HAVE_GIF && MAC_OS] (gif_load): Call EnterMovies.

(init_image) [MAC_OS]: Don't call EnterMovies.
[!HAVE_GIF && MAC_OS] (gif_load): Call EnterMovies.
dac5344b · YAMAMOTO Mitsuharu · a7b24852 · dac5344b
Commit dac5344b authored Dec 10, 2005 by YAMAMOTO Mitsuharu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

src/image.c src/image.c +4 -6

No files found.
--- a/src/image.c
+++ b/src/image.c
@@ -7778,6 +7778,9 @@ gif_load (f, img)
  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 @@ meaning don't clear the cache.  */);
 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