Merge pull request #354 from oddkiva/maint-deduplicate-code

MAINT: deduplicate code.
oddkiva · Oct 29, 2023 · 63b8e34 · 63b8e34
2 parents dac2a7e + dcfbdb8
commit 63b8e34
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 34 deletions.
diff --git a/cpp/drafts/ChessboardDetection/EdgeStatistics.hpp b/cpp/drafts/ChessboardDetection/EdgeStatistics.hpp
@@ -14,11 +14,6 @@
 #include <DO/Sara/ImageProcessing/EdgeShapeStatistics.hpp>
 
 
-inline constexpr auto operator"" _percent(long double x) -> long double
-{
-  return x / 100;
-}
-
 namespace DO::Sara {
 
   auto is_strong_edge(const ImageView<float>& grad_mag,

diff --git a/cpp/examples/Sara/FeatureDetectors/edge_detection_example.cpp b/cpp/examples/Sara/FeatureDetectors/edge_detection_example.cpp
@@ -35,12 +35,6 @@ using namespace std;
 using namespace DO::Sara;
 
 
-inline constexpr long double operator"" _percent(long double x)
-{
-  return x / 100;
-}
-
-
 auto is_strong_edge(const ImageView<float>& grad_mag,
                     const std::vector<Eigen::Vector2i>& edge,
                     const float grad_thres) -> float

diff --git a/cpp/examples/Sara/FeatureMatching/video_edge_matching.cpp b/cpp/examples/Sara/FeatureMatching/video_edge_matching.cpp
@@ -37,12 +37,6 @@ using namespace std;
 using namespace DO::Sara;
 
 
-inline constexpr long double operator"" _percent(long double x)
-{
-  return x / 100;
-}
-
-
 auto initialize_camera_intrinsics_1()
 {
   auto intrinsics = BrownConradyCamera32<float>{};

diff --git a/cpp/examples/Sara/MultiViewGeometry/orthogonal_vanishing_point_detection.cpp b/cpp/examples/Sara/MultiViewGeometry/orthogonal_vanishing_point_detection.cpp
@@ -41,12 +41,6 @@ namespace po = boost::program_options;
 using namespace DO::Sara;
 
 
-inline constexpr long double operator"" _percent(long double x)
-{
-  return x / 100;
-}
-
-
 auto initialize_camera_intrinsics_1()
 {
   auto intrinsics = BrownConradyCamera32<float>{};
@@ -239,13 +233,13 @@ int sara_graphics_main(int argc, char** argv)
 
   // Output save.
   const auto basename = fs::path(video_filepath).stem().string();
-  VideoWriter video_writer{
+  const auto output_file =
 #if defined(__APPLE__)
-      "/Users/david/Desktop/" + basename + ".ortho-vp.mp4",
+      "/Users/david/Desktop/" + basename + ".ortho-vp.mp4";
 #else
-      "/home/david/Desktop/" + basename + ".ortho-vp.mp4",
+      "/home/david/Desktop/" + basename + ".ortho-vp.mp4";
 #endif
-      frame.sizes()};
+  auto video_writer = VideoWriter{output_file, frame.sizes()};
 
 
   // Show the local extrema.

diff --git a/cpp/src/DO/Sara/Core/PhysicalQuantities.hpp b/cpp/src/DO/Sara/Core/PhysicalQuantities.hpp
@@ -426,7 +426,19 @@ namespace DO::Sara {
       -> PixelUnits<2>
   {
     const auto ratio = sensor_sizes.cast<long double>() / focal_length.value;
-    return image_sizes.cast<long double>().cwiseProduct(ratio).cast<PixelUnit>();
+    return image_sizes.cast<long double>()
+        .cwiseProduct(ratio)
+        .cast<PixelUnit>();
+  }
+
+}  // namespace DO::Sara
+
+
+namespace DO::Sara {
+
+  inline constexpr auto operator"" _percent(long double x) -> long double
+  {
+    return x / 100;
   }
 
 }  // namespace DO::Sara
diff --git a/cpp/src/DO/Shakti/Halide/Generators/examples/halide_edge_detection_example.cpp b/cpp/src/DO/Shakti/Halide/Generators/examples/halide_edge_detection_example.cpp
@@ -180,12 +180,6 @@ namespace v2 {
 }  // namespace v2
 
 
-inline constexpr long double operator"" _percent(long double x)
-{
-  return x / 100;
-}
-
-
 int main(int argc, char** argv)
 {
   DO::Sara::GraphicsApplication app(argc, argv);