Merge pull request #1486 from rstudio/fix-image_load

t-kalinowski · web-flow · commit 71937432eb14 · 2025-01-23T16:34:29.000-05:00
`image_load()`: coerce `target_size` correctly
diff --git a/R/image-utils.R b/R/image-utils.R
@@ -147,7 +147,7 @@ image_load <-
 function (path, color_mode = "rgb", target_size = NULL, interpolation = "nearest",
           keep_aspect_ratio = FALSE)
 {
-  args <- capture_args()
+  args <- capture_args(list(target_size = as_integer_tuple))
   do.call(keras$utils$load_img, args)
 }
 
diff --git a/R/r-utils.R b/R/r-utils.R
@@ -271,7 +271,7 @@ as_integer_array <- function(x) {
 }
 
 as_integer_tuple <- function(x, force_tuple = FALSE) {
-  if (is.null(x))
+  if (is.null(x) || is_py_object(x))
     x
   else if (is.list(x) || force_tuple)
     tuple(as.list(as.integer(x)))

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ image_load <-`
`147`	`147`	`function (path, color_mode = "rgb", target_size = NULL, interpolation = "nearest",`
`148`	`148`	`keep_aspect_ratio = FALSE)`
`149`	`149`	`{`
`150`		`- args <- capture_args()`
	`150`	`+ args <- capture_args(list(target_size = as_integer_tuple))`
`151`	`151`	`do.call(keras$utils$load_img, args)`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ as_integer_array <- function(x) {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`as_integer_tuple <- function(x, force_tuple = FALSE) {`
`274`		`- if (is.null(x))`
	`274`	`+ if (is.null(x) \|\| is_py_object(x))`
`275`	`275`	`x`
`276`	`276`	`else if (is.list(x) \|\| force_tuple)`
`277`	`277`	`tuple(as.list(as.integer(x)))`