Skip to content

Add OpenCV4 support #6638

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
BigBookPlus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add OpenCV4 support #6638

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a04cc2
add opencv4 support
BigBookPlus Dec 13, 2018
640159f
Update README.md
BigBookPlus Jan 30, 2019
a0b8667
Update README.md
BigBookPlus Jan 30, 2019
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
6 changes: 6 additions & 0 deletions include/caffe/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ private:\
// is executed we will see a fatal log.
#define NOT_IMPLEMENTED LOG(FATAL) << "Not Implemented Yet"

// Supporting OpenCV4
#if (CV_MAJOR_VERSION == 4)
#define CV_LOAD_IMAGE_COLOR cv::IMREAD_COLOR
#define CV_LOAD_IMAGE_GRAYSCALE cv::IMREAD_GRAYSCALE
#endif

// See PR #1236
namespace cv { class Mat; }

Expand Down