Skip to content

Commit

Permalink
Tried to fix a problem, created more problems, now they're all fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
sjmgarnier committed Jan 30, 2024
1 parent 3b47ba2 commit 40a1098
Show file tree
Hide file tree
Showing 191 changed files with 69,437 additions and 2,551 deletions.
5 changes: 0 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,7 @@ export(writeFrame)
export(writeMulti)
export(writerOuput)
export(zeros)
exportClasses(Image)
exportClasses(Queue)
exportClasses(Stream)
exportClasses(Video)
exportClasses(VideoStack)
exportClasses(VideoWriter)
import(ROpenCVLite)
import(Rcpp)
import(methods)
Expand Down
23 changes: 3 additions & 20 deletions R/ImageClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @name Image-class
#'
#' @aliases Rcpp_Image
#' @aliases Rcpp_Image Image
#'
#' @docType class
#'
Expand Down Expand Up @@ -32,24 +32,7 @@
#'
#' @author Simon Garnier, \email{garnier@@njit.edu}
#'
#' @seealso \code{\link{image}}, \code{\link{Video}}, \code{\link{Stream}}
#'
#' @export
setClass("Image",
representation(
cpp = "C++Object"
),
prototype(
cpp = NULL
),
validity = function(object) {
if (is.null(object@cpp) || is(object@cpp, "Rcpp_Image")) {
return(TRUE)
} else {
return(FALSE)
}
}
)
#' @seealso \code{\link{image}}


#' @title Create an Object of Class \code{Image}
Expand Down Expand Up @@ -80,7 +63,7 @@ setClass("Image",
#'
#' @export
image <- function(..., colorspace = "BGR") {
new(Rvision::Image, ..., colorspace)
new(Image, ..., colorspace)
}


Expand Down
21 changes: 2 additions & 19 deletions R/QueueClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @name Queue-class
#'
#' @aliases Rcpp_Queue
#' @aliases Rcpp_Queue Queue
#'
#' @docType class
#'
Expand Down Expand Up @@ -37,24 +37,7 @@
#'
#' @author Simon Garnier, \email{garnier@@njit.edu}
#'
#' @seealso \code{\link{Video}}, \code{\link{Stream}}
#'
#' @export
setClass("Queue",
representation(
cpp = "C++Object"
),
prototype(
cpp = NULL
),
validity = function(object) {
if (is.null(object@cpp) || is(object@cpp, "Rcpp_Queue")) {
return(TRUE)
} else {
return(FALSE)
}
}
)
#' @seealso \code{\link{queue}}, \code{\link{Video}}, \code{\link{Stream}}


#' @title Create an Object of Class \code{Queue}
Expand Down
21 changes: 2 additions & 19 deletions R/StreamClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @name Stream-class
#'
#' @aliases Rcpp_Stream
#' @aliases Rcpp_Stream Stream
#'
#' @docType class
#'
Expand All @@ -21,24 +21,7 @@
#'
#' @author Simon Garnier, \email{garnier@@njit.edu}
#'
#' @seealso \code{\link{VideoWriter}}, \code{\link{Stream}}
#'
#' @export
setClass("Stream",
representation(
cpp = "C++Object"
),
prototype(
cpp = NULL
),
validity = function(object) {
if (is.null(object@cpp) || is(object@cpp, "Rcpp_Stream")) {
return(TRUE)
} else {
return(FALSE)
}
}
)
#' @seealso \code{\link{stream}}, \code{\link{queue}}


#' @title Create an Object of Class \code{Stream}
Expand Down
20 changes: 3 additions & 17 deletions R/VideoClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @name Video-class
#'
#' @aliases Rcpp_Video
#' @aliases Rcpp_Video Video
#'
#' @docType class
#'
Expand Down Expand Up @@ -30,22 +30,8 @@
#'
#' @author Simon Garnier, \email{garnier@@njit.edu}
#'
#' @export
setClass("Video",
representation(
cpp = "C++Object"
),
prototype(
cpp = NULL
),
validity = function(object) {
if (is.null(object@cpp) || is(object@cpp, "Rcpp_Video")) {
return(TRUE)
} else {
return(FALSE)
}
}
)
#' @seealso \code{\link{video}}, \code{\link{queue}}



#' @title Create an Object of Class \code{Video}
Expand Down
21 changes: 3 additions & 18 deletions R/VideoWriterClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' @name VideoWriter-class
#'
#' @aliases Rcpp_VideoWriter
#' @aliases Rcpp_VideoWriter VideoWriter
#'
#' @docType class
#'
Expand All @@ -29,23 +29,8 @@
#' @slot release Function to release the object from memory.
#'
#' @author Simon Garnier, \email{garnier@@njit.edu}
#'
#' @export
setClass("VideoWriter",
representation(
cpp = "C++Object"
),
prototype(
cpp = NULL
),
validity = function(object) {
if (is.null(object@cpp) || is(object@cpp, "Rcpp_VideoWriter")) {
return(TRUE)
} else {
return(FALSE)
}
}
)
#'
#' @seealso \code{\link{videoWriter}}


#' @title Create an object of class \code{VideoWriter}
Expand Down
18 changes: 9 additions & 9 deletions docs/articles/z2_io.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/articles/z3_basic.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/z4_inplace.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 40a1098

Please sign in to comment.