Skip to content

Commit c60e8ef

Browse files
dbastonrouault
authored andcommitted
GDALWarp: Allow INIT_DEST=NO_DATA without NoData, for now
See OSGeo#12189
1 parent 2de9712 commit c60e8ef

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

alg/gdalwarpoperation.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,9 @@ CPLErr GDALWarpOperation::InitializeDestinationBuffer(void *pDstBuffer,
801801
{
802802
if (psOptions->padfDstNoDataReal == nullptr)
803803
{
804-
CPLError(CE_Failure, CPLE_AppDefined,
804+
// TODO: Change to CE_Failure for GDAL 3.12
805+
// See https://github.com/OSGeo/gdal/pull/12189
806+
CPLError(CE_Warning, CPLE_AppDefined,
805807
"INIT_DEST was set to NO_DATA, but a NoData value was "
806808
"not defined.");
807809
return CE_Failure;

autotest/utilities/test_gdalwarp_lib.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4391,7 +4391,9 @@ def test_gdalwarp_lib_init_dest_invalid(tmp_vsimem, init_dest):
43914391

43924392
def test_gdalwarp_lib_init_dest_nodata_invalid(tmp_vsimem):
43934393

4394-
with pytest.raises(Exception, match="NoData value was not defined"):
4394+
# TODO: switch from warning to failure in GDAL 3.12
4395+
# with pytest.raises(Exception, match="NoData value was not defined"):
4396+
with gdaltest.error_raised(gdal.CE_Warning, "NoData value was not defined"):
43954397
gdal.Warp(
43964398
tmp_vsimem / "out.tif",
43974399
"../gcore/data/byte.tif",

0 commit comments

Comments
 (0)