Skip to content

Commit

Permalink
Fix some build warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 9, 2020
1 parent 61d1ac1 commit f208580
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/core/mesh/qgsmeshdataprovider.cpp
Expand Up @@ -370,6 +370,7 @@ bool QgsMesh::contains( const QgsMesh::ElementType &type ) const
case ElementType::Face:
return !faces.isEmpty();
}
return false;
}

int QgsMesh::vertexCount() const
Expand Down Expand Up @@ -511,4 +512,5 @@ bool QgsMeshDataSourceInterface::contains( const QgsMesh::ElementType &type ) co
case QgsMesh::ElementType::Face:
return faceCount() != 0;
}
return false;
}
1 change: 1 addition & 0 deletions src/core/mesh/qgsmeshlayerutils.cpp
Expand Up @@ -45,6 +45,7 @@ int QgsMeshLayerUtils::datasetValuesCount( const QgsMesh *mesh, QgsMeshDatasetGr
case QgsMeshDatasetGroupMetadata::DataType::DataOnVolumes:
return mesh->faceCount(); // because they are averaged to faces
}
return 0;
}

QgsMeshDatasetGroupMetadata::DataType QgsMeshLayerUtils::datasetValuesType( const QgsMeshDatasetGroupMetadata::DataType &type )
Expand Down
2 changes: 2 additions & 0 deletions src/core/mesh/qgstriangularmesh.cpp
Expand Up @@ -271,6 +271,8 @@ bool QgsTriangularMesh::contains( const QgsMesh::ElementType &type ) const
case QgsMesh::ElementType::Face:
return mTriangularMesh.faceCount() != 0;
}

return false;
}

const QVector<QgsMeshVertex> &QgsTriangularMesh::vertices() const
Expand Down

0 comments on commit f208580

Please sign in to comment.