diff --git a/src/general.pri b/src/general.pri index b5499535f..c46845ddf 100644 --- a/src/general.pri +++ b/src/general.pri @@ -27,6 +27,11 @@ CONFIG(system_eigen3): EIGENDIR = /usr/include/eigen3 !CONFIG(system_eigen3):EIGENDIR = $$VCGDIR/eigenlib !CONFIG(system_glew): GLEWDIR = $$MESHLAB_EXTERNAL_DIRECTORY/glew-2.1.0 +## Warnings Settings ## +#not showing warnings from external libraries +QMAKE_CXXFLAGS+=-Wno-unused-result #warning on unused result from fscanf... +QMAKE_CFLAGS+=-Wno-unused-result + ######## WINDOWS SETTINGS ########## diff --git a/src/meshlabplugins/decorate_background/decorate_background.cpp b/src/meshlabplugins/decorate_background/decorate_background.cpp index f9ae23de2..de5178281 100644 --- a/src/meshlabplugins/decorate_background/decorate_background.cpp +++ b/src/meshlabplugins/decorate_background/decorate_background.cpp @@ -358,6 +358,7 @@ void DecorateBackgroundPlugin::DrawGriddedCube(MLSceneGLSharedDataContext* share // qDebug("BG Grid boxF %7.3f %7.3f %7.3f # %7.3f %7.3f %7.3f",minP[0],minP[1],minP[2],maxP[0],maxP[1],maxP[2]); // qDebug("BG Grid boxG %7.3f %7.3f %7.3f # %7.3f %7.3f %7.3f",minG[0],minG[1],minG[2],maxG[0],maxG[1],maxG[2]); for (int ii=0;ii<3;++ii) + { for(int jj=0;jj<2;++jj) { bool front = FrontFacing(viewPos,ii,jj,minP,maxP); @@ -374,12 +375,12 @@ void DecorateBackgroundPlugin::DrawGriddedCube(MLSceneGLSharedDataContext* share } } } - - glDisable(GL_BLEND); - glPopAttrib(); + } + glDisable(GL_BLEND); + glPopAttrib(); } -void DecorateBackgroundPlugin::setValue(QString name, Shotm val) +void DecorateBackgroundPlugin::setValue(QString, Shotm val) { curShot=val; } diff --git a/src/meshlabplugins/decorate_base/decorate_base.cpp b/src/meshlabplugins/decorate_base/decorate_base.cpp index 9182ea5c6..d9f17f8af 100644 --- a/src/meshlabplugins/decorate_base/decorate_base.cpp +++ b/src/meshlabplugins/decorate_base/decorate_base.cpp @@ -375,9 +375,12 @@ void DecorateBasePlugin::drawQuotedLine(const Point3d &a,const Point3d &b, float // fmod ( -104.5 , 10) returns -4.5 // So it holds that - if(aVal > 0 ) firstTick = aVal - fmod(aVal,tickScalarDistance) + tickScalarDistance; - if(aVal ==0 ) firstTick = tickScalarDistance; - if(aVal < 0 ) firstTick = aVal + fmod(fabs(aVal),tickScalarDistance); + if (aVal > 0 ) + firstTick = aVal - fmod(aVal,tickScalarDistance) + tickScalarDistance; + else if(aVal ==0 ) + firstTick = tickScalarDistance; + else //aVal < 0 + firstTick = aVal + fmod(fabs(aVal),tickScalarDistance); // now we are sure that aVal < firstTick // let also be sure that there is enough space