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

Fix some unused/uninitialized variables.

Browse Source
This commit is contained in:
Thomas Geymayer 2013-12-07 13:43:17 +01:00
parent 42b50bd7f7
commit 2a6d62e6f7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/scene/tgdb/obj.cxx
View File

@ -489,10 +489,6 @@ public:
continue;
osg::Texture2D* object_mask = mat->get_object_mask(triangleBin);
osg::Image* img;
if (object_mask != NULL) {
img = object_mask->getImage();
}
int group_count = mat->get_object_group_count();
float building_coverage = mat->get_building_coverage();
@ -502,7 +498,7 @@ public:
if (building_coverage == 0)
continue;
SGBuildingBin* bin;
SGBuildingBin* bin = NULL;
if (building_coverage > 0) {
bin = new SGBuildingBin(mat);
@ -909,7 +905,7 @@ public:
// Generate all the lighting objects for the tile.
osg::LOD* generateLightingTileObjects()
{
SGMaterialLib* matlib;
SGMaterialLib* matlib = NULL;
if (_options)
matlib = _options->getMaterialLib();
@ -1050,7 +1046,7 @@ public:
// Generate all the random forest, objects and buildings for the tile
osg::LOD* generateRandomTileObjects()
{
SGMaterialLib* matlib;
SGMaterialLib* matlib = NULL;
bool use_random_objects = false;
bool use_random_vegetation = false;
bool use_random_buildings = false;

4
simgear/structure/expression_test.cxx
View File

@ -53,7 +53,7 @@ void testBasic()
void testParse()
{
initPropTree();
#if 0
const char* xml = "<?xml version=\"1.0\"?>"
"<PropertyList>"
"<expression>"
@ -69,7 +69,7 @@ void testParse()
"</and>"
"</expression>"
"</PropertyList>";
#endif
const char* xml2 = "<?xml version=\"1.0\"?>"
"<PropertyList>"
"<sqr>"