[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a9bb9d8: Fix DPI calculation when Xft/DPI is defaul
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a9bb9d8: Fix DPI calculation when Xft/DPI is default |
Date: |
Mon, 10 Aug 2015 06:23:43 +0000 |
branch: master
commit a9bb9d8fc22417d1fafd8001d89a91c33c8b39ec
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fix DPI calculation when Xft/DPI is default
* src/xsettings.c (parse_settings): Don't use Xft/DPI default
value of -1, which evaluates to 2**32 - 1 (Bug#21152).
Remove unnecessary cast while we're in the neighborhood.
---
src/xsettings.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/xsettings.c b/src/xsettings.c
index 028487b..f6a8bfd 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -537,10 +537,10 @@ parse_settings (unsigned char *prop,
else
settings->seen &= ~SEEN_RGBA;
}
- else if (strcmp (name, "Xft/DPI") == 0)
+ else if (strcmp (name, "Xft/DPI") == 0 && ival != (CARD32) -1)
{
settings->seen |= SEEN_DPI;
- settings->dpi = (double)ival/1024.0;
+ settings->dpi = ival / 1024.0;
}
else if (strcmp (name, "Xft/lcdfilter") == 0)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a9bb9d8: Fix DPI calculation when Xft/DPI is default,
Paul Eggert <=