Merge pull request #1400 from fspindle/fix_quality_rules_9

Apply misra c++ quality rules mainly to headers
lagadic · May 14, 2024 · 7ece4ea · 7ece4ea
2 parents 029255c + 1056d74
commit 7ece4ea
Show file tree

Hide file tree

Showing 40 changed files with 1,113 additions and 821 deletions.
diff --git a/cmake/VISPUtils.cmake b/cmake/VISPUtils.cmake
@@ -1095,7 +1095,10 @@ macro(vp_add_subdirectories lst subdir)
         file(GLOB __subdirs RELATIVE "${__path}/${subdir}" "${__path}/${subdir}/*")
         foreach(__s ${__subdirs})
           if(EXISTS "${__path}/${subdir}/${__s}/CMakeLists.txt")
-            add_subdirectory("${__path}/${subdir}/${__s}" "${CMAKE_BINARY_DIR}/${subdir}/${__s}")
+            # Add subdir only if ut doesn't exist
+            if(NOT EXISTS "${CMAKE_BINARY_DIR}/${subdir}/${__s}")
+              add_subdirectory("${__path}/${subdir}/${__s}" "${CMAKE_BINARY_DIR}/${subdir}/${__s}")
+            endif()
           endif()
         endforeach()
       endif()

diff --git a/example/manual/image-manipulation/manGrab1394.cpp b/example/manual/image-manipulation/manGrab1394.cpp
@@ -33,13 +33,13 @@
  *
 *****************************************************************************/
 /*!
-  \file manGrab1394-2.cpp
+  \file manGrab1394.cpp
 
   \brief Images grabbing example with the vp1394TwoGrabber class.
 
  */
  /*!
-   \example manGrab1394-2.cpp
+   \example manGrab1394.cpp
 
    \brief Images grabbing example with the vp1394TwoGrabber class.
 
@@ -76,7 +76,7 @@ int main()
         g.acquire(I[camera]);
       }
     }
-    delete [] I;
+    delete[] I;
     return EXIT_SUCCESS;
   }
   catch (const vpException &e) {

diff --git a/example/robot-simulator/camera/servoSimu3D_cMcd_CamVelocityWithoutVpServo.cpp b/example/robot-simulator/camera/servoSimu3D_cMcd_CamVelocityWithoutVpServo.cpp
@@ -28,7 +28,7 @@
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Description:
+ * Description
  * Simulation of a 3D visual servoing.
  *
 *****************************************************************************/
@@ -267,7 +267,7 @@ int main(int argc, const char **argv)
 
       // Compute the camera translational velocity
       vpColVector v(3);
-      v = lambda * (I - vpColVector::skew(tu_cRcd)) * ctcd;
+      v = lambda * (I - vpColVector::skew(vpColVector(tu_cRcd))) * ctcd;
       // Compute the camera rotational velocity
       vpColVector w(3);
       w = lambda * tu_cRcd;