mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solve mac OSX errors.

Browse Source
This commit is contained in:
kalbl
2016-09-22 14:49:56 +02:00
parent d8ca2965eb
commit cf331dd523
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,6 +184,9 @@ namespace openspace {
}
}
// Commenting away the following for now since it is not supported for older
// versions of GDAL. Only used for debug info.
/*
const std::string originalDriverName = dataset->GetDriverName();
if (originalDriverName != "WMS") {
@@ -200,7 +203,7 @@ namespace openspace {
const char* in_memory = "";
//GDALDataset* vrtDataset = driver->CreateCopy(in_memory, dataset, false, nullptr, nullptr, nullptr);
}
*/
return dataset;
}
@@ -308,8 +311,7 @@ namespace openspace {
TileDepthTransform TileDataset::calculateTileDepthTransform() {
GDALRasterBand* firstBand = _dataset->GetRasterBand(1);
// Floating point types does not have a fix maximum or minimum value and
// can not be normalized when sampling a texture. Hence no rescaling is needed.
bool isFloat = (_dataLayout.gdalType == GDT_Float32 || _dataLayout.gdalType == GDT_Float64);
double maximumValue = isFloat ? 1.0 : TileDataType::getMaximumValue(_dataLayout.gdalType);

7
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
View File

@@ -74,10 +74,11 @@ namespace openspace {
throw std::runtime_error("Must define key '" + KeyFilePath + "'");
}
std::ifstream in(_datasetFile.c_str());
ghoul_assert(errno == 0, strerror(errno) << std::endl << _datasetFile);
if (!in.is_open()) {
throw ghoul::FileNotFoundError(_datasetFile);
}
// read file
std::string xml((std::istreambuf_iterator<char>(in)), (std::istreambuf_iterator<char>()));
_gdalXmlTemplate = consumeTemporalMetaData(xml);