mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 04:49:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where TileDataLayout is created based on an uninitialized variable

Browse Source
This commit is contained in:
Erik Broberg
2016-08-16 16:25:28 -04:00
parent 5bddbcd683
commit 3cb519ad77
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/globebrowsing/tile/tiledataset.cpp
View File

@@ -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);

2
modules/globebrowsing/tile/tiledataset.h
View File

@@ -47,7 +47,7 @@ namespace openspace {
struct TileDataLayout {
TileDataLayout();
TileDataLayout(GDALDataset* dataSet, GLuint glType);
TileDataLayout(GDALDataset* dataSet, GLuint preferredGlType);
GDALDataType gdalType;
GLuint glType;