diff --git a/3rdparty/clipper/clipper.cpp b/3rdparty/clipper/clipper.cpp index d0e5ba2577..1444408884 100644 --- a/3rdparty/clipper/clipper.cpp +++ b/3rdparty/clipper/clipper.cpp @@ -4329,10 +4329,10 @@ double DistanceFromLineSqrd( const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) { //The equation of a line in general form (Ax + By + C = 0) - //given 2 points (x¹,y¹) & (x²,y²) is ... - //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 - //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ - //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) + //given 2 points (x1,y1) & (x1,y1) is ... + //(y1 - y1)x + (x1 - x1)y + (y1 - y1)x1 - (x1 - x1)y1 = 0 + //A = (y1 - y1); B = (x2 - x1); C = (y2 - y1)x1 - (x2 - x1)y1 + //perpendicular distance of point (x3,y3) = (Ax3 + By3 + C)/Sqrt(A*A + B*B) //see http://en.wikipedia.org/wiki/Perpendicular_distance double A = double(ln1.Y - ln2.Y); double B = double(ln2.X - ln1.X); diff --git a/3rdparty/simdlib/Simd/SimdBaseImageLoadPng.cpp b/3rdparty/simdlib/Simd/SimdBaseImageLoadPng.cpp index d5fd24a6a1..548a06e05d 100644 --- a/3rdparty/simdlib/Simd/SimdBaseImageLoadPng.cpp +++ b/3rdparty/simdlib/Simd/SimdBaseImageLoadPng.cpp @@ -1148,4 +1148,5 @@ namespace Simd } } } -} \ No newline at end of file +} + diff --git a/3rdparty/simdlib/Simd/SimdBaseImageSaveJpeg.cpp b/3rdparty/simdlib/Simd/SimdBaseImageSaveJpeg.cpp index db2b86ee9b..2eac5cbcd8 100644 --- a/3rdparty/simdlib/Simd/SimdBaseImageSaveJpeg.cpp +++ b/3rdparty/simdlib/Simd/SimdBaseImageSaveJpeg.cpp @@ -601,4 +601,5 @@ namespace Simd return NULL; } } -} \ No newline at end of file +} + diff --git a/3rdparty/simdlib/Simd/SimdBaseImageSavePng.cpp b/3rdparty/simdlib/Simd/SimdBaseImageSavePng.cpp index 7b172a046f..42b066dc8c 100644 --- a/3rdparty/simdlib/Simd/SimdBaseImageSavePng.cpp +++ b/3rdparty/simdlib/Simd/SimdBaseImageSavePng.cpp @@ -376,4 +376,5 @@ namespace Simd WriteCrc32(_stream, 0); } } -} \ No newline at end of file +} + diff --git a/3rdparty/simdlib/Simd/SimdLib.h b/3rdparty/simdlib/Simd/SimdLib.h index 14a3e9205e..b396f0d39d 100644 --- a/3rdparty/simdlib/Simd/SimdLib.h +++ b/3rdparty/simdlib/Simd/SimdLib.h @@ -71,7 +71,7 @@ typedef unsigned __int64 uint64_t; typedef enum { SimdFalse = 0, /*!< False value. */ - SimdTrue = 1, /*!< True value. */ + SimdTrue = 1 /*!< True value. */ } SimdBool; /*! @ingroup c_types @@ -91,7 +91,7 @@ typedef enum /*! equal to: a < b */ SimdCompareLesser, /*! equal to: a <= b */ - SimdCompareLesserOrEqual, + SimdCompareLesserOrEqual } SimdCompareType; /*! @ingroup c_types @@ -111,7 +111,7 @@ typedef enum SimdCpuInfoAvx512bw, /*!< Availability of AVX-512BW (x86). */ SimdCpuInfoVmx, /*!< Availability of VMX or Altivec (PowerPC). */ SimdCpuInfoVsx, /*!< Availability of VSX (PowerPC). */ - SimdCpuInfoNeon, /*!< Availability of NEON (ARM). */ + SimdCpuInfoNeon /*!< Availability of NEON (ARM). */ } SimdCpuInfoType; /*! @ingroup c_types @@ -132,7 +132,7 @@ typedef enum /*! A PNG (Portable Network Graphics) image file format. */ SimdImageFilePng, /*! A JPEG (Joint Photographic Experts Group) image file format. */ - SimdImageFileJpeg, + SimdImageFileJpeg } SimdImageFileType; /*! @ingroup c_types @@ -158,7 +158,7 @@ typedef enum /*! Subtracts unsigned 8-bit integer b from unsigned 8-bit integer a (for every channel of every point of the images). */ SimdOperationBinary8uSubtraction, /*! Adds unsigned 8-bit integer b from unsigned 8-bit integer a (for every channel of every point of the images). */ - SimdOperationBinary8uAddition, + SimdOperationBinary8uAddition } SimdOperationBinary8uType; /*! @ingroup c_types @@ -189,7 +189,7 @@ typedef enum /*! A 24-bit (3 8-bit channels) RGB (Red, Green, Blue) pixel format. */ SimdPixelFormatRgb24, /*! A 32-bit (4 8-bit channels) RGBA (Red, Green, Blue, Alpha) pixel format. */ - SimdPixelFormatRgba32, + SimdPixelFormatRgba32 } SimdPixelFormatType; /*! @ingroup c_types @@ -200,7 +200,7 @@ enum SimdReduceType SimdReduce2x2, /*!< Using of function ::SimdReduceGray2x2 for image reducing. */ SimdReduce3x3, /*!< Using of function ::SimdReduceGray3x3 for image reducing. */ SimdReduce4x4, /*!< Using of function ::SimdReduceGray4x4 for image reducing. */ - SimdReduce5x5, /*!< Using of function ::SimdReduceGray5x5 for image reducing. */ + SimdReduce5x5 /*!< Using of function ::SimdReduceGray5x5 for image reducing. */ }; /*! @ingroup resizing @@ -213,7 +213,7 @@ typedef enum /*! 16-bit integer channel type. */ SimdResizeChannelShort, /*! 32-bit float channel type. */ - SimdResizeChannelFloat, + SimdResizeChannelFloat } SimdResizeChannelType; /*! @ingroup resizing @@ -236,7 +236,7 @@ typedef enum /*! Area method. */ SimdResizeMethodArea, /*! Area method for previously reduced in 2 times image. */ - SimdResizeMethodAreaFast, + SimdResizeMethodAreaFast } SimdResizeMethodType; /*! @ingroup yuv_conversion @@ -248,7 +248,7 @@ typedef enum SimdYuvBt601, /*!< Corresponds to BT.601 standard. Uses Kr=0.299, Kb=0.114. Restricts Y to range [16..235], U and V to [16..240]. */ SimdYuvBt709, /*!< Corresponds to BT.709 standard. Uses Kr=0.2126, Kb=0.0722. Restricts Y to range [16..235], U and V to [16..240]. */ SimdYuvBt2020, /*!< Corresponds to BT.2020 standard. Uses Kr=0.2627, Kb=0.0593. Restricts Y to range [16..235], U and V to [16..240]. */ - SimdYuvTrect871, /*!< Corresponds to T-REC-T.871 standard. Uses Kr=0.299, Kb=0.114. Y, U and V use full range [0..255]. */ + SimdYuvTrect871 /*!< Corresponds to T-REC-T.871 standard. Uses Kr=0.299, Kb=0.114. Y, U and V use full range [0..255]. */ } SimdYuvType; // ViSP custom SIMD code diff --git a/3rdparty/simdlib/Simd/SimdMath.h b/3rdparty/simdlib/Simd/SimdMath.h index c1851a61c0..251cf7cd3c 100644 --- a/3rdparty/simdlib/Simd/SimdMath.h +++ b/3rdparty/simdlib/Simd/SimdMath.h @@ -953,7 +953,7 @@ namespace Simd vst1q_f32(_a, a); float r[4] = { 1.0f / _a[0], 1.0f / _a[1], 1.0f / _a[2], 1.0f / _a[3] }; return vld1q_f32(r); - }; + } template<> SIMD_INLINE float32x4_t Reciprocal<0>(const float32x4_t & a) { @@ -985,7 +985,7 @@ namespace Simd vst1q_f32(_b, b); float c[4] = { _a[0] / _b[0], _a[1] / _b[1], _a[2] / _b[2], _a[3] / _b[3] }; return vld1q_f32(c); - }; + } template SIMD_INLINE float32x4_t ReciprocalSqrt(const float32x4_t & a); diff --git a/modules/core/src/image/vpCannyEdgeDetection.cpp b/modules/core/src/image/vpCannyEdgeDetection.cpp index 0dbf7c2dc4..d142a3c364 100644 --- a/modules/core/src/image/vpCannyEdgeDetection.cpp +++ b/modules/core/src/image/vpCannyEdgeDetection.cpp @@ -55,7 +55,7 @@ static void scaleFilter( } } } -}; +} #endif BEGIN_VISP_NAMESPACE diff --git a/modules/core/src/image/vpImageCircle.cpp b/modules/core/src/image/vpImageCircle.cpp index cb75dac8db..8ba135fd64 100644 --- a/modules/core/src/image/vpImageCircle.cpp +++ b/modules/core/src/image/vpImageCircle.cpp @@ -1049,7 +1049,7 @@ void incrementIfIsInMask(const vpImage &mask, const int &width, const int ++count; } } -}; +} #endif unsigned int vpImageCircle::computePixelsInMask(const vpImage &mask) const diff --git a/modules/core/src/math/matrix/vpMatrix_mul.cpp b/modules/core/src/math/matrix/vpMatrix_mul.cpp index fb54a085a2..643574f9c4 100644 --- a/modules/core/src/math/matrix/vpMatrix_mul.cpp +++ b/modules/core/src/math/matrix/vpMatrix_mul.cpp @@ -115,7 +115,7 @@ END_VISP_NAMESPACE #else // Work around to avoid warning LNK4221: This object file does not define any // previously undefined public symbols -void dummy_vpMatrix_blas() { }; +void dummy_vpMatrix_blas() { } #endif #endif // #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/modules/vision/include/visp3/vision/vpPose.h b/modules/vision/include/visp3/vision/vpPose.h index 752c6f8ce1..151e534523 100644 --- a/modules/vision/include/visp3/vision/vpPose.h +++ b/modules/vision/include/visp3/vision/vpPose.h @@ -95,7 +95,7 @@ class VISP_EXPORT vpPose initialized by Dementhon approach */ LAGRANGE_VIRTUAL_VS, /*!< Non linear virtual visual servoing approach initialized by Lagrange approach */ - DEMENTHON_LAGRANGE_VIRTUAL_VS, /*!< Non linear virtual visual servoing approach + DEMENTHON_LAGRANGE_VIRTUAL_VS /*!< Non linear virtual visual servoing approach initialized by either Dementhon or Lagrange approach, depending on which method has the smallest residual. */ } vpPoseMethodType;