diff --git a/modules/globebrowsing/tile/tiledataset.cpp b/modules/globebrowsing/tile/tiledataset.cpp index 08e02a7c2a..4a22118d98 100644 --- a/modules/globebrowsing/tile/tiledataset.cpp +++ b/modules/globebrowsing/tile/tiledataset.cpp @@ -63,9 +63,9 @@ namespace openspace { } - TileDataLayout::TileDataLayout(GDALDataset* dataSet, GLuint _glType) { + TileDataLayout::TileDataLayout(GDALDataset* dataSet, GLuint preferredGlType) { // Assume all raster bands have the same data type - gdalType = _glType != 0 ? TileDataType::getGdalDataType(glType) : dataSet->GetRasterBand(1)->GetRasterDataType(); + gdalType = preferredGlType != 0 ? TileDataType::getGdalDataType(preferredGlType) : dataSet->GetRasterBand(1)->GetRasterDataType(); glType = TileDataType::getOpenGLDataType(gdalType); numRasters = dataSet->GetRasterCount(); bytesPerDatum = TileDataType::numberOfBytes(gdalType); diff --git a/modules/globebrowsing/tile/tiledataset.h b/modules/globebrowsing/tile/tiledataset.h index 81975f8c6b..cd68c671c7 100644 --- a/modules/globebrowsing/tile/tiledataset.h +++ b/modules/globebrowsing/tile/tiledataset.h @@ -47,7 +47,7 @@ namespace openspace { struct TileDataLayout { TileDataLayout(); - TileDataLayout(GDALDataset* dataSet, GLuint glType); + TileDataLayout(GDALDataset* dataSet, GLuint preferredGlType); GDALDataType gdalType; GLuint glType;