From 49db1052c5835e40944a0844690585e1030fb849 Mon Sep 17 00:00:00 2001 From: Michael Sumner Date: Mon, 3 Jun 2024 08:06:29 +0000 Subject: [PATCH] fix adding empty options --- R/raster-input.R | 1 + inst/include/gdalwarpmem/gdalwarpmem.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/R/raster-input.R b/R/raster-input.R index 5d55a2e2..84121422 100644 --- a/R/raster-input.R +++ b/R/raster-input.R @@ -509,6 +509,7 @@ vapour_warp_raster <- function(x, bands = NULL, stop("manually setting -r, -te, -t_srs, -of, -s_srs, -ot options not allowed \n ( these controlled by arguments 'resample', 'target_extent', 'target_projection', '', 'source_projection', 'band_output_type')") } if (any(grepl("-te_srs", options))) stop("setting '-te_srs' projection of target extent is not supported") + vals <- warp_in_memory_gdal_cpp(x, source_WKT = source_projection, target_WKT = projection, target_extent = as.numeric(extent), diff --git a/inst/include/gdalwarpmem/gdalwarpmem.h b/inst/include/gdalwarpmem/gdalwarpmem.h index 62608942..9a658d66 100644 --- a/inst/include/gdalwarpmem/gdalwarpmem.h +++ b/inst/include/gdalwarpmem/gdalwarpmem.h @@ -122,7 +122,9 @@ inline List gdal_warp_in_memory(CharacterVector source_filename, papszArg = CSLAddString(papszArg, resample[0]); for (int gwopt = 0; gwopt < options.length(); gwopt++) { - papszArg = CSLAddString(papszArg, options[gwopt]); + if (!options[gwopt].empty()) { + papszArg = CSLAddString(papszArg, options[gwopt]); + } }