diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-03-15 21:05:45 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-03-15 21:05:45 +0000 |
| commit | efba7f83ef225df8a0eaee660cb9bba19fd775c0 (patch) | |
| tree | 70dfe476f8fab3474685870c6026d62205c837ec | |
| parent | 245466d4ef8ea4012242a3fa21a217e767f4eac4 (diff) | |
Update from ASPEED Technology Inc. to fix incorrect line drawing issue and
change driver name from "AST1000/2000" to "AST" to fix Xorg log
formatting issues with long driver names. Bugzilla #4937
<https://bugs.freedesktop.org/show_bug.cgi?id=4937> Attachment #4948
<https://bugs.freedesktop.org/attachment.cgi?id=4948>
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | src/ast.h | 2 | ||||
| -rw-r--r-- | src/ast_2dtool.c | 4 | ||||
| -rw-r--r-- | src/ast_accel.c | 12 |
4 files changed, 31 insertions, 12 deletions
@@ -1,3 +1,14 @@ +2006-03-15 Alan Coopersmith <alan.coopersmith@sun.com> + + * src/ast.h: + * src/ast_2dtool.c: + * src/ast_accel.c: + Update from ASPEED Technology Inc. to fix incorrect line drawing issue + and change driver name from "AST1000/2000" to "AST" to fix Xorg log + formatting issues with long driver names. + Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937> + Attachment #4948 <https://bugs.freedesktop.org/attachment.cgi?id=4948> + 2006-03-14 Alan Coopersmith <alan.coopersmith@sun.com> * COPYING: @@ -9,13 +20,13 @@ * src/.cvsignore: Add the normal trappings of the Xorg modular build system. - * ast_2dtool.c: - * ast_accel.c: - * ast_cursor.c: - * ast_driver.c: - * ast_mode.c: - * ast_tool.c: - * ast_vgatool.c: + * src/ast_2dtool.c: + * src/ast_accel.c: + * src/ast_cursor.c: + * src/ast_driver.c: + * src/ast_mode.c: + * src/ast_tool.c: + * src/ast_vgatool.c: Replace "Xv.h" with <X11/extensions/Xv.h> and add #include "config.h" for modular build Strip ^M out of ast_accel.c @@ -35,7 +35,7 @@ #endif /* AST REC Info */ -#define AST_NAME "AST1000/2000" +#define AST_NAME "AST" #define AST_DRIVER_NAME "ast" #define AST_MAJOR_VERSION 0 #define AST_MINOR_VERSION 80 diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index cfdf984..e4bbf8b 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -363,7 +363,7 @@ ASTRecPtr pAST, ULONG ulDataLen) Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam) { - LONG GAbsX, GAbsY, GXInc, GYInc, GSlopeOne, GXMajor; + LONG GAbsX, GAbsY, GXInc, GYInc, GXMajor; LONG MM, mm, Error0, K1, K2; /* Init */ @@ -377,7 +377,6 @@ Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam) GXInc = (LineInfo->X1 < LineInfo->X2) ? 1:0; GYInc = (LineInfo->Y1 < LineInfo->Y2) ? 1:0; - GSlopeOne = (GAbsX ==GAbsY) ? 1:0; GXMajor = (GAbsX >= GAbsY) ? 1:0; /* Calculate */ @@ -413,7 +412,6 @@ Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam) return(TRUE); } - #endif /* end of Accel_2D */ diff --git a/src/ast_accel.c b/src/ast_accel.c index 0a31a78..0247227 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -668,6 +668,11 @@ static void ASTSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn, y1 -= miny; y2 -= miny; } + + LineInfo.X1 = x1; + LineInfo.Y1 = y1; + LineInfo.X2 = x2; + LineInfo.Y2 = y2; bGetLineTerm(&LineInfo, &dsLineParam); /* Get Line Parameter */ @@ -818,7 +823,12 @@ ASTSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn, y1 -= miny; y2 -= miny; } - + + LineInfo.X1 = x1; + LineInfo.Y1 = y1; + LineInfo.X2 = x2; + LineInfo.Y2 = y2; + bGetLineTerm(&LineInfo, &dsLineParam); /* Get Line Parameter */ if (dsLineParam.dwLineAttributes & LINEPARAM_X_DEC) |