Merge branch 'develop'

JenkinsFile

@@ -2,5 +2,4 @@ SolArModulePipeline {
     moduleName="SolARModulePopSift"
     dirName="SolARBuild"
     runTests=true
-    android=false
 }

SolARModulePopSift.pro

@@ -8,7 +8,7 @@ QMAKE_PROJECT_DEPTH = 0
 INSTALLSUBDIR = SolARBuild
 TARGET = SolARModulePopSift
 FRAMEWORK = $$TARGET
-VERSION=0.11.0
+VERSION=1.0.0
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY
@@ -51,15 +51,6 @@ unix {
     QMAKE_POST_LINK += "make install install_deps"
 }
 
-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
-}
-
 win32 {
 
     INCLUDEPATH+= $$(CUDA_PATH)/include

bcom-SolARModulePopSift.pc.in

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

packagedependencies.txt

@@ -1,2 +1,2 @@
-SolARFramework|0.11.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
-popsift|1.0.0-rc3|popsift|conan-solar@conan|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0|default
+SolARFramework|1.0.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+popsift#1_0_0|1.0.0-rc3|popsift|conan-solar@conan|conan-solar|default

src/SolARDescriptorsExtractorFromImagePopSift.cpp

@@ -23,6 +23,7 @@
 #include <popsift/sift_conf.h>
 #include <popsift/sift_config.h>
 #include <popsift/version.hpp>
+#include <memory>
 
 XPCF_DEFINE_FACTORY_CREATE_INSTANCE(SolAR::MODULES::POPSIFT::SolARDescriptorsExtractorFromImagePopSift);
 
@@ -153,15 +154,15 @@ FrameworkReturnCode SolARDescriptorsExtractorFromImagePopSift::extract(
     if (allocTestError!=PopSift::AllocTest::Ok)
         LOG_ERROR("{}",m_popSift->testTextureFitErrorString(allocTestError,image->getWidth(), image->getHeight()));
 
-    SiftJob* job;
+    std::unique_ptr<SiftJob> job;
     if (m_imageMode == "Unsigned Char")
-        job = m_popSift->enqueue(image->getWidth(), image->getHeight(), (unsigned char*)greyImage->data());
+        job.reset(m_popSift->enqueue(image->getWidth(), image->getHeight(), (unsigned char*)greyImage->data()));
     else if (m_imageMode == "Float")
-        job = m_popSift->enqueue(image->getWidth(), image->getHeight(), (float*)greyImage->data());
+        job.reset(m_popSift->enqueue(image->getWidth(), image->getHeight(), (float*)greyImage->data()));
     else
         return FrameworkReturnCode::_ERROR_;
 
-    popsift::FeaturesHost* popFeatures = job->getHost();
+    std::unique_ptr<popsift::Features> popFeatures(job->get());
     int id(0);	
 	std::vector<popsift::Descriptor> descBuffer;
 	int descPos(0);

tests/SolARTest_ModulePopSift_DescriptorMatcher/SolARTest_ModulePopSift_DescriptorMatcher.pro

@@ -6,7 +6,7 @@ QMAKE_PROJECT_DEPTH = 0
 
 ## global defintions : target lib name, version
 TARGET = SolARTest_ModulePopSift_DescriptorMatcher
-VERSION=0.11.0
+VERSION=1.0.0
 PROJECTDEPLOYDIR = $${PWD}/../deploy
 
 DEFINES += MYVERSION=$${VERSION}
@@ -52,10 +52,6 @@ unix {
     QMAKE_POST_LINK += "make install install_deps"
 }
 
-macx {
-    QMAKE_MAC_SDK= macosx
-    QMAKE_CXXFLAGS += -fasm-blocks -x objective-c++
-}
 
 win32 {
     QMAKE_LFLAGS += /MACHINE:X64
@@ -67,10 +63,6 @@ win32 {
     INCLUDEPATH += $$(WINDOWSSDKDIR)lib/winv6.3/um/x64
 }
 
-android {
-    ANDROID_ABIS="arm64-v8a"
-}
-
 linux {
   run_install.path = $${TARGETDEPLOYDIR}
   run_install.files = $${PWD}/../run.sh

tests/SolARTest_ModulePopSift_DescriptorMatcher/SolARTest_ModulePopSift_DescriptorMatcher_conf.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <xpcf-registry autoAlias="true">
-    <module uuid="4a43732c-a1b2-11eb-bcbc-0242ac130002" name="SolARModulePopSift" description="SolARModulePopSift" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModulePopSift/0.11.0/lib/x86_64/shared">
+    <module uuid="4a43732c-a1b2-11eb-bcbc-0242ac130002" name="SolARModulePopSift" description="SolARModulePopSift" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModulePopSift/1.0.0/lib/x86_64/shared">
         <component uuid="7fb2aace-a1b1-11eb-bcbc-0242ac130002" name="SolARDescritorsExtractorFromImagePopSift" description="SolARDescritorsExtractorFromImagePopSift">
             <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
             <interface uuid="1cd4f5f1-6b74-413b-9725-69653aee48ef" name="IDescriptorsExtractorFromImage" description="IDescriptorsExtractorFromImage"/>
@@ -10,7 +10,7 @@
             <interface uuid="157ec340-0682-4e6c-bf69-e4d95fa760d3" name="IImageMatcher" description="IImageMatcher"/>
         </component>
     </module>
-    <module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" description="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/0.11.0/lib/x86_64/shared">
+    <module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" description="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/1.0.0/lib/x86_64/shared">
         <component uuid="e42d6526-9eb1-4f8a-bb68-53e06f09609c" name="SolARImageLoaderOpencv" description="SolARImageLoaderOpencv">
                 <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
                 <interface uuid="6FCDAA8D-6EA9-4C3F-97B0-46CD11B67A9B" name="IImageLoader" description="IImageLoader"/>

tests/SolARTest_ModulePopSift_DescriptorMatcher/packagedependencies.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

tests/packagedependencies-linux.txt

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

tests/packagedependencies-win.txt

@@ -1,2 +1,2 @@
-SolARModuleOpenGL|0.11.0|SolARModuleOpenGL|SolARBuild@github|https://github.com/SolarFramework/SolarModuleOpenGL/releases/download
+SolARModuleOpenGL|1.0.0|SolARModuleOpenGL|SolARBuild@github|https://github.com/SolarFramework/SolarModuleOpenGL/releases/download
 

tests/testInstall.sh

@@ -1,5 +1,5 @@
 # Download AR device capture
-curl https://artifact.b-com.com/solar-generic-local/captures/hololens/bcomLab/loopDesktopA.zip -L -o loopDesktopA.zip
+curl https://repository.solarframework.org/generic/captures/hololens/bcomLab/loopDesktopA.zip -L -o loopDesktopA.zip
 unzip -o loopDesktopA.zip -d ./data
 rm loopDesktopA.zip
 

xpcf_SolARModulePopSift_registry.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <xpcf-registry>
-   <module uuid="4a43732c-a1b2-11eb-bcbc-0242ac130002" name="SolARModulePopSift" description="SolARModulePopSift" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModulePopSift/0.11.0/lib/x86_64/shared">
+   <module uuid="4a43732c-a1b2-11eb-bcbc-0242ac130002" name="SolARModulePopSift" description="SolARModulePopSift" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModulePopSift/1.0.0/lib/x86_64/shared">
         <component uuid="7fb2aace-a1b1-11eb-bcbc-0242ac130002" name="SolARDescritorsExtractorFromImagePopSift" description="SolARDescritorsExtractorFromImagePopSift">
             <interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
             <interface uuid="c0e49ff1-0696-4fe6-85a8-9b2c1e155d2e" name="IDescriptorsExtractorFromImage" description="IDescriptorsExtractorFromImage"/>