Merge branch 'develop'

Author: jim-bcom

.gitignore

@@ -76,6 +76,9 @@ doxygen/
 # Tests builds
 tests/bin
 
+# Tests data 
+tests/data
+
 # Others
 *.*pre1
 *.rej

JenkinsFile

@@ -4,14 +4,12 @@ node("master") {
 		dirName="SolARBuild"
 		runTests=true
 		buildDir="SolARModuleOpenCV"
-		android=true
 	}
 
 	SolArModulePipeline {
 		moduleName="SolARModuleOpenCVCuda"
 		dirName="SolARBuild"
 		runTests=true
 		buildDir="SolARModuleOpenCVCuda"
-		android=false
 	}
 }

SolARModuleOpenCV.pri

@@ -7,6 +7,7 @@ HEADERS += $$PWD/interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     $$PWD/interfaces/SolARContoursExtractorOpencv.h \
     $$PWD/interfaces/SolARContoursFilterBinaryMarkerOpencv.h \
     $$PWD/interfaces/SolARCornerRefinementOpencv.h \
+    $$PWD/interfaces/SolARGenericSemanticSegmentationOpencv.h \
     $$PWD/interfaces/SolARDescriptorMatcherHammingBruteForceOpencv.h \
     $$PWD/interfaces/SolARDescriptorMatcherKNNOpencv.h \
     $$PWD/interfaces/SolARDescriptorMatcherRadiusOpencv.h \
@@ -88,6 +89,7 @@ SOURCES +=  $$PWD/src/AKAZE2/akaze.cpp \
     $$PWD/src/SolARContoursExtractorOpencv.cpp \
     $$PWD/src/SolARContoursFilterBinaryMarkerOpencv.cpp \
     $$PWD/src/SolARCornerRefinementOpencv.cpp \
+    $$PWD/src/SolARGenericSemanticSegmentationOpencv.cpp \
     $$PWD/src/SolARDescriptorMatcherHammingBruteForceOpencv.cpp \
     $$PWD/src/SolARDescriptorMatcherKNNOpencv.cpp \
     $$PWD/src/SolARDescriptorMatcherRadiusOpencv.cpp \

SolARModuleOpenCV/SolARModuleOpenCV.pro

@@ -8,7 +8,7 @@ QMAKE_PROJECT_DEPTH = 0
 INSTALLSUBDIR = SolARBuild
 TARGET = SolARModuleOpenCV
 FRAMEWORK = $$TARGET
-VERSION=0.11.0
+VERSION=1.0.0
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
@@ -48,29 +48,14 @@ include (../SolARModuleOpenCV.pri)
 unix {
     # Avoids adding install steps manually. To be commented to have a better control over them.
     QMAKE_POST_LINK += "make install install_deps"
-}
-
-unix:!android {
     QMAKE_CXXFLAGS += -Wignored-qualifiers
-#    QMAKE_LINK=clang++
-#    QMAKE_CXX = clang++
 }
 
 linux {
     QMAKE_LFLAGS += -ldl
     LIBS += -L/home/linuxbrew/.linuxbrew/lib # temporary fix caused by grpc with -lre2 ... without -L in grpc.pc
 }
 
-macx {
-    DEFINES += _MACOS_TARGET_
-    QMAKE_MAC_SDK= macosx
-    QMAKE_CFLAGS += -mmacosx-version-min=10.7 -std=c11 #-x objective-c++
-    QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -std=c11 -std=c++11 -O3 -fPIC#-x objective-c++
-    QMAKE_LFLAGS += -mmacosx-version-min=10.7 -v -lstdc++
-    LIBS += -lstdc++ -lc -lpthread
-    LIBS += -L/usr/local/lib
-}
-
 win32 {
 
     DEFINES += WIN64 UNICODE _UNICODE
@@ -80,10 +65,6 @@ win32 {
     QMAKE_CXXFLAGS_RELEASE += /O2
 }
 
-android {
-    ANDROID_ABIS="arm64-v8a"
-}
-
 header_files.path = $${PROJECTDEPLOYDIR}/interfaces
 header_files.files = $$files($${PWD}/../interfaces/*.h*)
 
@@ -96,9 +77,7 @@ INSTALLS += xpcf_xml_files
 OTHER_FILES += \
     packagedependencies.txt \
     packagedependencies-linux.txt \
-    packagedependencies-mac.txt \
     packagedependencies-win.txt \
-    packagedependencies-android.txt \
     extra-packages.txt \
     extra-packages-linux.txt
 

SolARModuleOpenCV/bcom-SolARModuleOpenCV.pc.in

@@ -5,7 +5,7 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/interfaces
 Name: SolARModuleOpenCV
 Description:
-Version: 0.11.0
+Version: 1.0.0
 Requires:
 Libs: -L${libdir} -l${libname}
 Libs.private: ${libdir}/${pfx}${libname}.${lext}

SolARModuleOpenCV/packagedependencies-android.txt

@@ -1 +1 @@
-opencv|4.5.5|opencv|conan-solar@conan|conan-solar|default|
+opencv#1_0_0|4.5.5|opencv|conan-solar@conan|conan-solar|default|

SolARModuleOpenCV/packagedependencies-linux.txt

@@ -1 +1 @@
-opencv|4.5.5|opencv|conan-solar@conan|conan-solar|default|with_ffmpeg=False
+opencv#1_0_0|4.5.5|opencv|conan-solar@conan|conan-solar|default|with_ffmpeg=False

SolARModuleOpenCV/packagedependencies-mac.txt

@@ -1 +1 @@
-SolARFramework|0.11.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+SolARFramework|1.0.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download