summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ast.h2
-rw-r--r--src/ast_2dtool.c4
-rw-r--r--src/ast_accel.c12
3 files changed, 13 insertions, 5 deletions
diff --git a/src/ast.h b/src/ast.h
index 2ec9846..321e741 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -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)