From: <cw...@us...> - 2014-02-18 23:35:33
|
Revision: 2163 http://sourceforge.net/p/graphics32/code/2163 Author: cwbudde Date: 2014-02-18 23:35:30 +0000 (Tue, 18 Feb 2014) Log Message: ----------- Fixed naming Modified Paths: -------------- trunk/Source/GR32_VectorUtils.pas Modified: trunk/Source/GR32_VectorUtils.pas =================================================================== --- trunk/Source/GR32_VectorUtils.pas 2014-02-18 23:34:06 UTC (rev 2162) +++ trunk/Source/GR32_VectorUtils.pas 2014-02-18 23:35:30 UTC (rev 2163) @@ -124,8 +124,8 @@ function ClipPolygon(const Points: TArrayOfFloatPoint; const ClipRect: TFloatRect): TArrayOfFloatPoint; overload; function ClipPolygon(const Points: TArrayOfFixedPoint; const ClipRect: TFixedRect): TArrayOfFixedPoint; overload; -function CatPolygon(const P1, P2: TArrayOfArrayOfFloatPoint): TArrayOfArrayOfFloatPoint; overload; -function CatPolygon(const P1, P2: TArrayOfArrayOfFixedPoint): TArrayOfArrayOfFixedPoint; overload; +function CatPolyPolygon(const P1, P2: TArrayOfArrayOfFloatPoint): TArrayOfArrayOfFloatPoint; overload; +function CatPolyPolygon(const P1, P2: TArrayOfArrayOfFixedPoint): TArrayOfArrayOfFixedPoint; overload; function CalculateCircleSteps(Radius: TFloat): Cardinal; {$IFDEF USEINLINING} inline; {$ENDIF} function BuildArc(const P: TFloatPoint; StartAngle, EndAngle, Radius: TFloat; Steps: Integer): TArrayOfFloatPoint; overload; @@ -369,7 +369,7 @@ end; // if max distance is greater than epsilon, recursively simplify - if DeltaMax >= Epsilon * Hypot(Points[FirstIndex].x - Points[LastIndex].x, + if DeltaMax >= Epsilon * GR32_Math.Hypot(Points[FirstIndex].x - Points[LastIndex].x, Points[FirstIndex].y - Points[LastIndex].y) then begin // Recursive call @@ -2657,7 +2657,7 @@ {$ENDIF} end; -function CatPolygon(const P1, P2: TArrayOfArrayOfFloatPoint): TArrayOfArrayOfFloatPoint; +function CatPolyPolygon(const P1, P2: TArrayOfArrayOfFloatPoint): TArrayOfArrayOfFloatPoint; var L1, L2: Integer; begin @@ -2668,7 +2668,7 @@ Move(P2[0], Result[L1], L2 * SizeOf(TFloatPoint)); end; -function CatPolygon(const P1, P2: TArrayOfArrayOfFixedPoint): TArrayOfArrayOfFixedPoint; overload; +function CatPolyPolygon(const P1, P2: TArrayOfArrayOfFixedPoint): TArrayOfArrayOfFixedPoint; overload; var L1, L2: Integer; begin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |