diff options
| author | Keith Packard <keithp@keithp.com> | 2013-03-18 11:18:58 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-03-18 11:18:58 -0700 |
| commit | 116f020102fd6c2a603069a639b113dfa31b48b7 (patch) | |
| tree | 6255896d3cfc86be4cb4bc12443374eb38e6e3d7 /randr | |
| parent | cf89aa53748b964f9d9eceaa12a7d6f1a076d1ee (diff) | |
| parent | 0f537da72d414ed84e3cd14e3bb7e08565136bd7 (diff) | |
Merge remote-tracking branch 'whot/next'
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/rrcrtc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 6e2eca5ad..721b05ac3 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -363,13 +363,12 @@ void RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) { ScreenPtr master = crtc->pScreen->current_master; - int ret; PixmapPtr mscreenpix; rrScrPriv(crtc->pScreen); mscreenpix = master->GetScreenPixmap(master); - ret = pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); + pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); if (crtc->scanout_pixmap) { master->StopPixmapTracking(mscreenpix, crtc->scanout_pixmap); /* @@ -442,7 +441,7 @@ rrCheckPixmapBounding(ScreenPtr pScreen, RRCrtcPtr rr_crtc, int x, int y, int w, int h) { RegionRec root_pixmap_region, total_region, new_crtc_region; - int i, c; + int c; BoxRec newbox; BoxPtr newsize; ScreenPtr slave; @@ -502,10 +501,8 @@ rrCheckPixmapBounding(ScreenPtr pScreen, new_height == screen_pixmap->drawable.height) { ErrorF("adjust shatters %d %d\n", newsize->x1, newsize->x2); } else { - int ret; rrScrPriv(pScreen); - ret = pScrPriv->rrScreenSetSize(pScreen, - new_width, new_height, 0, 0); + pScrPriv->rrScreenSetSize(pScreen, new_width, new_height, 0, 0); } /* set shatters TODO */ |