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

Surface_mesh_shortest_path

This commit is contained in:
Andreas Fabri 2018-01-17 21:56:19 +00:00
parent 39b1431fca
commit f723c527e1
6 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Surface_mesh_segmentation.h> #include <CGAL/license/Surface_mesh_segmentation.h>
#include <CGAL/disable_warnings.h>
/// @cond CGAL_DOCUMENT_INTERNAL /// @cond CGAL_DOCUMENT_INTERNAL
@ -265,4 +266,7 @@ public:
/// @endcond /// @endcond
}//namespace CGAL }//namespace CGAL
#undef CGAL_ANGLE_ST_DEV_DIVIDER #undef CGAL_ANGLE_ST_DEV_DIVIDER
#include <CGAL/enable_warnings.h>
#endif //CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H #endif //CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H

3
Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Surface_mesh_segmentation.h> #include <CGAL/license/Surface_mesh_segmentation.h>
#include <CGAL/disable_warnings.h>
/** /**
* @file mesh_segmentation.h * @file mesh_segmentation.h
@ -499,4 +500,6 @@ segmentation_via_sdf_values(const TriangleMesh& triangle_mesh,
}//namespace CGAL }//namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H // #endif // CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H //

4
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Surface_mesh_shortest_path.h> #include <CGAL/license/Surface_mesh_shortest_path.h>
#include <CGAL/disable_warnings.h>
#include <iterator> #include <iterator>
#include <vector> #include <vector>
@ -2059,7 +2060,6 @@ public:
std::cout << "Final node count: " << m_currentNodeCount << std::endl; std::cout << "Final node count: " << m_currentNodeCount << std::endl;
} }
return; return;
CGAL_assertion(m_currentNodeCount == 0);
#endif #endif
} }
@ -2808,4 +2808,6 @@ public:
} // namespace CGAL } // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_SURFACE_MESH_SHORTEST_PATH_SURFACE_MESH_SHORTEST_PATH_H #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_SURFACE_MESH_SHORTEST_PATH_H

2
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Surface_mesh_shortest_path.h> #include <CGAL/license/Surface_mesh_shortest_path.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Surface_mesh_shortest_path/barycentric.h> #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
#include <CGAL/Surface_mesh_shortest_path/function_objects.h> #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
@ -225,5 +226,6 @@ public:
} // namespace CGAL } // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_SURFACE_MESH_SHORTEST_PATH_TRAITS_H #endif // CGAL_SURFACE_MESH_SHORTEST_PATH_TRAITS_H

3
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/barycentric.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Surface_mesh_shortest_path.h> #include <CGAL/license/Surface_mesh_shortest_path.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
@ -262,4 +263,6 @@ public:
} // namespace CGAL } // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_SURFACE_MESH_SHORTEST_PATHS_3_BARYCENTRIC_H #endif // CGAL_SURFACE_MESH_SHORTEST_PATHS_3_BARYCENTRIC_H

2
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
View File

@ -90,7 +90,7 @@ struct TestMeshProgramInstance
if (randomizer) if (randomizer)
{ {
return shortestPath.face_location(vertices[randomizer->get_int(0, vertices.size())]); return shortestPath.face_location(vertices[randomizer->get_int(0, static_cast<int>(vertices.size()))]);
} }
else else
{ {