diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp index d52a81e774b0d29d46b2cdcd74798727e8bfa99e..18eeb2a72b38525d78197130a8a036a34bbb5241 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 9900b65251e2476a590c706926762f8b28519709..572abde497aaeb327151d79e9c2184062700e84c 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;