Add PBM support for cairo.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index cc9ffa8fea75b8bdcd923d68b3ecfc79d3b7aef5..780700724386053286edb5f861e347f24434dbce 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,18 @@
+2015-04-26  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * image.c (xcolor_to_argb32): New function.
+       (get_spec_bg_or_alpha_as_argb): Call xcolor_to_argb32.
+       (pbm_load, png_load_body, jpeg_load_body, gif_load): Only use
+       XImagePtr if ! USE_CAIRO.
+       (pbm_load): Add cairo support.
+
 2015-04-12  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO.
+       (x_free_cr_resources): Renamed from x_prepare_for_xlibdraw.
+       (x_cr_draw_frame, x_cr_export_frames, x_shift_glyphs_for_insert)
+       (x_free_frame_resources): Rename x_prepare_for_xlibdraw to
+       x_free_cr_resources.
 
        * image.c (get_spec_bg_or_alpha_as_argb)
        (create_cairo_image_surface): New functions when USE_CAIRO.