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

Rename FrameGrab to GrabFrame.

Browse Source
This commit is contained in:
Peter Johnson
2016-08-26 00:30:45 -07:00
parent 4f22ac4100
commit 151c89fb5d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/cameraserver_oo.h
View File

@@ -326,7 +326,7 @@ class CvSink : public VideoSink {
/// to calling WaitForFrame() followed by GetImage(0, image).
/// @return Frame time, or 0 on error (call GetError() to obtain the error
/// message);
uint64_t FrameGrab(cv::Mat* image) const;
uint64_t GrabFrame(cv::Mat* image) const;
/// Get error string. Call this if WaitForFrame() returns 0 to determine
/// what the error is.

2
include/cameraserver_oo.inl
View File

@@ -276,7 +276,7 @@ inline bool CvSink::GetImage(int channel, cv::Mat* image) const {
return GetSinkImage(m_handle, channel, image, &m_status);
}
inline uint64_t CvSink::FrameGrab(cv::Mat* image) const {
inline uint64_t CvSink::GrabFrame(cv::Mat* image) const {
m_status = 0;
return GrabSinkFrame(m_handle, image, &m_status);
}

2
java/src/edu/wpi/cameraserver/CvSink.java
View File

@@ -41,7 +41,7 @@ public class CvSink extends VideoSink {
/// to calling WaitForFrame() followed by GetImage(0, image).
/// @return Frame time, or 0 on error (call GetError() to obtain the error
/// message);
//public long frameGrab(CvMat image) {
//public long grabFrame(CvMat image) {
// return CameraServerJNI.grabSinkFrame(m_handle, image);
//}