FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indentation fixes (and signed/unsigned comparison fix) to silence GCC 6 warnings

Browse Source
This commit is contained in:
Alessandro Menti 2016-05-22 19:14:42 +02:00
parent fd124e91de
commit b1270376c9
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/canvas/ShivaVG/src/shPipeline.c
View File

@ -80,8 +80,12 @@ void updateBlendingStateGL(VGContext *c, int alphaIsOne)
case VG_BLEND_SRC_OVER: default: case VG_BLEND_SRC_OVER: default:
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (alphaIsOne) glDisable(GL_BLEND); if (alphaIsOne) {
else glEnable(GL_BLEND); break; glDisable(GL_BLEND);
} else {
glEnable(GL_BLEND);
}
break;
}; };
} }

7
simgear/environment/metar.cxx
View File

@ -648,10 +648,11 @@ bool SGMetar::scanWeather()
weather = pre + weather + post; weather = pre + weather + post;
weather.erase(weather.length() - 1); weather.erase(weather.length() - 1);
_weather.push_back(weather); _weather.push_back(weather);
if( ! w.phenomena.empty() ) if( ! w.phenomena.empty() ) {
_weather2.push_back( w ); _weather2.push_back( w );
_grpcount++; }
return true; _grpcount++;
return true;
} }

2
simgear/package/Root.cxx
View File

@ -384,7 +384,7 @@ void Root::refresh(bool aForce)
CatalogList toRefresh; CatalogList toRefresh;
CatalogDict::iterator it = d->catalogs.begin(); CatalogDict::iterator it = d->catalogs.begin();
for (; it != d->catalogs.end(); ++it) { for (; it != d->catalogs.end(); ++it) {
int age = it->second->ageInSeconds(); unsigned int age = it->second->ageInSeconds();
if (aForce || (age > maxAgeSeconds())) { if (aForce || (age > maxAgeSeconds())) {
toRefresh.push_back(it->second); toRefresh.push_back(it->second);
} }

5
simgear/sound/sample_openal.cxx
View File

@ -260,5 +260,8 @@ SGPath SGSoundSample::file_path() const
void SGSoundSample::free_data() void SGSoundSample::free_data()
{ {
if ( _data != NULL ) free( _data ); _data = NULL; if ( _data != NULL ) {
free( _data );
}
_data = NULL;
} }