summaryrefslogtreecommitdiff
path: root/src/w32term.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-08-21 17:46:42 +0300
committerEli Zaretskii <eliz@gnu.org>2017-08-21 17:46:42 +0300
commit76fbe2f4541b11af8bcb0b5e57bb155b796b8d8e (patch)
tree9d1387417298711062a0b1b4e81e625a9300bd2f /src/w32term.c
parent9840499564c90c43b1d269154593ebe57a7cb9b0 (diff)
downloademacs-76fbe2f4541b11af8bcb0b5e57bb155b796b8d8e.tar.gz
Avoid floating-point exceptions while drawing underwave
* src/w32term.c (x_get_scale_factor): * src/xterm.c (x_get_scale_factor): Don't let the scale factors become less than 1. Reported by Yuri D'Elia <wavexx@thregr.org> in http://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00459.html.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 6d2fa335859..2785ae2b52d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -318,8 +318,10 @@ x_get_scale_factor(struct w32_display_info *dpyinfo, int *scale_x, int *scale_y)
if (dpyinfo)
{
- *scale_x = floor (dpyinfo->resx / base_res);
- *scale_y = floor (dpyinfo->resy / base_res);
+ if (dpyinfo->resx > base_res)
+ *scale_x = floor (dpyinfo->resx / base_res);
+ if (dpyinfo->resy > base_res)
+ *scale_y = floor (dpyinfo->resy / base_res);
}
}