Skip to content

Fix build with later versions of OpenCV 3 #644

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

Merged
JWhitleyWork merged 1 commit into from
May 3, 2021
Merged

Fix build with later versions of OpenCV 3 #644

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
3 changes: 1 addition & 2 deletions image_proc/src/crop_decimate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ void debayer2x2toBGR(
int R, int G1, int G2, int B)
{
typedef cv::Vec<T, 3> DstPixel; // 8- or 16-bit BGR
#if CV_VERSION_MAJOR >= 4
#if CV_VERSION_MAJOR >= 4 || (CV_MAJOR_VERSION == 3 && CV_MINOR_VERSION > 2)
dst.create(src.rows / 2, src.cols / 2, cv::traits::Type<DstPixel>::value);
#else
// Assume OpenCV 3 API
dst.create(src.rows / 2, src.cols / 2, cv::DataType<DstPixel>::type);
#endif

Expand Down