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

fix source vertex and face types

This commit is contained in:
Sébastien Loriot 2012-12-19 10:52:56 +01:00
parent d0f1090611
commit 09e42c760e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
View File

@ -1776,8 +1776,7 @@ copy_tds(const TDS_src& tds_src,
const ConvertVertex& convert_vertex, const ConvertVertex& convert_vertex,
const ConvertFace& convert_face) const ConvertFace& convert_face)
{ {
if (this == &tds_src) return Vertex_handle(); if (vert != typename TDS_src::Vertex_handle())
if (vert != Vertex_handle())
CGAL_triangulation_precondition( tds_src.is_vertex(vert)); CGAL_triangulation_precondition( tds_src.is_vertex(vert));
clear(); clear();
@ -1790,11 +1789,11 @@ copy_tds(const TDS_src& tds_src,
if(n == 0) {return Vertex_handle();} if(n == 0) {return Vertex_handle();}
//initializes maps //initializes maps
Unique_hash_map<Vertex_handle,Vertex_handle> vmap; Unique_hash_map<typename TDS_src::Vertex_handle,Vertex_handle> vmap;
Unique_hash_map<Face_handle,Face_handle> fmap; Unique_hash_map<typename TDS_src::Face_handle,Face_handle> fmap;
// create vertices // create vertices
Vertex_iterator vit1 = tds_src.vertices_begin(); typename TDS_src::Vertex_iterator vit1 = tds_src.vertices_begin();
for( ; vit1 != tds_src.vertices_end(); ++vit1) { for( ; vit1 != tds_src.vertices_end(); ++vit1) {
Vertex_handle vh = create_vertex( convert_vertex(*vit1) ); Vertex_handle vh = create_vertex( convert_vertex(*vit1) );
vmap[vit1] = vh; vmap[vit1] = vh;
@ -1802,7 +1801,7 @@ copy_tds(const TDS_src& tds_src,
} }
//create faces //create faces
Face_iterator fit1 = tds_src.faces().begin(); typename TDS_src::Face_iterator fit1 = tds_src.faces().begin();
for( ; fit1 != tds_src.faces_end(); ++fit1) { for( ; fit1 != tds_src.faces_end(); ++fit1) {
Face_handle fh = create_face( convert_face(*fit1) ); Face_handle fh = create_face( convert_face(*fit1) );
fmap[fit1] = fh; fmap[fit1] = fh;
@ -1827,7 +1826,7 @@ copy_tds(const TDS_src& tds_src,
// remove the post condition because it is false when copying the // remove the post condition because it is false when copying the
// TDS of a regular triangulation because of hidden vertices // TDS of a regular triangulation because of hidden vertices
// CGAL_triangulation_postcondition( is_valid() ); // CGAL_triangulation_postcondition( is_valid() );
return (vert == Vertex_handle()) ? Vertex_handle() : vmap[vert]; return (vert == typename TDS_src::Vertex_handle()) ? Vertex_handle() : vmap[vert];
} }
//utilities for copy_tds //utilities for copy_tds
@ -1865,6 +1864,7 @@ Triangulation_data_structure_2<Vb,Fb>::
copy_tds(const Tds &src, Vertex_handle vh) copy_tds(const Tds &src, Vertex_handle vh)
// return the vertex corresponding to vh in the new tds // return the vertex corresponding to vh in the new tds
{ {
if (this == &src) return Vertex_handle();
internal::TDS_2::Default_vertex_converter<Vertex,Vertex> setv; internal::TDS_2::Default_vertex_converter<Vertex,Vertex> setv;
internal::TDS_2::Default_face_converter<Face,Face> setf; internal::TDS_2::Default_face_converter<Face,Face> setf;
return copy_tds(src,vh,setv,setf); return copy_tds(src,vh,setv,setf);