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

- removed compiler time errors

This commit is contained in:
granzuglia 2015-07-06 02:38:32 +00:00
parent 73ee392537
commit 1dc8a067ac
4 changed files with 1380 additions and 1372 deletions
vcg
complex/algorithms
clean.h
update
topology.h
space/index/kdtree
kdtree.h
wrap/gl
gl_mesh_attributes_feeder.h

2
vcg/complex/algorithms/clean.h
View File

@ -1837,7 +1837,7 @@ public:
{ {
std::vector<typename MeshType::VertexPointer> temp; std::vector<typename MeshType::VertexPointer> temp;
vcg::face::VVStarVF<typename MeshType::FaceType>(f->V(j), temp); vcg::face::VVStarVF<typename MeshType::FaceType>(f->V(j), temp);
std::vector<typename MeshType::VertexPointer>::iterator iter = temp.begin(); typename std::vector<typename MeshType::VertexPointer>::iterator iter = temp.begin();
for (; iter != temp.end(); iter++) for (; iter != temp.end(); iter++)
{ {
if ((*iter) != f->V1(j) && (*iter) != f->V2(j)) if ((*iter) != f->V1(j) && (*iter) != f->V2(j))

2
vcg/complex/algorithms/update/topology.h
View File

@ -351,7 +351,7 @@ static void FaceFaceFromTexCoord(MeshType &m)
bool isBorder = false; bool isBorder = false;
if (!vcg::face::IsBorder((*fi), i)) if (!vcg::face::IsBorder((*fi), i))
{ {
MeshType::FacePointer nextFace = (*fi).FFp(i); typename MeshType::FacePointer nextFace = (*fi).FFp(i);
int nextEdgeIndex = (*fi).FFi(i); int nextEdgeIndex = (*fi).FFi(i);
bool border = false; bool border = false;
if ((*fi).cV(i) == nextFace->cV(nextEdgeIndex)) if ((*fi).cV(i) == nextFace->cV(nextEdgeIndex))

2
vcg/space/index/kdtree/kdtree.h
View File

@ -31,7 +31,7 @@
#include <vector> #include <vector>
#include <limits> #include <limits>
#include <iostream> #include <iostream>
#include <cstdint> //#include <cstdint>
namespace vcg { namespace vcg {

2614
wrap/gl/gl_mesh_attributes_feeder.h
View File

File diff suppressed because it is too large Load Diff