Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Curve Fitting: circular fit could give NAN handles

Browse Source 
Fitting lines that exactly double back on themselves could give NAN length handles.
This commit is contained in:
Campbell Barton
2016-07-31 13:55:50 +10:00
parent 8fab198aae
commit 3fe7aacdf7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extern/curve_fit_nd/intern/curve_fit_cubic.c vendored
View File

@@ -742,7 +742,11 @@ static void cubic_from_points(
!(alpha_r >= 0.0)) !(alpha_r >= 0.0))
{ {
#ifdef USE_CIRCULAR_FALLBACK #ifdef USE_CIRCULAR_FALLBACK
alpha_l = alpha_r = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims); double alpha_test = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
if (!isfinite(alpha_test)) {
alpha_test = len_vnvn(p0, p3, dims) / 3.0;
}
alpha_l = alpha_r = alpha_test;
#else #else
alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0; alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
#endif #endif
@@ -804,7 +808,11 @@ static void cubic_from_points(
p2_dist_sq > dist_sq_max) p2_dist_sq > dist_sq_max)
{ {
#ifdef USE_CIRCULAR_FALLBACK #ifdef USE_CIRCULAR_FALLBACK
alpha_l = alpha_r = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims); double alpha_test = points_calc_cubic_scale(p0, p3, tan_l, tan_r, points_offset_coords_length, dims);
if (!isfinite(alpha_test)) {
alpha_test = len_vnvn(p0, p3, dims) / 3.0;
}
alpha_l = alpha_r = alpha_test;
#else #else
alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0; alpha_l = alpha_r = len_vnvn(p0, p3, dims) / 3.0;
#endif #endif