diff options
| author | YAMAMOTO Mitsuharu | 2019-05-30 10:05:27 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-30 10:05:27 +0900 |
| commit | 46a176169b9050a5e6d97b11f265bd58b4b5eb05 (patch) | |
| tree | df359f5083e7bb92a24285f4e9e6205150d4e1aa /src | |
| parent | 10582d0511f4455d5c0449fd8a1e0eca9be06d7b (diff) | |
| download | emacs-46a176169b9050a5e6d97b11f265bd58b4b5eb05.tar.gz emacs-46a176169b9050a5e6d97b11f265bd58b4b5eb05.zip | |
Fix breakage of native image scaling on XRENDER by previous change
* src/image.c (image_create_x_image_and_pixmap_1) [HAVE_XRENDER]: Get depth if
it is unspecified.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c index 70ca1079f3f..c5d97e05743 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -2270,6 +2270,8 @@ image_create_x_image_and_pixmap_1 (struct frame *f, int width, int height, int d | |||
| 2270 | int event_basep, error_basep; | 2270 | int event_basep, error_basep; |
| 2271 | if (picture && XRenderQueryExtension (display, &event_basep, &error_basep)) | 2271 | if (picture && XRenderQueryExtension (display, &event_basep, &error_basep)) |
| 2272 | { | 2272 | { |
| 2273 | if (depth <= 0) | ||
| 2274 | depth = DefaultDepthOfScreen (FRAME_X_SCREEN (f)); | ||
| 2273 | if (depth == 32 || depth == 24 || depth == 8) | 2275 | if (depth == 32 || depth == 24 || depth == 8) |
| 2274 | { | 2276 | { |
| 2275 | XRenderPictFormat *format; | 2277 | XRenderPictFormat *format; |