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

Eliminate compiler warnings

Browse Source
This commit is contained in:
Scott Giese 2018-12-23 22:16:05 -06:00
parent fc2630e66d
commit ed87a0b032
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/canvas/ShivaVG/src/shPath.c
View File

@ -1193,7 +1193,7 @@ VG_API_CALL VGboolean vgInterpolatePath(VGPath dstPath, VGPath startPath,
SHfloat *procData1, *procData2; SHfloat *procData1, *procData2;
SHint procSegCount1=0, procSegCount2=0; SHint procSegCount1=0, procSegCount2=0;
SHint procDataCount1=0, procDataCount2=0; SHint procDataCount1=0, procDataCount2=0;
SHuint8 *newSegs, *newData; SHuint8 *newSegs, *newData=0;
void *userData[4]; void *userData[4];
SHint segment1, segment2; SHint segment1, segment2;
SHint segindex, s,d,i; SHint segindex, s,d,i;

2
simgear/debug/logstream.cxx
View File

@ -518,7 +518,7 @@ public:
// SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured // SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured
// separately and thus it makes more sense to allow these message through. // separately and thus it makes more sense to allow these message through.
if (p == SG_OSG) return true; if (static_cast<unsigned>(p) == static_cast<unsigned>(SG_OSG)) return true;
p = translatePriority(p); p = translatePriority(p);
if (p >= SG_INFO) return true; if (p >= SG_INFO) return true;

10
simgear/scene/util/SGSceneFeatures.cxx
View File

@ -40,14 +40,14 @@
SGSceneFeatures::SGSceneFeatures() : SGSceneFeatures::SGSceneFeatures() :
_textureCompression(UseARBCompression), _textureCompression(UseARBCompression),
_shaderLights(true),
_pointSpriteLights(true),
_distanceAttenuationLights(true),
_textureFilter(1),
_MaxTextureSize(4096), _MaxTextureSize(4096),
_TextureCacheCompressionActive(true), _TextureCacheCompressionActive(true),
_TextureCacheCompressionActiveTransparent(true), _TextureCacheCompressionActiveTransparent(true),
_TextureCacheActive(false) _TextureCacheActive(false),
_shaderLights(true),
_pointSpriteLights(true),
_distanceAttenuationLights(true),
_textureFilter(1)
{ {
} }

8
simgear/sound/readwav.cxx
View File

@ -65,16 +65,16 @@ namespace
else if (numChannels == 2 && bitsPerSample == 16) rv = SG_SAMPLE_STEREO16; else if (numChannels == 2 && bitsPerSample == 16) rv = SG_SAMPLE_STEREO16;
else if (numChannels == 2 && bitsPerSample == 8) rv = SG_SAMPLE_STEREO8; else if (numChannels == 2 && bitsPerSample == 8) rv = SG_SAMPLE_STEREO8;
else { else {
char msg[65]; char msg[81];
snprintf(msg, 64, "Unsupported audio format: tracks: %i, bits/sample: %i", numChannels, bitsPerSample); snprintf(msg, 80, "Unsupported audio format: tracks: %i, bits/sample: %i", numChannels, bitsPerSample);
throw sg_exception(msg); throw sg_exception(msg);
} }
} else { } else {
if (numChannels == 1 && bitsPerSample == 4) rv = SG_SAMPLE_ADPCM; if (numChannels == 1 && bitsPerSample == 4) rv = SG_SAMPLE_ADPCM;
else if (numChannels == 1 && bitsPerSample == 8) rv = SG_SAMPLE_MULAW; else if (numChannels == 1 && bitsPerSample == 8) rv = SG_SAMPLE_MULAW;
else { else {
char msg[65]; char msg[81];
snprintf(msg, 64, "Unsupported compressed audio format: tracks: %i, bits/sample: %i", numChannels, bitsPerSample); snprintf(msg, 80, "Unsupported compressed audio format: tracks: %i, bits/sample: %i", numChannels, bitsPerSample);
throw sg_exception(msg); throw sg_exception(msg);
} }
} }

2
simgear/structure/subsystem_mgr.cxx
View File

@ -281,7 +281,7 @@ SGSubsystemGroup::incrementalInit()
notifyDidChange(m->subsystem, State::INIT); notifyDidChange(m->subsystem, State::INIT);
++_initPosition; ++_initPosition;
if (_initPosition < _members.size()) { if (_initPosition < static_cast<int>(_members.size())) {
// start init of the next one // start init of the next one
notifyWillChange( _members[_initPosition]->subsystem, State::INIT); notifyWillChange( _members[_initPosition]->subsystem, State::INIT);
} }