[Libreoffice-commits] core.git: filter/source
Caolán McNamara
caolanm at redhat.com
Wed Nov 1 00:26:54 UTC 2017
filter/source/graphicfilter/icgm/class4.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit dae6ba564fcf20299b7a560aeb346efc84364d41
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 31 15:42:27 2017 +0000
ofz: Divide-by-zero
Change-Id: Id6153afbfd04ac2eafc8a8670144e157cb527538
Reviewed-on: https://gerrit.libreoffice.org/44126
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index 8bcb4b3f703a..659eba8d43ad 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -647,8 +647,10 @@ void CGM::ImplDoClass4()
bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
ImplGetVector( &vector[ 0 ] );
- fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
- fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308;
+ double fStartSqrt = sqrt(vector[0] * vector[0] + vector[1] * vector[1]);
+ fStartAngle = fStartSqrt ? (acos(vector[0] / fStartSqrt) * 57.29577951308) : 0.0;
+ double fEndSqrt = sqrt(vector[2] * vector[2] + vector[3] * vector[3]);
+ fEndAngle = fEndSqrt ? (acos(vector[2] / fEndSqrt) * 57.29577951308) : 0.0;
if ( vector[ 1 ] > 0 )
fStartAngle = 360 - fStartAngle;
More information about the Libreoffice-commits
mailing list