diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-09-02 15:43:15 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-09-03 18:58:43 -0400 |
| commit | f385303cd0242e3a7fded15f8b5c3d610c13ee41 (patch) | |
| tree | 731837ad692a319469cd0d741765434f36aeab26 | |
| parent | 6cb7f595b97e9442a79660bc639b2fc91842e19a (diff) | |
Fix strict-aliasing silliness in XAA.
(cherry picked from commit 613ce0955032fb032de0a3940752828d314f057a)
| -rw-r--r-- | hw/xfree86/xaa/xaaFillPoly.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 23c27818e..6f11e35ff 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -131,8 +131,8 @@ XAAIsEasyPolygon( *bottomY = 0; origin -= (origin & 0x8000) << 1; - vertex1 = *((int *) &extents->x1) - origin; - vertex2 = *((int *) &extents->x2) - origin /* - 0x00010001 */; + vertex1 = extents->x1 - origin; + vertex2 = extents->x2 - origin /* - 0x00010001 */; /* I think this was an error in cfb ^ */ if (shape == Convex) { @@ -714,7 +714,7 @@ XAAFillPolygonStippled( return; } - origin = *((int *)&pDraw->x); + origin = pDraw->x; switch( XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents, origin, &topPoint, &y, &maxy, shape) ) { @@ -867,7 +867,7 @@ XAAFillPolygonTiled( return; } - origin = *((int *)&pDraw->x); + origin = pDraw->x; switch( XAAIsEasyPolygon(ptsIn, count, &pGC->pCompositeClip->extents, origin, &topPoint, &y, &maxy, shape) ) { |