Various fixes, notably for #96 and #97.

DESCRIPTION

@@ -18,6 +18,7 @@ Depends:
     R (>= 4.0.0)
 Imports:
     Rcpp (>= 1.0.1),
+    RcppArmadillo,
     ROpenCVLite (>= 4.70.0),
     methods,
     pbapply,
@@ -29,7 +30,7 @@ RcppModules: class_Image, class_Capture, class_VideoWriter,
     methods_OpticalFlow, methods_Blob, methods_Morphology, methods_Filters, 
     methods_Display, methods_Draw, methods_Geometry, methods_Shape, methods_Transform,
     methods_Feature, methods_Autothresh, methods_Ximgproc, methods_Calib3d
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Biarch: false
 StagedInstall: false
 Encoding: UTF-8

NEWS.md

@@ -10,7 +10,7 @@
 * Add goodFeaturesToTrack function (finds the most prominent corners in an image).
 * Add pyramid resampling functions (up- and down-).
 * Add ORB keypoint detection and matching. 
-* Add approxPolyDP (Douglas-Peucker algorithm for approximates a polygon with another polygon with less vertices).
+* Add approxPolyDP (Douglas-Peucker algorithm for approximating a polygon with another polygon with fewer vertices).
 * Add affine transform matrix computation.
 * Add string argument for streams (users can now pass the URL of a video stream or a GStreamer pipeline string). 
 + Add invertFourcc function to recover a codec's name from its fourcc code.

R/Rvision-package.R

@@ -13,8 +13,8 @@
 #' \tabular{ll}{
 #'  Package: \tab Rvision\cr
 #'  Type: \tab Package\cr
-#'  Version: \tab 0.1.0\cr
-#'  Date: \tab 2016-07-06\cr
+#'  Version: \tab 0.8.0\cr
+#'  Date: \tab 2024-01-31\cr
 #'  License: \tab GPL-3\cr
 #' }
 #'

src/Makevars

@@ -1,3 +1,3 @@
 PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("libs")'`
 PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("cflags")'`
-PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'`
+PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'` -g -O3 $(SHLIB_OPENMP_CXXFLAGS)

src/Makevars.win

@@ -2,4 +2,4 @@ PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e \
 						"ROpenCVLite::opencvConfig('libs', arch = Sys.getenv('R_ARCH'))")
 PKG_CPPFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e \
 						"ROpenCVLite::opencvConfig('cflags', arch = Sys.getenv('R_ARCH'))")
-PKG_CXXFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::CxxFlags()")
+PKG_CXXFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::CxxFlags()") -g -O3 $(SHLIB_OPENMP_CXXFLAGS)

src/visionModule.cpp

@@ -1,5 +1,7 @@
-// [[Rcpp::depends(RcppArmadillo)]]
 #include <RcppArmadillo.h>
+
+// [[Rcpp::depends(RcppArmadillo)]]
+
 using namespace Rcpp;
 
 #include "opencv2/opencv.hpp"
@@ -292,7 +294,7 @@ RCPP_MODULE(methods_Display) {
   function("_display", &_display, List::create(_["image"], _["window_name"],
     _["delay"], _["height"], _["width"], _["interpolation"]), "");
   function("_destroyDisplay", &_destroyDisplay, List::create(_["window_name"]), "");
-  function("_destroyAllDisplays", &_destroyAllDisplays, "", "");
+  function("_destroyAllDisplays", &_destroyAllDisplays, List::create(), "");
   function("_selectBoundingBoxes", &_selectBoundingBoxes, List::create(_["image"],
     _["window_name"], _["crosshair"]), "");
   function("_click", &_click, List::create(_["window_name"]), "");