Skip to content
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.

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

Update for OpenCV v4.0 compatibility #306

Merged
merged 2 commits into from
Jan 11, 2019
Merged

Update for OpenCV v4.0 compatibility #306

merged 2 commits into from
Jan 11, 2019

Conversation

jacobperron
Copy link
Member

No description provided.

@jacobperron jacobperron added the in progress Actively being worked on (Kanban column) label Jan 10, 2019
@jacobperron jacobperron self-assigned this Jan 10, 2019
@jacobperron jacobperron added in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Jan 10, 2019
Copy link
Member

@nuclearsandwich nuclearsandwich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as long as it passes CI on Xenial, our current Windows builds, and MacOS with the latest OpenCV formula.

Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, with one comment.

Thanks for looking into it.

@@ -124,7 +124,7 @@ cv::Mat & Burger::render_burger(size_t width, size_t height)
}
burger_buf = cv::Mat(height_i, width_i, CV_8UC3);
}
burger_buf = cvScalar(0, 0, 0);
burger_buf = cv::Scalar_<int>(0, 0, 0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason you're using int specifically rather than double, i.e. cv::Scalar? I assume there is, but I'm just curious.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, no. I think this should just be cv::Scalar 😬

Fixed in 2877adb

@jacobperron
Copy link
Member Author

Packages up to image_tools:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@jacobperron jacobperron merged commit 3dca291 into master Jan 11, 2019
@jacobperron jacobperron deleted the cv4_compatibility branch January 11, 2019 17:41
@jacobperron jacobperron removed the in review Waiting for review (Kanban column) label Jan 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants