comparison src/image.c @ 101838:a4a5037b3040

(svg_load_image): Fix last change.

101837:a308d330b349

  init_color_table ();

  /* Handle alpha channel by combining the image with a background
     color.  */
  specified_bg = image_spec_value (img->spec, QCbackground, NULL);
  if (STRINGP (specified_bg)
      && x_defined_color (f, SDATA (specified_bg), &background, 0))
    {
      /* SVG pixmaps specify transparency in the last byte, so right
	 shift 8 bits to get rid of it, since emacs doesn't support
	 transparency.  */
      background.red   >>= 8;
      background.green >>= 8;
      background.blue  >>= 8;
    }
  else
    {
#ifndef HAVE_NS
      background.pixel = FRAME_BACKGROUND_PIXEL (f);
      x_query_color (f, &background);
#else
      ns_query_color(FRAME_BACKGROUND_COLOR (f), &background, 1);
#endif
    }

  /* This loop handles opacity values, since Emacs assumes
     non-transparent images.  Each pixel must be "flattened" by
     calculating the resulting color, given the transparency of the
     pixel, and the image background color.  */

101838:a4a5037b3040

  init_color_table ();

  /* Handle alpha channel by combining the image with a background
     color.  */
  specified_bg = image_spec_value (img->spec, QCbackground, NULL);
  if (!STRINGP (specified_bg)
      || !x_defined_color (f, SDATA (specified_bg), &background, 0))
    {
#ifndef HAVE_NS
      background.pixel = FRAME_BACKGROUND_PIXEL (f);
      x_query_color (f, &background);
#else
      ns_query_color(FRAME_BACKGROUND_COLOR (f), &background, 1);
#endif
    }

  /* SVG pixmaps specify transparency in the last byte, so right
     shift 8 bits to get rid of it, since emacs doesn't support
     transparency.  */
  background.red   >>= 8;
  background.green >>= 8;
  background.blue  >>= 8;

  /* This loop handles opacity values, since Emacs assumes
     non-transparent images.  Each pixel must be "flattened" by
     calculating the resulting color, given the transparency of the
     pixel, and the image background color.  */