This repository has been archived by the owner on Jan 3, 2023. It is now read-only.
Support for the latest OpenCV version #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ub.com/NervanaSystems/aeon into kbinias/support_opencv_greater_than_v2
sfraczek
suggested changes
Feb 3, 2020
| @@ -141,6 +141,10 @@ find_package(PkgConfig REQUIRED) | |||
|
|
|||
| find_package(OpenCV REQUIRED) | |||
|
|
|||
| if(NOT (${OpenCV_VERSION} VERSION_LESS 3)) | |||
There was a problem hiding this comment.
what do you think about that?
Suggested change
| if(NOT (${OpenCV_VERSION} VERSION_LESS 3)) | |
| if${OpenCV_VERSION} VERSION_GREATER_EQUAL 3) |
| @@ -77,6 +77,10 @@ image::extractor::extractor(const image::config& cfg) | |||
| { | |||
| _pixel_type = CV_MAKETYPE(CV_8U, cfg.channels); | |||
| _color_mode = cfg.channels == 1 ? CV_LOAD_IMAGE_GRAYSCALE : CV_LOAD_IMAGE_COLOR; | |||
| #ifdef OPENCV_LEGACY_MODE | |||
| // Do not run ApplyExifOrientation as this causes Segmentation faults | |||
| _color_mode = _color_mode | CV_LOAD_IMAGE_IGNORE_ORIENTATION; | |||
There was a problem hiding this comment.
So with OpenCV>=3 we have to add CV_LOAD_IMAGE_IGNORE_ORIENTATION to prevent the unexpected orientation change?
| @@ -86,7 +90,11 @@ shared_ptr<image::decoded> image::extractor::extract(const void* inbuf, size_t i | |||
|
|
|||
| // It is bad to cast away const, but opencv does not support a const Mat | |||
| // The Mat is only used for imdecode on the next line so it is OK here | |||
| #ifdef OPENCV_LEGACY_MODE | |||
| cv::Mat input_img(insize * CV_MAT_CN(_pixel_type), 1, CV_8UC1, (char*)inbuf); | |||
There was a problem hiding this comment.
What does this constructor do?
| libs = "" | ||
| include_dirs = "" | ||
| include_dirs += " -I${CMAKE_PREFIX_PATH}/include " | ||
| lib_dirs = "${CMAKE_PREFIX_PATH}/lib" |
There was a problem hiding this comment.
What happened here to this file?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added support for the latest OpenCV version (tested with 2.4.x, 3.4.x, 4.2.x)