From 640aea518e215d07e0c4ad95f1ee3d4ca8c5e91c Mon Sep 17 00:00:00 2001
From: rahv <karsten.rink@ufz.de>
Date: Mon, 9 Mar 2015 16:45:38 +0100
Subject: [PATCH] adjusted tag names and error messages
---
Applications/DataExplorer/VtkVis/VtkRaster.cpp | 4 ++--
FileIO/AsciiRasterInterface.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
index d52a81e774b..18eeb2a72b3 100644
--- a/Applications/DataExplorer/VtkVis/VtkRaster.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
@@ -76,7 +76,7 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName,
#ifdef GEOTIFF_FOUND
return loadImageFromTIFF(fileName, x0, y0, delta);
#else
- ERR("VtkRaster::loadImage(): Tiff file format not support in this version!");
+ ERR("VtkRaster::loadImage(): Tiff file format not supported in this version!");
return nullptr;
#endif
}
@@ -264,7 +264,7 @@ vtkImageReader2* VtkRaster::loadImageFromFile(const std::string &fileName)
image = vtkBMPReader::New();
else
{
- ERR("VtkRaster::readImageFromFile(): File format not support, please convert to BMP, JPG or PNG.");
+ ERR("VtkRaster::readImageFromFile(): File format not supported, please convert to BMP, JPG or PNG.");
return nullptr;
}
diff --git a/FileIO/AsciiRasterInterface.cpp b/FileIO/AsciiRasterInterface.cpp
index 9900b65251e..572abde497a 100644
--- a/FileIO/AsciiRasterInterface.cpp
+++ b/FileIO/AsciiRasterInterface.cpp
@@ -89,13 +89,13 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols,
} else return false;
in >> tag;
- if (tag.compare("xllcorner") == 0) {
+ if (tag.compare("xllcorner") == 0 || tag.compare("xllcenter") == 0) {
in >> value;
xllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false;
in >> tag;
- if (tag.compare("yllcorner") == 0) {
+ if (tag.compare("yllcorner") == 0 || tag.compare("yllcenter") == 0) {
in >> value;
yllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false;
@@ -107,7 +107,7 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols,
} else return false;
in >> tag;
- if (tag.compare("NODATA_value") == 0) {
+ if (tag.compare("NODATA_value") == 0 || tag.compare("nodata_value") == 0) {
in >> value;
no_data_val = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false;
--
GitLab