diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-29 04:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 19:23:57 -0800 |
| commit | eb044d1eb5250a79c94c86f6157e034627f7628b (patch) | |
| tree | 591c88640d8ee5ef61f1d3e417db9b639651e7b0 /ports/openmvg | |
| parent | 2eece71f53de6f9a83d2b686b8adceb40100a134 (diff) | |
| download | vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.tar.gz vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.zip | |
[OpenCV] bump to 4.5.1 and to 3.4.13 (#15859)
* [OpenCV] bump to 4.5.1 and to 3.4.13
* [OpenCV] fix patches
* [OpenCV] fix hdf5 integration
* [OpenCV] devendor quirc
* fix quirc for downstream ports
* [quirc] fix target export
* update version refs
* [OpenMVG] fix regressions with new opencv
* update version refs
* fix quirc mismatch
* update version refs
Diffstat (limited to 'ports/openmvg')
| -rw-r--r-- | ports/openmvg/CONTROL | 1 | ||||
| -rw-r--r-- | ports/openmvg/build_fixes.patch | 19 |
2 files changed, 17 insertions, 3 deletions
diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 69d673579..b28081c60 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,5 +1,6 @@ Source: openmvg Version: 1.6 +Port-Version: 1 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres[suitesparse,cxsparse], cereal, libjpeg-turbo, tiff, libpng, zlib, vlfeat diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index fff8846d2..d87161e67 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -525,10 +525,10 @@ index 5fcd972..b21ea7b 100644 endif() set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") diff --git a/src/openMVG/numeric/CMakeLists.txt b/src/openMVG/numeric/CMakeLists.txt -index 06baee7..47255be 100644 +index 1f3fc30..4097320 100644 --- a/src/openMVG/numeric/CMakeLists.txt +++ b/src/openMVG/numeric/CMakeLists.txt -@@ -24,7 +24,7 @@ target_include_directories(openMVG_numeric +@@ -26,7 +26,7 @@ target_include_directories(openMVG_numeric $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}> $<INSTALL_INTERFACE:include> ) @@ -649,6 +649,19 @@ index 9a5a482..e804a19 100644 pRecons.wait() - - +diff --git a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +index 9cc46af..f8bd892 100644 +--- a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp ++++ b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +@@ -208,7 +208,7 @@ public: + // Create a SIFT detector + std::vector< cv::KeyPoint > v_keypoints; + cv::Mat m_desc; +- cv::Ptr<cv::Feature2D> siftdetector = cv::xfeatures2d::SIFT::create(); ++ cv::Ptr<cv::Feature2D> siftdetector = cv::SIFT::create(); + + // Process SIFT computation + siftdetector->detectAndCompute(img, m_mask, v_keypoints, m_desc); diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in index 259e24e..1097062 100644 --- a/src/software/SfM/tutorial_demo.py.in @@ -682,7 +695,7 @@ index aa7dffe..2c4d237 100644 m_detector->detect(current_img, m_nextKeypoints); diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index 816a941..f0b7145 100644 +index b71dfab..ad98e51 100644 --- a/src/third_party/CMakeLists.txt +++ b/src/third_party/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(stlplus3) |