diff options
| author | Jan D | 2015-04-05 18:34:07 +0200 |
|---|---|---|
| committer | Jan D | 2015-04-05 18:34:07 +0200 |
| commit | 69a8655d7190b1dc28de9cbc786a86e8966a45a4 (patch) | |
| tree | 4ece133f665d2402720cf11bdb198cc3baa34dc0 /src/ChangeLog | |
| parent | 74c4ce27b510b90c29d25c462d9b84b203d00252 (diff) | |
| download | emacs-69a8655d7190b1dc28de9cbc786a86e8966a45a4.tar.gz emacs-69a8655d7190b1dc28de9cbc786a86e8966a45a4.zip | |
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/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1a473e65386..18e4b343fb7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2015-04-05 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * image.c: #undef COLOR_TABLE_SUPPORT when USE_CAIRO. | ||
| 4 | (x_clear_image): Free cr_data and cr_data2 if set. | ||
| 5 | (xpm_load): Assign data to cr_data2. | ||
| 6 | (svg_load_image): Convert from GdkPixbuf to CAIRO_FORMAT_ARGB32. | ||
| 7 | |||
| 8 | * dispextern.h (struct image): add cr_data2 if cairo. | ||
| 9 | |||
| 1 | 2015-04-03 Jan Djärv <jan.h.d@swipnet.se> | 10 | 2015-04-03 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 11 | ||
| 3 | * image.c (prepare_image_for_display): Don't load if USE_CAIRO. | 12 | * image.c (prepare_image_for_display): Don't load if USE_CAIRO. |