songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix

This commit is contained in:
Sven Oesau 2025-10-22 13:41:17 +02:00
parent c611b70101
commit 6eb1da989f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AABB_tree/include/CGAL/AABB_traits_3.h
View File

@ -448,7 +448,6 @@ public:
const FT sr = typename GeomTraits::Compute_squared_radius_3()(sphere); const FT sr = typename GeomTraits::Compute_squared_radius_3()(sphere);
const Point center = typename GeomTraits::Construct_center_3()(sphere); const Point center = typename GeomTraits::Construct_center_3()(sphere);
using Construct_cartesian_const_iterator = typename GeomTraits::Construct_cartesian_const_iterator_3;
typename GeomTraits::Cartesian_const_iterator_3 cci = typename GeomTraits::Construct_cartesian_const_iterator_3()(center); typename GeomTraits::Cartesian_const_iterator_3 cci = typename GeomTraits::Construct_cartesian_const_iterator_3()(center);
if (*cci < bxmin) if (*cci < bxmin)

19
AABB_tree/include/CGAL/AABB_tree/internal/AABB_statically_filtered_traits_3.h
View File

@ -45,16 +45,16 @@ public:
double bxmin = b.xmin(), bymin = b.ymin(), bzmin = b.zmin(), double bxmin = b.xmin(), bymin = b.ymin(), bzmin = b.zmin(),
bxmax = b.xmax(), bymax = b.ymax(), bzmax = b.zmax(); bxmax = b.xmax(), bymax = b.ymax(), bzmax = b.zmax();
if (fit_in_double(get_approx(c).x(), scx) && if (internal::fit_in_double(get_approx(c).x(), scx) &&
fit_in_double(get_approx(c).y(), scy) && internal::fit_in_double(get_approx(c).y(), scy) &&
fit_in_double(get_approx(c).z(), scz) && internal::fit_in_double(get_approx(c).z(), scz) &&
fit_in_double(s.squared_radius(), ssr)) internal::fit_in_double(s.squared_radius(), ssr))
{ {
CGAL_BRANCH_PROFILER_BRANCH_1(tmp); CGAL_BRANCH_PROFILER_BRANCH_1(tmp);
if ((ssr < 1.11261183279326254436e-293) || (ssr > 2.80889552322236673473e+306)) { if ((ssr < 1.11261183279326254436e-293) || (ssr > 2.80889552322236673473e+306)) {
CGAL_BRANCH_PROFILER_BRANCH_2(tmp); CGAL_BRANCH_PROFILER_BRANCH_2(tmp);
return Base::operator()(s, b); return Base::Compare_distance::operator()(p, b, bound);
} }
double distance = 0; double distance = 0;
double max1 = 0; double max1 = 0;
@ -169,18 +169,17 @@ public:
// double_tmp_result and eps were growing all the time // double_tmp_result and eps were growing all the time
// no need to test for > eps as done earlier in at least one case // no need to test for > eps as done earlier in at least one case
if (double_tmp_result < -eps) return CGAL::SMALLER;
return CGAL::LARGER;
else
return CGAL::SMALLER;
CGAL_BRANCH_PROFILER_BRANCH_2(tmp); CGAL_BRANCH_PROFILER_BRANCH_2(tmp);
} }
return Base::operator()(s, b); return Base::Compare_distance::operator()(p, b, bound);
} }
}; };
AABB_statically_filtered_traits_3() : Base() {} AABB_statically_filtered_traits_3() : Base() {}
AABB_statically_filtered_traits_3(BboxMap bbm) : Base(bbm) {} AABB_statically_filtered_traits_3(BboxMap bbm) : Base(bbm) {}
Compare_distance compare_distance_object() const { return Compare_distance(); }
}; };
} //namespace CGAL } //namespace CGAL