Attachment 11425 Details for Bug 12286 – fbPolyArc fix

[patch] fbPolyArc fix

fbarc.patch (text/plain), 1.18 KB, created by Alan Hourihane on 2007-09-05 01:30:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hourihane

Created: 2007-09-05 01:30:52 UTC

Size: 1.18 KB

patch

obsolete

>diff --git a/fb/fbarc.c b/fb/fbarc.c
>index 3f46bd4..85999d4 100644
>--- a/fb/fbarc.c
>+++ b/fb/fbarc.c
>@@ -71,9 +71,11 @@ fbPolyArc (DrawablePtr	pDrawable,
> 	    BoxRec	box;
> 	    int		x2, y2;
> 	    RegionPtr	cclip;
>+	    int		wrapped = 0;
> 	    
> 	    cclip = fbGetCompositeClip (pGC);
> 	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
>+	    wrapped = 1;
> 	    while (narcs--)
> 	    {
> 		if (miCanZeroArc (parcs))
>@@ -97,14 +99,27 @@ fbPolyArc (DrawablePtr	pDrawable,
> 		    box.y2 = y2;
> 		    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
> 			(RECT_IN_REGION(pDrawable->pScreen, cclip, &box) == rgnIN) )
>+			if (!wrapped) {
>+			    fbPrepareAccess (pDrawable);
>+			    wrapped = 1;
>+			}
> 			(*arc) (dst, dstStride, dstBpp, 
> 				parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, 
> 				pPriv->and, pPriv->xor);
>-		    else
>+		    else {
>+		    	if (wrapped) {
>+	    			fbFinishAccess (pDrawable);
>+				wrapped = 0;
>+			}
> 			miZeroPolyArc(pDrawable, pGC, 1, parcs);
> 		}
>-		else
>+		else {
>+		    if (wrapped) {
>+	    		fbFinishAccess (pDrawable);
>+			wrapped = 0;
>+		    }
> 		    miPolyArc(pDrawable, pGC, 1, parcs);
>+		}
> 		parcs++;
> 	    }
> 	    fbFinishAccess (pDrawable);

Actions: View | Splinter Review

Attachments on bug 12286: 11425 | 11426 | 11427 | 11429 | 11437

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.