From d173bb9a88c0d215c894cc8d484fc0117468947e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 24 Nov 2003 20:58:15 +0000 Subject: [PATCH] *** empty log message *** --- .../Nuage_III/include/NUAGE/Extract_surface.h | 10 +++---- .../NUAGE/Local_selection_cell_base_3.h | 5 +++- .../NUAGE/Local_selection_vertex_base_3.h | 30 +++++++++---------- .../include/NUAGE/iofile_manipulator.h | 18 +++++------ Extension_Packages/Nuage_III/src/Makefile | 6 ++-- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/Extension_Packages/Nuage_III/include/NUAGE/Extract_surface.h b/Extension_Packages/Nuage_III/include/NUAGE/Extract_surface.h index 2b80244c9c7..b3b2c4406d6 100644 --- a/Extension_Packages/Nuage_III/include/NUAGE/Extract_surface.h +++ b/Extension_Packages/Nuage_III/include/NUAGE/Extract_surface.h @@ -83,7 +83,7 @@ public: last = false; } else { advance_on_boundary(); - if(pos == first_vertex){ + if(&*pos == &*first_vertex){ last = true; } } @@ -1685,7 +1685,7 @@ public: { std::list ch_set; T.incident_cells(vh, std::back_inserter(ch_set)); - for (std::list::iterator c_it = ch_set.begin(); + for (typename std::list::iterator c_it = ch_set.begin(); c_it != ch_set.end(); c_it++) (*c_it)->clear(); @@ -1698,7 +1698,7 @@ public: { std::list ch_set; T.incident_cells(vh, std::back_inserter(ch_set)); - for (std::list::iterator c_it = ch_set.begin(); + for (typename std::list::iterator c_it = ch_set.begin(); c_it != ch_set.end(); c_it++) { Cell_handle c = *c_it; @@ -1898,7 +1898,7 @@ public: std::list vh_list; T.incident_vertices(vh, std::back_inserter(vh_list)); - for (std::list::iterator v_it = vh_list.begin(); + for (typename std::list::iterator v_it = vh_list.begin(); v_it != vh_list.end(); v_it++) if ((*v_it)->is_on_border() && is_interior_edge(Edge_like(vh, *v_it))) return true; @@ -2037,7 +2037,7 @@ public: do { itmp = L_v.size(); - std::list::iterator new_end = + typename std::list::iterator new_end = std::remove_if(L_v.begin(), L_v.end(), Remove(*this,T)); L_v.erase(new_end, L_v.end()); } diff --git a/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_cell_base_3.h b/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_cell_base_3.h index 8e2cb83fbb4..6a4b8858ae7 100644 --- a/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_cell_base_3.h +++ b/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_cell_base_3.h @@ -26,6 +26,9 @@ public: typedef Local_selection_cell_base_3 Other; }; + typedef typename CellBase::Vertex_handle Vertex_handle; + typedef typename CellBase::Cell_handle Cell_handle; + private: #ifdef FACET_NUMBER @@ -219,4 +222,4 @@ facet_number(int i) }; -#endif LOCAL_SELECTION_CELL_BASE_3_H +#endif // LOCAL_SELECTION_CELL_BASE_3_H diff --git a/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_vertex_base_3.h b/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_vertex_base_3.h index 11fce2c5a96..74bd550aa24 100644 --- a/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_vertex_base_3.h +++ b/Extension_Packages/Nuage_III/include/NUAGE/Local_selection_vertex_base_3.h @@ -79,12 +79,12 @@ private: // and two iterators per vertex in this list // Note that ie_last is not past the end // ie_first == ie_last == interior_edge.end() iff the set is empty - std::list::iterator ie_first, ie_last; + typename std::list::iterator ie_first, ie_last; // We do the same for the incidence requests static std::list< Incidence_request_elt > incidence_requests; - std::list< Incidence_request_elt >::iterator ir_first, ir_last; + typename std::list< Incidence_request_elt >::iterator ir_first, ir_last; //-------------------- CONSTRUCTORS --------------------------------- public: @@ -160,14 +160,14 @@ public: } if(ir_first != incidence_requests.end()){ assert(ir_last != incidence_requests.end()); - std::list< Incidence_request_elt >::iterator b(ir_first), e(ir_last); + typename std::list< Incidence_request_elt >::iterator b(ir_first), e(ir_last); e++; incidence_requests.erase(b, e); } if(ie_first != interior_edges.end()){ assert(ie_last != interior_edges.end()); - std::list::iterator b(ie_first), e(ie_last); + typename std::list::iterator b(ie_first), e(ie_last); e++; interior_edges.erase(b, e); } @@ -186,7 +186,7 @@ public: if(ir_first != incidence_requests.end()){ assert(ir_last != incidence_requests.end()); - std::list< Incidence_request_elt >::iterator b(ir_first), e(ir_last); + typename std::list< Incidence_request_elt >::iterator b(ir_first), e(ir_last); e++; incidence_requests.erase(b, e); ir_first = incidence_requests.end(); @@ -312,9 +312,9 @@ public: if(ie_first == interior_edges.end()){ r1 = false; }else { - std::list::iterator b(ie_first), e(ie_last); + typename std::list::iterator b(ie_first), e(ie_last); e++; - std::list::iterator r = std::find(b, e, v); + typename std::list::iterator r = std::find(b, e, v); r1 = ( r != e); } @@ -328,10 +328,10 @@ public: ie_last = interior_edges.insert(ie_last, v); ie_first = ie_last; } else { - std::list::iterator e(ie_last); + typename std::list::iterator e(ie_last); e++; #ifdef DEBUG - std::list::iterator r = std::find(ie_first, e, v); + typename std::list::iterator r = std::find(ie_first, e, v); #endif assert(r == e); ie_last = interior_edges.insert(e, v); @@ -349,9 +349,9 @@ public: ie_first = ie_last; } } else { - std::list::iterator b(ie_first), e(ie_last); + typename std::list::iterator b(ie_first), e(ie_last); e++; - std::list::iterator r = std::find(b, e, v); + typename std::list::iterator r = std::find(b, e, v); if(r != e){ if(r == ie_first){ ie_first++; @@ -373,7 +373,7 @@ public: ir_last = incidence_requests.insert(ir_last, ir); ir_first = ir_last; } else { - std::list::iterator e(ir_last); + typename std::list::iterator e(ir_last); e++; ir_last = incidence_requests.insert(e, ir); } @@ -474,11 +474,11 @@ public: }; template -std::list::Vertex_handle> Local_selection_vertex_base_3::interior_edges; +std::list::Vertex_handle> Local_selection_vertex_base_3::interior_edges; template -std::list::Incidence_request_elt> Local_selection_vertex_base_3::incidence_requests; +std::list::Incidence_request_elt> Local_selection_vertex_base_3::incidence_requests; //------------------------------------------------------------------- -#endif LOCAL_SELECTION_VERTEX_BASE_3_H +#endif //LOCAL_SELECTION_VERTEX_BASE_3_H //------------------------------------------------------------------- diff --git a/Extension_Packages/Nuage_III/include/NUAGE/iofile_manipulator.h b/Extension_Packages/Nuage_III/include/NUAGE/iofile_manipulator.h index 5eb40adb18d..959f7f8ae1f 100644 --- a/Extension_Packages/Nuage_III/include/NUAGE/iofile_manipulator.h +++ b/Extension_Packages/Nuage_III/include/NUAGE/iofile_manipulator.h @@ -67,7 +67,7 @@ write_in_file_medit_selected_facets(char* foutput, const Surface& S) for (Finite_vertices_iterator v_it = T.finite_vertices_begin(); v_it != T.finite_vertices_end(); v_it++){ - CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; + typename CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; if ((!v_it->is_exterior()) && d == -1){ d = count; count++; @@ -168,7 +168,7 @@ write_in_file_gv_selected_facets(char* foutput, const Surface& S) for (Finite_vertices_iterator v_it = T.finite_vertices_begin(); v_it != T.finite_vertices_end(); v_it++){ - CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; + typename CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; if ((!v_it->is_exterior()) && d == -1){ d = count; count++; @@ -276,7 +276,7 @@ write_in_file_ply_selected_facets(char* foutput, const Surface& S) for (Finite_vertices_iterator v_it = T.finite_vertices_begin(); v_it != T.finite_vertices_end(); v_it++){ - CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; + typename CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; if ((!v_it->is_exterior()) && d == -1){ d = count; count++; @@ -369,7 +369,7 @@ write_in_file_iv_border_edges(const Surface& S, std::ofstream& os) typedef const Point* Const_point_star; std::vector points_tab(_vh_bord_count); - for (std::map::iterator vh_it = _vh_vect.begin(); + for (typename std::map::iterator vh_it = _vh_vect.begin(); vh_it != _vh_vect.end(); vh_it++) points_tab[vh_it->second] = &vh_it->first->point(); @@ -447,7 +447,7 @@ write_in_file_iv_remaining_points(const Surface& S, std::ofstream& os) typedef const Point* Const_point_star; std::vector points_tab(_vh_bord_count); - for (std::map::iterator vh_it = _vh_vect.begin(); + for (typename std::map::iterator vh_it = _vh_vect.begin(); vh_it != _vh_vect.end(); vh_it++) points_tab[vh_it->second] = &vh_it->first->point(); @@ -513,7 +513,7 @@ write_in_file_iv_border_facets(const Surface& S, std::ofstream& os) typedef const Point* Const_point_star; std::vector points_tab(_vh_bord_count); - for (std::map::iterator vh_it = _vh_vect.begin(); + for (typename std::map::iterator vh_it = _vh_vect.begin(); vh_it != _vh_vect.end(); vh_it++) points_tab[vh_it->second] = &vh_it->first->point(); @@ -672,7 +672,7 @@ write_in_file_iv_selected_facets(char* foutput, const Surface& S, for (Finite_vertices_iterator v_it = T.finite_vertices_begin(); v_it != T.finite_vertices_end(); v_it++){ - CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; + typename CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; if ((!v_it->is_exterior()) && d == -1){ d = count; count++; @@ -854,7 +854,7 @@ write_in_file_vrml2_selected_facets(char* foutput, const Surface& S, for (Finite_vertices_iterator v_it = T.finite_vertices_begin(); v_it != T.finite_vertices_end(); v_it++){ - CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; + typename CGAL::Unique_hash_map::Data& d = vertex_index_map[v_it]; if ((!v_it->is_exterior()) && d == -1){ d = count; count++; @@ -919,7 +919,7 @@ write_in_file_vrml2_selected_facets(char* foutput, const Surface& S, write_boundaries(os, S); } - Surface::Outlier_iterator pit = S.outliers_begin(); + typename Surface::Outlier_iterator pit = S.outliers_begin(); if(pit != S.outliers_end()) { os << "Shape {\n" diff --git a/Extension_Packages/Nuage_III/src/Makefile b/Extension_Packages/Nuage_III/src/Makefile index b24301ab310..c8b45dbab1b 100644 --- a/Extension_Packages/Nuage_III/src/Makefile +++ b/Extension_Packages/Nuage_III/src/Makefile @@ -4,7 +4,9 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-105/make/makefile_i686_CYGWINNT-5.0-1.3.12_ICL.EXE-7 +#CGAL_MAKEFILE = c:/cgal/CGAL-2.5-I-154/make/makefile_i686_CYGWINNT-5.1-1.5.5_ICL.EXE-7 + +CGAL_MAKEFILE = /cygdrive/c/cgal/CGAL-2.5-I-154/make/makefile_i686_CYGWINNT-5.1-1.5.5_g++-3.3.1 #CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-93/make/makefile_i686_CYGWINNT-5.0-1.3.12_g++-2.95 #CGAL_MAKEFILE =/cygdrive/d/cgal/CGAL-2.5-I-93/make/makefile_i686_CYGWINNT-5.0-1.3.12_ICL.EXE-7 #CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-36/make/makefile_i686_CYGWINNT-5.0-1.3.12_bcc32.exe-5.51 @@ -21,7 +23,7 @@ MY_OPT_FLAGS = -DNOLAZY -DBLIND -DDEBUG #pour desactiver le dump dans geomview -DBLIND #pour desactiver l'evaluation paresseuse -DNOLAZY -CXXFLAGS = \ +CXXFLAGS = -O3 -DNDEBUG \ $(CGAL_CXXFLAGS) -I../include $(MY_OPT_FLAGS)