diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
| commit | 8724bb25c325f4a03f36389d553b00f87930ced9 (patch) | |
| tree | d2b505c5966f0a0d01732a56bb07f940548e0d99 /randr/rrinfo.c | |
| parent | cad2feacb52c7e38236db39df06c3fc11ba3aae1 (diff) | |
| parent | dfc03ef3fda3572db590c2096272c990d434163e (diff) | |
Merge tag 'xorg-server-1.12.4' into cygwin-release-1.12xserver-cygwin-1.12.4-1cygwin-release-1.12
xorg-server-1.12.4
Conflicts:
glx/glxcmds.c
hw/xfree86/modes/xf86Crtc.c
os/utils.c
pseudoramiX/pseudoramiX.c
Diffstat (limited to 'randr/rrinfo.c')
| -rw-r--r-- | randr/rrinfo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/randr/rrinfo.c b/randr/rrinfo.c index 114ec3471..1408d6f64 100644 --- a/randr/rrinfo.c +++ b/randr/rrinfo.c @@ -82,6 +82,7 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations) int i; CARD16 minWidth = MAXSHORT, minHeight = MAXSHORT; CARD16 maxWidth = 0, maxHeight = 0; + CARD16 width, height; /* * First time through, create a crtc and output and hook @@ -141,11 +142,11 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations) /* find size bounds */ for (i = 0; i < output->numModes + output->numUserModes; i++) { - RRModePtr mode = (i < output->numModes ? + mode = (i < output->numModes ? output->modes[i] : output->userModes[i - output->numModes]); - CARD16 width = mode->mode.width; - CARD16 height = mode->mode.height; + width = mode->mode.width; + height = mode->mode.height; if (width < minWidth) minWidth = width; |