diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-11 22:42:55 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-11 22:42:55 +0800 |
| commit | 1b9b4cf4c1152f06153ac9c141fb9f724b984884 (patch) | |
| tree | c058db7e9bf646a7e40ffefa4c4894665876e821 /doc | |
| parent | 05ecb497393551e8bb65fb07fbdc4bbb5f61765a (diff) | |
| download | emacs-1b9b4cf4c1152f06153ac9c141fb9f724b984884.tar.gz | |
Support transparency for ImageMagick images.
* src/image.c (imagemagick_load_image): Implement transparency.
* doc/lispref/display.texi (ImageMagick Images): ImageMagick now supports the
:background property.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 74c4a91c49a..37221d74109 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2012-06-11 Chong Yidong <cyd@gnu.org> + + * display.texi (ImageMagick Images): ImageMagick now supports the + :background property. + 2012-06-10 Dmitry Antipov <dmantipov@yandex.ru> * internals.texi (Garbage Collection): Typo fix. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 3725b6fd820..5face4138e0 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -4603,6 +4603,12 @@ JPEG files, add @code{JPG} to this list. image descriptor properties: @table @code +@item :background @var{background} +@var{background}, if non-@code{nil}, should be a string specifying a +color, which is used as the image's background color if the image +supports transparency. If the value is @code{nil}, it defaults to the +frame's background color. + @item :width, :height The @code{:width} and @code{:height} keywords are used for scaling the image. If only one of them is specified, the other one will be |