From 8127465f44fee99181f37a5e55dafc90bfafe3d8 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Mon, 14 Dec 2009 19:19:01 +0200 Subject: xf86xv: Fix off-by-one in viewport clipping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of the Xv Put/Get operations have an off by one error in the viewport clipping. Apparently PutImage was fixed at some point but the same code was already copy-pasted all over the place, and so the other operations still suffer from the bug. Signed-off-by: Ville Syrjälä Reviewed-by: Tiago Vignatti Signed-off-by: Keith Packard --- hw/xfree86/common/xf86xv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 82216598b..bdcc4fc2b 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -787,8 +787,8 @@ xf86XVReputVideo(XvPortRecPrivatePtr portPriv) VPBox.x1 = portPriv->pScrn->frameX0; VPBox.y1 = portPriv->pScrn->frameY0; - VPBox.x2 = portPriv->pScrn->frameX1; - VPBox.y2 = portPriv->pScrn->frameY1; + VPBox.x2 = portPriv->pScrn->frameX1 + 1; + VPBox.y2 = portPriv->pScrn->frameY1 + 1; REGION_INIT(pScreen, &VPReg, &VPBox, 1); REGION_INTERSECT(pScreen, &ClipRegion, &ClipRegion, &VPReg); @@ -877,8 +877,8 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv) VPBox.x1 = portPriv->pScrn->frameX0; VPBox.y1 = portPriv->pScrn->frameY0; - VPBox.x2 = portPriv->pScrn->frameX1; - VPBox.y2 = portPriv->pScrn->frameY1; + VPBox.x2 = portPriv->pScrn->frameX1 + 1; + VPBox.y2 = portPriv->pScrn->frameY1 + 1; REGION_INIT(pScreen, &VPReg, &VPBox, 1); REGION_INTERSECT(pScreen, &ClipRegion, &ClipRegion, &VPReg); @@ -1433,8 +1433,8 @@ xf86XVPutStill( VPBox.x1 = portPriv->pScrn->frameX0; VPBox.y1 = portPriv->pScrn->frameY0; - VPBox.x2 = portPriv->pScrn->frameX1; - VPBox.y2 = portPriv->pScrn->frameY1; + VPBox.x2 = portPriv->pScrn->frameX1 + 1; + VPBox.y2 = portPriv->pScrn->frameY1 + 1; REGION_INIT(pScreen, &VPReg, &VPBox, 1); REGION_INTERSECT(pScreen, &ClipRegion, &ClipRegion, &VPReg); -- cgit v1.2.3