libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 112 insertions, 125 deletions

diff --git a/xorg-server/mi/mipolypnt.c b/xorg-server/mi/mipolypnt.c
index 29d3e29e1..086502b26 100644
--- a/xorg-server/mi/mipolypnt.c
+++ b/xorg-server/mi/mipolypnt.c
@@ -1,125 +1,112 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xprotostr.h>

-#include "pixmapstr.h"

-#include "gcstruct.h"

-#include "windowstr.h"

-#include "mi.h"

-

-void

-miPolyPoint(

-    DrawablePtr		pDrawable,

-    GCPtr		pGC,

-    int			mode,		/* Origin or Previous */

-    int			npt,

-    xPoint		*pptInit

-    )

-{

-

-    int 		xorg;

-    int 		yorg;

-    int 		nptTmp;

-    ChangeGCVal		fsOld, fsNew;

-    int			*pwidthInit, *pwidth;

-    int			i;

-    xPoint 		*ppt;

-

-    if(!(pwidthInit = malloc(npt * sizeof(int))))

-	return;

-

-    /* make pointlist origin relative */

-    if (mode == CoordModePrevious)

-    {

-        ppt = pptInit;

-        nptTmp = npt;

-	nptTmp--;

-	while(nptTmp--)

-	{

-	    ppt++;

-	    ppt->x += (ppt-1)->x;

-	    ppt->y += (ppt-1)->y;

-	}

-    }

-

-    if(pGC->miTranslate)

-    {

-	ppt = pptInit;

-	nptTmp = npt;

-	xorg = pDrawable->x;

-	yorg = pDrawable->y;

-	while(nptTmp--)

-	{

-	    ppt->x += xorg;

-	    ppt++->y += yorg;

-	}

-    }

-

-    fsOld.val = pGC->fillStyle;

-    fsNew.val = FillSolid;

-    if(pGC->fillStyle != FillSolid)

-    {

-	ChangeGC(NullClient, pGC, GCFillStyle, &fsNew);

-	ValidateGC(pDrawable, pGC);

-    }

-    pwidth = pwidthInit;

-    for(i = 0; i < npt; i++)

-	*pwidth++ = 1;

-    (*pGC->ops->FillSpans)(pDrawable, pGC, npt, pptInit, pwidthInit, FALSE); 

-

-    if(fsOld.val != FillSolid)

-    {

-	ChangeGC(NullClient, pGC, GCFillStyle, &fsOld);

-	ValidateGC(pDrawable, pGC);

-    }

-    free(pwidthInit);

-}

-

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
+#include "pixmapstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "mi.h"
+
+void
+miPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, /* Origin or Previous */
+            int npt, xPoint * pptInit)
+{
+
+    int xorg;
+    int yorg;
+    int nptTmp;
+    ChangeGCVal fsOld, fsNew;
+    int *pwidthInit, *pwidth;
+    int i;
+    xPoint *ppt;
+
+    if (!(pwidthInit = malloc(npt * sizeof(int))))
+        return;
+
+    /* make pointlist origin relative */
+    if (mode == CoordModePrevious) {
+        ppt = pptInit;
+        nptTmp = npt;
+        nptTmp--;
+        while (nptTmp--) {
+            ppt++;
+            ppt->x += (ppt - 1)->x;
+            ppt->y += (ppt - 1)->y;
+        }
+    }
+
+    if (pGC->miTranslate) {
+        ppt = pptInit;
+        nptTmp = npt;
+        xorg = pDrawable->x;
+        yorg = pDrawable->y;
+        while (nptTmp--) {
+            ppt->x += xorg;
+            ppt++->y += yorg;
+        }
+    }
+
+    fsOld.val = pGC->fillStyle;
+    fsNew.val = FillSolid;
+    if (pGC->fillStyle != FillSolid) {
+        ChangeGC(NullClient, pGC, GCFillStyle, &fsNew);
+        ValidateGC(pDrawable, pGC);
+    }
+    pwidth = pwidthInit;
+    for (i = 0; i < npt; i++)
+        *pwidth++ = 1;
+    (*pGC->ops->FillSpans) (pDrawable, pGC, npt, pptInit, pwidthInit, FALSE);
+
+    if (fsOld.val != FillSolid) {
+        ChangeGC(NullClient, pGC, GCFillStyle, &fsOld);
+        ValidateGC(pDrawable, pGC);
+    }
+    free(pwidthInit);
+}