Merge pull request #196 from oehhar/master

Fix for ticket #179 "division by 0" proposed by SergeySlice
This commit is contained in:
Mikko Mononen 2021-03-30 23:20:21 +03:00 committed by GitHub
commit 3cdd4a9d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2187,7 +2187,12 @@ static void nsvg__pathArcTo(NSVGparser* p, float* cpx, float* cpy, float* args,
// The loop assumes an iteration per end point (including start and end), this +1. // The loop assumes an iteration per end point (including start and end), this +1.
ndivs = (int)(fabsf(da) / (NSVG_PI*0.5f) + 1.0f); ndivs = (int)(fabsf(da) / (NSVG_PI*0.5f) + 1.0f);
hda = (da / (float)ndivs) / 2.0f; hda = (da / (float)ndivs) / 2.0f;
kappa = fabsf(4.0f / 3.0f * (1.0f - cosf(hda)) / sinf(hda)); // Fix for ticket #179: division by 0: avoid cotangens around 0 (infinite)
if ((hda < 1e-3f) && (hda > -1e-3f))
hda *= 0.5f;
else
hda = (1.0f - cosf(hda)) / sinf(hda);
kappa = fabsf(4.0f / 3.0f * hda);
if (da < 0.0f) if (da < 0.0f)
kappa = -kappa; kappa = -kappa;