From efbd86df7f6cf0ebb6e95982bc4c3a922d3701e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 4 Oct 2021 11:10:36 +0200 Subject: [PATCH] extra manual fixes --- .../Heat_method_3/heat_method_surface_mesh_intrinsic_test.cpp | 2 +- .../examples/Polygon_mesh_processing/match_faces.cpp | 2 +- .../self_intersection_surface_mesh_test.cpp | 2 +- Shape_detection/test/Shape_detection/CMakeLists.txt | 4 ++-- Surface_mesh/examples/Surface_mesh/sm_do_intersect.cpp | 2 +- .../Surface_mesh_topology/path_simplicity_double_torus.cpp | 2 +- .../Surface_mesh_topology/path_simplicity_double_torus_2.cpp | 2 +- .../Triangulation_on_sphere_2/triang_on_sphere_exact.cpp | 4 ++-- .../Triangulation_on_sphere_2/triang_on_sphere_geo.cpp | 2 +- .../Triangulation_on_sphere_2/triang_on_sphere_range.cpp | 2 +- Voronoi_diagram_2/test/Voronoi_diagram_2/vda_tos2.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_intrinsic_test.cpp b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_intrinsic_test.cpp index e4aeb76dd2c..035acdb34b0 100644 --- a/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_intrinsic_test.cpp +++ b/Heat_method_3/test/Heat_method_3/heat_method_surface_mesh_intrinsic_test.cpp @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) { //read in mesh Surface_mesh sm; - const char* filename = (argc > 1) ? argv[1] : "./data/rectangle_with_degenerate_faces.off"; + const char* filename = (argc > 1) ? argv[1] : "data/rectangle_with_degenerate_faces.off"; std::ifstream in(filename); in >> sm; //property map for the distance values to the source set diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp index 4737c6282a1..48afef6c1d1 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/match_faces.cpp @@ -24,7 +24,7 @@ namespace PMP = CGAL::Polygon_mesh_processing; int main(int argc, char* argv[]) { - const char* filename1 = (argc > 1) ? argv[1] : CGAL::data_file_path("meshes/P.off"); + const std::string filename1 = (argc > 1) ? argv[1] : CGAL::data_file_path("meshes/P.off"); Surface_mesh mesh1; Polyhedron mesh2; diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp index 24fb284356f..6e017c948c0 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp @@ -83,7 +83,7 @@ int test_self_intersections(const std::string filename, } template -int test_limited_self_intersections(const char* filename) +int test_limited_self_intersections(const std::string& filename) { typedef CGAL::Surface_mesh Mesh; typedef typename boost::graph_traits::face_descriptor face_descriptor; diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt index 38bdf72c817..e24e8fe6270 100644 --- a/Shape_detection/test/Shape_detection/CMakeLists.txt +++ b/Shape_detection/test/Shape_detection/CMakeLists.txt @@ -49,10 +49,10 @@ if(EIGEN3_FOUND) file(GLOB proto_misc_src "${RANSAC_PROTO_DIR}/MiscLib/*.cpp") add_library(libproto STATIC ${proto_src} ${proto_misc_src}) add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp") - target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Eigen3_support) + target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Data CGAL::Eigen3_support) else() add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp") - target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Eigen3_support) + target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Data CGAL::Eigen3_support) endif() cgal_add_test(test_validity_sampled_data) endif() diff --git a/Surface_mesh/examples/Surface_mesh/sm_do_intersect.cpp b/Surface_mesh/examples/Surface_mesh/sm_do_intersect.cpp index 80a250becf2..0b6e533c9d0 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_do_intersect.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_do_intersect.cpp @@ -112,7 +112,7 @@ int main(int argc, char* argv[]) } Mesh P, Q; - if(!CGAL::IO::read_polygon_mesh(P_name, P) || !CGAL::IO::read_polygon_mesh(Q_name], Q)) + if(!CGAL::IO::read_polygon_mesh(P_name, P) || !CGAL::IO::read_polygon_mesh(Q_name, Q)) { std::cerr << "Invalid input files." << std::endl; return EXIT_FAILURE; diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp index 4b3fdc3dd82..4bbe27c670b 100644 --- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp +++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp @@ -81,7 +81,7 @@ int main(int argc, char** argv) { bool draw=(argc>1?std::string(argv[1])=="-draw":false); LCC_3_cmap lcc; - if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off"))) + if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off").c_str())) { std::cout<<"ERROR reading file data/double-torus.off"<1?std::string(argv[1])=="-draw":false); LCC_3_cmap lcc; - if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off"))) + if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off").c_str())) { std::cout<<"ERROR reading file data/double-torus.off"< template -void create_triangulation(const char* filename) +void create_triangulation(const std::string& filename) { typedef typename Kernel::FT FT; @@ -59,7 +59,7 @@ int main(int argc, char** argv) // and thus a separation mechanism is needed to ensure that no points are hidden typedef CGAL::Exact_predicates_inexact_constructions_kernel EPICK; - const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); + const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); create_triangulation(filename); create_triangulation(filename); diff --git a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_geo.cpp b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_geo.cpp index b7267b12957..f2dcb474906 100644 --- a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_geo.cpp +++ b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_geo.cpp @@ -25,7 +25,7 @@ int main(int argc, char** argv) { std::cout.precision(17); - const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); + const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); Traits traits(Point_3(0, 0, 0), 100); diff --git a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_range.cpp b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_range.cpp index 025de62e538..c6c433f824c 100644 --- a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_range.cpp +++ b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/triang_on_sphere_range.cpp @@ -17,7 +17,7 @@ int main(int argc, char** argv) { std::cout.precision(17); - const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); + const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); std::vector points; double x, y, z; diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_tos2.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_tos2.cpp index fb12faf9a05..18dd6ec5700 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_tos2.cpp +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_tos2.cpp @@ -34,7 +34,7 @@ typedef CGAL::Voronoi_diagram_2 VD; int main(int argc, char** argv) { - const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); + const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); const double radius = (argc > 2) ? std::stod(argv[2]) : 1; const double step = (argc > 3) ? std::stod(argv[3]) : 0.01;