diff --git a/DESCRIPTION b/DESCRIPTION index 66e4484..c859542 100644 --- 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 = "garnier@njit.edu", 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 index e5eeac2..90e81ee 100644 --- 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 index 9d1c463..a50f36e 100644 --- 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() } -} \ No newline at end of file +} diff --git a/cran-comments.md b/cran-comments.md index 1b46f94..56903bf 100644 --- 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 index d0ca7ac..3dcfd91 100644 --- a/docs/404.html +++ b/docs/404.html @@ -31,7 +31,7 @@ ROpenCVLite - 4.90.0 + 4.90.1