diff --git a/Point_set_processing_3/include/CGAL/IO/write_las_points.h b/Point_set_processing_3/include/CGAL/IO/write_las_points.h index 56d8d84b2e3..b053c1d38d6 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_las_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_las_points.h @@ -105,7 +105,7 @@ namespace LAS { inline void output_value(LASpoint& r, const float& v, const LAS_property::Scan_angle&) { #if LAS_TOOLS_VERSION < 250517 - r.set_scan_angle_rank(v); + r.set_scan_angle_rank(I8_QUANTIZE(v)); #else r.set_scan_angle(v); #endif diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h index 91a585dc683..896644d1797 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h @@ -588,8 +588,6 @@ loop() { CGAL_SMS_TRACE(0, "Collapsing edges..."); - CGAL_assertion_code(size_type non_collapsable_count = 0); - // Pops and processes each edge from the PQ std::optional opt_h; @@ -635,8 +633,6 @@ loop() } else { - CGAL_assertion_code(++non_collapsable_count); - m_visitor.OnNonCollapsable(profile); CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " NOT Collapsible" ); @@ -656,8 +652,6 @@ loop() } else { - CGAL_assertion_code(++non_collapsable_count); - m_visitor.OnNonCollapsable(profile); CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " NOT Collapsible" ); @@ -668,8 +662,6 @@ loop() CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " uncomputable cost." ); } } - - CGAL_assertion_code(CGAL_USE(non_collapsable_count)); } template diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h index 34eca5b4923..0008a930bf9 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h @@ -188,7 +188,6 @@ class Segment_Delaunay_graph_face_tester_2 Edge_circulator ec = ec_start; size_type deg = 0; // vertex degree size_type n_degen = 0; // number of degenerate/non-infinite edges - size_type n_inf = 0; // number of infinite edges // number of non-degenerate/non-infinite edges size_type n_non_degen = 0; @@ -196,8 +195,7 @@ class Segment_Delaunay_graph_face_tester_2 Edge_tester e_tester; do { if ( e_tester(dual, ec) ) { ++n_degen; } - else if ( dual.is_infinite(ec) ) { ++n_inf; } - else { + else if ( !dual.is_infinite(ec) ) { if ( !dual.is_infinite(ec) ) { if ( n_non_degen < 2 ) { e[n_non_degen] = *ec; @@ -209,8 +207,6 @@ class Segment_Delaunay_graph_face_tester_2 ++ec; } while ( ec != ec_start ); - CGAL_USE(n_inf); - if ( deg == n_degen ) { return true; } if ( n_non_degen != 2 ) { return false; }