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:
Guillaume Damiand 2020-04-08 09:23:59 +02:00
parent 130d430815
commit daab96982e
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -105,7 +105,7 @@ namespace CGAL {
typedef typename Base::Null_handle_type Null_handle_type;
using Base::null_handle;
using Base::null_dart_handle;
using Base::mdarts;
using Base::get_alpha;
using Base::is_free;

4
Generalized_map/include/CGAL/Generalized_map_storages.h
View File

@ -103,7 +103,7 @@ namespace CGAL {
// Init
void init_storage()
{}
{ null_dart_handle=nullptr; }
/** Return if this dart is free for adimension.
* @param dh a dart handle
@ -402,6 +402,8 @@ namespace CGAL {
}
protected:
Dart_handle null_dart_handle; // To be compatible with combinatorial map
/// Dart container.
Dart_container mdarts;

4
Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
View File

@ -122,7 +122,7 @@ namespace CGAL {
// Init
void init_storage()
{}
{ null_dart_handle=nullptr; }
/** Return if this dart is free for adimension.
* @param dh a dart handle
@ -435,6 +435,8 @@ namespace CGAL {
}
protected:
Dart_handle null_dart_handle; // To be compatible with combinatorial map
/// Dart container.
Dart_container mdarts;

1
Linear_cell_complex/include/CGAL/Linear_cell_complex_base.h
View File

@ -112,6 +112,7 @@ namespace CGAL {
using Base::create_dart;
using Base::attribute;
using Base::null_handle;
using Base::null_dart_handle;
using Base::point_of_vertex_attribute;
using Base::other_extremity;
using Base::darts;

10
Surface_mesh_topology/include/CGAL/Path_on_surface.h
View File

@ -246,7 +246,7 @@ public:
Dart_const_handle get_ith_real_dart(std::size_t i) const
{
CGAL_assertion(i<m_path.size());
return (get_ith_flip(i)?get_map().template opposite2(get_ith_dart(i)):
return (get_ith_flip(i)?get_map().opposite2(get_ith_dart(i)):
get_ith_dart(i));
}
@ -256,7 +256,7 @@ public:
{
CGAL_assertion(i<m_path.size());
return (get_ith_flip(i)?get_ith_dart(i):
get_map().template opposite2(get_ith_dart(i)));
get_map().opposite2(get_ith_dart(i)));
}
/// @return the first dart of the path, taking into account flip.
@ -372,7 +372,7 @@ public:
{
if (m_flip[i] && !get_map().template is_free<2>(m_path[i]))
{
m_path[i]=get_map().template opposite2(m_path[i]);
m_path[i]=get_map().opposite2(m_path[i]);
m_flip[i]=!m_flip[i];
}
else if (show_flips_left)
@ -562,7 +562,7 @@ public:
while (!get_map().darts().is_used(index) ||
(!get_map().template is_free<2>(get_map().dart_handle(index)) &&
get_map().dart_handle(index)>get_map().
template opposite2(get_map().dart_handle(index))))
opposite2(get_map().dart_handle(index))))
{
++index;
if (index==get_map().darts().capacity()) index=0;
@ -945,7 +945,7 @@ public:
/* This assert is long if (!m_map.darts().owns(m_path[i]))
{ return false; } */
if (m_path[i]==m_map.null_dart_handle)
if (m_path[i]==Map::null_handle || m_path[i]==m_map.null_dart_handle)
{ return false; }
last_vertex=m_flip[i-1]?m_path[i-1]:get_map().next(m_path[i-1]);