Skip to content

Commit d5de4e7

Browse files
authored
Merge pull request #14149 from LoveChauhan-18/fix-init-dest-warning
gdalwarp: change INIT_DEST=NO_DATA warning to failure
2 parents 28b33d8 + a5d8207 commit d5de4e7

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

alg/gdalwarpoperation.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,9 @@ CPLErr GDALWarpOperation::InitializeDestinationBuffer(void *pDstBuffer,
845845
{
846846
if (psOptions->padfDstNoDataReal == nullptr)
847847
{
848-
// TODO: Change to CE_Failure and error out for GDAL 3.13
849-
// See https://github.com/OSGeo/gdal/pull/12189
850-
CPLError(CE_Warning, CPLE_AppDefined,
848+
CPLError(CE_Failure, CPLE_AppDefined,
851849
"INIT_DEST was set to NO_DATA, but a NoData value was "
852-
"not defined. This warning will become a failure in a "
853-
"future GDAL release.");
850+
"not defined.");
854851
}
855852
else
856853
{

autotest/utilities/test_gdalwarp_lib.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4553,9 +4553,7 @@ def test_gdalwarp_lib_init_dest_invalid(tmp_vsimem, init_dest):
45534553

45544554
def test_gdalwarp_lib_init_dest_nodata_invalid(tmp_vsimem):
45554555

4556-
# TODO: switch from warning to failure in GDAL 3.12
4557-
# with pytest.raises(Exception, match="NoData value was not defined"):
4558-
with gdaltest.error_raised(gdal.CE_Warning, "NoData value was not defined"):
4556+
with gdaltest.error_raised(gdal.CE_Failure, "NoData value was not defined"):
45594557
gdal.Warp(
45604558
tmp_vsimem / "out.tif",
45614559
"../gcore/data/byte.tif",

0 commit comments

Comments
 (0)