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

Bug-fix: bug with Null in Labeled_mesh_domain_3 

The bug was introduced in the PR #1010, and was only exposed when the
`Null_subdomain_index` functor was non-trivial.
This commit is contained in:
Laurent Rineau 2016-09-01 19:39:13 +02:00
parent 056df4d93d
commit 955ca9a55d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
View File

@ -360,7 +360,8 @@ public:
// If the two points are enough close, then we return midpoint
if ( squared_distance(p1, p2) < r_domain_.squared_error_bound_ )
{
CGAL_assertion(value_at_p1 != value_at_p2);
CGAL_assertion(value_at_p1 != value_at_p2 &&
! ( r_domain_.null(value_at_p1) && r_domain_.null(value_at_p2) ) );
const Surface_patch_index sp_index =
r_domain_.make_surface_index(value_at_p1, value_at_p2);
const Index index = r_domain_.index_from_surface_patch_index(sp_index);
@ -372,7 +373,8 @@ public:
// change p2 if f(p1)!=f(p2).
// That allows us to find the first intersection from a of [a,b] with
// a surface.
if ( value_at_p1 != value_at_mid )
if ( value_at_p1 != value_at_mid &&
! ( r_domain_.null(value_at_p1) && r_domain_.null(value_at_mid) ) )
{
p2 = mid;
value_at_p2 = value_at_mid;