GDAL: forcing float data type for DEM warp

melowntech · Sep 14, 2020 · 9ce3ead · 9ce3ead
1 parent 9fd56e4
commit 9ce3ead
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/externals/libgeo b/externals/libgeo
diff --git a/externals/libutility b/externals/libutility
diff --git a/mapproxy/src/mapproxy/gdalsupport/operations.cpp b/mapproxy/src/mapproxy/gdalsupport/operations.cpp
@@ -96,6 +96,7 @@ cv::Mat* warpImage(DatasetCache &cache, ManagedBuffer &mb
     auto &src(cache(dataset));
     auto dst(geo::GeoDataset::deriveInMemory
              (src, srs, size, extents, boost::none, asOptNodata(nodata)));
+
     src.warpInto(dst, resampling);
 
     if (optimize && dst.cmask().empty()) {
@@ -135,6 +136,7 @@ cv::Mat* warpMask(DatasetCache &cache, ManagedBuffer &mb
     auto &src(cache(dataset));
     auto dst(geo::GeoDataset::deriveInMemory
              (src, srs, size, extents, boost::none, asOptNodata(nodata)));
+
     src.warpInto(dst, resampling);
 
     // fetch mask from dataset (optimized, all valid -> invalid matrix)
@@ -213,6 +215,7 @@ cv::Mat* warpValueMinMax(DatasetCache &cache, ManagedBuffer &mb
     // choose finer overview on GDAL>=2.2, since there is something rotten there
     warpOptions.overviewBias = -1;
 #endif
+    warpOptions.workingDataType = GDT_Float32;
 
     auto wri(src.warpInto(dst, resampling, warpOptions));
     minSrc.warpInto(minDst, geo::GeoDataset::Resampling::minimum
@@ -300,7 +303,10 @@ cv::Mat* warpDem(DatasetCache &cache, ManagedBuffer &mb
              (src, srs, gridSize, gridExtents, ::GDT_Float32
               , asOptNodata(nodata, ForcedNodata)));
 
-    auto wri(src.warpInto(dst, geo::GeoDataset::Resampling::dem));
+    geo::GeoDataset::WarpOptions wo;
+    wo.workingDataType = ::GDT_Float32;
+
+    auto wri(src.warpInto(dst, geo::GeoDataset::Resampling::dem, wo));
     LOG(info1) << "Warp result: scale=" << wri.scale
                << ", resampling=" << wri.resampling << ".";
+2 −6		geo/csconvertorWithoutGdal.cpp
+1 −1		geo/detail/ovrdataset.new.cpp
+1 −1		geo/detail/ovrdataset.old.cpp
+149 −70		geo/geodataset.cpp
+21 −11		geo/geodataset.hpp
+47 −6		geo/geotransform.hpp
+1 −3		geo/srsdefWithoutGdal.cpp
+1 −1		utility/CMakeLists.txt
+13 −6		utility/detail/filedes.posix.cpp
+14 −1		utility/detail/filedes.windows.cpp
+37 −0		utility/detail/rlimit.windows.cpp
+10 −5		utility/filedes.hpp
+22 −0		utility/gccversion.hpp
+40 −0		utility/interprocess.hpp
+12 −0		utility/mysqldb.cpp
+19 −0		utility/mysqldb.hpp
+120 −1		utility/process.cpp
+108 −0		utility/process.hpp
+26 −0		utility/python/importsupport.py
+9 −3		utility/python/utilitymodule.cpp
+10 −4		utility/streams.hpp
+108 −0		utility/variant.hpp