Merge branch 'develop' into unit_test

RangeShifter · Dec 21, 2023 · a08d21c · a08d21c
2 parents e25b0e4 + c3645a9
commit a08d21c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Landscape.cpp b/Landscape.cpp
@@ -2281,11 +2281,13 @@ int Landscape::readCosts(string fname)
 #else
 	if (header != "ncols" && header != "NCOLS") {
 #endif
-		costs.close(); costs.clear();
-		return -1;
-	}
-	costs >> maxXcost >> header >> maxYcost >> header >> minLongCost;
-	costs >> header >> minLatCost >> header >> resolCost >> header >> NODATACost;
+	costs.close(); costs.clear();
+	return -1;
+}
+double tmpresolCost;		
+costs >> maxXcost >> header >> maxYcost >> header >> minLongCost;
+costs >> header >> minLatCost >> header >> tmpresolCost >> header >> NODATACost;
+resolCost = (int) tmpresolCost;
 
 #if !RS_RCPP
 	MemoLine("Loading costs map. Please wait...");