]> git.eshelyaron.com Git - emacs.git/commit
Handle specified bg in images. Use generic libpng code for PNG:s.
authorJan D <jan.h.d@swipnet.se>
Sun, 12 Apr 2015 11:42:42 +0000 (13:42 +0200)
committerJan D <jan.h.d@swipnet.se>
Sun, 12 Apr 2015 11:42:42 +0000 (13:42 +0200)
commitc744c8a8fc2ddea0f3e7d510f1a3c98876c51c05
tree414429ce9272b43cdeb3b23e5aef41e39d538deb
parentac00e0a0bf4aac5b2443a7651853f3812251047f
Handle specified bg in images.  Use generic libpng code for PNG:s.

* src/image.c (get_spec_bg_or_alpha_as_argb)
(create_cairo_image_surface): New functions when USE_CAIRO.
(xpm_load): Call the above functions.  Handle XPM without mask
when USE_CAIRO.
(png_load_body): Handle USE_CAIRO case.
(png_load): Remove USE_CAIRO specific fuction, modify png_load_body
instead.
(jpeg_load_body): Call create_cairo_image_surface.
(gif_load, svg_load_image): Handle specified background, call
create_cairo_image_surface.

* src/xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO.
src/ChangeLog
src/image.c
src/xterm.c