vcl/source/filter/idxf/dxf2mtf.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d3308503a8c320b4a1c3f6156a6b7e6a71a5806d
Author: VaibhavMalik4187 <vaibhavmalik2...@gmail.com>
AuthorDate: Fri Dec 31 01:12:39 2021 +0530
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Fri Jan 7 00:19:50 2022 +0100
tdf#146479 - Use basegfx fTools for converting the angle unit
Change-Id: Id54191d7c1e41ae444d42f6d110c4b82ba4515b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127788
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/vcl/source/filter/idxf/dxf2mtf.cxx
b/vcl/source/filter/idxf/dxf2mtf.cxx
index a8504c0d4c53..3c248c31fca0 100644
--- a/vcl/source/filter/idxf/dxf2mtf.cxx
+++ b/vcl/source/filter/idxf/dxf2mtf.cxx
@@ -275,7 +275,7 @@ void DXF2GDIMetaFile::DrawCircleEntity(const
DXFCircleEntity & rE, const DXFTran
nPoints=OptPointsPerCircle;
tools::Polygon aPoly(nPoints);
for (i=0; i<nPoints; i++) {
-
fAng=2*3.14159265359/static_cast<double>(nPoints-1)*static_cast<double>(i);
+ fAng=2*M_PI/static_cast<double>(nPoints-1)*static_cast<double>(i);
rTransform.Transform(
rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),0),
aPoly[i]
@@ -285,7 +285,7 @@ void DXF2GDIMetaFile::DrawCircleEntity(const
DXFCircleEntity & rE, const DXFTran
if (rE.fThickness!=0) {
tools::Polygon aPoly2(nPoints);
for (i=0; i<nPoints; i++) {
-
fAng=2*3.14159265359/static_cast<double>(nPoints-1)*static_cast<double>(i);
+
fAng=2*M_PI/static_cast<double>(nPoints-1)*static_cast<double>(i);
rTransform.Transform(
rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),rE.fThickness),
aPoly2[i]
@@ -322,10 +322,10 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity &
rE, const DXFTransform
if (fdA<=0) fdA+=360.0;
rTransform.Transform(rE.aP0,aC);
if (rE.fThickness==0 && fdA>5.0 &&
rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)) {
- DXFVector
aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
+ DXFVector
aVS(cos(basegfx::deg2rad(fA1)),sin(basegfx::deg2rad(fA1)),0.0);
aVS*=rE.fRadius;
aVS+=rE.aP0;
- DXFVector
aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
+ DXFVector
aVE(cos(basegfx::deg2rad(fA1+fdA)),sin(basegfx::deg2rad(fA1+fdA)),0.0);
aVE*=rE.fRadius;
aVE+=rE.aP0;
Point aPS,aPE;
@@ -349,7 +349,7 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity &
rE, const DXFTransform
if (nPoints<2) nPoints=2;
tools::Polygon aPoly(nPoints);
for (i=0; i<nPoints; i++) {
- fAng=3.14159265359/180.0 * ( fA1 +
fdA/static_cast<double>(nPoints-1)*static_cast<double>(i) );
+ fAng=basegfx::deg2rad( fA1 +
fdA/static_cast<double>(nPoints-1)*static_cast<double>(i) );
rTransform.Transform(
rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),0),
aPoly[i]
@@ -359,7 +359,7 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity &
rE, const DXFTransform
if (rE.fThickness!=0) {
tools::Polygon aPoly2(nPoints);
for (i=0; i<nPoints; i++) {
- fAng=3.14159265359/180.0 * ( fA1 +
fdA/static_cast<double>(nPoints-1)*static_cast<double>(i) );
+ fAng=basegfx::deg2rad( fA1 +
fdA/static_cast<double>(nPoints-1)*static_cast<double>(i) );
rTransform.Transform(
rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),rE.fThickness),
aPoly2[i]
