Fix compilation warnings.

modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp

@@ -415,7 +415,10 @@ size_t numberOfRasters(ghoul::opengl::Texture::Format format) {
         case ghoul::opengl::Texture::Format::BGR: return 3;
         case ghoul::opengl::Texture::Format::RGBA:; // Intentional fallthrough
         case ghoul::opengl::Texture::Format::BGRA: return 4;
-        default: ghoul_assert(false, "Unknown format");
+        default: {
+            ghoul_assert(false, "Unknown format");
+            return 0;
+        }
     }
 }
 
@@ -430,8 +433,10 @@ size_t numberOfBytes(GLenum glType) {
         case GL_HALF_FLOAT: return sizeof(GLhalf);
         case GL_FLOAT: return sizeof(GLfloat);
         case GL_DOUBLE: return sizeof(GLdouble);
-        default:
+        default: {
             ghoul_assert(false, "Unknown data type");
+            return 0;
+        }
     }
 }
 
@@ -447,8 +452,10 @@ size_t getMaximumValue(GLenum glType) {
             return size_t(1) << 32;
         case GL_INT:
             return 1 << 31;
-        default:
+        default: {
             ghoul_assert(false, "Unknown data type");
+            return 0;
+        }
     }
 }
 
@@ -470,8 +477,10 @@ float interpretFloat(GLenum glType, const char* src) {
             return static_cast<float>(*reinterpret_cast<const GLfloat*>(src));
         case GL_DOUBLE:
             return static_cast<float>(*reinterpret_cast<const GLdouble*>(src));
-        default:
+        default: {
             ghoul_assert(false, "Unknown data type");
+            return 0;
+        }
     }
 }
 

modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp

@@ -197,8 +197,6 @@ void DefaultTileProvider::initTexturesFromLoadedData() {
 void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData) {
     std::string _loggerCat = "DefaultTileProvider : " + _name;
 
-    RawTileDataReader* tileDataReader = nullptr;
-
     RawTileDataReader::PerformPreprocessing preprocess =
         _performPreProcessing ? RawTileDataReader::PerformPreprocessing::Yes :
         RawTileDataReader::PerformPreprocessing::No;

modules/globebrowsing/tile/tileprovider/tileprovider.cpp

@@ -34,10 +34,6 @@
 
 #include <climits>
 
-namespace {
-    const char* KeyType = "Type";
-}
-
 namespace openspace {
 namespace globebrowsing {
 namespace tileprovider {

modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp

@@ -29,6 +29,8 @@
 #include <ghoul/logging/logmanager.h>
 
 namespace {
+    const char* _loggerCat = "TileProviderByLevel";
+
     const char* KeyProviders = "LevelTileProviders";
     const char* KeyMaxLevel = "MaxLevel";
     const char* KeyTileProvider = "TileProvider";
@@ -46,7 +48,6 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary)
   
     layergroupid::GroupID layerGroupID;
     dictionary.getValue(KeyLayerGroupID, layerGroupID);
-    const char* _loggerCat = ("TileProviderByLevel" + name).c_str();
   
     ghoul::Dictionary providers;
     if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyProviders)) {