From a5d4e9111377647a4ecd4acf0f4e6e4c1749851f Mon Sep 17 00:00:00 2001 From: Simon Garnier Date: Thu, 20 Jul 2023 14:11:11 +0200 Subject: [PATCH] Fix CRAN comments. --- R/opencv.R | 14 +++++++++----- cran-comments.md | 8 +++++++- docs/pkgdown.yml | 2 +- docs/reference/defaultOpenCVPath.html | 5 +++-- docs/reference/opencvConfig.html | 11 ++++++----- inst/CITATION | 4 ++-- man/defaultOpenCVPath.Rd | 4 +++- man/opencvConfig.Rd | 10 ++++++---- 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/R/opencv.R b/R/opencv.R index 324a46c..4a164ec 100644 --- a/R/opencv.R +++ b/R/opencv.R @@ -8,7 +8,9 @@ #' @author Simon Garnier, \email{garnier@@njit.edu} #' #' @examples -#' defaultOpenCVPath() +#' \dontrun{ +#' defaultOpenCVPath() +#' } #' #' @export defaultOpenCVPath <- function() { @@ -385,10 +387,12 @@ opencvVersion <- function() { #' @author Simon Garnier, \email{garnier@@njit.edu} #' #' @examples -#' if (isOpenCVInstalled()) { -#' opencvConfig() -#' opencvConfig(output = "cflags") -#' opencvConfig(arch = R.version$arch) +#' \dontrun{ +#' if (isOpenCVInstalled()) { +#' opencvConfig() +#' opencvConfig(output = "cflags") +#' opencvConfig(arch = R.version$arch) +#' } #' } #' #' @export diff --git a/cran-comments.md b/cran-comments.md index f3cf578..78089cd 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -23,4 +23,10 @@ There are currently no downstream dependencies for this package. ## CRAN team comments -N/A. +* Version jumps in minor (submitted: 4.80.0, existing: 4.70.0) + +This is normal. The package version follows that of OpenCV. + +* Package CITATION file contains call(s) to old-style citEntry(). Please use bibentry() instead. + +Fixed. \ No newline at end of file diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index f176e4e..5be41de 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -4,7 +4,7 @@ pkgdown_sha: ~ articles: install: install.html usage: usage.html -last_built: 2023-07-20T07:15Z +last_built: 2023-07-20T12:10Z urls: reference: https://swarm-lab.github.io/ROpenCVLite/reference article: https://swarm-lab.github.io/ROpenCVLite/articles diff --git a/docs/reference/defaultOpenCVPath.html b/docs/reference/defaultOpenCVPath.html index 01f1d27..0e14b3f 100644 --- a/docs/reference/defaultOpenCVPath.html +++ b/docs/reference/defaultOpenCVPath.html @@ -77,8 +77,9 @@

Author<

Examples

- 
defaultOpenCVPath()
-#> [1] "/Users/simon/Library/R/arm64/4.3/library/ROpenCV"
+    
if (FALSE) {
+ defaultOpenCVPath()
+}
diff --git a/docs/reference/opencvConfig.html b/docs/reference/opencvConfig.html index b40bd3e..8f8d207 100644 --- a/docs/reference/opencvConfig.html +++ b/docs/reference/opencvConfig.html @@ -90,12 +90,13 @@

Author<

Examples

- 
if (isOpenCVInstalled()) {
-  opencvConfig()
-  opencvConfig(output = "cflags")
-  opencvConfig(arch = R.version$arch)
+    
if (FALSE) {
+ if (isOpenCVInstalled()) {
+   opencvConfig()
+   opencvConfig(output = "cflags")
+   opencvConfig(arch = R.version$arch)
+ }
 }
-#> -L/Users/simon/Library/R/arm64/4.3/library/ROpenCV/lib -lopencv_calib3d -lopencv_core -lopencv_dnn -lopencv_features2d -lopencv_flann -lopencv_gapi -lopencv_highgui -lopencv_imgcodecs -lopencv_imgproc -lopencv_ml -lopencv_objdetect -lopencv_photo -lopencv_stitching -lopencv_video -lopencv_videoio -lopencv_ximgproc-I/Users/simon/Library/R/arm64/4.3/library/ROpenCV/include/opencv4 -I/Users/simon/Library/R/arm64/4.3/library/ROpenCV/include-L/Users/simon/Library/R/arm64/4.3/library/ROpenCV/lib -lopencv_calib3d -lopencv_core -lopencv_dnn -lopencv_features2d -lopencv_flann -lopencv_gapi -lopencv_highgui -lopencv_imgcodecs -lopencv_imgproc -lopencv_ml -lopencv_objdetect -lopencv_photo -lopencv_stitching -lopencv_video -lopencv_videoio -lopencv_ximgproc
diff --git a/inst/CITATION b/inst/CITATION index c2a1a1b..042eb2b 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -3,8 +3,8 @@ citHeader("To cite ROpenCVLite in publications use:") year <- sub("-.*", "", meta$Date) note <- sprintf("R package version %s", meta$Version) -citEntry( - entry = "Manual", +bibentry( + bibtype = "Manual", title = "{ROpenCVLite} - Helper package for installing OpenCV with R", author = "Simon Garnier and John Muschelli", journal = "", diff --git a/man/defaultOpenCVPath.Rd b/man/defaultOpenCVPath.Rd index ba94847..d3c4beb 100644 --- a/man/defaultOpenCVPath.Rd +++ b/man/defaultOpenCVPath.Rd @@ -14,7 +14,9 @@ This function returns the location at which OpenCV should be installed by default. } \examples{ -defaultOpenCVPath() +\dontrun{ + defaultOpenCVPath() +} } \author{ diff --git a/man/opencvConfig.Rd b/man/opencvConfig.Rd index 477b3ff..b51dd08 100644 --- a/man/opencvConfig.Rd +++ b/man/opencvConfig.Rd @@ -22,10 +22,12 @@ This function returns the configuration options for compiling C/C++-based packages against OpenCV installed by \code{\link{ROpenCVLite}}. } \examples{ -if (isOpenCVInstalled()) { - opencvConfig() - opencvConfig(output = "cflags") - opencvConfig(arch = R.version$arch) +\dontrun{ + if (isOpenCVInstalled()) { + opencvConfig() + opencvConfig(output = "cflags") + opencvConfig(arch = R.version$arch) + } } }