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

some fixes

This commit is contained in:
Sven Oesau 2025-09-03 17:16:07 +02:00
parent ea15e10289
commit e84de2cead
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Point_set_processing_3/include/CGAL/IO/write_las_points.h
View File

@ -105,7 +105,7 @@ namespace LAS {
inline void output_value(LASpoint& r, const float& v, const LAS_property::Scan_angle&) inline void output_value(LASpoint& r, const float& v, const LAS_property::Scan_angle&)
{ {
#if LAS_TOOLS_VERSION < 250517 #if LAS_TOOLS_VERSION < 250517
r.set_scan_angle_rank(v); r.set_scan_angle_rank(I8_QUANTIZE(v));
#else #else
r.set_scan_angle(v); r.set_scan_angle(v);
#endif #endif

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h
View File

@ -588,8 +588,6 @@ loop()
{ {
CGAL_SMS_TRACE(0, "Collapsing edges..."); CGAL_SMS_TRACE(0, "Collapsing edges...");
CGAL_assertion_code(size_type non_collapsable_count = 0);
// Pops and processes each edge from the PQ // Pops and processes each edge from the PQ
std::optional<halfedge_descriptor> opt_h; std::optional<halfedge_descriptor> opt_h;
@ -635,8 +633,6 @@ loop()
} }
else else
{ {
CGAL_assertion_code(++non_collapsable_count);
m_visitor.OnNonCollapsable(profile); m_visitor.OnNonCollapsable(profile);
CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " NOT Collapsible" ); CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " NOT Collapsible" );
@ -656,8 +652,6 @@ loop()
} }
else else
{ {
CGAL_assertion_code(++non_collapsable_count);
m_visitor.OnNonCollapsable(profile); m_visitor.OnNonCollapsable(profile);
CGAL_SMS_TRACE(1, edge_to_string(*opt_h) << " NOT Collapsible" ); 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_SMS_TRACE(1, edge_to_string(*opt_h) << " uncomputable cost." );
} }
} }
CGAL_assertion_code(CGAL_USE(non_collapsable_count));
} }
template<class TM, class GT, class SP, class VIM, class VPM,class HIM, class ECM, class CF, class PF, class SI, class V, bool URH> template<class TM, class GT, class SP, class VIM, class VPM,class HIM, class ECM, class CF, class PF, class SI, class V, bool URH>

6
Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h
View File

@ -188,7 +188,6 @@ class Segment_Delaunay_graph_face_tester_2
Edge_circulator ec = ec_start; Edge_circulator ec = ec_start;
size_type deg = 0; // vertex degree size_type deg = 0; // vertex degree
size_type n_degen = 0; // number of degenerate/non-infinite edges 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 // number of non-degenerate/non-infinite edges
size_type n_non_degen = 0; size_type n_non_degen = 0;
@ -196,8 +195,7 @@ class Segment_Delaunay_graph_face_tester_2
Edge_tester e_tester; Edge_tester e_tester;
do { do {
if ( e_tester(dual, ec) ) { ++n_degen; } if ( e_tester(dual, ec) ) { ++n_degen; }
else if ( dual.is_infinite(ec) ) { ++n_inf; } else if ( !dual.is_infinite(ec) ) {
else {
if ( !dual.is_infinite(ec) ) { if ( !dual.is_infinite(ec) ) {
if ( n_non_degen < 2 ) { if ( n_non_degen < 2 ) {
e[n_non_degen] = *ec; e[n_non_degen] = *ec;
@ -209,8 +207,6 @@ class Segment_Delaunay_graph_face_tester_2
++ec; ++ec;
} while ( ec != ec_start ); } while ( ec != ec_start );
CGAL_USE(n_inf);
if ( deg == n_degen ) { return true; } if ( deg == n_degen ) { return true; }
if ( n_non_degen != 2 ) { return false; } if ( n_non_degen != 2 ) { return false; }