forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
allow to build opencv_objdetect without dnn in 4.5.5
It has been "fixed" upstream for OpenCV 4.6.0 It fixes few things in this recipe: - avoid a bug where quirc is in requirements, but not required by any component in package_indo() when dnn is False - a regression introduced by conan-io#11009. Indeed objdetect can be built without dnn in all OpenCV version before 4.5.4, so this PR was breaking these versions when dnn was False by not exposing opencv_objdetect and few contrib components.
- Loading branch information
Showing
4 changed files
with
124 additions
and
11 deletions.
There are no files selected for viewing
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
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
97 changes: 97 additions & 0 deletions
97
recipes/opencv/4.x/patches/4.5.5-0002-objdetect-without-dnn.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| --- a/modules/objdetect/CMakeLists.txt | ||
| +++ b/modules/objdetect/CMakeLists.txt | ||
| @@ -1,5 +1,16 @@ | ||
| set(the_description "Object Detection") | ||
| -ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js) | ||
| +ocv_define_module(objdetect | ||
| + opencv_core | ||
| + opencv_imgproc | ||
| + opencv_calib3d | ||
| + OPTIONAL | ||
| + opencv_dnn | ||
| + WRAP | ||
| + python | ||
| + java | ||
| + objc | ||
| + js | ||
| +) | ||
|
|
||
| if(HAVE_QUIRC) | ||
| get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) | ||
| --- a/modules/objdetect/src/face_detect.cpp | ||
| +++ b/modules/objdetect/src/face_detect.cpp | ||
| @@ -6,13 +6,16 @@ | ||
|
|
||
| #include "opencv2/imgproc.hpp" | ||
| #include "opencv2/core.hpp" | ||
| +#ifdef HAVE_OPENCV_DNN | ||
| #include "opencv2/dnn.hpp" | ||
| +#endif | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| namespace cv | ||
| { | ||
|
|
||
| +#ifdef HAVE_OPENCV_DNN | ||
| class FaceDetectorYNImpl : public FaceDetectorYN | ||
| { | ||
| public: | ||
| @@ -273,6 +276,7 @@ class FaceDetectorYNImpl : public FaceDetectorYN | ||
|
|
||
| std::vector<Rect2f> priors; | ||
| }; | ||
| +#endif | ||
|
|
||
| Ptr<FaceDetectorYN> FaceDetectorYN::create(const String& model, | ||
| const String& config, | ||
| @@ -283,7 +287,12 @@ Ptr<FaceDetectorYN> FaceDetectorYN::create(const String& model, | ||
| const int backend_id, | ||
| const int target_id) | ||
| { | ||
| +#ifdef HAVE_OPENCV_DNN | ||
| return makePtr<FaceDetectorYNImpl>(model, config, input_size, score_threshold, nms_threshold, top_k, backend_id, target_id); | ||
| +#else | ||
| + CV_UNUSED(model); CV_UNUSED(config); CV_UNUSED(input_size); CV_UNUSED(score_threshold); CV_UNUSED(nms_threshold); CV_UNUSED(top_k); CV_UNUSED(backend_id); CV_UNUSED(target_id); | ||
| + CV_Error(cv::Error::StsNotImplemented, "cv::FaceDetectorYN requires enabled 'dnn' module."); | ||
| +#endif | ||
| } | ||
|
|
||
| } // namespace cv | ||
| --- a/modules/objdetect/src/face_recognize.cpp | ||
| +++ b/modules/objdetect/src/face_recognize.cpp | ||
| @@ -4,13 +4,17 @@ | ||
|
|
||
| #include "precomp.hpp" | ||
|
|
||
| +#include "opencv2/core.hpp" | ||
| +#ifdef HAVE_OPENCV_DNN | ||
| #include "opencv2/dnn.hpp" | ||
| +#endif | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| namespace cv | ||
| { | ||
|
|
||
| +#ifdef HAVE_OPENCV_DNN | ||
| class FaceRecognizerSFImpl : public FaceRecognizerSF | ||
| { | ||
| public: | ||
| @@ -173,10 +177,16 @@ class FaceRecognizerSFImpl : public FaceRecognizerSF | ||
| private: | ||
| dnn::Net net; | ||
| }; | ||
| +#endif | ||
|
|
||
| Ptr<FaceRecognizerSF> FaceRecognizerSF::create(const String& model, const String& config, int backend_id, int target_id) | ||
| { | ||
| +#ifdef HAVE_OPENCV_DNN | ||
| return makePtr<FaceRecognizerSFImpl>(model, config, backend_id, target_id); | ||
| +#else | ||
| + CV_UNUSED(model); CV_UNUSED(config); CV_UNUSED(backend_id); CV_UNUSED(target_id); | ||
| + CV_Error(cv::Error::StsNotImplemented, "cv::FaceRecognizerSF requires enabled 'dnn' module"); | ||
| +#endif | ||
| } | ||
|
|
||
| } // namespace cv |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- a/modules/objdetect/CMakeLists.txt | ||
| +++ b/modules/objdetect/CMakeLists.txt | ||
| @@ -13,7 +13,6 @@ ocv_define_module(objdetect | ||
| ) | ||
|
|
||
| if(HAVE_QUIRC) | ||
| - get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) | ||
| - ocv_include_directories(${QUIRC_INCLUDE}) | ||
| - ocv_target_link_libraries(${the_module} quirc) | ||
| + find_package(quirc REQUIRED CONFIG) | ||
| + ocv_target_link_libraries(${the_module} quirc::quirc) | ||
| endif() |