From 2a6d62e6f73c9465e8f91263cbf9b357c39423e4 Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Sat, 7 Dec 2013 13:43:17 +0100
Subject: [PATCH] Fix some unused/uninitialized variables.

---
 simgear/scene/tgdb/obj.cxx            | 10 +++-------
 simgear/structure/expression_test.cxx |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index 5b484060..771ff2c4 100644
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -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;
diff --git a/simgear/structure/expression_test.cxx b/simgear/structure/expression_test.cxx
index f1ba16f6..a8bb9fe5 100644
--- a/simgear/structure/expression_test.cxx
+++ b/simgear/structure/expression_test.cxx
@@ -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>"
-- 
2.39.5