manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcc compiling issues (again using template keyword to disambiguate templated functions in templated classes)

This commit is contained in:
Paolo Cignoni 2008-09-25 16:10:47 +00:00
parent a097ef4df9
commit f3bddee157
1 changed files with 674 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vcg/complex/trimesh/autoalign_4pcs.h
View File

@ -433,11 +433,11 @@ FourPCS<MeshType>::FindCongruent() { // of base B, on Q, with approximation delt
int vi,vj; int vi,vj;
typename PMesh::VertexIterator vii; typename PMesh::VertexIterator vii;
std::vector<Couple>::iterator bR1,eR1,bR2,eR2,ite,cite; typename std::vector<Couple>::iterator bR1,eR1,bR2,eR2,ite,cite;
bR1 = std::lower_bound<std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d1-prs.delta*2.0)); bR1 = std::lower_bound<typename std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d1-prs.delta*2.0));
eR1 = std::lower_bound<std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d1+prs.delta*2.0)); eR1 = std::lower_bound<typename std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d1+prs.delta*2.0));
bR2 = std::lower_bound<std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d2-prs.delta*2.0)); bR2 = std::lower_bound<typename std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d2-prs.delta*2.0));
eR2 = std::lower_bound<std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d2+prs.delta*2.0)); eR2 = std::lower_bound<typename std::vector<Couple>::iterator,Couple>(R1.begin(),R1.end(),Couple(d2+prs.delta*2.0));
// in [bR1,eR1) there are all the pairs ad a distance d1 +- prs.delta // in [bR1,eR1) there are all the pairs ad a distance d1 +- prs.delta
// in [bR1,eR1) there are all the pairs ad a distance d2 +- prs.delta // in [bR1,eR1) there are all the pairs ad a distance d2 +- prs.delta
@ -456,7 +456,7 @@ FourPCS<MeshType>::FindCongruent() { // of base B, on Q, with approximation delt
if(Invr.vert.empty() ) return false; if(Invr.vert.empty() ) return false;
// index remaps a vertex of Invr to its corresponding point in R1 // index remaps a vertex of Invr to its corresponding point in R1
PMesh::PerVertexAttributeHandle<int> id = vcg::tri::Allocator<PMesh>::AddPerVertexAttribute<int>(Invr,std::string("index")); typename PMesh::template PerVertexAttributeHandle<int> id = vcg::tri::Allocator<PMesh>::template AddPerVertexAttribute<int>(Invr,std::string("index"));
i = &(*bR1)-&(*R1.begin()); i = &(*bR1)-&(*R1.begin());
for(vii = Invr.vert.begin(); vii != Invr.vert.end();++vii,++i) id[vii] = i; for(vii = Invr.vert.begin(); vii != Invr.vert.end();++vii,++i) id[vii] = i;
@ -530,7 +530,7 @@ FourPCS<MeshType>::FindCongruent() { // of base B, on Q, with approximation delt
} }
delete ugrid; delete ugrid;
vcg::tri::Allocator<PMesh>::DeletePerVertexAttribute<int>(Invr,id); vcg::tri::Allocator<PMesh>::DeletePerVertexAttribute(Invr,id);
printf("n_closests %5d = (An %5d ) + ( Tr %5d ) + (OK) %5d\n",n_closests,acf,trf,n_congr); printf("n_closests %5d = (An %5d ) + ( Tr %5d ) + (OK) %5d\n",n_closests,acf,trf,n_congr);
return done; return done;