Update dates and versions, and mac OS and iOS dependencies. Don't store opencv in repo.

Author: philip-lamb

Calibration.cpp

@@ -39,6 +39,7 @@
 #include "Calibration.hpp"
 #include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/core/core_c.h>
 #include "calc.hpp"
 
 //
@@ -214,7 +215,7 @@ void *Calibration::cornerFinder(THREAD_HANDLE_T *threadHandle)
 
         switch (cornerFinderDataPtr->patternType) {
             case CalibrationPatternType::CHESSBOARD:
-                cornerFinderDataPtr->cornerFoundAllFlag = cv::findChessboardCorners(cv::cvarrToMat(cornerFinderDataPtr->calibImage), cornerFinderDataPtr->patternSize, cornerFinderDataPtr->corners, CV_CALIB_CB_FAST_CHECK|CV_CALIB_CB_ADAPTIVE_THRESH|CV_CALIB_CB_FILTER_QUADS);
+                cornerFinderDataPtr->cornerFoundAllFlag = cv::findChessboardCorners(cv::cvarrToMat(cornerFinderDataPtr->calibImage), cornerFinderDataPtr->patternSize, cornerFinderDataPtr->corners, cv::CALIB_CB_FAST_CHECK|cv::CALIB_CB_ADAPTIVE_THRESH|cv::CALIB_CB_FILTER_QUADS);
                 break;
             case CalibrationPatternType::CIRCLES_GRID:
                 cornerFinderDataPtr->cornerFoundAllFlag = cv::findCirclesGrid(cv::cvarrToMat(cornerFinderDataPtr->calibImage), cornerFinderDataPtr->patternSize, cornerFinderDataPtr->corners, cv::CALIB_CB_SYMMETRIC_GRID);

Calibration.hpp

@@ -40,6 +40,7 @@
 
 #include <ARX/AR/ar.h>
 #include <opencv2/core/core.hpp>
+#include <opencv2/core/types_c.h>
 #include <ARX/ARVideoSource.h>
 #include <map>
 

build.sh

@@ -19,7 +19,7 @@ set -x
 # Get our location.
 OURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-SDK_VERSION='1.0.6.1'
+SDK_VERSION='1.1'
 # If the version number includes a dev build number, drop it.
 SDK_VERSION_CANON=`echo -n "${SDK_VERSION}" | sed -E -e 's/([0-9]+\.[0-9]+\.[0-9]+)(\.[0-9])?/\1/'`
 # If the tiny version number is 0, drop it.
@@ -242,7 +242,7 @@ if [ $BUILD_WINDOWS ] ; then
         mkdir build-windows
     fi
 
-    SDK_FILENAME="artoolkitX.for.Windows.v${SDK_VERSION_PRETTY}.dmg"
+    SDK_FILENAME="artoolkitX.for.Windows.v${SDK_VERSION_PRETTY}.zip"
     curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
 
     (cd Windows

calc.cpp

@@ -38,8 +38,7 @@
 
 #include "calc.hpp"
 
-#include <opencv2/calib3d/calib3d.hpp>
-#include <opencv2/core/core_c.h>
+#include <opencv2/calib3d.hpp>
 
 static void convParam(const float intr[3][4], const float dist[AR_DIST_FACTOR_NUM_MAX], const int xsize, const int ysize, const int dist_function_version, ARParam *param);
 static ARdouble getSizeFactor(ARdouble const dist_factor[AR_DIST_FACTOR_NUM_MAX], const int xsize, const int ysize, const int dist_function_version);
@@ -137,22 +136,22 @@ void calc(const int capturedImageNum,
     convParam(intr, dist, width, height, dist_function_version, &param);
     arParamDisp(&param);
 
-    CvMat          *rotationVector;
-    CvMat          *rotationMatrix;
+    cv::Mat         rotationVector;
+    cv::Mat         rotationMatrix;
     double          trans[3][4];
     ARdouble        cx, cy, cz, hx, hy, h, sx, sy, ox, oy, err;
     ARdouble        err_min = 1000000.0f, err_avg = 0.0f, err_max = 0.0f;
-    rotationVector     = cvCreateMat(1, 3, CV_32FC1);
-    rotationMatrix     = cvCreateMat(3, 3, CV_32FC1);
+    rotationVector     = cv::Mat(1, 3, CV_32FC1);
+    rotationMatrix     = cv::Mat(3, 3, CV_32FC1);
 
     for (k = 0; k < capturedImageNum; k++) {
         for (i = 0; i < 3; i++) {
-            ((float *)(rotationVector->data.ptr))[i] = (float)rotationVectors.at(k).at<double>(i);
+            ((float *)(rotationVector.data))[i] = (float)rotationVectors.at(k).at<double>(i);
         }
-        cvRodrigues2(rotationVector, rotationMatrix, 0);
+        cv::Rodrigues(rotationVector, rotationMatrix);
         for (j = 0; j < 3; j++) {
             for (i = 0; i < 3; i++) {
-                trans[j][i] = ((float *)(rotationMatrix->data.ptr + rotationMatrix->step*j))[i];
+                trans[j][i] = rotationMatrix.at<float>(j, i);
             }
             trans[j][3] = (float)translationVectors.at(k).at<double>(j);
         }
@@ -192,9 +191,6 @@ void calc(const int capturedImageNum,
     *err_max_out = err_max;
 
     *param_out = param;
-
-    cvReleaseMat(&rotationVector);
-    cvReleaseMat(&rotationMatrix);
 }
 
 static void convParam(const float intr[3][4], const float dist[AR_DIST_FACTOR_NUM_MAX], const int xsize, const int ysize, const int dist_function_version, ARParam *param)

calib_camera.cpp

@@ -32,6 +32,7 @@
  *  are not obligated to do so. If you do not wish to do so, delete this exception
  *  statement from your version.
  *
+ *  Copyright 2019-2023 Philip Lamb
  *  Copyright 2018 Realmax, Inc.
  *  Copyright 2015-2016 Daqri, LLC.
  *  Copyright 2002-2015 ARToolworks, Inc.
@@ -237,7 +238,7 @@ static void startVideo(void)
         vs->configure(buf, true, NULL, NULL, 0);
         if (!vs->open()) {
             ARLOGe("Error: Unable to open video source.\n");
-            EdenMessageShow((const unsigned char *)"Welcome to artoolkitX Camera Calibrator\n(c)2018 Realmax, Inc. & (c)2017 DAQRI LLC.\n\nUnable to open video source.\n\nPress 'p' for settings and help.");
+            EdenMessageShow((const unsigned char *)"Welcome to artoolkitX Camera Calibrator\n(c)2023 artoolkitX Contributors.\n\nUnable to open video source.\n\nPress 'p' for settings and help.");
         }
     }
     gPostVideoSetupDone = false;
@@ -995,7 +996,7 @@ void drawView(void)
                 vertices[i*8 + 7] = vs->getVideoHeight() - corners[i].y - 5.0f;
 
                 unsigned char buf[12]; // 10 digits in INT32_MAX, plus sign, plus null.
-                sprintf((char *)buf, "%d\n", i);
+                snprintf((char *)buf, sizeof(buf), "%d\n", i);
 
                 GLfloat mvp[16];
 #if !HAVE_GLES2

depends/ios/include/jconfig.h

@@ -1,45 +1,37 @@
-/* jconfig.h.  Generated automatically by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-#define HAVE_PROTOTYPES 
-#define HAVE_UNSIGNED_CHAR 
-#define HAVE_UNSIGNED_SHORT 
-#undef void
-#undef const
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H 
-#define HAVE_STDLIB_H 
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-#define INLINE __inline__
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */
+/* Version ID for the JPEG library.
+ * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
+ */
+#define JPEG_LIB_VERSION  62
+
+/* libjpeg-turbo version */
+#define LIBJPEG_TURBO_VERSION  2.1.5
+
+/* libjpeg-turbo version in integer form */
+#define LIBJPEG_TURBO_VERSION_NUMBER  2001005
+
+/* Support arithmetic encoding */
+#define C_ARITH_CODING_SUPPORTED 1
+
+/* Support arithmetic decoding */
+#define D_ARITH_CODING_SUPPORTED 1
+
+/* Support in-memory source/destination managers */
+#define MEM_SRCDST_SUPPORTED 1
+
+/* Use accelerated SIMD routines. */
+#define WITH_SIMD 1
+
+/*
+ * Define BITS_IN_JSAMPLE as either
+ *   8   for 8-bit sample values (the usual setting)
+ *   12  for 12-bit sample values
+ * Only 8 and 12 are legal data precisions for lossy JPEG according to the
+ * JPEG standard, and the IJG code does not support anything else!
+ * We do not support run-time selection of data precision, sorry.
+ */
+
+#define BITS_IN_JSAMPLE  8      /* use 8 or 12 */
+
+/* Define if your (broken) compiler shifts signed values as if they were
+   unsigned. */
+/* #undef RIGHT_SHIFT_IS_UNSIGNED */