[meshlib] renaming functions and vars in RasterDataToMesh

ufz · Jun 10, 2020 · 75e89e9 · 75e89e9
1 parent a184a90
commit 75e89e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/MeshLib/MeshEditing/RasterDataToMesh.cpp b/MeshLib/MeshEditing/RasterDataToMesh.cpp
@@ -19,7 +19,7 @@ namespace MeshLib
 namespace RasterDataToMesh
 {
 
-static bool checkMesh2D(MeshLib::Mesh const& mesh)
+static bool checkMesh(MeshLib::Mesh const& mesh)
 {
     if (mesh.getDimension() > 2)
     {
@@ -50,13 +50,13 @@ static double evaluatePixel(double const value, double const no_data,
     {
         return replacement;
     }
-    return value;
+     return value;
 }
 
 bool projectToNodes(MeshLib::Mesh& mesh, GeoLib::Raster const& raster,
                     double const def, std::string const& array_name)
 {
-    if (!checkMesh2D(mesh))
+    if (!checkMesh(mesh))
     {
         return false;
     }
@@ -78,7 +78,7 @@ bool projectToNodes(MeshLib::Mesh& mesh, GeoLib::Raster const& raster,
 bool projectToElements(MeshLib::Mesh& mesh, GeoLib::Raster const& raster,
                        double const def, std::string const& array_name)
 {
-    if (!checkMesh2D(mesh))
+    if (!checkMesh(mesh))
     {
         return false;
     }

diff --git a/MeshLib/MeshEditing/RasterDataToMesh.h b/MeshLib/MeshEditing/RasterDataToMesh.h
@@ -23,9 +23,9 @@ namespace MeshLib
 namespace RasterDataToMesh
 {
 bool projectToNodes(MeshLib::Mesh& mesh, GeoLib::Raster const& raster,
-                    double const default, std::string const& array_name);
+                    double const def, std::string const& array_name);
 
 bool projectToElements(MeshLib::Mesh& mesh, GeoLib::Raster const& raster,
-                       double const default, std::string const& array_name);
+                       double const def, std::string const& array_name);
 }  // end namespace RasterDataToMesh
 }  // end namespace MeshLib