Merge pull request #41 from swarm-lab/develop

Merge develop branch with master branch in preparation for v0.6.0 release.

.github/workflows/R-CMD-check.yaml

@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - master
+      - develop
   pull_request:
     branches:
       - main
       - master
+      - develop
 
 name: R-CMD-check
 

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: Rvision
 Type: Package
-Title: Computer vision library for R
-Version: 0.5.0
-Date: 2021-02-19
+Title: Computer Vision Library for R
+Version: 0.6.0
+Date: 2021-03-21
 Authors@R: c(
     person("Simon", "Garnier", email = "[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-3886-3974")),
@@ -18,14 +18,14 @@ Depends:
     R (>= 3.5.0)
 Imports:
     Rcpp (>= 1.0.1),
-    ROpenCVLite (>= 4.50.0),
+    ROpenCVLite (>= 4.51.0),
     methods,
     pbapply,
     stats,
     graphics
 LinkingTo: Rcpp, RcppArmadillo
 SystemRequirements: C++11
-RcppModules: class_Image, class_Video, class_Stream, class_VideoWriter, 
+RcppModules: class_Image, class_Capture, class_VideoWriter, 
     methods_Arithmetic, methods_Statistics, methods_Comparisons, methods_Logical, 
     methods_OpticalFlow, methods_Blob, methods_Morphology, methods_Filters, 
     methods_Display, methods_Draw, methods_Geometry, methods_Shape, methods_Transform,

NAMESPACE

@@ -7,24 +7,29 @@ S3method(as.matrix,Rcpp_Image)
 S3method(codec,Rcpp_Video)
 S3method(codec,Rcpp_VideoWriter)
 S3method(dim,Rcpp_Image)
+S3method(dim,Rcpp_Queue)
 S3method(dim,Rcpp_Stream)
 S3method(dim,Rcpp_Video)
 S3method(dim,Rcpp_VideoWriter)
 S3method(fps,Rcpp_Video)
 S3method(fps,Rcpp_VideoWriter)
+S3method(frame,Rcpp_Queue)
+S3method(frame,Rcpp_Video)
 S3method(getProp,Rcpp_Stream)
 S3method(getProp,Rcpp_Video)
 S3method(getProp,Rcpp_VideoWriter)
+S3method(length,Rcpp_Queue)
 S3method(max,Rcpp_Image)
 S3method(mean,Rcpp_Image)
 S3method(mean,list)
 S3method(min,Rcpp_Image)
-S3method(plot,OF_array)
 S3method(plot,Rcpp_Image)
 S3method(plot,blob)
 S3method(range,Rcpp_Image)
+S3method(readNext,Rcpp_Queue)
 S3method(readNext,Rcpp_Stream)
 S3method(readNext,Rcpp_Video)
+S3method(release,Rcpp_Queue)
 S3method(release,Rcpp_Stream)
 S3method(release,Rcpp_Video)
 S3method(release,Rcpp_VideoWriter)
@@ -45,6 +50,7 @@ export("%i>=%")
 export("%i|%")
 export(Image)
 export(LUT)
+export(Queue)
 export(Stream)
 export(Video)
 export(VideoWriter)
@@ -55,13 +61,16 @@ export(addWeighted)
 export(api)
 export(bilateralFilter)
 export(bitAnd)
+export(bitMax)
+export(bitMin)
 export(bitNot)
 export(bitOr)
 export(bitdepth)
 export(blur)
 export(border)
 export(boxFilter)
 export(canny)
+export(capacity)
 export(changeBitDepth)
 export(changeColorSpace)
 export(click)
@@ -75,6 +84,7 @@ export(connectedComponents)
 export(contourArea)
 export(convexHull)
 export(convexityDefects)
+export(countNonZero)
 export(destroyAllDisplays)
 export(destroyDisplay)
 export(display)
@@ -88,6 +98,7 @@ export(drawPolyline)
 export(drawRectangle)
 export(drawRotatedRectangle)
 export(drawText)
+export(empty)
 export(farneback)
 export(fillConvexPoly)
 export(fillPoly)
@@ -102,6 +113,7 @@ export(floodFill)
 export(fourcc)
 export(fps)
 export(frame)
+export(full)
 export(gaussianBlur)
 export(getPerspectiveTransform)
 export(getProp)
@@ -115,6 +127,7 @@ export(inpaint)
 export(invert)
 export(isBlob)
 export(isImage)
+export(isQueue)
 export(isStream)
 export(isVideo)
 export(isVideoWriter)
@@ -129,24 +142,31 @@ export(morph)
 export(multiply)
 export(nchan)
 export(ncol.Rcpp_Image)
+export(ncol.Rcpp_Queue)
 export(ncol.Rcpp_Stream)
 export(ncol.Rcpp_Video)
 export(ncol.Rcpp_VideoWriter)
 export(newDisplay)
 export(nframes)
 export(not)
 export(nrow.Rcpp_Image)
+export(nrow.Rcpp_Queue)
 export(nrow.Rcpp_Stream)
 export(nrow.Rcpp_Video)
 export(nrow.Rcpp_VideoWriter)
 export(ones)
 export(pget)
 export(pixelsInContour)
+export(plotOF)
 export(pset)
+export(queue)
+export(randn)
+export(randu)
 export(readFrame)
 export(readMulti)
 export(readNext)
 export(release)
+export(reset)
 export(resize)
 export(rotateScale)
 export(scharr)

NEWS.md

@@ -0,0 +1,24 @@
+# Rvision 0.6.0
+
+## New features
+
+* We now have a changelog (yes, I know, finally).
+* A large portion of the code base has been rewritten for improving performance
+and facilitating code maintenance (hopefully). 
+* In-place operations have been reworked to allow for saving results in target
+images for more flexibility while maintaining performance.
+* GPU support has been added wherever possible. Stupid-fast mode enabled on 
+compatible hardware :-) 
+* An experimental dynamic queuing system operating on a separate thread has been 
+introduced to allow for reading frames in parallel with image processing on the 
+main R thread.
+* New, hopefully more useful vignettes have been added. 
+* More OpenCV functions are now accessible through Rvision (e.g., histogram 
+equalization).
+
+## Minor improvements and fixes
+
+* The documentation has been fixed/improved in several places. 
+* Minor bug fixes here and there. 
+
+---