Jacek Caban : gdi32: Move LineDDA to objects.c.
Alexandre Julliard
julliard at winehq.org
Thu Sep 2 15:45:30 CDT 2021
Module: wine
Branch: master
Commit: 66fd792c4d16bb5815b5d796f119e7bf8d946fc1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fd792c4d16bb5815b5d796f119e7bf8d946fc1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Sep 2 14:12:24 2021 +0200
gdi32: Move LineDDA to objects.c.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++
dlls/gdi32/painting.c | 58 ---------------------------------------------------
2 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c
index a79540885c3..5bc14090feb 100644
--- a/dlls/gdi32/objects.c
+++ b/dlls/gdi32/objects.c
@@ -1001,3 +1001,61 @@ BOOL WINAPI CombineTransform( XFORM *result, const XFORM *xform1, const XFORM *x
*result = r;
return TRUE;
}
+
+/***********************************************************************
+ * LineDDA (GDI32.@)
+ */
+BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end,
+ LINEDDAPROC callback, LPARAM lparam )
+{
+ INT xadd = 1, yadd = 1;
+ INT err,erradd;
+ INT cnt;
+ INT dx = x_end - x_start;
+ INT dy = y_end - y_start;
+
+ TRACE( "(%d, %d), (%d, %d), %p, %lx\n", x_start, y_start,
+ x_end, y_end, callback, lparam );
+
+ if (dx < 0)
+ {
+ dx = -dx;
+ xadd = -1;
+ }
+ if (dy < 0)
+ {
+ dy = -dy;
+ yadd = -1;
+ }
+ if (dx > dy) /* line is "more horizontal" */
+ {
+ err = 2*dy - dx; erradd = 2*dy - 2*dx;
+ for(cnt = 0;cnt < dx; cnt++)
+ {
+ callback( x_start, y_start, lparam );
+ if (err > 0)
+ {
+ y_start += yadd;
+ err += erradd;
+ }
+ else err += 2*dy;
+ x_start += xadd;
+ }
+ }
+ else /* line is "more vertical" */
+ {
+ err = 2*dx - dy; erradd = 2*dx - 2*dy;
+ for(cnt = 0; cnt < dy; cnt++)
+ {
+ callback( x_start, y_start, lparam );
+ if (err > 0)
+ {
+ x_start += xadd;
+ err += erradd;
+ }
+ else err += 2*dx;
+ y_start += yadd;
+ }
+ }
+ return TRUE;
+}
diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c
index 9fecce61bd2..1ab977595f8 100644
--- a/dlls/gdi32/painting.c
+++ b/dlls/gdi32/painting.c
@@ -664,64 +664,6 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR
}
-/**********************************************************************
- * LineDDA (GDI32.@)
- */
-BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
- LINEDDAPROC callback, LPARAM lParam )
-{
- INT xadd = 1, yadd = 1;
- INT err,erradd;
- INT cnt;
- INT dx = nXEnd - nXStart;
- INT dy = nYEnd - nYStart;
-
- TRACE( "(%d, %d), (%d, %d), %p, %lx\n", nXStart, nYStart, nXEnd, nYEnd, callback, lParam );
-
- if (dx < 0)
- {
- dx = -dx;
- xadd = -1;
- }
- if (dy < 0)
- {
- dy = -dy;
- yadd = -1;
- }
- if (dx > dy) /* line is "more horizontal" */
- {
- err = 2*dy - dx; erradd = 2*dy - 2*dx;
- for(cnt = 0;cnt < dx; cnt++)
- {
- callback(nXStart,nYStart,lParam);
- if (err > 0)
- {
- nYStart += yadd;
- err += erradd;
- }
- else err += 2*dy;
- nXStart += xadd;
- }
- }
- else /* line is "more vertical" */
- {
- err = 2*dx - dy; erradd = 2*dx - 2*dy;
- for(cnt = 0;cnt < dy; cnt++)
- {
- callback(nXStart,nYStart,lParam);
- if (err > 0)
- {
- nXStart += xadd;
- err += erradd;
- }
- else err += 2*dx;
- nYStart += yadd;
- }
- }
- return TRUE;
-}
-
-
/******************************************************************
*
* *Very* simple bezier drawing code,
More information about the wine-cvs
mailing list