[FIX] Moved wrongly placed END_VISP_NAMESPACE + include forgotten vpC…

…Onfig
fspindle · Jun 4, 2024 · 90136e6 · 90136e6
1 parent 14e5d4a
commit 90136e6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/modules/core/include/visp3/core/vpCylinder.h b/modules/core/include/visp3/core/vpCylinder.h
@@ -40,6 +40,7 @@
 #define vpCylinder_hh
 
 #include <math.h>
+#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpHomogeneousMatrix.h>
 #include <visp3/core/vpMath.h>
 
@@ -96,7 +97,7 @@ BEGIN_VISP_NAMESPACE
  * get_p(), getRho1(), getTheta1() and getRho2(), getTheta2() allow to access to the
  * projected line parameters.
  */
-class VISP_EXPORT vpCylinder : public vpForwardProjection
+  class VISP_EXPORT vpCylinder : public vpForwardProjection
 {
 public:
   typedef enum

diff --git a/modules/core/include/visp3/core/vpPolygon3D.h b/modules/core/include/visp3/core/vpPolygon3D.h
@@ -41,6 +41,7 @@
 
 #include <vector>
 
+#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpMeterPixelConversion.h>
 #include <visp3/core/vpPixelMeterConversion.h>
 #include <visp3/core/vpPoint.h>

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbScanLine.h b/modules/tracker/mbt/include/visp3/mbt/vpMbScanLine.h
@@ -47,8 +47,8 @@
 #include <set>
 #include <vector>
 
-#include <visp3/core/vpCameraParameters.h>
 #include <visp3/core/vpConfig.h>
+#include <visp3/core/vpCameraParameters.h>
 #include <visp3/core/vpColVector.h>
 #include <visp3/core/vpImage.h>
 #include <visp3/core/vpImageConvert.h>
@@ -70,7 +70,7 @@ BEGIN_VISP_NAMESPACE
   \ingroup group_mbt_faces
 
  */
-class VISP_EXPORT vpMbScanLine
+  class VISP_EXPORT vpMbScanLine
 {
 public:
   //! Structure to define if a scanline intersection is a starting or an

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCircle.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCircle.h
@@ -41,8 +41,8 @@
 #ifndef vpMbtDistanceCircle_HH
 #define vpMbtDistanceCircle_HH
 
-#include <visp3/core/vpCircle.h>
 #include <visp3/core/vpConfig.h>
+#include <visp3/core/vpCircle.h>
 #include <visp3/core/vpHomogeneousMatrix.h>
 #include <visp3/core/vpPoint.h>
 #include <visp3/mbt/vpMbHiddenFaces.h>

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtTukeyEstimator.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtTukeyEstimator.h
@@ -37,8 +37,8 @@
 #define _vpMbtTukeyEstimator_h_
 
 #include <vector>
-#include <visp3/core/vpColVector.h>
 #include <visp3/core/vpConfig.h>
+#include <visp3/core/vpColVector.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
@@ -59,8 +59,9 @@ template <typename T> class vpMbtTukeyEstimator
   std::vector<T> m_normres;
   std::vector<T> m_residues;
 };
-#endif //#ifndef DOXYGEN_SHOULD_SKIP_THIS
 END_VISP_NAMESPACE
+#endif //#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
 /*
  * The code bellow previously in vpMbtTuckeyEstimator.cpp produced
  * a link issue with MinGW-W64 x86_64-8.1.0-posix-seh-rt_v6-rev0 (g++ 8.1.0)
@@ -113,7 +114,7 @@ END_VISP_NAMESPACE
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
 #if HAVE_TRANSFORM
-namespace
+  namespace
 {
 // Check if std:c++14 or higher
 #if ((__cplusplus >= 201402L) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)))
@@ -180,7 +181,7 @@ void vpMbtTukeyEstimator<T>::MEstimator_impl(const std::vector<T> &residues, std
 #else
   for (size_t i = 0; i < m_residues.size(); i++) {
     m_normres[i] = (std::fabs(residues[i] - med));
-  }
+}
 #endif
 
   m_residues = m_normres;
@@ -254,11 +255,11 @@ inline void vpMbtTukeyEstimator<float>::MEstimator_impl_simd(const std::vector<f
   (void)weights;
   (void)NoiseThreshold;
 #endif
-  }
+}
 
-  /*!
-   * \relates vpMbtTukeyEstimator
-   */
+/*!
+ * \relates vpMbtTukeyEstimator
+ */
 template <>
 inline void vpMbtTukeyEstimator<double>::MEstimator_impl_simd(const std::vector<double> &residues,
                                                               std::vector<double> &weights,
@@ -306,11 +307,11 @@ inline void vpMbtTukeyEstimator<double>::MEstimator_impl_simd(const std::vector<
   (void)weights;
   (void)NoiseThreshold;
 #endif
-  }
+}
 
-  /*!
-   * \relates vpMbtTukeyEstimator
-   */
+/*!
+ * \relates vpMbtTukeyEstimator
+ */
 template <>
 inline void vpMbtTukeyEstimator<float>::MEstimator(const std::vector<float> &residues, std::vector<float> &weights,
                                                    float NoiseThreshold)

diff --git a/modules/tracker/me/include/visp3/me/vpMeSite.h b/modules/tracker/me/include/visp3/me/vpMeSite.h
@@ -39,6 +39,7 @@
 #ifndef _vpMeSite_h_
 #define _vpMeSite_h_
 
+#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpDisplay.h>
 #include <visp3/core/vpImage.h>
 #include <visp3/core/vpMatrix.h>
@@ -63,7 +64,7 @@ BEGIN_VISP_NAMESPACE
  *
  * - sample step.
  */
-class VISP_EXPORT vpMeSite
+  class VISP_EXPORT vpMeSite
 {
 public:
   /*!