diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-04-05 18:34:07 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-04-05 18:34:07 +0200 |
| commit | 69a8655d7190b1dc28de9cbc786a86e8966a45a4 (patch) | |
| tree | 4ece133f665d2402720cf11bdb198cc3baa34dc0 /src/dispextern.h | |
| parent | 74c4ce27b510b90c29d25c462d9b84b203d00252 (diff) | |
| download | emacs-69a8655d7190b1dc28de9cbc786a86e8966a45a4.tar.gz | |
Support RSVG and cairo.
* configure.ac: Allow rsvg with cairo. Move back HAVE_RSVG.
* src/dispextern.h (struct image): add cr_data2 if cairo.
* src/image.c: #undef COLOR_TABLE_SUPPORT when USE_CAIRO.
(x_clear_image): Free cr_data and cr_data2 if set.
(xpm_load): Assign data to cr_data2.
(svg_load_image): Convert from GdkPixbuf to CAIRO_FORMAT_ARGB32.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index addb43275bc..d9d4d2300fa 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2943,6 +2943,7 @@ struct image #ifdef USE_CAIRO void *cr_data; + void *cr_data2; #endif #ifdef HAVE_X_WINDOWS /* X images of the image, corresponding to the above Pixmaps. |