Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliot McIntire committed Jul 28, 2020
2 parents 4de707b + da78814 commit ad34d9e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions R/postProcess.R
Expand Up @@ -1942,7 +1942,7 @@ projNotWKT2warn <- "Using PROJ not WKT2"


#' @importFrom raster extension
`cropReprojMaskWGDAL` <- function(x, studyArea, rasterToMatch, targetCRS, cores, dots, filename2, useSAcrs,
cropReprojMaskWGDAL <- function(x, studyArea, rasterToMatch, targetCRS, cores, dots, filename2, useSAcrs,
destinationPath = getOption("reproducible.destinationPath", "."), ...) {
message("crop, reproject, mask is using one-step gdalwarp")

Expand All @@ -1952,7 +1952,7 @@ projNotWKT2warn <- "Using PROJ not WKT2"
tempSrcRaster <- bigRastersTmpFile()
returnToRAM <- FALSE
if (missing(filename2)) filename2 <- NULL
if (isTRUE(filename2)) {
if (!.isFALSE(filename2)) {
filename2 <- determineFilename(filename2, destinationPath = destinationPath)
} else if (is.null(filename2) | .isFALSE(filename2)) {
returnToRAM <- TRUE
Expand Down

0 comments on commit ad34d9e

Please sign in to comment.