Merge branch 'master' into canonical

* master:
  Uploading distortion model v5 parameter files requires bumping required server version. Move version number setting out of fileUploader so it can be set based on the distortion model version.

Author: philip-lamb

Linux/CMakeLists.txt

@@ -115,6 +115,7 @@ include_directories(${ARTOOLKITX_HOME}/Source/depends/linux/include)
 include(${ARTOOLKITX_HOME}/SDK/lib/ARX/ARX.cmake)
 
 set(SOURCE
+    ../version.h
     ../calib_camera.cpp
     ../calib_camera.h
     ../Calibration.hpp

build.sh

@@ -13,7 +13,7 @@
 # Get our location.
 OURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-SDK_VERSION='1.0.2'
+SDK_VERSION='1.0.3'
 # If the tiny version number is 0, drop it.
 SDK_VERSION_PRETTY=`echo -n "${SDK_VERSION}" | sed -E -e 's/([0-9]+\.[0-9]+)\.0/\1/'`
 SDK_URL_DIR="https://github.com/artoolkitx/artoolkitx/releases/download/${SDK_VERSION_PRETTY}/"

calib_camera.cpp

@@ -1226,6 +1226,9 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
             goodWrite = false;
         }
 
+        // Add a version to the request. "2" if sending a v5 distortion function file, "1" otherwise.
+        if (goodWrite) fprintf(fp, "version,%d\n", param->dist_function_version == 5 ? 2 : 1);
+        
         // File name.
         if (goodWrite) fprintf(fp, "file,%s\n", paramPathname);
 

fileUploader.c

@@ -343,9 +343,6 @@ static void *fileUploader(THREAD_HANDLE_T *threadHandle)
     			break;
     		}
 
-    		// Add a version to the request.
-			curl_formadd(&post, &last, CURLFORM_COPYNAME, "version", CURLFORM_COPYCONTENTS, "1", CURLFORM_END);
-
     	    curlErr = curl_easy_setopt(curlHandle, CURLOPT_HTTPPOST, post); // Automatically sets CURLOPT_NOBODY to 0.
     		if (curlErr != CURLE_OK) {
     			ARLOGe("Error setting CURL form data: %s (%d)\n", curl_easy_strerror(curlErr), curlErr);

iOS/ARViewController.mm

@@ -1161,6 +1161,9 @@ - (void) saveParam2:(const ARParam *)param err_min:(ARdouble)err_min err_avg:(AR
             goodWrite = false;
         }
 
+        // Add a version to the request. "2" if sending a v5 distortion function file, "1" otherwise.
+        if (goodWrite) fprintf(fp, "version,%d\n", param->dist_function_version == 5 ? 2 : 1);
+        
         // File name.
         if (goodWrite) fprintf(fp, "file,%s\n", paramPathname);
 

iOS/artoolkitX Camera Calibration Utility.xcodeproj/project.pbxproj

@@ -68,6 +68,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		4A01554A21645B3D00FE1CE5 /* version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = "<group>"; };
+		4A01554B21645B3D00FE1CE5 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = readme.md; path = ../readme.md; sourceTree = "<group>"; };
 		4A0AB67F1E81DA6900F6EBB9 /* ARViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARViewController.h; sourceTree = "<group>"; };
 		4A0AB6801E81DA6900F6EBB9 /* ARViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ARViewController.mm; sourceTree = "<group>"; };
 		4A0AB6821E81DFCE00F6EBB9 /* prefs.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = prefs.hpp; path = ../prefs.hpp; sourceTree = "<group>"; };
@@ -214,6 +216,7 @@
 			isa = PBXGroup;
 			children = (
 				4A60A98F1EF367EF00BEBF8A /* user-config.xcconfig */,
+				4A01554B21645B3D00FE1CE5 /* readme.md */,
 				4A4793611E80CF24002C3631 /* Source */,
 				4A47936F1E80CF9B002C3631 /* Resources */,
 				4A4793961E80D072002C3631 /* Dependencies */,
@@ -233,6 +236,7 @@
 		4A4793611E80CF24002C3631 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				4A01554A21645B3D00FE1CE5 /* version.h */,
 				4A47934D1E80CDBE002C3631 /* AppDelegate.h */,
 				4A47934E1E80CDBE002C3631 /* AppDelegate.m */,
 				4A0AB67F1E81DA6900F6EBB9 /* ARViewController.h */,

macOS/artoolkitX Camera Calibration Utility.xcodeproj/project.pbxproj

@@ -80,6 +80,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		4A01554821645AF900FE1CE5 /* version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = "<group>"; };
+		4A01554921645AFA00FE1CE5 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = readme.md; path = ../readme.md; sourceTree = "<group>"; };
 		4A0720F81E6637FE00084FB6 /* PrefsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PrefsWindow.xib; sourceTree = "<group>"; };
 		4A0720FA1E663EBA00084FB6 /* PrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefsWindowController.h; sourceTree = "<group>"; };
 		4A0720FB1E663EBA00084FB6 /* PrefsWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrefsWindowController.mm; sourceTree = "<group>"; };
@@ -346,6 +348,7 @@
 			isa = PBXGroup;
 			children = (
 				4A60A98E1EF3675000BEBF8A /* user-config.xcconfig */,
+				4A01554921645AFA00FE1CE5 /* readme.md */,
 				4A9142151DF6459900DF4FEE /* Source */,
 				4A91421E1DF6466A00DF4FEE /* Dependencies */,
 				4A9142141DF6453500DF4FEE /* Resources */,
@@ -376,6 +379,7 @@
 		4A9142151DF6459900DF4FEE /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				4A01554821645AF900FE1CE5 /* version.h */,
 				4A5FA0BF1DFE160500795630 /* calib_camera.h */,
 				4A9142181DF645A900DF4FEE /* calib_camera.cpp */,
 				4A47933C1E7F676E002C3631 /* Calibration.hpp */,

version.h

@@ -42,7 +42,7 @@
 extern "C" {
 #endif
 
-#define VERSION_STRING "1.0.1"
+#define VERSION_STRING "1.0.3"
 
 #ifdef __cplusplus
 }