From df39cceb585a01da9807d5c57dc86d670b85d642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 29 May 2020 18:12:18 +0200 Subject: [PATCH] Misc fixes --- .../reconstruction_structured.cpp | 6 +++--- .../doc/Alpha_shapes_3/Alpha_shapes_3.txt | 2 +- BGL/examples/BGL_LCC/distance_lcc.cpp | 4 ++-- BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h | 8 ++++---- ...es_Linear_cell_complex_for_combinatorial_map.h | 15 +++++++++++++++ Stream_support/include/CGAL/IO/polygon_soup_io.h | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp index cca5609f509..e7a7b4ba5e5 100644 --- a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp +++ b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp @@ -114,9 +114,9 @@ int main (int argc, char* argv[]) // Loading point set from a file. if (!CGAL::read_points(fname, - std::back_inserter(points), - CGAL::parameters::point_map(Point_map()). - normal_map(Normal_map()))) + std::back_inserter(points), + CGAL::parameters::point_map(Point_map()). + normal_map(Normal_map()))) { std::cerr << "Error: cannot read file" << std::endl; return EXIT_FAILURE; diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Alpha_shapes_3.txt b/Alpha_shapes_3/doc/Alpha_shapes_3/Alpha_shapes_3.txt index fdd63f691f8..30cc7664e39 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Alpha_shapes_3.txt +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Alpha_shapes_3.txt @@ -194,7 +194,7 @@ the vertices, edges, facets and cells of the different types \subsection AlphaShape3DIO Input/Output It is possible to export a 3D alpha shape to a `std::ostream` or to a `Geomview_stream` -using the `operator<<`. More information in the references of `Alpha_shape_3`. +using the `operator<<`, see the documentation of the class `Alpha_shape_3` for more information. \section AlphaShape3D_ConceptAndModels Concepts and Models diff --git a/BGL/examples/BGL_LCC/distance_lcc.cpp b/BGL/examples/BGL_LCC/distance_lcc.cpp index 7d76d579cb3..afc32287a34 100644 --- a/BGL/examples/BGL_LCC/distance_lcc.cpp +++ b/BGL/examples/BGL_LCC/distance_lcc.cpp @@ -36,8 +36,8 @@ int main(int argc, char** argv) // bfs = breadth first search explores the graph // Just as the distance_recorder there is a way to record the predecessor of a vertex boost::breadth_first_search(lcc, - vd, - visitor(boost::make_bfs_visitor + vd, + visitor(boost::make_bfs_visitor (boost::record_distances (make_iterator_property_map (distance.begin(), diff --git a/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h b/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h index 12cfa040d28..73c9cef13ce 100644 --- a/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h +++ b/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h @@ -74,7 +74,7 @@ bool read_polygon_mesh(std::istream& is, * \param fname the name of the file. Its extension must be one of the following : * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"), - * `.vtp`(\ref IOStreamVTK "VTP file format") or `.ts`(\ref IOStreamGocad "GOCAD file format"). + * `.vtp` (\ref IOStreamVTK "VTP file format") or `.ts` (\ref IOStreamGocad "GOCAD file format"). * \param g the mesh * \param verbose whether extra information is printed when an incident occurs during reading * \param np optional \ref pmp_namedparameters "Named Parameters" described below @@ -163,7 +163,7 @@ bool read_polygon_mesh(const char* fname, FaceGraph& g) * \param fname the name of the file. Its extension must be one of the following : * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"), - * `.vtp`(\ref IOStreamVTK "VTP file format") or `.ts`(\ref IOStreamGocad "GOCAD file format"). + * `.vtp` (\ref IOStreamVTK "VTP file format") or `.ts` (\ref IOStreamGocad "GOCAD file format"). * \param g the mesh to be output * \param verbose whether extra information is printed when an incident occurs during writing * \param np optional \ref pmp_namedparameters "Named Parameters" described below @@ -181,8 +181,8 @@ bool read_polygon_mesh(const char* fname, FaceGraph& g) */ template bool write_polygon_mesh(const std::string& fname, - FaceGraph& g, - const NamedParameters& np, + FaceGraph& g, + const NamedParameters& np, const bool verbose = false) { const std::string ext = IO::internal::get_file_extension(fname); diff --git a/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h b/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h index 582d7d956b8..ff980a8c53e 100644 --- a/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h +++ b/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h @@ -186,6 +186,7 @@ struct LCC_property_map typedef type const_type; }; }; + template <> struct LCC_property_map { @@ -197,6 +198,8 @@ struct LCC_property_map typedef type const_type; }; }; + + template <> struct LCC_property_map { @@ -208,6 +211,7 @@ struct LCC_property_map typedef type const_type; }; }; + template <> struct LCC_property_map { @@ -234,6 +238,7 @@ get(boost::halfedge_external_index_t, CGAL_LCC_TYPE const&) return typename boost::property_map:: const_type(halfedges(ncmap).begin(), halfedges(ncmap).end(), num_halfedges(ncmap)); } + template typename boost::property_map::const_type get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&) @@ -242,6 +247,7 @@ get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&) return typename boost::property_map:: const_type(vertices(ncmap).begin(), vertices(ncmap).end(), num_vertices(ncmap)); } + template typename boost::property_map::const_type get(boost::edge_external_index_t, CGAL_LCC_TYPE const&) @@ -249,6 +255,7 @@ get(boost::edge_external_index_t, CGAL_LCC_TYPE const&) return typename boost::property_map:: const_type(const_cast(cmap)); } + template typename boost::property_map::const_type get(boost::face_external_index_t, CGAL_LCC_TYPE const&) @@ -267,6 +274,7 @@ get(boost::edge_index_t, CGAL_LCC_TYPE const& cmap) return typename boost::property_map:: const_type(const_cast(cmap)); } + template typename boost::property_map::const_type get(boost::halfedge_index_t, CGAL_LCC_TYPE const& cmap) @@ -274,6 +282,7 @@ get(boost::halfedge_index_t, CGAL_LCC_TYPE const& cmap) return typename boost::property_map:: const_type(const_cast(cmap)); } + template typename boost::property_map::const_type get(boost::vertex_index_t, CGAL_LCC_TYPE const& cmap) @@ -281,6 +290,7 @@ get(boost::vertex_index_t, CGAL_LCC_TYPE const& cmap) return typename boost::property_map:: const_type(const_cast(cmap)); } + template typename boost::property_map::const_type get(boost::face_index_t, CGAL_LCC_TYPE const& cmap) @@ -288,6 +298,7 @@ get(boost::face_index_t, CGAL_LCC_TYPE const& cmap) return typename boost::property_map:: const_type(const_cast(cmap)); } + */ /*template @@ -316,6 +327,7 @@ get(boost::halfedge_external_index_t, CGAL_LCC_TYPE&) return typename boost::property_map:: type(halfedges(cmap).begin(), halfedges(cmap).end(), num_halfedges(cmap)); } + template typename boost::property_map::type get(boost::vertex_external_index_t, CGAL_LCC_TYPE&) @@ -323,6 +335,7 @@ get(boost::vertex_external_index_t, CGAL_LCC_TYPE&) return typename boost::property_map:: type(vertices(cmap).begin(), vertices(cmap).end(), num_vertices(cmap)); } + template typename boost::property_map::type get(boost::edge_external_index_t, CGAL_LCC_TYPE& cmap) @@ -330,6 +343,8 @@ get(boost::edge_external_index_t, CGAL_LCC_TYPE& cmap) return typename boost::property_map:: type(const_cast(cmap)); } + + template typename boost::property_map::type get(boost::face_external_index_t, CGAL_LCC_TYPE&) diff --git a/Stream_support/include/CGAL/IO/polygon_soup_io.h b/Stream_support/include/CGAL/IO/polygon_soup_io.h index 924977e9cb6..51cc1860e4a 100644 --- a/Stream_support/include/CGAL/IO/polygon_soup_io.h +++ b/Stream_support/include/CGAL/IO/polygon_soup_io.h @@ -65,7 +65,7 @@ std::string get_file_extension(const std::string fname) * \param fname the name of the file. Its extension must be one of the following : * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format") - * or `.ts`(\ref IOStreamGocad "GOCAD file format"). + * or `.ts` (\ref IOStreamGocad "GOCAD file format"). * \param polygons each element in the range describes a polygon * using the indices of the vertices. * \param points points of the soup of polygons @@ -126,7 +126,7 @@ bool read_polygon_soup(const std::string& fname, * \param fname the name of the file. Its extension must be one of the following : * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format") - * or `.ts`(\ref IOStreamGocad "GOCAD file format"). + * or `.ts` (\ref IOStreamGocad "GOCAD file format"). * \param polygons each element in the range describes a polygon * using the indices of the vertices. * \param points points of the soup of polygons