diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
| commit | a27ca45b676116ebbce31973bc1a319cad76ffbf (patch) | |
| tree | 098711ced704936739bc91abbd75942a815d89db /xorg-server/randr | |
| parent | 0b89941658d6117d17555ee28c6e5d7715673705 (diff) | |
| parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
| download | vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.gz vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.bz2 vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
Diffstat (limited to 'xorg-server/randr')
| -rw-r--r-- | xorg-server/randr/rrcrtc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c index 76d24f60a..7c59293fe 100644 --- a/xorg-server/randr/rrcrtc.c +++ b/xorg-server/randr/rrcrtc.c @@ -477,7 +477,7 @@ rrCheckPixmapBounding(ScreenPtr pScreen, xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) { rrScrPrivPtr slave_priv = rrGetScrPriv(slave); - for (c = 0; c < slave_priv->numCrtcs; c++) + for (c = 0; c < slave_priv->numCrtcs; c++) { if (slave_priv->crtcs[c] == rr_crtc) { newbox.x1 = x; newbox.x2 = x + w; @@ -492,8 +492,9 @@ rrCheckPixmapBounding(ScreenPtr pScreen, newbox.y1 = slave_priv->crtcs[c]->y; newbox.y2 = slave_priv->crtcs[c]->y + slave_priv->crtcs[c]->mode->mode.height; } - RegionInit(&new_crtc_region, &newbox, 1); - RegionUnion(&total_region, &total_region, &new_crtc_region); + RegionInit(&new_crtc_region, &newbox, 1); + RegionUnion(&total_region, &total_region, &new_crtc_region); + } } newsize = RegionExtents(&total_region); |