diff options
| author | Tormod Volden <bugzi06.fdo.tormod@xoxy.net> | 2007-11-18 11:56:31 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@aspartame.nwnk.net> | 2007-11-18 11:56:31 -0500 |
| commit | ee2d4626dca6e0d4fc6f524e5de4bdefa2ed43df (patch) | |
| tree | f475ab47573337101a6c9a9461ed85c4e4844cd2 /hw | |
| parent | a46c30c3be33ffb304a885503c8aaa78396ed3d9 (diff) | |
Bug #12932: Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index bb416fddc..dc49861d4 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -704,9 +704,9 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height) mm_height = output->mm_height; if (!mm_height) - mm_height = 203; /* 768 pixels at 96dpi */ + mm_height = (768 * 25.4) / DEFAULT_DPI; /* - * Pick a mode closest to 96dpi + * Pick a mode closest to DEFAULT_DPI */ for (mode = output->probed_modes; mode; mode = mode->next) { @@ -721,7 +721,7 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height) /* yes, use VDisplay here, not xf86ModeHeight */ dpi = (mode->VDisplay * 254) / (mm_height * 10); - diff = dpi - 96; + diff = dpi - DEFAULT_DPI; diff = diff < 0 ? -diff : diff; if (target_mode == NULL || (preferred > target_preferred) || (preferred == target_preferred && diff < target_diff)) diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index fe21717f1..c1a06b296 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -450,10 +450,10 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) else { /* - * Otherwise, just set the screen to 96dpi + * Otherwise, just set the screen to DEFAULT_DPI */ - mmWidth = width * 25.4 / 96; - mmHeight = height * 25.4 / 96; + mmWidth = width * 25.4 / DEFAULT_DPI; + mmHeight = height * 25.4 / DEFAULT_DPI; } } xf86DrvMsg(pScrn->scrnIndex, X_INFO, |