]> code.delx.au - gnu-emacs/commit
Introduce limited Xpm support (32 bit ZPixmap) for Cairo.
authorJan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 16:10:27 +0000 (18:10 +0200)
committerJan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 16:10:27 +0000 (18:10 +0200)
commit74c4ce27b510b90c29d25c462d9b84b203d00252
tree465be24a6c2d3b8be458c0f7d81ad110d367a1d6
parent5558a14438172634e8802cbaa87abc265e5d7a4c
Introduce limited Xpm support (32 bit ZPixmap) for Cairo.

* configure.ac (HAVE_RSVG): Move after cairo.
(USE_CAIRO): Disable rsvg, don't disable Xpm.

* src/image.c (prepare_image_for_display): Don't load if USE_CAIRO.
(x_clear_image): If USE_CAIRO, also free possible img->ximg->obdata and
don't return early.
(ALLOC_XPM_COLORS): Don't define when USE_CAIRO.
(xpm_load): Convert simple Xpms (32 bit ZPixmap) to CAIRO_FORMAT_ARGB32
and create a surface.
ChangeLog
configure.ac
src/ChangeLog
src/image.c