diff options
| author | Eli Zaretskii | 2022-03-26 11:31:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2022-03-26 11:31:46 +0300 |
| commit | a6abb6f5cdd5a44bce2e42c340a6c6b83579de93 (patch) | |
| tree | 0411015118b08c5610664dc611f4b36d0a380aa6 /src | |
| parent | de953a6fe39d8e547ce4d40f39cd2c10b71a1e3c (diff) | |
| download | emacs-a6abb6f5cdd5a44bce2e42c340a6c6b83579de93.tar.gz emacs-a6abb6f5cdd5a44bce2e42c340a6c6b83579de93.zip | |
Support display of BMP images on MS-Windows
* src/w32image.c (w32_can_use_native_image_api): Support BMP
images.
* src/image.c (syms_of_image) <Qbmp>: New symbol.
[HAVE_NTGUI]: Add 'bmp' to list of supported image types.
* doc/lispref/display.texi (Image Formats): Document built-in
support for BMP images.
* etc/NEWS: Announce the change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/w32image.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c index c412dc90296..d44d6890846 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -11558,6 +11558,8 @@ non-numeric, there is no explicit limit on the size of images. */); | |||
| 11558 | # ifdef HAVE_NTGUI | 11558 | # ifdef HAVE_NTGUI |
| 11559 | DEFSYM (Qgdiplus, "gdiplus"); | 11559 | DEFSYM (Qgdiplus, "gdiplus"); |
| 11560 | DEFSYM (Qshlwapi, "shlwapi"); | 11560 | DEFSYM (Qshlwapi, "shlwapi"); |
| 11561 | DEFSYM (Qbmp, "bmp"); | ||
| 11562 | add_image_type (Qbmp); | ||
| 11561 | # endif | 11563 | # endif |
| 11562 | #endif | 11564 | #endif |
| 11563 | 11565 | ||
diff --git a/src/w32image.c b/src/w32image.c index f3374dcfd30..1f7c4921b31 100644 --- a/src/w32image.c +++ b/src/w32image.c | |||
| @@ -253,6 +253,7 @@ w32_can_use_native_image_api (Lisp_Object type) | |||
| 253 | || EQ (type, Qpng) | 253 | || EQ (type, Qpng) |
| 254 | || EQ (type, Qgif) | 254 | || EQ (type, Qgif) |
| 255 | || EQ (type, Qtiff) | 255 | || EQ (type, Qtiff) |
| 256 | || EQ (type, Qbmp) | ||
| 256 | || EQ (type, Qnative_image))) | 257 | || EQ (type, Qnative_image))) |
| 257 | { | 258 | { |
| 258 | /* GDI+ can also display BMP, Exif, ICON, WMF, and EMF images. | 259 | /* GDI+ can also display BMP, Exif, ICON, WMF, and EMF images. |