diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-29 09:50:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-29 09:50:56 +0200 |
| commit | f6d1847eef027266daa0f75ee92ceb09698b2761 (patch) | |
| tree | 7ce3418e8255a636034d90be862167046c06473d /xorg-server/randr/rrinfo.c | |
| parent | 67551627d34fff4a0fbe719bce33a3bacb55ccef (diff) | |
| download | vcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.tar.gz vcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.tar.bz2 vcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.zip | |
xkeyboard-config xserver pixman mesa git update 29 Jun 2012
Diffstat (limited to 'xorg-server/randr/rrinfo.c')
| -rw-r--r-- | xorg-server/randr/rrinfo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/randr/rrinfo.c b/xorg-server/randr/rrinfo.c index 114ec3471..1408d6f64 100644 --- a/xorg-server/randr/rrinfo.c +++ b/xorg-server/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; |