Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OpenCV dependency and update OpenCV interfaces.

Browse Source 
This requires the wpilibsuite/opencv packages with PRs 1-3 applied.
This commit is contained in:
Peter Johnson
2016-10-22 09:57:33 -07:00
parent 0a8e0e9746
commit 218718a063
8 changed files with 170 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cameraserver_c.cpp
View File

@@ -10,6 +10,7 @@
#include <cstddef>
#include <cstdlib>
#include "opencv2/core/core.hpp"
#include "llvm/SmallString.h"
#include "cameraserver_cpp.h"
@@ -183,7 +184,8 @@ void CS_ReleaseSource(CS_Source source, CS_Status* status) {
void CS_PutSourceFrame(CS_Source source, struct CvMat* image,
CS_Status* status) {
//TODO: return cs::PutSourceFrame(source, image, status);
auto mat = cv::cvarrToMat(image);
return cs::PutSourceFrame(source, mat, status);
}
void CS_NotifySourceError(CS_Source source, const char* msg,
@@ -269,7 +271,8 @@ void CS_ReleaseSink(CS_Sink sink, CS_Status* status) {
uint64_t CS_GrabSinkFrame(CS_Sink sink, struct CvMat* image,
CS_Status* status) {
return 0; // TODO: cs::GrabSinkFrame(sink, image, status);
auto mat = cv::cvarrToMat(image);
return cs::GrabSinkFrame(sink, mat, status);
}
char* CS_GetSinkError(CS_Sink sink, CS_Status* status) {