diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
| commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
| tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /xorg-server/mi/miwideline.c | |
| parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
| parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
| download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/mi/miwideline.c')
| -rw-r--r-- | xorg-server/mi/miwideline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/mi/miwideline.c b/xorg-server/mi/miwideline.c index 242f3f8b0..ff64ab5d4 100644 --- a/xorg-server/mi/miwideline.c +++ b/xorg-server/mi/miwideline.c @@ -998,7 +998,7 @@ miLineProjectingCap(DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel, { int xorgi = 0, yorgi = 0; int lw; - PolyEdgeRec lefts[2], rights[2]; + PolyEdgeRec lefts[4], rights[4]; int lefty, righty, topy, bottomy; PolyEdgePtr left, right; PolyEdgePtr top, bottom; @@ -1170,7 +1170,7 @@ miWideSegment(DrawablePtr pDrawable, PolyEdgePtr top, bottom; int lefty, righty, topy, bottomy; int signdx; - PolyEdgeRec lefts[2], rights[2]; + PolyEdgeRec lefts[4], rights[4]; LineFacePtr tface; int lw = pGC->lineWidth; @@ -1524,7 +1524,7 @@ miWideDashSegment(DrawablePtr pDrawable, PolyVertexRec vertices[4]; PolyVertexRec saveRight, saveBottom; PolySlopeRec slopes[4]; - PolyEdgeRec left[2], right[2]; + PolyEdgeRec left[4], right[4]; LineFaceRec lcapFace, rcapFace; int nleft, nright; int h; |