gdal raster clip: Fix bbox check with clip geometry

Author: dbaston

apps/gdalalg_raster_clip.cpp

@@ -252,11 +252,9 @@ bool GDALRasterClipAlgorithm::RunStep(GDALPipelineStepRunContext &)
             poClipGeomInSrcSRS->getEnvelope(&env);
         }
 
-        if (!m_allowExtentOutsideSource &&
-            !(env.MinX >= gt[0] &&
-              env.MaxX <= gt[0] + gt[1] * poSrcDS->GetRasterXSize() &&
-              env.MaxY >= gt[3] &&
-              env.MinY <= gt[3] + gt[5] * poSrcDS->GetRasterYSize()))
+        OGREnvelope rasterEnv;
+        poSrcDS->GetExtent(&rasterEnv, nullptr);
+        if (!m_allowExtentOutsideSource && !rasterEnv.Contains(env))
         {
             ReportError(CE_Failure, CPLE_AppDefined,
                         "Clipping geometry is partially or totally outside the "

autotest/utilities/test_gdalalg_raster_clip.py

@@ -169,6 +169,28 @@ def test_gdalalg_raster_clip_bbox_crs():
     )
 
 
+def test_gdalgalg_raster_clip_geometry(tmp_vsimem):
+
+    alg = get_alg()
+
+    alg["input"] = "../gcore/data/byte.tif"
+    alg["output"] = ""
+    alg["output-format"] = "MEM"
+    alg[
+        "geometry"
+    ] = "POLYGON ((440885 3750741, 441344 3750294, 441612 3750501, 441773 3751203, 441545 3751254, 441576 3750847, 441576 3750847, 440885 3750741))"
+
+    assert alg.Run()
+
+    ds = alg["output"].GetDataset()
+    assert ds.RasterXSize == 16
+    assert ds.RasterYSize == 17
+    assert ds.GetSpatialRef().GetAuthorityCode(None) == "26711"
+    assert ds.GetGeoTransform() == pytest.approx(
+        (440840, 60.0, 0.0, 3751260, 0.0, -60.0), rel=1e-8
+    )
+
+
 def test_gdalalg_raster_clip_geometry_add_alpha():
 
     src_ds = gdal.Open("../gcore/data/byte.tif")