Merge pull request #1232 from SamFlt/undefined_symbols

Pull fixes from python_wrapper branch
lagadic · Sep 15, 2023 · cb394fe · cb394fe
2 parents fed5b91 + a15411f
commit cb394fe
Show file tree

Hide file tree

Showing 20 changed files with 426 additions and 242 deletions.
diff --git a/modules/core/include/visp3/core/vpColVector.h b/modules/core/include/visp3/core/vpColVector.h
@@ -242,7 +242,6 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
     return (*this);
   }
 
-  vp_deprecated double euclideanNorm() const;
   /*!
      Extract a sub-column vector from a column vector.
      \param r : Index of the row corresponding to the first element of the
@@ -263,9 +262,9 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
   {
     if (r >= rowNum || r + colsize > rowNum) {
       throw(vpException(vpException::fatalError,
-        "Cannot extract a (%dx1) column vector from a (%dx1) "
-        "column vector starting at index %d",
-        colsize, rowNum, r));
+                        "Cannot extract a (%dx1) column vector from a (%dx1) "
+                        "column vector starting at index %d",
+                        colsize, rowNum, r));
     }
 
     return vpColVector(*this, r, colsize);
@@ -368,9 +367,9 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
   {
     if (ncols != 1) {
       throw(vpException(vpException::fatalError,
-        "Cannot resize a column vector to a (%dx%d) "
-        "dimension vector that has more than one column",
-        nrows, ncols));
+                        "Cannot resize a column vector to a (%dx%d) "
+                        "dimension vector that has more than one column",
+                        nrows, ncols));
     }
     vpArray2D<double>::resize(nrows, ncols, flagNullify);
   }
@@ -455,6 +454,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
   }
 
   vp_deprecated void insert(const vpColVector &v, unsigned int r, unsigned int c = 0);
+  vp_deprecated double euclideanNorm() const;
   //@}
 #endif
 };

diff --git a/modules/core/include/visp3/core/vpHomogeneousMatrix.h b/modules/core/include/visp3/core/vpHomogeneousMatrix.h
@@ -306,6 +306,7 @@ class VISP_EXPORT vpHomogeneousMatrix : public vpArray2D<double>
   // Conversion helper function to avoid circular dependencies and MSVC errors that are not exported in the DLL
   void parse_json(const nlohmann::json &j);
   void convert_to_json(nlohmann::json &j) const;
+public:
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
       // Conversion helper function to avoid circular dependencies and MSVC errors that are not exported in the DLL
       void parse_json(const nlohmann::json &j);
       void convert_to_json(nlohmann::json &j) const;
+    public:
     #endif
@@ Expand Down @@