Fix getPerspectiveTransform. Version bump. Website update.

swarm-lab · Feb 24, 2021 · 5d1ebfb · 5d1ebfb
1 parent 11a6611
commit 5d1ebfb
Show file tree

Hide file tree

Showing 138 changed files with 216 additions and 187 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rvision
 Type: Package
 Title: Computer vision library for R
-Version: 0.4.2
+Version: 0.4.3
 Date: 2021-02-19
 Authors@R: c(
     person("Simon", "Garnier", email = "garnier@njit.edu", role = c("aut", "cre"),
@@ -16,7 +16,7 @@ LazyData: TRUE
 NeedsCompilation: yes
 Imports:
     Rcpp (>= 1.0.1),
-    ROpenCVLite (>= 0.3.412),
+    ROpenCVLite (>= 4.50.0),
     methods,
     pbapply,
     stats,

diff --git a/R/transform.R b/R/transform.R
@@ -231,43 +231,6 @@ findTransformORB <- function(template, image, warp_mode = "affine", max_features
 # }
 
 
-#' @title Perspective Transform
-#'
-#' @description \code{getPerspectiveTransform} computes the matrix of a perspective
-#'  transform from 4 pairs of corresponding points.
-#'
-#' @param from A 4x2 matrix indicating the location (x, y) of 4 points in the
-#'  source image.
-#'
-#' @param to A 4x2 matrix indicating the location (x, y) of 4 points in the
-#'  destination image. The order of the points must correspond to the order in
-#'  \code{from}.
-#'
-#' @return A 3x3 matrix.
-#'
-#' @author Simon Garnier, \email{garnier@@njit.edu}
-#'
-#' @seealso \code{\link{warpPerspective}}
-#'
-#' @examples
-#' from <- matrix(c(1, 1, 2, 5, 6, 5, 5, 1), nrow = 4, byrow = TRUE)
-#' to <- matrix(c(1, 1, 1, 5, 5, 5, 5, 1), nrow = 4, byrow = TRUE)
-#' getPerspectiveTransform(from, to)
-#'
-#' @export
-getPerspectiveTransform <- function(from, to) {
-  if (any(dim(from) != c(4, 2)) | any(dim(to) != c(4, 2)))
-    stop("'from' and 'to' must be 4x2 matrices.")
-
-  from[, 1] <- from[, 1] - 1
-  from[, 2] <- -from[, 2] + nrow(image)
-  to[, 1] <- to[, 1] - 1
-  to[, 2] <- -to[, 2] + nrow(image) - (nrow(image) - output_size[1])
-
-  `_getPerspectiveTransform`(from, to)
-}
-
-
 #' @title Image Rotation and Scaling
 #'
 #' @description \code{rotateScale} rotates (clockwise) and scales an image using
@@ -403,6 +366,51 @@ warpAffine <- function(image, warp_matrix, output_size = dim(image)[1:2],
 }
 
 
+#' @title Perspective Transform
+#'
+#' @description \code{getPerspectiveTransform} computes the matrix of a perspective
+#'  transform from 4 pairs of corresponding points in a source and destination
+#'  image.
+#'
+#' @param from A 4x2 matrix indicating the location (x, y) of 4 points in the
+#'  source image.
+#'
+#' @param to A 4x2 matrix indicating the location (x, y) of 4 points in the
+#'  destination image. The order of the points must correspond to the order in
+#'  \code{from}.
+#'
+#' @param from_dim A vector which first two elements indicate the number of rows
+#'  and columns of the source image.
+#'
+#' @param to_dim A vector which first two elements indicate the number of rows
+#'  and columns of the destination image. If not specified, \code{from_dim} will
+#'  be used as a default.
+#'
+#' @return A 3x3 matrix.
+#'
+#' @author Simon Garnier, \email{garnier@@njit.edu}
+#'
+#' @seealso \code{\link{warpPerspective}}
+#'
+#' @examples
+#' from <- matrix(c(1, 1, 2, 5, 6, 5, 5, 1), nrow = 4, byrow = TRUE)
+#' to <- matrix(c(1, 1, 1, 5, 5, 5, 5, 1), nrow = 4, byrow = TRUE)
+#' getPerspectiveTransform(from, to, c(1080, 1920), c(1080, 1920))
+#'
+#' @export
+getPerspectiveTransform <- function(from, to, from_dim, to_dim = from_dim) {
+  if (any(dim(from) != c(4, 2)) | any(dim(to) != c(4, 2)))
+    stop("'from' and 'to' must be 4x2 matrices.")
+
+  from[, 1] <- from[, 1] - 1
+  from[, 2] <- -from[, 2] + from_dim[1]
+  to[, 1] <- to[, 1] - 1
+  to[, 2] <- -to[, 2] + from_dim[1] - (from_dim[1] - to_dim[1])
+
+  `_getPerspectiveTransform`(from, to)
+}
+
+
 #' @title Perspective Transformation
 #'
 #' @description \code{warpPerspective} applies a perspective transformation to

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/z1_install.html b/docs/articles/z1_install.html
diff --git a/docs/articles/z2_io.html b/docs/articles/z2_io.html
diff --git a/docs/articles/z3_basic.html b/docs/articles/z3_basic.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,7 +5,7 @@ articles:
   z1_install: z1_install.html
   z2_io: z2_io.html
   z3_basic: z3_basic.html
-last_built: 2021-02-24T19:40Z
+last_built: 2021-02-24T20:41Z
 urls:
   reference: https://swarm-lab.github.io/ROpenCVLite//reference
   article: https://swarm-lab.github.io/ROpenCVLite//articles

diff --git a/docs/reference/Image-class.html b/docs/reference/Image-class.html
diff --git a/docs/reference/LUT.html b/docs/reference/LUT.html
diff --git a/docs/reference/Rvision.html b/docs/reference/Rvision.html
diff --git a/docs/reference/RvisionAck.html b/docs/reference/RvisionAck.html
diff --git a/docs/reference/Stream-class.html b/docs/reference/Stream-class.html
diff --git a/docs/reference/Video-class.html b/docs/reference/Video-class.html
diff --git a/docs/reference/VideoWriter-class.html b/docs/reference/VideoWriter-class.html
diff --git a/docs/reference/absdiff.html b/docs/reference/absdiff.html
diff --git a/docs/reference/adaptiveThreshold.html b/docs/reference/adaptiveThreshold.html
diff --git a/docs/reference/addWeighted.html b/docs/reference/addWeighted.html
diff --git a/docs/reference/api.html b/docs/reference/api.html
diff --git a/docs/reference/as.array.Rcpp_Image.html b/docs/reference/as.array.Rcpp_Image.html
diff --git a/docs/reference/bilateralFilter.html b/docs/reference/bilateralFilter.html
diff --git a/docs/reference/bitdepth.html b/docs/reference/bitdepth.html
diff --git a/docs/reference/blur.html b/docs/reference/blur.html
diff --git a/docs/reference/border.html b/docs/reference/border.html
diff --git a/docs/reference/boxFilter.html b/docs/reference/boxFilter.html
diff --git a/docs/reference/canny.html b/docs/reference/canny.html
diff --git a/docs/reference/changeBitDepth.html b/docs/reference/changeBitDepth.html
diff --git a/docs/reference/changeColorSpace.html b/docs/reference/changeColorSpace.html
diff --git a/docs/reference/click.html b/docs/reference/click.html