Merge branch 'master' into ogre-1_12

lagadic · Jan 10, 2025 · fa83af1 · fa83af1
2 parents 55b5324 + abf3419
commit fa83af1
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 0 deletions.
diff --git a/modules/core/include/visp3/core/vpImageMorphology.h b/modules/core/include/visp3/core/vpImageMorphology.h
@@ -143,6 +143,10 @@ class VISP_EXPORT vpImageMorphology
   public:
     vpPixelOperation() { }
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+    virtual ~vpPixelOperation() = default;
+#endif
+
     virtual T operator()(const T &, const T &) = 0;
   };
 

diff --git a/modules/core/include/visp3/core/vpMoment.h b/modules/core/include/visp3/core/vpMoment.h
@@ -131,6 +131,11 @@ class VISP_EXPORT vpMoment
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMoment(const vpMoment &) = delete; // non construction-copyable
+  vpMoment &operator=(const vpMoment &) = delete; // non copyable
+#endif
+
 public:
   vpMoment();
 

diff --git a/modules/core/include/visp3/core/vpMomentCommon.h b/modules/core/include/visp3/core/vpMomentCommon.h
@@ -126,6 +126,11 @@ class VISP_EXPORT vpMomentCommon : public vpMomentDatabase
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMomentCommon(const vpMomentCommon &) = delete; // non construction-copyable
+  vpMomentCommon &operator=(const vpMomentCommon &) = delete; // non copyable
+#endif
+
 public:
   vpMomentCommon(double dstSurface, const std::vector<double> &ref, double refAlpha, double dstZ = 1.0,
                  bool flg_sxsyfromnormalized = false);

diff --git a/modules/core/include/visp3/core/vpMutex.h b/modules/core/include/visp3/core/vpMutex.h
@@ -182,6 +182,10 @@ class VP_DEPRECATED vpMutex
     //    }
     //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+    vpScopedLock &operator=(const vpScopedLock &) = delete; // non copyable
+#endif
+
   public:
     //! Constructor that locks the mutex.
     vpScopedLock(vpMutex &mutex) : _mutex(mutex) { _mutex.lock(); }

diff --git a/modules/core/include/visp3/core/vpUKSigmaDrawerAbstract.h b/modules/core/include/visp3/core/vpUKSigmaDrawerAbstract.h
@@ -61,6 +61,8 @@ class VISP_EXPORT vpUKSigmaDrawerAbstract
 
   inline vpUKSigmaDrawerAbstract(const unsigned int &n) : m_n(n) { }
 
+  virtual ~vpUKSigmaDrawerAbstract() = default;
+
   /**
    * \brief Draw the sigma points according to the current mean and covariance of the state
    * of the Unscented Kalman filter.

diff --git a/modules/core/src/image/vpImageFilter.cpp b/modules/core/src/image/vpImageFilter.cpp
@@ -320,6 +320,13 @@ void vpImageFilter::gaussianBlur<double, double>(const vpImage<double> &I, vpIma
 void vpImageFilter::gaussianBlur(const vpImage<vpRGBa> &I, vpImage<vpRGBa> &GI, unsigned int size, double sigma, bool normalize,
                                  const vpImage<bool> *p_mask)
 {
+  if (size-1 > I.getWidth() || size-1 > I.getHeight()) {
+    std::ostringstream oss;
+    oss << "Image size (" << I.getWidth() << "x" << I.getHeight() << ") is too small for the Gaussian kernel ("
+      << "size=" << size << "), min size is " << (size-1);
+    throw vpException(vpException::dimensionError, oss.str());
+  }
+
   double *fg = new double[(size + 1) / 2];
   vpImageFilter::getGaussianKernel(fg, size, sigma, normalize);
   vpImage<vpRGBa> GIx;

diff --git a/modules/sensor/include/visp3/sensor/vpV4l2Grabber.h b/modules/sensor/include/visp3/sensor/vpV4l2Grabber.h
@@ -211,6 +211,11 @@ class VISP_EXPORT vpV4l2Grabber : public vpFrameGrabber
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpV4l2Grabber(const vpV4l2Grabber &) = delete; // non construction-copyable
+  vpV4l2Grabber &operator=(const vpV4l2Grabber &) = delete; // non copyable
+#endif
+
 public:
   vpV4l2Grabber();
   VP_EXPLICIT vpV4l2Grabber(bool verbose);

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCircle.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCircle.h
@@ -121,6 +121,11 @@ class VISP_EXPORT vpMbtDistanceCircle
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMbtDistanceCircle(const vpMbtDistanceCircle &) = delete; // non construction-copyable
+  vpMbtDistanceCircle &operator=(const vpMbtDistanceCircle &) = delete; // non copyable
+#endif
+
 public:
   vpMbtDistanceCircle();
   virtual ~vpMbtDistanceCircle();

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCylinder.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceCylinder.h
@@ -136,6 +136,11 @@ class VISP_EXPORT vpMbtDistanceCylinder
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMbtDistanceCylinder(const vpMbtDistanceCylinder &) = delete; // non construction-copyable
+  vpMbtDistanceCylinder &operator=(const vpMbtDistanceCylinder &) = delete; // non copyable
+#endif
+
 public:
   vpMbtDistanceCylinder();
   virtual ~vpMbtDistanceCylinder();

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceKltCylinder.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceKltCylinder.h
@@ -129,6 +129,11 @@ class VISP_EXPORT vpMbtDistanceKltCylinder
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMbtDistanceKltCylinder(const vpMbtDistanceKltCylinder &) = delete; // non construction-copyable
+  vpMbtDistanceKltCylinder &operator=(const vpMbtDistanceKltCylinder &) = delete; // non copyable
+#endif
+
 public:
   vpMbtDistanceKltCylinder();
   virtual ~vpMbtDistanceKltCylinder();

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceKltPoints.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceKltPoints.h
@@ -130,6 +130,11 @@ class VISP_EXPORT vpMbtDistanceKltPoints
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMbtDistanceKltPoints(const vpMbtDistanceKltPoints &) = delete; // non construction-copyable
+  vpMbtDistanceKltPoints &operator=(const vpMbtDistanceKltPoints &) = delete; // non copyable
+#endif
+
 public:
   vpMbtDistanceKltPoints();
   virtual ~vpMbtDistanceKltPoints();

diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceLine.h b/modules/tracker/mbt/include/visp3/mbt/vpMbtDistanceLine.h
@@ -130,6 +130,11 @@ class VISP_EXPORT vpMbtDistanceLine
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpMbtDistanceLine(const vpMbtDistanceLine &) = delete; // non construction-copyable
+  vpMbtDistanceLine &operator=(const vpMbtDistanceLine &) = delete; // non copyable
+#endif
+
 public:
   vpMbtDistanceLine();
   virtual ~vpMbtDistanceLine();

diff --git a/modules/tracker/tt_mi/include/visp3/tt_mi/vpTemplateTrackerMI.h b/modules/tracker/tt_mi/include/visp3/tt_mi/vpTemplateTrackerMI.h
@@ -142,6 +142,11 @@ class VISP_EXPORT vpTemplateTrackerMI : public vpTemplateTracker
   //    }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpTemplateTrackerMI(const vpTemplateTrackerMI &) = delete; // non construction-copyable
+  vpTemplateTrackerMI &operator=(const vpTemplateTrackerMI &) = delete; // non copyable
+#endif
+
 public:
   //! Default constructor.
   vpTemplateTrackerMI()

diff --git a/modules/tracker/tt_mi/include/visp3/tt_mi/vpTemplateTrackerMIESM.h b/modules/tracker/tt_mi/include/visp3/tt_mi/vpTemplateTrackerMIESM.h
@@ -96,6 +96,11 @@ class VISP_EXPORT vpTemplateTrackerMIESM : public vpTemplateTrackerMI
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpTemplateTrackerMIESM(const vpTemplateTrackerMIESM &) = delete; // non construction-copyable
+  vpTemplateTrackerMIESM &operator=(const vpTemplateTrackerMIESM &) = delete; // non copyable
+#endif
+
 public:
   //! Default constructor.
   vpTemplateTrackerMIESM()

diff --git a/modules/visual_features/include/visp3/visual_features/vpFeatureMoment.h b/modules/visual_features/include/visp3/visual_features/vpFeatureMoment.h
@@ -188,6 +188,11 @@ class VISP_EXPORT vpFeatureMoment : public vpBasicFeature
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpFeatureMoment(const vpFeatureMoment &) = delete; // non construction-copyable
+  vpFeatureMoment &operator=(const vpFeatureMoment &) = delete; // non copyable
+#endif
+
 public:
   /*!
    * Initializes the feature with information about the database of moment

diff --git a/modules/vs/include/visp3/vs/vpServo.h b/modules/vs/include/visp3/vs/vpServo.h
@@ -273,6 +273,11 @@ class VISP_EXPORT vpServo
   //  }
   //#endif
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
+  vpServo(const vpServo &) = delete; // non construction-copyable
+  vpServo &operator=(const vpServo &) = delete; // non copyable
+#endif
+
 public:
   /*!
    * Default constructor that initializes the following settings: