Added GDAL version cfg barriers on WarpResampleAlg options.

georust · Dec 29, 2023 · 9e9ba71 · 9e9ba71
1 parent 9c9dd15
commit 9e9ba71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/raster/warp/mod.rs b/src/raster/warp/mod.rs
@@ -171,6 +171,8 @@ mod tests {
     use crate::{assert_near, Dataset};
     use std::path::Path;
 
+    // TODO: For some unknown reason this test fails on GDAL < 3.4
+    #[cfg(any(all(major_ge_3, minor_ge_4), major_ge_4))]
     #[test]
     fn test_create_reproject() -> Result<()> {
         let dst_srs = SpatialRef::from_epsg(4269)?;

diff --git a/src/raster/warp/resample.rs b/src/raster/warp/resample.rs
@@ -31,8 +31,10 @@ pub enum WarpResampleAlg {
     Q1 = GDALResampleAlg::GRA_Q1,
     /// Q3 (selects third quartile of all non-NODATA contributing pixels)
     Q3 = GDALResampleAlg::GRA_Q3,
-    /// Sum (weighed sum of all non-NODATA contributing pixels). Added in GDAL 3.1
+    #[cfg(any(all(major_ge_3, minor_ge_1), major_ge_4))]
+    /// Sum (weighed sum of all non-NODATA contributing pixels).
     Sum = GDALResampleAlg::GRA_Sum,
+    #[cfg(any(all(major_ge_3, minor_ge_3), major_ge_4))]
     /// RMS (weighted root mean square (quadratic mean) of all non-NODATA contributing pixels)
     RMS = GDALResampleAlg::GRA_RMS,
 }
@@ -55,7 +57,9 @@ impl WarpResampleAlg {
             GDALResampleAlg::GRA_Med => WarpResampleAlg::Med,
             GDALResampleAlg::GRA_Q1 => WarpResampleAlg::Q1,
             GDALResampleAlg::GRA_Q3 => WarpResampleAlg::Q3,
+            #[cfg(any(all(major_ge_3, minor_ge_1), major_ge_4))]
             GDALResampleAlg::GRA_Sum => WarpResampleAlg::Sum,
+            #[cfg(any(all(major_ge_3, minor_ge_3), major_ge_4))]
             GDALResampleAlg::GRA_RMS => WarpResampleAlg::RMS,
             o => {
                 return Err(GdalError::BadArgument(format!(