Commit 7eb4f1be authored by mjg226's avatar mjg226
Browse files

fix linux problems in ESRI_ASCIIGrid

parent ba35e132
......@@ -168,6 +168,8 @@ namespace CA {
if( src.empty() )
return;
// NOTe: caution is required, I'm not sure this logic is complete. it's ambitious
// Create a list of boxes to add.
Boxes toadd;
......@@ -182,7 +184,7 @@ namespace CA {
{
// if box to add is completely within an existing box, then
// if box to add is completely within an existing box, then remove it from the list to add, and move on
if ((*iorg).Union((*iadd), (*iorg)) == (*iorg)) {
toadd.remove(*iadd);
continue;
......
......@@ -898,11 +898,11 @@ namespace CA {
std::ostringstream Str;
std::string output;
Str << "n cols: " << ncols << std::endl;
Str << "n rows: " << nrows << std::endl;
Str << "xllcorner: " << xllcorner << std::endl;
Str << "yllcorner: " << yllcorner << std::endl;
Str << "no_data: " << nodata << std::endl;
Str << "n cols: " << AsciiGridGeneral<T>::ncols << std::endl;
Str << "n rows: " << AsciiGridGeneral<T>::nrows << std::endl;
Str << "xllcorner: " << AsciiGridGeneral<T>::xllcorner << std::endl;
Str << "yllcorner: " << AsciiGridGeneral<T>::yllcorner << std::endl;
Str << "no_data: " << AsciiGridGeneral<T>::nodata << std::endl;
output = Str.str();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment