Merge branch 'develop' into feat/deploy-dir

(cherry picked from commit c44bed5)

Author: jim-bcom

tests/SolARTest_ModuleFBOW_ClosestKeyframeRetrieval/SolARTest_ModuleFBOW_ClosestKeyframeRetrieval_conf.xml

@@ -43,19 +43,19 @@
     </factory>
     <properties>
         <configure component="SolARImageLoaderOpencv" name="frame_0001_prop">
-                        <property name="filePath" type="string" value="../../../../data/frame_0001.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/frame_0001.png"/>
 		</configure>
         <configure component="SolARImageLoaderOpencv" name="frame_0002_prop">
-                        <property name="filePath" type="string" value="../../../../data/frame_0002.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/frame_0002.png"/>
 		</configure>
         <configure component="SolARImageLoaderOpencv" name="frame_0003_prop">
-                        <property name="filePath" type="string" value="../../../../data/frame_0003.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/frame_0003.png"/>
 		</configure>
         <configure component="SolARImageLoaderOpencv" name="frame_0004_prop">
-                        <property name="filePath" type="string" value="../../../../data/frame_0004.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/frame_0004.png"/>
 		</configure>
         <configure component="SolARImageLoaderOpencv" name="frame_0005_prop">
-                        <property name="filePath" type="string" value="../../../../ata/frame_0005.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/frame_0005.png"/>
 		</configure>
         <configure component="SolARKeypointDetectorOpencv">
 			<property name="type" type="string" value="AKAZE2"/>
@@ -66,7 +66,7 @@
             <property name="threshold" type="float" value="3e-4"/>
 		</configure>
         <configure component="SolARKeyframeRetrieverFBOW">
-                        <property name="VOCpath" type="string" value="../../../../data/akaze.fbow"/>
+                        <property name="VOCpath" type="string" value="../../../../../data/akaze.fbow"/>
             <property name="threshold" type="float" value="0.01"/>
 		</configure>
     </properties>

tests/SolARTest_ModuleFBOW_FeatureMatching/SolARTest_ModuleFBOW_FeatureMatching_conf.xml

@@ -56,10 +56,10 @@
     </factory>
     <properties>
         <configure component="SolARImageLoaderOpencv" name="image1_prop">
-                        <property name="filePath" type="string" value="../../../../data/Image1.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/Image1.png"/>
 		</configure>
         <configure component="SolARImageLoaderOpencv" name="image2_prop">
-                        <property name="filePath" type="string" value="../../../../data/Image2.png"/>
+                        <property name="filePath" type="string" value="../../../../../data/Image2.png"/>
 		</configure>
         <configure component="SolARKeypointDetectorOpencv">
 			<property name="type" type="string" value="AKAZE2"/>
@@ -70,7 +70,7 @@
             <property name="threshold" type="float" value="3e-4"/>
 		</configure>
         <configure component="SolARKeyframeRetrieverFBOW">
-            <property name="VOCpath" type="string" value="../../../../data/akaze.fbow"/>
+            <property name="VOCpath" type="string" value="../../../../../data/akaze.fbow"/>
             <property name="threshold" type="float" value="0.01"/>
             <property name="level" type="int" value="3"/>
             <property name="matchingDistanceRatio" type="float" value="0.8"/>

tools/SolARTool_FBOWCreator/SolARTool_FBOWCreator_conf.xml

@@ -79,7 +79,7 @@
         </configure>
         <configure component="SolARImagesAsCameraOpencv">
             <property name="calibrationFile" type="string" value="camera_calibration.json"/>		<!--path to calibration file"/-->
-            <property name="imagesDirectoryPath" type="string" value="../../datafbow/%06d.png"/>		<!--path to images"/-->
+            <property name="imagesDirectoryPath" type="string" value="../../../datafbow/%06d.png"/>		<!--path to images"/-->
             <property name="delayTime" type="int" value="30"/>
         </configure>
         <configure component="SolARVideoAsCameraOpencv">