Skip to content
Snippets Groups Projects
Commit 640aea51 authored by Karsten Rink's avatar Karsten Rink
Browse files

adjusted tag names and error messages

parent 6d904b2f
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,7 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName, ...@@ -76,7 +76,7 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName,
#ifdef GEOTIFF_FOUND #ifdef GEOTIFF_FOUND
return loadImageFromTIFF(fileName, x0, y0, delta); return loadImageFromTIFF(fileName, x0, y0, delta);
#else #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; return nullptr;
#endif #endif
} }
...@@ -264,7 +264,7 @@ vtkImageReader2* VtkRaster::loadImageFromFile(const std::string &fileName) ...@@ -264,7 +264,7 @@ vtkImageReader2* VtkRaster::loadImageFromFile(const std::string &fileName)
image = vtkBMPReader::New(); image = vtkBMPReader::New();
else 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; return nullptr;
} }
......
...@@ -89,13 +89,13 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols, ...@@ -89,13 +89,13 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols,
} else return false; } else return false;
in >> tag; in >> tag;
if (tag.compare("xllcorner") == 0) { if (tag.compare("xllcorner") == 0 || tag.compare("xllcenter") == 0) {
in >> value; in >> value;
xllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0); xllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false; } else return false;
in >> tag; in >> tag;
if (tag.compare("yllcorner") == 0) { if (tag.compare("yllcorner") == 0 || tag.compare("yllcenter") == 0) {
in >> value; in >> value;
yllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0); yllcorner = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false; } else return false;
...@@ -107,7 +107,7 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols, ...@@ -107,7 +107,7 @@ bool AsciiRasterInterface::readASCHeader(std::ifstream &in, std::size_t &n_cols,
} else return false; } else return false;
in >> tag; in >> tag;
if (tag.compare("NODATA_value") == 0) { if (tag.compare("NODATA_value") == 0 || tag.compare("nodata_value") == 0) {
in >> value; in >> value;
no_data_val = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0); no_data_val = strtod(BaseLib::replaceString(",", ".", value).c_str(), 0);
} else return false; } else return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment