Merge pull request #46 from swarm-lab/develop

Develop
swarm-lab · Jan 20, 2024 · 3003806 · 3003806
2 parents e1567bd + 3a00c2e
commit 3003806
Show file tree

Hide file tree

Showing 26 changed files with 61 additions and 2,936 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: ROpenCVLite
 Type: Package
 Title: Helper Package for Installing OpenCV with R
-Version: 4.90.0
-Date: 2024-01-08
+Version: 4.90.1
+Date: 2024-01-20
 Authors@R: c(
     person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-3886-3974")),
@@ -22,7 +22,7 @@ Imports:
     parallel
 SystemRequirements: 
   cmake
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
 Biarch: false
 Encoding: UTF-8
 Depends:

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,16 @@
+# ROpenCVLite 4.90.1
+
+## New features
+
+* Adds WeChat QR code module (thanks to @wresch).
+* Adds pkgconfig files (thanks to @wresch).  
+
+## Minor improvements and fixes
+
+* Remove some processor optimization to avoid errors on Windows with recent CPUs.
+
+---
+
 # ROpenCVLite 4.90.0
 
 ## New features

diff --git a/R/install.R b/R/install.R
@@ -112,13 +112,14 @@ defaultOpenCVPath <- function() {
                             ' -DOpenCV_ARCH=x64',
                             ' -DOpenCV_RUNTIME=mingw',
                             ' -DBUILD_SHARED_LIBS=ON',
-                            if (grepl("11", config$os)) ' -DCPU_DISPATCH=SSE4_1,SSE4_2,FP16,AV')
+                            ' -DCPU_DISPATCH=SSE4_1,SSE4_2,FP16,AV')
     ),
     ' -DCMAKE_MAKE_PROGRAM="', config$make_path, '"',
     ' -DCMAKE_CXX_STANDARD=11',
     ' -DENABLE_PRECOMPILED_HEADERS=OFF',
     ' -DOPENCV_EXTRA_MODULES_PATH=', config$contrib_dir,
-    ' -DBUILD_LIST=calib3d,core,dnn,features2d,flann,gapi,highgui,imgcodecs,imgproc,ml,objdetect,photo,stitching,video,videoio,ximgproc',
+    ' -DBUILD_LIST=calib3d,core,dnn,features2d,flann,gapi,highgui,imgcodecs,imgproc,ml,objdetect,photo,stitching,video,videoio,ximgproc,wechat_qrcode',
+    ' -DOPENCV_GENERATE_PKGCONFIG=ON',
     ' -DWITH_OPENMP=ON',
     ' -DWITH_TBB=ON',
     ' -DWITH_EIGEN=ON',
@@ -287,4 +288,4 @@ removeOpenCV <- function() {
     message("OpenCV is not installed on this system. Nothing to be done.")
     !isOpenCVInstalled()
   }
-}
+}
diff --git a/cran-comments.md b/cran-comments.md
@@ -16,9 +16,7 @@
 
 ## R CMD check results
 
-* Version jumps in minor (submitted: 4.90.0, existing: 4.80.1)
-
-This is normal. The package numbering scheme is based on the OpenCV version number. 
+* N/A.
 
 ## Downstream dependencies
 

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/install.html b/docs/articles/install.html
diff --git a/docs/articles/usage.html b/docs/articles/usage.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/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -4,7 +4,7 @@ pkgdown_sha: ~
 articles:
   install: install.html
   usage: usage.html
-last_built: 2024-01-08T14:03Z
+last_built: 2024-01-20T20:53Z
 urls:
   reference: https://swarm-lab.github.io/ROpenCVLite/reference
   article: https://swarm-lab.github.io/ROpenCVLite/articles

diff --git a/docs/reference/OpenCVPath.html b/docs/reference/OpenCVPath.html
diff --git a/docs/reference/ROpenCVLite-package.html b/docs/reference/ROpenCVLite-package.html
diff --git a/docs/reference/defaultOpenCVPath.html b/docs/reference/defaultOpenCVPath.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/installOpenCV.html b/docs/reference/installOpenCV.html
diff --git a/docs/reference/isCmakeInstalled.html b/docs/reference/isCmakeInstalled.html
diff --git a/docs/reference/isOpenCVInstalled.html b/docs/reference/isOpenCVInstalled.html
diff --git a/docs/reference/opencvConfig.html b/docs/reference/opencvConfig.html
diff --git a/docs/reference/opencvVersion.html b/docs/reference/opencvVersion.html
diff --git a/docs/reference/removeOpenCV.html b/docs/reference/removeOpenCV.html