Merge pull request #1539 from fspindle/fix_deletec_functions

Fix deleted functions
lagadic · Jan 11, 2025 · 241053f · 241053f
2 parents abf3419 + 488b4bb
commit 241053f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -88,12 +88,15 @@ ViSP 3.x.x (Version in development)
     . [#1337] The pose of the automatic data generation pipeline from blenderproc seems wrong
     . [#1341] SVD computation fails with Lapack when m < n
     . [#1370] encountered compilation errors while building the ViSP library
+    . [#1404] Compilation error when no GUI library is available
     . [#1424] Unable to detect Yarp 3.9.0
     . [#1485] Build issue around nlohmann_json usage with VTK 9.2.0 or more recent version used as an embedded
               3rdparty by PCL
     . [#1487] Segfault with vpCannyEdgeDetection with a certain image
     . [#1494] Memory management issue in vpArray2D::resize()
     . [#1495] vpMeLine is unable to seek extremities
+    . [#1519] Dataset not detected when tests are disabled
+    . [#1521] Build issues with OpenCV 5.0.0
 ----------------------------------------------
 ViSP 3.6.0 (released September 22, 2023)
   - Contributors:

diff --git a/modules/visual_features/include/visp3/visual_features/vpFeatureMoment.h b/modules/visual_features/include/visp3/visual_features/vpFeatureMoment.h
@@ -187,11 +187,12 @@ class VISP_EXPORT vpFeatureMoment : public vpBasicFeature
   //    implemented!"); return *this;
   //  }
   //#endif
-
+#if !defined(VISP_MOMENTS_COMBINE_MATRICES)
 #if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
   vpFeatureMoment(const vpFeatureMoment &) = delete; // non construction-copyable
   vpFeatureMoment &operator=(const vpFeatureMoment &) = delete; // non copyable
 #endif
+#endif
 
 public:
   /*!