sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-05 00:04:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

update MDAL to 0.7.0

Browse Source
This commit is contained in:
Peter Petrik 2020-09-09 08:21:22 +02:00 committed by Nyall Dawson
parent ed91ceeea5
commit 5a1fe648dc
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/mdal/frmts/mdal_gdal_netcdf.cpp vendored
View File

@ -39,8 +39,11 @@ bool MDAL::DriverGdalNetCDF::parseBandInfo( const MDAL::GdalDataset *cfGDALDatas
metadata_hash::const_iterator iter;
iter = metadata.find( "netcdf_dim_time" );
if ( iter == metadata.end() ) return true; //FAILURE, skip no-time bands
*time = MDAL::RelativeTimestamp( parseMetadataTime( iter->second ), mTimeUnit );
if ( iter == metadata.end() )
*time = MDAL::RelativeTimestamp();
else
*time = MDAL::RelativeTimestamp( parseMetadataTime( iter->second ), mTimeUnit );
// NAME
iter = metadata.find( "long_name" );

2
external/mdal/mdal.cpp vendored
View File

@ -21,7 +21,7 @@ static const char *EMPTY_STR = "";
const char *MDAL_Version()
{
return "0.6.93";
return "0.7.0";
}
MDAL_Status MDAL_LastStatus()

12
external/mdal/mdal_memory_data_model.cpp vendored
View File

@ -205,9 +205,15 @@ void MDAL::MemoryMesh::addFaces( size_t faceCount, size_t driverMaxVerticesPerFa
Face face( faceSize );
for ( size_t i = 0; i < faceSize; ++i )
{
size_t indice = vertexIndices[indicesIndex + i];
if ( indice >= 0 && indice < mVertices.size() )
face[i] = indice;
const int indice = vertexIndices[indicesIndex + i];
if ( indice < 0 )
{
MDAL::Log::error( Err_InvalidData, "Invalid vertex index when adding faces" );
return;
}
size_t indiceU = static_cast< size_t >( indice );
if ( indiceU < mVertices.size() )
face[i] = indiceU;
else
{
MDAL::Log::error( Err_InvalidData, "Invalid vertex index when adding faces" );