VXL 2023-06-18 (4332fd74)

Code extracted from:

    https://github.com/vxl/vxl.git

at commit 4332fd7409a6d26902c0477fe2991a3185282e45 (master).

Author: VXL Maintainers

CMakeLists.txt

@@ -67,7 +67,7 @@ foreach(p
 endforeach()
 
 project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
-    VERSION  4.2.1.0 # defines #MAJOR,MINOR,PATCH,TWEAK}
+    VERSION  4.3.1.0 # defines #MAJOR,MINOR,PATCH,TWEAK}
     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
     LANGUAGES CXX C)
 

core/CMakeLists.txt

@@ -121,6 +121,8 @@ CMAKE_DEPENDENT_OPTION( VXL_BUILD_VGUI "Build VGUI" OFF
 mark_as_advanced(VXL_BUILD_VGUI)
 if(VXL_BUILD_VGUI)
   add_subdirectory(vgui)
+else()
+  unset(VGUI_FOUND)
 endif()
 
 

core/vnl/tests/test_matrix.cxx

@@ -349,6 +349,24 @@ test_int()
     for (unsigned int i = 0; i < vc.size(); ++i)
       TEST("vc.apply_columnwise(sum_vector)", vc.get(i), 5);
   }
+
+  { // test operator-() on unsigned values
+    unsigned int vvalues[] = {1, 2, 3, 4};
+    int out_values[] = {-1, -2, -3, -4};
+    const vnl_matrix<int> outm(2, 2, 4, out_values);
+
+    vnl_matrix<unsigned int> unsigned_m22(2, 2, 4, vvalues);
+    const vnl_matrix<int> minus_v1 = -unsigned_m22;
+    const vnl_matrix<int> minus_v2 = unsigned_m22.operator-();
+    TEST("unsigned_m22.operator-()",
+         (outm(0, 0) == minus_v1(0, 0) && outm(0, 1) == minus_v1(0, 1) && outm(1, 0) == minus_v1(1, 0) &&
+          outm(1, 1) == minus_v1(1, 1)), true);
+    TEST("unsigned_m22.operator-()",
+         (outm(0, 0) == minus_v2(0, 0) && outm(0, 1) == minus_v2(0, 1) && outm(1, 0) == minus_v2(1, 0) &&
+          outm(1, 1) == minus_v2(1, 1)), true);
+  }
+
+
 }
 
 

core/vnl/tests/test_matrix_fixed.cxx

@@ -292,6 +292,22 @@ test_int()
   TEST("m.update([4],1,1)",
        ((m3 = 4), (m.update(m3, 1, 1)), (m(0, 0) == 0 && m(0, 1) == -2 && m(1, 0) == 2 && m(1, 1) == 4)),
        true);
+
+  { // test operator-() on unsigned values
+    unsigned int vvalues[] = {1, 2, 3, 4};
+    int out_values[] = {-1, -2, -3, -4};
+    const vnl_matrix_fixed<int,2,2> outm( out_values);
+
+    vnl_matrix_fixed<unsigned int,2,2> unsigned_m22(vvalues);
+    const vnl_matrix_fixed<int,2,2> minus_v1 = -unsigned_m22;
+    const vnl_matrix_fixed<int,2,2> minus_v2 = unsigned_m22.operator-();
+    TEST("unsigned_m22.operator-()",
+         (outm(0, 0) == minus_v1(0, 0) && outm(0, 1) == minus_v1(0, 1) && outm(1, 0) == minus_v1(1, 0) &&
+          outm(1, 1) == minus_v1(1, 1)), true);
+    TEST("unsigned_m22.operator-()",
+         (outm(0, 0) == minus_v2(0, 0) && outm(0, 1) == minus_v2(0, 1) && outm(1, 0) == minus_v2(1, 0) &&
+          outm(1, 1) == minus_v2(1, 1)), true);
+  }
 }
 
 static void

core/vnl/tests/test_vector.cxx

@@ -317,6 +317,37 @@ vnl_vector_test_int()
     v = v_temp, v.roll_inplace(-5); // Positive, in range
     TEST("v.roll_inplace(-5)", (1 == v[0] && 2 == v[1] && 3 == v[2] && 0 == v[3]), true);
   }
+
+  { // test operator-() on unsigned values
+    unsigned int vvalues[] = {1, 2, 3, 4};
+    int out_values[] = {-1, -2, -3, -4};
+
+    vnl_vector<unsigned int> unsigned_v(4, 4, vvalues);
+    const vnl_vector<int> minus_v1 = -unsigned_v;
+    const vnl_vector<int> minus_v2 = unsigned_v.operator-();
+    TEST("unsigned_v.operator-()",
+         (out_values[0] == minus_v1[0] && out_values[1] == minus_v1[1] && out_values[2] == minus_v1[2] &&
+          out_values[3] == minus_v1[3]), true);
+    TEST("unsigned_v.operator-()",
+         (out_values[0] == minus_v2[0] && out_values[1] == minus_v2[1] && out_values[2] == minus_v2[2] &&
+          out_values[3] == minus_v2[3]), true);
+  }
+
+  { // test operator-() on unsigned values
+    unsigned int vvalues[] = {1, 2, 3, 4};
+    int out_values[] = {-1, -2, -3, -4};
+
+    vnl_vector_fixed<unsigned int,4> unsigned_v(vvalues);
+    const vnl_vector_fixed<int,4> minus_v1 = -unsigned_v;
+    const vnl_vector_fixed<int,4> minus_v2 = unsigned_v.operator-();
+    TEST("unsigned_v.operator-()",
+         (out_values[0] == minus_v1[0] && out_values[1] == minus_v1[1] && out_values[2] == minus_v1[2] &&
+          out_values[3] == minus_v1[3]), true);
+    TEST("unsigned_v.operator-()",
+         (out_values[0] == minus_v2[0] && out_values[1] == minus_v2[1] && out_values[2] == minus_v2[2] &&
+          out_values[3] == minus_v2[3]), true);
+  }
+
 }
 
 bool

core/vnl/vnl_bignum_traits.h

@@ -25,6 +25,11 @@ class VNL_EXPORT vnl_numeric_traits<vnl_bignum>
   typedef vnl_bignum double_t;
   //: Name of type which results from multiplying this type with a double
   typedef double real_t;
+  //: Name of this type
+  using self = vnl_bignum;
+  //: Name of type which results from using a unary operator-()
+  using signed_t = self;
+
 };
 
 #endif // vnl_bignum_traits_h_

core/vnl/vnl_decnum_traits.h

@@ -25,6 +25,11 @@ class VNL_EXPORT vnl_numeric_traits<vnl_decnum>
   typedef vnl_decnum double_t;
   //: Name of type which results from multiplying this type with a double
   typedef vnl_decnum real_t;
+  //: Name of this type
+  using self = vnl_decnum;
+  //: Name of type which results from using a unary operator-()
+  using signed_t = self;
+
 };
 
 #endif // vnl_decnum_traits_h_

core/vnl/vnl_matrix.h

@@ -284,7 +284,7 @@ class VNL_EXPORT vnl_matrix
   vnl_matrix<T>& operator*=(vnl_matrix<T> const&rhs) { return *this = (*this) * rhs; }
 
   //: Negate all elements of matrix
-  vnl_matrix<T> operator-() const;
+  vnl_matrix<typename vnl_numeric_traits<T>::signed_t> operator-() const;
 
 
   //: Add rhs to each element of lhs matrix and return result in new matrix

core/vnl/vnl_matrix.hxx

@@ -548,12 +548,12 @@ vnl_matrix<T> operator- (T const& value, vnl_matrix<T> const& m)
 // O(m*n).
 
 template <class T>
-vnl_matrix<T> vnl_matrix<T>::operator- () const
+vnl_matrix<typename vnl_numeric_traits<T>::signed_t> vnl_matrix<T>::operator- () const
 {
-  vnl_matrix<T> result(this->num_rows, this->num_cols);
+  vnl_matrix<typename vnl_numeric_traits<T>::signed_t> result(this->num_rows, this->num_cols);
   for (unsigned int i = 0; i < this->num_rows; i++)
     for (unsigned int j = 0; j < this->num_cols; j++)
-      result.data[i][j] = - this->data[i][j];
+      result(i,j) = - this->data[i][j];
   return result;
 }
 

core/vnl/vnl_matrix_fixed.h

@@ -223,11 +223,26 @@ class VNL_EXPORT vnl_matrix_fixed
 
   //: Access an element for reading or writing
   // There are assert style boundary checks - #define NDEBUG to turn them off.
-  T       & operator() (unsigned r, unsigned c);
+  T       & operator() (unsigned r, unsigned c)
+  {
+#if VNL_CONFIG_CHECK_BOUNDS  && (!defined NDEBUG)
+    assert(r < rows());   // Check the row index is valid
+    assert(c < cols());   // Check the column index is valid
+#endif
+    return this->data_[r][c];
+  }
+
 
   //: Access an element for reading
   // There are assert style boundary checks - #define NDEBUG to turn them off.
-  T const & operator() (unsigned r, unsigned c) const;
+  T const & operator() (unsigned r, unsigned c) const
+  {
+#if VNL_CONFIG_CHECK_BOUNDS  && (!defined NDEBUG)
+    assert(r < rows());   // Check the row index is valid
+    assert(c < cols());   // Check the column index is valid
+#endif
+    return this->data_[r][c];
+  }
 
   // ----------------------- Filling and copying -----------------------
 
@@ -353,10 +368,12 @@ class VNL_EXPORT vnl_matrix_fixed
   }
 
   //: Negate all elements of matrix
-  vnl_matrix_fixed operator- () const
+  vnl_matrix_fixed<typename vnl_numeric_traits<T>::signed_t, num_rows,num_cols> operator- () const
   {
-    vnl_matrix_fixed r;
-    self::sub( T(0), data_block(), r.data_block() );
+    vnl_matrix_fixed<typename vnl_numeric_traits<T>::signed_t, num_rows,num_cols> r;
+    for(int i=0; i<num_rows; ++i)
+      for(int j=0; j<num_cols; ++j)
+        r(i,j) = -(*this)(i,j);
     return r;
   }