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.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e5a8442c389..cc9ffa8fea7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-12  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO.
+
+        * 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.
+
 2015-04-11  Jan Djärv  <jan.h.d@swipnet.se>
 
         * image.c (jpeg_load_body): Create cairo image surface if USE_CAIRO.