Skip to content
This repository was archived by the owner on Jul 20, 2023. It is now read-only.

Commit c343dee

Browse files
sky3sky3
authored
Merge pull request #33 from SolarFramework/develop
merge 0.5.0 updates
2 parents ebd6f2d + b7bbb3f commit c343dee

File tree

201 files changed

+113464
-3423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+113464
-3423
lines changed

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
*-Release
66

7+
*.vcxproj*
78

89
# Prerequisites
910
*.d
@@ -14,6 +15,8 @@
1415
*.o
1516
*.obj
1617

18+
.\build
19+
1720
# Precompiled Headers
1821
*.gch
1922
*.pch
@@ -52,6 +55,10 @@
5255
.vs*
5356
x64*
5457

58+
*.txt
59+
*.log
60+
*.tlog
61+
*.TMP
62+
*.tmp
5563

56-
tests/SolARHomographyEstimation/xpcf_custom\.xml
5764

‎CMakeLists.txt‎

Lines changed: 99 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,107 @@
11
cmake_minimum_required(VERSION 3.7.2)
22

33
##################################################
4-
set (VERSION_NUMBER "0.4.0")
4+
set (VERSION_NUMBER "0.5.0")
55
project("SolARModuleOpenCV")
66
set (SOURCES
7-
src/SolARModuleOpencv.cpp
8-
src/SolARKeypointDetectorOpencv.cpp
9-
src/SolARImageLoaderOpencv.cpp
10-
src/SolARImageConvertorOpencv.cpp
11-
src/SolARImageFilterOpencv.cpp
12-
src/SolARImageViewerOpencv.cpp
13-
src/SolARCameraOpencv.cpp
14-
src/SolAROpenCVHelper.cpp
15-
src/SolARCameraCalibrationOpencv.cpp
16-
src/SolARMarker2DNaturalImageOpencv.cpp
17-
src/SolARContoursExtractorOpencv.cpp
18-
src/SolARPerspectiveControllerOpencv.cpp
19-
src/SolARMarker2DSquaredBinaryOpencv.cpp
20-
src/SolARContoursFilterBinaryMarkerOpencv.cpp
21-
src/SolARDescriptorsExtractorSBPatternOpencv.cpp
22-
src/SolARDescriptorsExtractorAKAZEOpencv.cpp
23-
src/SolARDescriptorsExtractorORBOpencv.cpp
24-
src/SolARPoseEstimationOpencv.cpp
25-
src/SolARDescriptorMatcherHammingBruteForceOpencv.cpp
26-
src/SolARDescriptorMatcherKNNOpencv.cpp
27-
src/SolARDescriptorMatcherRadiusOpencv.cpp
28-
src/SolARSideBySideOverlayOpencv.cpp
29-
src/SolAR2DOverlayOpencv.cpp
30-
src/SolAR3DOverlayOpencv.cpp
31-
src/SolARModuleManagerOpencv.cpp
32-
src/SolARHomographyEstimationOpencv.cpp
33-
src/SolARDescriptorsExtractorAKAZE2Opencv.cpp
34-
src/AKAZE2/akaze.cpp
35-
src/AKAZE2/AKAZEFeatures.cpp
36-
src/AKAZE2/fed.cpp
37-
src/AKAZE2/nldiffusion_functions.cpp
38-
)
7+
src/SolARModuleOpencv.cpp
8+
src/SolARKeypointDetectorOpencv.cpp
9+
src/SolARImageLoaderOpencv.cpp
10+
src/SolARImageConvertorOpencv.cpp
11+
src/SolARImageViewerOpencv.cpp
12+
src/SolARCameraOpencv.cpp
13+
src/SolAROpenCVHelper.cpp
14+
src/SolARCameraCalibrationOpencv.cpp
15+
src/SolARMarker2DNaturalImageOpencv.cpp
16+
src/SolARContoursExtractorOpencv.cpp
17+
src/SolARPerspectiveControllerOpencv.cpp
18+
src/SolARMarker2DSquaredBinaryOpencv.cpp
19+
src/SolARContoursFilterBinaryMarkerOpencv.cpp
20+
src/SolARDescriptorsExtractorSBPatternOpencv.cpp
21+
src/SolARDescriptorsExtractorAKAZEOpencv.cpp
22+
src/SolARDescriptorsExtractorORBOpencv.cpp
23+
src/SolARDescriptorMatcherHammingBruteForceOpencv.cpp
24+
src/SolARDescriptorMatcherKNNOpencv.cpp
25+
src/SolARDescriptorMatcherRadiusOpencv.cpp
26+
src/SolARGeometricMatchesFilterOpencv.cpp
27+
src/SolAR2DOverlayOpencv.cpp
28+
src/SolARHomographyEstimationOpencv.cpp
29+
src/SolARPoseEstimationPnpEPFL.cpp
30+
src/SolARPoseEstimationPnpOpencv.cpp
31+
src/SolARDescriptorsExtractorAKAZE2Opencv.cpp
32+
src/AKAZE2/akaze.cpp
33+
src/AKAZE2/AKAZEFeatures.cpp
34+
src/AKAZE2/fed.cpp
35+
src/AKAZE2/nldiffusion_functions.cpp
36+
src/SolARSVDTriangulationOpencv.cpp
37+
src/SolARFundamentalMatrixEstimationOpencv.cpp
38+
src/SolARSVDFundamentalMatrixDecomposerOpencv.cpp
39+
src/SolARImageFilterBinaryOpencv.cpp
40+
src/SolARImageFilterAdaptiveBinaryOpencv.cpp
41+
src/SolARImageFilterBlurOpencv.cpp
42+
src/SolARImageFilterDilateOpencv.cpp
43+
src/SolAR2D3DcorrespondencesFinderOpencv.cpp
44+
src/SolARImageFilterErodeOpencv.cpp
45+
src/SolARVideoAsCameraOpencv.cpp
46+
src/SolARImagesAsCameraOpencv.cpp
47+
src/SolAR3DOverlayBoxOpencv.cpp
48+
src/SolARHomographyMatrixDecomposerOpencv.cpp
49+
src/SolARPoseFinderFrom2D2DOpencv.cpp
50+
src/SolARMatchesOverlayOpencv.cpp
51+
)
52+
53+
set (HEADERS
54+
interfaces/SolARCameraOpencv.h
55+
interfaces/SolARImageConvertorOpencv.h
56+
interfaces/SolARImageLoaderOpencv.h
57+
interfaces/SolARImageViewerOpencv.h
58+
interfaces/SolARKeypointDetectorOpencv.h
59+
interfaces/SolAROpenCVHelper.h
60+
interfaces/SolAROpencvAPI.h
61+
interfaces/SolARCameraCalibrationOpencv.h
62+
interfaces/SolARMarker2DNaturalImageOpencv.h
63+
interfaces/SolARContoursExtractorOpencv.h
64+
interfaces/SolARPerspectiveControllerOpencv.h
65+
interfaces/SolARMarker2DSquaredBinaryOpencv.h
66+
interfaces/SolARContoursFilterBinaryMarkerOpencv.h
67+
interfaces/SolARDescriptorsExtractorSBPatternOpencv.h
68+
interfaces/SolARDescriptorsExtractorAKAZEOpencv.h
69+
interfaces/SolARDescriptorsExtractorAKAZE2Opencv.h
70+
interfaces/SolARDescriptorsExtractorORBOpencv.h
71+
interfaces/SolARHomographyEstimationOpencv.h
72+
interfaces/SolARDescriptorMatcherHammingBruteForceOpencv.h
73+
interfaces/SolARDescriptorMatcherKNNOpencv.h
74+
interfaces/SolARDescriptorMatcherRadiusOpencv.h
75+
interfaces/SolARFundamentalMatrixEstimationOpencv.h
76+
interfaces/SolARSVDFundamentalMatrixDecomposerOpencv.h
77+
interfaces/SolARPoseEstimationPnpEPFL.h
78+
interfaces/SolARPoseEstimationPnpOpencv.h
79+
interfaces/SolARGeometricMatchesFilterOpencv.h
80+
interfaces/SolAR2DOverlayOpencv.h
81+
interfaces/SolARSVDTriangulationOpencv.h
82+
src/AKAZE2/AKAZEConfig.h
83+
src/AKAZE2/AKAZEFeatures.h
84+
src/AKAZE2/fed.h
85+
src/AKAZE2/nldiffusion_functions.h
86+
src/AKAZE2/TEvolution.h
87+
src/AKAZE2/utils.h
88+
interfaces/SolARModuleOpencv_traits.h
89+
interfaces/SolARImageFilterAdaptiveBinaryOpencv.h
90+
interfaces/SolARImageFilterBinaryOpencv.h
91+
interfaces/SolARImageFilterBlurOpencv.h
92+
interfaces/SolARImageFilterDilateOpencv.h
93+
interfaces/SolAR2D3DcorrespondencesFinderOpencv.h
94+
interfaces/SolARImageFilterErodeOpencv.h
95+
interfaces/SolARVideoAsCameraOpencv.h
96+
interfaces/SolARImagesAsCameraOpencv.h
97+
interfaces/SolAR3DOverlayBoxOpencv.h
98+
interfaces/SolARHomographyMatrixDecomposerOpencv.h
99+
interfaces/SolARPoseFinderFrom2D2DOpencv.h
100+
interfaces/SolARMatchesOverlayOpencv.h
101+
)
102+
103+
install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/xpcf_SolARModuleOpenCV_registry.xml" DESTINATION $ENV{BCOMDEVROOT}/.xpcf/SolAR/ )
104+
39105
##################################################
40106

41107
# various macros

‎README.adoc‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
= SolARContainerOpencv Repository
1+
= SolARModuleOpencv Repository
2+
3+
== System and configuration supported:
4+
* Windows, OpenCV 3.2.1 : OK
5+
* Windows, OpenCV 3.4.3 : OK
6+
* Ubuntu 16.04, OpenCV 3.4.1 : OK
7+
* Ubuntu 16.04, OpenCV 3.4.3 : OK
8+
* Ubuntu 18.04, OpenCV 3.4.1 : OK
9+
* Ubuntu 18.04, OpenCV 3.4.3 : FAILED, we do not plan to fix it.
10+
** This configuration relies on a specific version of dependencies for opencv that are not part of Ubuntu 18.04 anymore...
11+
If you perform an ldd on libSolARModuleOpenCV.so, you will observe the list of missing version for
12+
libwebp.so.5, libpng12.so.0, libjasper.so.1, libavcodec-ffmpeg.so.56, libavformat-ffmpeg.so.56, libavutil-ffmpeg.so.54, libswscale-ffmpeg.so.3
13+
14+
* Ubuntu 18.04, OpenCV 4.0.0-alpha : OK, an ongoing branch exist to prepare the support with opencv 4.0 gold version expected by the end of October
15+
16+
17+

0 commit comments

Comments
 (0)