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

harmless gcc warnings

This commit is contained in:
Paolo Cignoni 2012-02-09 17:55:41 +00:00
parent 159f9d0c0f
commit 1def190868
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/space/poly_packer.h
View File

@ -106,7 +106,7 @@ static bool PackAsEqualSquares(const std::vector< std::vector<Point2x> > &polyV
bbMax.Add(bbVec.back()); bbMax.Add(bbVec.back());
} }
float unitScale = 1.0/max(bbMax.DimX(),bbMax.DimY()); float unitScale = 1.0/std::max(bbMax.DimX(), bbMax.DimY());
float polyScale = unitScale * pixelPerPoly; float polyScale = unitScale * pixelPerPoly;
int baseX =0; int baseX =0;

16
wrap/qt/PolyToQImage.cpp
View File

@ -74,8 +74,8 @@ void PolyDumper::DrawPolygonMask(const vector< vector<Point2f> > &polyVec,
qp.setWidthF(0); qp.setWidthF(0);
///find the BB ///find the BB
vcg::Box2f bbox; vcg::Box2f bbox;
for(int i=0;i<polyVec.size();++i) for(size_t i=0;i<polyVec.size();++i)
for(int j=0;j<polyVec[i].size();++j) for(size_t j=0;j<polyVec[i].size();++j)
{ {
Point2f pp=polyVec[i][j]; Point2f pp=polyVec[i][j];
pp.Rotate(trans.rotRad); pp.Rotate(trans.rotRad);
@ -98,10 +98,10 @@ void PolyDumper::DrawPolygonMask(const vector< vector<Point2f> > &polyVec,
///DRAW THE POLYGON ///DRAW THE POLYGON
QPainterPath QPP; QPainterPath QPP;
for(int i=0;i<polyVec.size();++i) for(size_t i=0;i<polyVec.size();++i)
{ {
QVector<QPointF> ppQ; QVector<QPointF> ppQ;
for(int j=0;j<polyVec[i].size();++j) for(size_t j=0;j<polyVec[i].size();++j)
{ {
Point2f pp=polyVec[i][j]; Point2f pp=polyVec[i][j];
//pp.Rotate(trans.rotRad); //pp.Rotate(trans.rotRad);
@ -255,10 +255,10 @@ void PolyDumper::dumpPolySetPNG(const char * imageName,
painter.scale(trVec[i].sca,trVec[i].sca); painter.scale(trVec[i].sca,trVec[i].sca);
QPainterPath QPP; QPainterPath QPP;
for(int jj=0;jj<polyVecVec[i].size();++jj) for(size_t jj=0;jj<polyVecVec[i].size();++jj)
{ {
QVector<QPointF> ppQ; QVector<QPointF> ppQ;
for(int j=0;j<polyVecVec[i][jj].size();++j) for(size_t j=0;j<polyVecVec[i][jj].size();++j)
{ {
Point2f pp=polyVecVec[i][jj][j]; Point2f pp=polyVecVec[i][jj][j];
ppQ.push_back(QPointF(pp[0],pp[1])); ppQ.push_back(QPointF(pp[0],pp[1]));
@ -334,10 +334,10 @@ void PolyDumper::dumpPolySetSVG(const char * imageName,
painter.scale(trVec[i].sca,trVec[i].sca); painter.scale(trVec[i].sca,trVec[i].sca);
QPainterPath QPP; QPainterPath QPP;
for(int jj=0;jj<polyVecVec[i].size();++jj) for(size_t jj=0;jj<polyVecVec[i].size();++jj)
{ {
QVector<QPointF> ppQ; QVector<QPointF> ppQ;
for(int j=0;j<polyVecVec[i][jj].size();++j) for(size_t j=0;j<polyVecVec[i][jj].size();++j)
{ {
Point2f pp=polyVecVec[i][jj][j]; Point2f pp=polyVecVec[i][jj][j];
ppQ.push_back(QPointF(pp[0],pp[1])); ppQ.push_back(QPointF(pp[0],pp[1]));