comparison src/image.c @ 70431:7c25b386a4c3

(Qduration) [MAC_OS]: New variable. (syms_of_image) [MAC_OS]: Intern and staticpro it. [MAC_OS] (gif_load): Save image extension data in img->data.lisp_val. [MAC_OSX] (image_load_quartz2d): Use cfstring_create_with_utf8_cstring instead of cfstring_create_with_string.

70430:a4ddaa03010e

	{
	  image_error ("Cannot find image file `%s'", specified_file, Qnil);
	  UNGCPRO;
	  return 0;
	}
      path = cfstring_create_with_string (file);
      url = CFURLCreateWithFileSystemPath (NULL, path,
					   kCFURLPOSIXPathStyle, 0);
      CFRelease (path);
      source = CGDataProviderCreateWithURL (url);
      CFRelease (url);

}

#else  /* !HAVE_GIF */

#ifdef MAC_OS
static int
gif_load (f, img)
     struct frame *f;
     struct image *img;
{

  Lisp_Object specified_bg;
  XColor color;
  RGBColor bg_color;
  int width, height;
  XImagePtr ximg;
  TimeValue time;
  int ino;
  CGrafPtr old_port;
  GDHandle old_gdh;

  specified_file = image_spec_value (img->spec, QCfile, NULL);

    {
      image_error ("Invalid image number `%s' in image `%s'",
		   image, img->spec);
      goto error;
    }

  specified_bg = image_spec_value (img->spec, QCbackground, NULL);
  if (!STRINGP (specified_bg) ||
      !mac_defined_color (f, SDATA (specified_bg), &color, 0))
    {

  bg_color.blue = color.blue;
  RGBBackColor (&bg_color);
  SetGWorld (old_port, old_gdh);
  SetMovieActive (movie, 1);
  SetMovieGWorld (movie, ximg, NULL);
  SampleNumToMediaTime (media, ino + 1, &time, NULL);
  SetMovieTimeValue (movie, time);
  MoviesTask (movie, 0L);
  DisposeTrackMedia (media);
  DisposeMovieTrack (track);
  DisposeMovie (movie);
  if (dh)
    DisposeHandle (dh);
  /* Maybe fill in the background field while we have ximg handy. */
  if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
    IMAGE_BACKGROUND (img, f, ximg);

  /* Put the image into the pixmap.  */

  Qgif = intern ("gif");
  staticpro (&Qgif);
  ADD_IMAGE_TYPE(Qgif);
#endif

#if defined (HAVE_PNG) || defined (MAC_OS)
  Qpng = intern ("png");
  staticpro (&Qpng);
  ADD_IMAGE_TYPE(Qpng);
#endif

70431:7c25b386a4c3

	{
	  image_error ("Cannot find image file `%s'", specified_file, Qnil);
	  UNGCPRO;
	  return 0;
	}
      path = cfstring_create_with_utf8_cstring (SDATA (file));
      url = CFURLCreateWithFileSystemPath (NULL, path,
					   kCFURLPOSIXPathStyle, 0);
      CFRelease (path);
      source = CGDataProviderCreateWithURL (url);
      CFRelease (url);

}

#else  /* !HAVE_GIF */

#ifdef MAC_OS
static Lisp_Object Qduration;

static int
gif_load (f, img)
     struct frame *f;
     struct image *img;
{

  Lisp_Object specified_bg;
  XColor color;
  RGBColor bg_color;
  int width, height;
  XImagePtr ximg;
  TimeScale time_scale;
  TimeValue time, duration;
  int ino;
  CGrafPtr old_port;
  GDHandle old_gdh;

  specified_file = image_spec_value (img->spec, QCfile, NULL);

    {
      image_error ("Invalid image number `%s' in image `%s'",
		   image, img->spec);
      goto error;
    }
  time_scale = GetMediaTimeScale (media);

  specified_bg = image_spec_value (img->spec, QCbackground, NULL);
  if (!STRINGP (specified_bg) ||
      !mac_defined_color (f, SDATA (specified_bg), &color, 0))
    {

  bg_color.blue = color.blue;
  RGBBackColor (&bg_color);
  SetGWorld (old_port, old_gdh);
  SetMovieActive (movie, 1);
  SetMovieGWorld (movie, ximg, NULL);
  SampleNumToMediaTime (media, ino + 1, &time, &duration);
  SetMovieTimeValue (movie, time);
  MoviesTask (movie, 0L);
  DisposeTrackMedia (media);
  DisposeMovieTrack (track);
  DisposeMovie (movie);
  if (dh)
    DisposeHandle (dh);

  /* Save GIF image extension data for `image-extension-data'.
     Format is (count IMAGES duration DURATION).  */
  img->data.lisp_val = list4 (Qcount, make_number (nsamples), Qduration,
			      make_float ((double)duration / time_scale));

  /* Maybe fill in the background field while we have ximg handy. */
  if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
    IMAGE_BACKGROUND (img, f, ximg);

  /* Put the image into the pixmap.  */

  Qgif = intern ("gif");
  staticpro (&Qgif);
  ADD_IMAGE_TYPE(Qgif);
#endif

#ifdef MAC_OS
  Qduration = intern ("duration");
  staticpro (&Qduration);
#endif

#if defined (HAVE_PNG) || defined (MAC_OS)
  Qpng = intern ("png");
  staticpro (&Qpng);
  ADD_IMAGE_TYPE(Qpng);
#endif