gdal raster scale: rename --[src/dst][min/max] to --[input/output][min/max]

dbaston · dbaston · commit f1d75bb3cd48 · 2026-04-22T21:24:44.000-04:00
diff --git a/.github/workflows/ubuntu_26.04/reference_arg_names.txt b/.github/workflows/ubuntu_26.04/reference_arg_names.txt
@@ -70,8 +70,6 @@ dim
 distance
 distance-units
 drivers
-dst-max
-dst-min
 elevation-name
 enable-sozip
 end-angle
@@ -129,6 +127,8 @@ input-crs
 input-field
 input-format
 input-layer
+input-max
+input-min
 input-nodata
 input-prefix
 interval
@@ -230,6 +230,8 @@ output-crs
 output-data-type
 output-format
 output-layer
+output-max
+output-min
 output-nodata
 output-open-option
 output-string
@@ -313,8 +315,6 @@ spectral
 split-multipolygons
 sql
 src-field-type
-src-max
-src-min
 start-angle
 stat
 stats
diff --git a/apps/gdalalg_raster_scale.cpp b/apps/gdalalg_raster_scale.cpp
@@ -34,19 +34,25 @@ GDALRasterScaleAlgorithm::GDALRasterScaleAlgorithm(bool standaloneStep)
     AddOutputDataTypeArg(&m_type);
     AddBandArg(&m_band,
                _("Select band to restrict the scaling (1-based index)"));
-    AddArg("src-min", 0, _("Minimum value of the source range"), &m_srcMin)
-        .SetMutualDependencyGroup("src-max-min");
-    AddArg("src-max", 0, _("Maximum value of the source range"), &m_srcMax)
-        .SetMutualDependencyGroup("src-max-min");
-    AddArg("dst-min", 0, _("Minimum value of the destination range"), &m_dstMin)
-        .SetMutualDependencyGroup("dst-max-min");
-    AddArg("dst-max", 0, _("Maximum value of the destination range"), &m_dstMax)
-        .SetMutualDependencyGroup("dst-max-min");
+    AddArg("input-min", 0, _("Minimum value of the source range"), &m_srcMin)
+        .SetMutualDependencyGroup("input-max-min")
+        .AddHiddenAlias("src-min");
+    AddArg("input-max", 0, _("Maximum value of the source range"), &m_srcMax)
+        .SetMutualDependencyGroup("input-max-min")
+        .AddHiddenAlias("src-max");
+    AddArg("output-min", 0, _("Minimum value of the destination range"),
+           &m_dstMin)
+        .SetMutualDependencyGroup("output-max-min")
+        .AddHiddenAlias("dst-min");
+    AddArg("output-max", 0, _("Maximum value of the destination range"),
+           &m_dstMax)
+        .SetMutualDependencyGroup("output-max-min")
+        .AddHiddenAlias("dst-max");
     AddArg("exponent", 0,
            _("Exponent to apply non-linear scaling with a power function"),
            &m_exponent);
-    AddArg("no-clip", 0, _("Do not clip input values to [srcmin, srcmax]"),
-           &m_noClip);
+    AddArg("no-clip", 0,
+           _("Do not clip input values to [innput-min, input-max]"), &m_noClip);
 }
 
 /************************************************************************/
diff --git a/autotest/gcore/algorithm.py b/autotest/gcore/algorithm.py
@@ -569,34 +569,39 @@ def test_algorithm_mutual_dependencies(tmp_path):
     ):
         alg.Run()
 
+
+def test_algorithm_mutual_dependency_group(tmp_path):
+
+    reg = gdal.GetGlobalAlgorithmRegistry()
+
     # Check mutual dependency group
     alg = reg["raster"]["scale"]
 
     usage = json.loads(alg.GetUsageAsJSON())
-    src_min = [a for a in usage["input_arguments"] if a["name"] == "src-min"][0]
-    src_max = [a for a in usage["input_arguments"] if a["name"] == "src-max"][0]
-    dst_min = [a for a in usage["input_arguments"] if a["name"] == "dst-min"][0]
-    dst_max = [a for a in usage["input_arguments"] if a["name"] == "dst-max"][0]
-
-    assert src_min["mutual_dependency_group"] == "src-max-min"
-    assert src_max["mutual_dependency_group"] == "src-max-min"
-    assert dst_min["mutual_dependency_group"] == "dst-max-min"
-    assert dst_max["mutual_dependency_group"] == "dst-max-min"
-
-    src_min_arg = alg.GetArg("src-min")
-    src_max_arg = alg.GetArg("src-max")
-    dst_min_arg = alg.GetArg("dst-min")
-    dst_max_arg = alg.GetArg("dst-max")
-
-    assert src_min_arg.GetMutualDependencyGroup() == "src-max-min"
-    assert src_max_arg.GetMutualDependencyGroup() == "src-max-min"
-    assert dst_min_arg.GetMutualDependencyGroup() == "dst-max-min"
-    assert dst_max_arg.GetMutualDependencyGroup() == "dst-max-min"
-
-    assert src_min["depends_on"] == ["src-max"]
-    assert src_max["depends_on"] == ["src-min"]
-    assert dst_min["depends_on"] == ["dst-max"]
-    assert dst_max["depends_on"] == ["dst-min"]
+    src_min = [a for a in usage["input_arguments"] if a["name"] == "input-min"][0]
+    src_max = [a for a in usage["input_arguments"] if a["name"] == "input-max"][0]
+    dst_min = [a for a in usage["input_arguments"] if a["name"] == "output-min"][0]
+    dst_max = [a for a in usage["input_arguments"] if a["name"] == "output-max"][0]
+
+    assert src_min["mutual_dependency_group"] == "input-max-min"
+    assert src_max["mutual_dependency_group"] == "input-max-min"
+    assert dst_min["mutual_dependency_group"] == "output-max-min"
+    assert dst_max["mutual_dependency_group"] == "output-max-min"
+
+    src_min_arg = alg.GetArg("input-min")
+    src_max_arg = alg.GetArg("input-max")
+    dst_min_arg = alg.GetArg("output-min")
+    dst_max_arg = alg.GetArg("output-max")
+
+    assert src_min_arg.GetMutualDependencyGroup() == "input-max-min"
+    assert src_max_arg.GetMutualDependencyGroup() == "input-max-min"
+    assert dst_min_arg.GetMutualDependencyGroup() == "output-max-min"
+    assert dst_max_arg.GetMutualDependencyGroup() == "output-max-min"
+
+    assert src_min["depends_on"] == ["input-max"]
+    assert src_max["depends_on"] == ["input-min"]
+    assert dst_min["depends_on"] == ["output-max"]
+    assert dst_max["depends_on"] == ["output-min"]
 
     # This does not include mutual dependencies
     assert src_min_arg.GetDirectDependencies() is None
@@ -605,26 +610,26 @@ def test_algorithm_mutual_dependencies(tmp_path):
     assert dst_max_arg.GetDirectDependencies() is None
 
     # This includes both direct and mutual dependencies
-    assert alg.GetArgDependencies("src-max") == ["src-min"]
-    assert alg.GetArgDependencies("src-min") == ["src-max"]
-    assert alg.GetArgDependencies("dst-min") == ["dst-max"]
-    assert alg.GetArgDependencies("dst-max") == ["dst-min"]
+    assert alg.GetArgDependencies("input-max") == ["input-min"]
+    assert alg.GetArgDependencies("input-min") == ["input-max"]
+    assert alg.GetArgDependencies("output-min") == ["output-max"]
+    assert alg.GetArgDependencies("output-max") == ["output-min"]
 
-    alg["src-min"] = 1
+    alg["input-min"] = 1
     alg["output"] = str(tmp_path / "out.tif")
     alg["input"] = "data/byte.tif"
     with pytest.raises(
         RuntimeError,
-        match=r"Argument\(s\) 'src-min' require\(s\) that the following argument\(s\) are also specified: src-max.",
+        match=r"Argument\(s\) 'input-min' require\(s\) that the following argument\(s\) are also specified: input-max.",
     ):
         alg.Run()
 
     alg = reg["raster"]["scale"]
-    alg["src-max"] = 10
+    alg["input-max"] = 10
     alg["input"] = "data/byte.tif"
     alg["output"] = str(tmp_path / "out.tif")
     with pytest.raises(
         RuntimeError,
-        match=r"Argument\(s\) 'src-max' require\(s\) that the following argument\(s\) are also specified: src-min.",
+        match=r"Argument\(s\) 'input-max' require\(s\) that the following argument\(s\) are also specified: input-min.",
     ):
         alg.Run()
diff --git a/autotest/utilities/test_gdalalg_raster_scale.py b/autotest/utilities/test_gdalalg_raster_scale.py
@@ -94,10 +94,10 @@ def test_gdalalg_raster_scale_missing_srcmin():
     alg["input"] = src_ds
     alg["output"] = ""
     alg["output-format"] = "MEM"
-    alg["src-max"] = 0
+    alg["output-max"] = 0
     with pytest.raises(
         Exception,
-        match=r"Argument\(s\) 'src-max' require\(s\) that the following argument\(s\) are also specified: src-min.",
+        match=r"Argument\(s\) 'output-max' require\(s\) that the following argument\(s\) are also specified: output-min.",
     ):
         alg.Run()
 
@@ -114,7 +114,7 @@ def test_gdalalg_raster_scale_missing_srcmax():
     alg["src-min"] = 0
     with pytest.raises(
         Exception,
-        match=r"Argument\(s\) 'src-min' require\(s\) that the following argument\(s\) are also specified: src-max.",
+        match=r"Argument\(s\) 'input-min' require\(s\) that the following argument\(s\) are also specified: input-max.",
     ):
         alg.Run()
 
@@ -128,10 +128,10 @@ def test_gdalalg_raster_scale_missing_dstmin():
     alg["input"] = src_ds
     alg["output"] = ""
     alg["output-format"] = "MEM"
-    alg["dst-max"] = 0
+    alg["output-max"] = 0
     with pytest.raises(
         Exception,
-        match=r"Argument\(s\) 'dst-max' require\(s\) that the following argument\(s\) are also specified: dst-min.",
+        match=r"Argument\(s\) 'output-max' require\(s\) that the following argument\(s\) are also specified: output-min.",
     ):
         alg.Run()
 
@@ -145,10 +145,10 @@ def test_gdalalg_raster_scale_missing_dstmax():
     alg["input"] = src_ds
     alg["output"] = ""
     alg["output-format"] = "MEM"
-    alg["dst-min"] = 0
+    alg["output-min"] = 0
     with pytest.raises(
         Exception,
-        match=r"Argument\(s\) 'dst-min' require\(s\) that the following argument\(s\) are also specified: dst-max.",
+        match=r"Argument\(s\) 'output-min' require\(s\) that the following argument\(s\) are also specified: output-max.",
     ):
         alg.Run()
 
@@ -163,10 +163,10 @@ def test_gdalalg_raster_scale_srcmin_srcmax_destmin_dstmax():
     alg["input"] = src_ds
     alg["output"] = ""
     alg["output-format"] = "MEM"
-    alg["src-min"] = 10
-    alg["src-max"] = 20
-    alg["dst-min"] = 100
-    alg["dst-max"] = 200
+    alg["input-min"] = 10
+    alg["input-max"] = 20
+    alg["output-min"] = 100
+    alg["output-max"] = 200
     assert alg.Run()
     out_ds = alg["output"].GetDataset()
     assert out_ds.GetRasterBand(1).ComputeRasterMinMax() == (150, 150)
diff --git a/doc/source/programs/gdal_raster_scale.rst b/doc/source/programs/gdal_raster_scale.rst
@@ -21,8 +21,8 @@ Description
 -----------
 
 :program:`gdal raster scale` can be used to rescale the input pixels values
-from the range :option:`--src-min` to :option:`--src-max` to the range
-:option:`--dst-min` to :option:`--dst-max`.
+from the range :option:`--input-min` to :option:`--input-max` to the range
+:option:`--output-min` to :option:`--output-max`.
 It is also often necessary to reset the output datatype with the :option:`--ot` switch.
 If omitted the output range is from the minimum value to the maximum value allowed
 for integer data types (for example from 0 to 255 for Byte output) or from 0 to 1
@@ -54,19 +54,11 @@ Program-Specific Options
 
     Index (starting at 1) of the band to which the scaling must be only applied.
 
-.. option:: --dst-max <DSTMAX>
-
-    Maximum value of the output range. This option must be used together with :option:`--dst-min`.
-
-.. option:: --dst-min <DSTMIN>
-
-    Minimum value of the output range. This option must be used together with :option:`--dst-max`.
-
 .. option:: --exponent <EXPONENT>
 
     Apply non-linear scaling with a power function. ``exp_val`` is the exponent
     of the power function (must be positive). This option must be used with the
-    :option:`--src-min` / :option:`--src-max` / :option:`--dst-min` / :option:`--dst-max` options.
+    :option:`--input-min` / :option:`--input-max` / :option:`--output-min` / :option:`--output-max` options.
 
     The scaled value ``Dst`` is calculated from the source value ``Src`` with the following
     formula:
@@ -79,21 +71,29 @@ Program-Specific Options
         :ref:`gdal_raster_unscale` assumes linear scaling, and
         this cannot unscale values back to the original ones.
 
-.. option:: --no-clip
-
-    Disable clipping input values to the source range. Note that using this option
-    with non-linear scaling with a non-integer exponent will cause input values lower
-    than the minimum value of the source range to be mapped to not-a-number.
-
-.. option:: --src-max <SRCMAX>
+.. option:: --input-max <MAX>
 
     Maximum value of the source range. If not specified, it will be calculated from the source dataset.
-    This option must be used together with :option:`--src-min`.
+    This option must be used together with :option:`--input-min`.
 
-.. option:: --src-min <SRCMIN>
+.. option:: --input-min <MIN>
 
     Minimum value of the source range. If not specified, it will be calculated from the input dataset.
-    This option must be used together with :option:`--src-max`.
+    This option must be used together with :option:`--input-max`.
+
+.. option:: --output-max <MAX>
+
+    Maximum value of the output range. This option must be used together with :option:`--output-min`.
+
+.. option:: --output-min <MIN>
+
+    Minimum value of the output range. This option must be used together with :option:`--output-max`.
+
+.. option:: --no-clip
+
+    Disable clipping input values to the source range. Note that using this option
+    with non-linear scaling with a non-integer exponent will cause input values lower
+    than the minimum value of the source range to be mapped to not-a-number.
 
 Standard Options
 ----------------
@@ -127,4 +127,4 @@ Examples
 
    .. code-block:: bash
 
-        $ gdal raster scale --datatype Byte --src-min 0 --src-max 4095 uint16.tif byte.tif --overwrite
+        $ gdal raster scale --datatype Byte --input-min 0 --input-max 4095 uint16.tif byte.tif --overwrite
