Skip to content

Moved OpenCV version in cpp pyDVS to major version 4 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akvavit01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved OpenCV version in cpp pyDVS to major version 4 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pydvs/cpp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBS = -lstdc++ $(shell pkg-config --libs opencv)
LIBS = -lstdc++ $(shell pkg-config --libs opencv4)
CFLAGS = -g -Wall -std=gnu++0x
CFLAGS += $(shell pkg-config --cflags opencv)
CFLAGS += $(shell pkg-config --cflags opencv4)

test: test.cpp dvs_emu.cpp
$(CXX) -o $@ $@.cpp dvs_emu.cpp dvs_op.cpp $(LIBS) $(CFLAGS)
Expand Down
30 changes: 15 additions & 15 deletions pydvs/cpp/dvs_emu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ bool PyDVS::init(const string& filename, const float thr, const float relaxRate,
_get_size();
_get_fps();
// set output format as 32-bit floating point with a single channel
_cap.set(CV_CAP_PROP_FORMAT, CV_32FC1);
_cap.set(cv::CAP_PROP_FORMAT, CV_32FC1);
setAdapt(relaxRate, adaptUp, adaptDown, thr);
_initMatrices(thr);

Expand All @@ -67,7 +67,7 @@ bool PyDVS::init(const char* filename, const float thr, const float relaxRate,
_get_size();
_get_fps();
// set output format as 32-bit floating point with a single channel
_cap.set(CV_CAP_PROP_FORMAT, CV_32FC1);
_cap.set(cv::CAP_PROP_FORMAT, CV_32FC1);
setAdapt(relaxRate, adaptUp, adaptDown, thr);
_initMatrices(thr);

Expand All @@ -77,24 +77,24 @@ bool PyDVS::init(const char* filename, const float thr, const float relaxRate,

void PyDVS::_get_size(){
if(_open){
_w = _cap.get(CV_CAP_PROP_FRAME_WIDTH);
_h = _cap.get(CV_CAP_PROP_FRAME_HEIGHT);
_w = _cap.get(cv::CAP_PROP_FRAME_WIDTH);
_h = _cap.get(cv::CAP_PROP_FRAME_HEIGHT);

}
}

bool PyDVS::_set_size(){

if(_open){
size_t w = _cap.get(CV_CAP_PROP_FRAME_WIDTH);
size_t h = _cap.get(CV_CAP_PROP_FRAME_HEIGHT);
size_t w = _cap.get(cv::CAP_PROP_FRAME_WIDTH);
size_t h = _cap.get(cv::CAP_PROP_FRAME_HEIGHT);
bool success = true;
success &= _cap.set(CV_CAP_PROP_FRAME_WIDTH, _w);
success &= _cap.set(CV_CAP_PROP_FRAME_HEIGHT, _h);
success &= _cap.set(cv::CAP_PROP_FRAME_WIDTH, _w);
success &= _cap.set(cv::CAP_PROP_FRAME_HEIGHT, _h);

if (!success){
_cap.set(CV_CAP_PROP_FRAME_WIDTH, w);
_cap.set(CV_CAP_PROP_FRAME_HEIGHT, h);
_cap.set(cv::CAP_PROP_FRAME_WIDTH, w);
_cap.set(cv::CAP_PROP_FRAME_HEIGHT, h);
_w = w;
_h = h;
}
Expand All @@ -105,17 +105,17 @@ bool PyDVS::_set_size(){

void PyDVS::_get_fps(){
if(_open){
_fps = _cap.get(CV_CAP_PROP_FPS);
_fps = _cap.get(cv::CAP_PROP_FPS);
}
}

bool PyDVS::_set_fps(){
if(_open){
size_t fps = _cap.get(CV_CAP_PROP_FPS);
size_t fps = _cap.get(cv::CAP_PROP_FPS);
bool success = true;
success &= _cap.set(CV_CAP_PROP_FPS, _fps);
success &= _cap.set(cv::CAP_PROP_FPS, _fps);
if(!success){
_cap.set(CV_CAP_PROP_FPS, fps);
_cap.set(cv::CAP_PROP_FPS, fps);
_fps = fps;
}
return success;
Expand All @@ -128,7 +128,7 @@ bool PyDVS::update(){
if (_frame.empty()){
return false;
}
cv::cvtColor(_frame, _gray, CV_BGR2GRAY);
cv::cvtColor(_frame, _gray, cv::COLOR_BGR2GRAY);
_gray.convertTo(_in, CV_32F);
cv::parallel_for_(cv::Range(0, _gray.rows), _dvsOp);

Expand Down