diff --git a/components/cairocanvas/cairocanvas.pas b/components/cairocanvas/cairocanvas.pas
index b4a564abf2..8b03ceebfd 100644
--- a/components/cairocanvas/cairocanvas.pas
+++ b/components/cairocanvas/cairocanvas.pas
@@ -635,6 +635,8 @@ end;
//C* - center, R* - halfaxis
procedure TCairoPrinterCanvas.EllipseArcPath(CX, CY, RX, RY: Double; Angle1, Angle2: Double; Clockwise, Continuous: Boolean);
+var
+ sinAngle1, cosAngle1: Double;
begin
if (RX=0) or (RY=0) then //cairo_scale do not likes zero params
Exit;
@@ -643,7 +645,10 @@ begin
cairo_translate(cr, SX(CX), SY(CY));
cairo_scale(cr, SX2(RX), SY2(RY));
if not Continuous then
- cairo_move_to(cr, cos(Angle1), sin(Angle1)); //Move to arcs starting point
+ begin
+ SinCos(Angle1, sinAngle1, cosAngle1);
+ cairo_move_to(cr, cosAngle1, sinAngle1); //Move to arcs starting point
+ end;
if Clockwise then
cairo_arc(cr, 0, 0, 1, Angle1, Angle2)
else
diff --git a/components/codetools/ide/codyctrls.pas b/components/codetools/ide/codyctrls.pas
index 3d3929c97b..662bbddcfc 100644
--- a/components/codetools/ide/codyctrls.pas
+++ b/components/codetools/ide/codyctrls.pas
@@ -268,7 +268,7 @@ var
OuterCnt: integer;
centerx, centery: single;
i: Integer;
- Ang: single;
+ Ang, sinAng, cosAng: single;
OuterRadiusX, OuterRadiusY, InnerRadiusX, InnerRadiusY: single;
Points: array of TPoint;
j: Integer;
@@ -286,16 +286,18 @@ begin
for i:=0 to OuterCnt do begin
Ang:=StartAngle+((EndAngle-StartAngle)/OuterCnt)*single(i);
Ang:=(Ang/FullCircle16)*2*pi;
- Points[j].x:=round(centerx+cos(Ang)*OuterRadiusX);
- Points[j].y:=round(centery-sin(Ang)*OuterRadiusY);
+ SinCos(Ang, sinAng, cosAng);
+ Points[j].x:=round(centerx+cosAng*OuterRadiusX);
+ Points[j].y:=round(centery-sinAng*OuterRadiusY);
inc(j);
end;
// inner arc
for i:=OuterCnt downto 0 do begin
Ang:=StartAngle+((EndAngle-StartAngle)/OuterCnt)*single(i);
Ang:=(Ang/FullCircle16)*2*pi;
- Points[j].x:=round(centerx+cos(Ang)*InnerRadiusX);
- Points[j].y:=round(centery-sin(Ang)*InnerRadiusY);
+ SinCos(Ang, sinAng, cosAng);
+ Points[j].x:=round(centerx+cosAng*InnerRadiusX);
+ Points[j].y:=round(centery-sinAng*InnerRadiusY);
inc(j);
end;
Canvas.Polygon(Points);
diff --git a/components/fpvectorial/fpvectorial.pas b/components/fpvectorial/fpvectorial.pas
index 0abb7262bd..fac784693e 100644
--- a/components/fpvectorial/fpvectorial.pas
+++ b/components/fpvectorial/fpvectorial.pas
@@ -3029,7 +3029,7 @@ procedure T2DEllipticalArcSegment.CalculateCenter;
var
XStart, YStart, lT1: Double;
CX1, CY1, CX2, CY2, LeftMostX, LeftMostY, RightMostX, RightMostY: Double;
- Sin0, Cos0, SinXRot, CosXRot, SinLT1, CosLT1: Double;
+ SinXRot, CosXRot, SinLT1, CosLT1: Double;
RotatedCenter: T3DPoint;
begin
if CenterSetByUser then Exit;
@@ -3043,10 +3043,13 @@ begin
if Previous = nil then
begin
- SinCos(0.0, Sin0, Cos0);
SinCos(XRotation, SinXRot, CosXRot);
+ {
CX := X - RX*Cos0*CosXRot + RY*Sin0*SinXRot;
CY := Y - RY*Sin0*CosXRot - RX*Cos0*SinXRot;
+ }
+ CX := X - RX*CosXRot;
+ CY := Y - RX*SinXRot;
Exit;
end;
diff --git a/components/fpvectorial/tests/vtmain.lfm b/components/fpvectorial/tests/vtmain.lfm
index 7d40e241d1..98ee05b227 100644
--- a/components/fpvectorial/tests/vtmain.lfm
+++ b/components/fpvectorial/tests/vtmain.lfm
@@ -6,11 +6,11 @@ object MainForm: TMainForm
Caption = 'Visual fpvectorial test'
ClientHeight = 700
ClientWidth = 900
+ ShowHint = True
+ LCLVersion = '3.99.0.0'
OnActivate = FormActivate
OnCreate = FormCreate
OnDestroy = FormDestroy
- ShowHint = True
- LCLVersion = '2.3.0.0'
object GbTree: TGroupBox
Left = 8
Height = 684
@@ -37,12 +37,12 @@ object MainForm: TMainForm
ReadOnly = True
StateImages = ImageList
TabOrder = 0
+ Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
OnCustomDrawItem = TreeCustomDrawItem
OnDeletion = TreeDeletion
OnGetImageIndex = TreeGetImageIndex
OnGetSelectedIndex = TreeGetSelectedIndex
OnSelectionChanged = TreeSelectionChanged
- Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end
end
object ScrollBox1: TScrollBox
@@ -231,9 +231,9 @@ object MainForm: TMainForm
BorderSpacing.Top = 8
BorderSpacing.Bottom = 8
Caption = 'Save as ref'
- OnClick = BtnSaveAsRefClick
ParentFont = False
TabOrder = 2
+ OnClick = BtnSaveAsRefClick
end
end
object gbReferenceImageTest: TGroupBox
@@ -408,8 +408,8 @@ object MainForm: TMainForm
BorderSpacing.Right = 4
BorderSpacing.Bottom = 6
Caption = 'Ext viewer...'
- OnClick = BtnViewImageClick
TabOrder = 0
+ OnClick = BtnViewImageClick
end
object WRBottomLeftPaintbox: TPaintBox
AnchorSideLeft.Control = gbWRBottomLeft
@@ -469,11 +469,11 @@ object MainForm: TMainForm
'svg'
'wmf'
)
- OnChange = CbFileFormatChange
ParentFont = False
Style = csDropDownList
TabOrder = 1
Text = 'svg'
+ OnChange = CbFileFormatChange
end
object Label1: TLabel
AnchorSideLeft.Control = LblReadWriteInstructions
@@ -505,9 +505,9 @@ object MainForm: TMainForm
BorderSpacing.Right = 8
BorderSpacing.Bottom = 6
Caption = 'Save && load'
- OnClick = BtnSaveToFilesClick
ParentFont = False
TabOrder = 2
+ OnClick = BtnSaveToFilesClick
end
object gbWRTopLeft: TGroupBox
AnchorSideLeft.Control = gbWRBottomLeft
@@ -541,8 +541,8 @@ object MainForm: TMainForm
BorderSpacing.Right = 4
BorderSpacing.Bottom = 6
Caption = 'Ext. viewer...'
- OnClick = BtnViewImageClick
TabOrder = 0
+ OnClick = BtnViewImageClick
end
object WRTopLeftPaintbox: TPaintBox
AnchorSideLeft.Control = gbWRTopLeft
@@ -589,10 +589,10 @@ object MainForm: TMainForm
BorderSpacing.Bottom = 8
Caption = 'unknown'
Checked = True
- OnChange = ResultStateChange
ParentFont = False
TabOrder = 2
TabStop = True
+ OnChange = ResultStateChange
end
object imgUnknown: TImage
AnchorSideLeft.Control = rbUnknown
@@ -620,9 +620,9 @@ object MainForm: TMainForm
Width = 54
BorderSpacing.Left = 32
Caption = 'passed'
- OnChange = ResultStateChange
ParentFont = False
TabOrder = 0
+ OnChange = ResultStateChange
end
object ImgPassed: TImage
AnchorSideLeft.Control = rbPassed
@@ -651,9 +651,9 @@ object MainForm: TMainForm
Width = 47
BorderSpacing.Left = 32
Caption = 'failed'
- OnChange = ResultStateChange
ParentFont = False
TabOrder = 1
+ OnChange = ResultStateChange
end
object ImgFailed: TImage
AnchorSideLeft.Control = rbFailed
diff --git a/components/fpvectorial/tests/vtmain.pas b/components/fpvectorial/tests/vtmain.pas
index 6664011abb..f48b3043cf 100644
--- a/components/fpvectorial/tests/vtmain.pas
+++ b/components/fpvectorial/tests/vtmain.pas
@@ -10,7 +10,7 @@ unit vtmain;
interface
-uses lazlogger,
+uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
ExtCtrls, ComCtrls, Buttons, fpimage, fpvectorial, Types;
@@ -596,7 +596,7 @@ var
isReversed, isClockwise, isEllipse, isRotated: Boolean;
p: T3dPoint;
x1, y1, x2, y2, rx, ry: Double;
- startAngle, endAngle, phi: Double;
+ startAngle, endAngle, phi, sinAngle, cosAngle: Double;
arc: TPath;
txt1, txt2: TvText;
begin
@@ -611,10 +611,12 @@ begin
startAngle := DegToRad((AIntParam and $000F) * 45); // 0°, 45°, 90°, ...
endAngle := startAngle + pi/2; // 90°, 135°, 180°, ...
- x1 := CX + rx * cos(startAngle);
- y1 := CY + ry * sin(startAngle);
- x2 := CX + rx * cos(endAngle);
- y2 := CY + ry * sin(endAngle);
+ SinCos(startAngle, sinAngle, cosAngle);
+ x1 := CX + rx * cosAngle;
+ y1 := CY + ry * sinAngle;
+ SinCos(endAngle, sinAngle, cosAngle);
+ x2 := CX + rx * cosAngle;
+ y2 := CY + ry * sinAngle;
if isRotated then begin
p := Rotate3DPointInXY(Make3DPoint(x1, y1), Make3DPoint(CX, CY), -phi);
// See comment at Rotate3DPointInXY regarding the negative sign of phi
diff --git a/components/freetype/easylazfreetype.pas b/components/freetype/easylazfreetype.pas
index 27f7151674..2137b5582d 100644
--- a/components/freetype/easylazfreetype.pas
+++ b/components/freetype/easylazfreetype.pas
@@ -1559,7 +1559,7 @@ var
g: TFreeTypeGlyph;
prevCharcode, glyphIndex: integer;
txmatrix: TT_Matrix;
- angle: single;
+ angle, sin_angle, cos_angle: single;
outline: ^TT_Outline;
vector: TT_Vector;
corrX, corrY: single;
@@ -1571,10 +1571,11 @@ begin
if Orientation<>0 then
begin
angle := Orientation * PI / 1800;
- txmatrix.xx := Round( cos( angle ) * $10000 );
- txmatrix.xy := -Round( sin( angle ) * $10000 );
- txmatrix.yx := Round( sin( angle ) * $10000 );
- txmatrix.yy := Round( cos( angle ) * $10000 );
+ SinCos(angle, sin_angle, cos_angle);
+ txmatrix.xx := Round( cos_angle * $10000 );
+ txmatrix.xy := -Round( sin_angle * $10000 );
+ txmatrix.yx := Round( sin_angle * $10000 );
+ txmatrix.yy := Round( cos_angle * $10000 );
end;
while idx <> 0 do
diff --git a/components/lazreport/source/barcode.pas b/components/lazreport/source/barcode.pas
index 78a7bea3f9..0916d44c64 100644
--- a/components/lazreport/source/barcode.pas
+++ b/components/lazreport/source/barcode.pas
@@ -70,7 +70,7 @@ interface
{$I lr_vers.inc}
uses
- SysUtils, Classes, Graphics, Controls, Forms, Dialogs;
+ SysUtils, Math, Classes, Graphics, Controls, Forms, Dialogs;
type
TBarcodeType = (bcCode_2_5_interleaved,
@@ -230,8 +230,7 @@ function Rotate2D(p: TPoint; alpha: double): TPoint;
var
sinus, cosinus: extended;
begin
- sinus := sin(alpha);
- cosinus := cos(alpha);
+ SinCos(alpha, sinus, cosinus);
Result.x := Round(p.x * cosinus + p.y * sinus);
Result.y := Round(-p.x * sinus + p.y * cosinus);
end;
diff --git a/examples/lazfreetype/lazfreetypetest.lpi b/examples/lazfreetype/lazfreetypetest.lpi
index ff24f3e625..ab07a0a1ef 100644
--- a/examples/lazfreetype/lazfreetypetest.lpi
+++ b/examples/lazfreetype/lazfreetypetest.lpi
@@ -44,6 +44,11 @@
+
+
+
+
+
@@ -105,6 +110,11 @@
+
+
+
+
+