lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix libcommon and decorate plugin gcc warnings

Browse Source
This commit is contained in:
alemuntoni 2020-03-05 12:11:32 +01:00
parent f1ebb5bd16
commit 3c9ec9c75e
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/general.pri
View File

@ -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 ##########

9
src/meshlabplugins/decorate_background/decorate_background.cpp
View File

@ -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;
}

9
src/meshlabplugins/decorate_base/decorate_base.cpp
View File

@ -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