VXL 2021-12-25 (fe6889da)

Code extracted from: https://github.com/vxl/vxl.git at commit fe6889da06ff144c70c2d833492af1305f99d2f8 (master).
InsightSoftwareConsortium · Jan 5, 2022 · 1f8b137 · 1f8b137
1 parent 186057d
commit 1f8b137
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/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 3.5.0.0 # defines #MAJOR,MINOR,PATCH,TWEAK}
+    VERSION 3.6.0.0 # defines #MAJOR,MINOR,PATCH,TWEAK}
     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
     LANGUAGES CXX C)
 

diff --git a/core/vnl/algo/tests/test_convolve.cxx b/core/vnl/algo/tests/test_convolve.cxx
@@ -52,15 +52,15 @@ test_convolve()
   for (unsigned i = 0; i < ntimes; ++i)
     r9 = vnl_convolve(l, k3);
   const std::clock_t timer_02 = std::clock();
-  const int ms1 = (timer_02 - timer_01) / (CLOCKS_PER_SEC / 1000);
+  const double ms1 = 1000.0 * (double)(timer_02 - timer_01) / CLOCKS_PER_SEC;
   std::cout << "Done straightforward 10000x2000 convolution in " << ms1 / double(ntimes) << " milliseconds\n";
 
   vnl_vector<double> r10;
   const std::clock_t timer_03 = std::clock();
   for (unsigned i = 0; i < ntimes; ++i)
     r10 = vnl_convolve(l, k3, 16384);
   const std::clock_t timer_04 = std::clock();
-  const int ms2 = (timer_04 - timer_03) / (CLOCKS_PER_SEC / 1000);
+  const double ms2 = 1000.0 * (double)(timer_04 - timer_03) / CLOCKS_PER_SEC;
 
   TEST_NEAR("vnl_convolve() with_fft(16384)", (r9 - r10).two_norm(), 0.0, 1e-6);
   std::cout << "Done FFT-2-based 10000x2000 convolution in " << ms2 / double(ntimes) << " milliseconds\n";
@@ -70,7 +70,7 @@ test_convolve()
   for (unsigned i = 0; i < ntimes; ++i)
     r11 = vnl_convolve(l, k3, 12800);
   const std::clock_t timer_06 = std::clock();
-  const int ms3 = (timer_06 - timer_05) / (CLOCKS_PER_SEC / 1000);
+  const double ms3 = 1000.0 * (double)(timer_06 - timer_05) / CLOCKS_PER_SEC;
   TEST_NEAR("vnl_convolve() with_fft(12800)", (r9 - r11).two_norm(), 0.0, 1e-6);
   std::cout << "Done FFT-2,5-based 10000x2000 convolution in " << ms3 / double(ntimes) << " milliseconds\n";
 
@@ -79,7 +79,7 @@ test_convolve()
   for (unsigned i = 0; i < ntimes; ++i)
     r12 = vnl_convolve(l, k3, 27648);
   const std::clock_t timer_08 = std::clock();
-  const int ms4 = (timer_08 - timer_07) / (CLOCKS_PER_SEC / 1000);
+  const double ms4 = 1000.0 * (double)(timer_08 - timer_07) / CLOCKS_PER_SEC;
   TEST_NEAR("vnl_convolve() with_fft(27648)", (r9 - r12).two_norm(), 0.0, 1e-6);
   std::cout << "Done FFT-2,3-based 10000x2000 convolution in " << ms4 / double(ntimes) << " milliseconds\n";
 

diff --git a/core/vnl/tests/test_rational.cxx b/core/vnl/tests/test_rational.cxx
@@ -260,7 +260,7 @@ test_frac()
   TEST_NEAR("large division with overflow", p, double(r) / double(s), 1e-12);
 }
 
-#if VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG
+#if VXL_INT_64_IS_LONG
 static void
 test_long_64()
 {

diff --git a/vcl/vcl_compiler.h.in b/vcl/vcl_compiler.h.in
@@ -1,5 +1,5 @@
-#ifndef vcl_compiler_h__
-#define vcl_compiler_h__
+#ifndef vcl_compiler_h_
+#define vcl_compiler_h_
 
 //:
 // \file
@@ -203,4 +203,4 @@
 #include "vcl_legacy_aliases.h"
 #endif
 
-#endif // vcl_compiler_h__
+#endif // vcl_compiler_h_