Format and lint.

Gold856 · Oct 22, 2024 · 83d2c08 · 83d2c08
1 parent 5092322
commit 83d2c08
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/wpical/CMakeLists.txt b/wpical/CMakeLists.txt
@@ -24,12 +24,7 @@ wpilib_target_warnings(wpical)
 target_include_directories(wpical PRIVATE src/main/native/include)
 
 find_package(OpenCV REQUIRED)
-target_link_libraries(
-    wpical
-    wpimath
-    apriltaglib
-    ${OpenCV_LIBS}
-)
+target_link_libraries(wpical wpimath apriltaglib ${OpenCV_LIBS})
 
 if(WIN32)
     set_target_properties(wpical PROPERTIES WIN32_EXECUTABLE YES)

diff --git a/wpical/src/main/native/cpp/WPIcal.cpp b/wpical/src/main/native/cpp/WPIcal.cpp
@@ -8,7 +8,10 @@
 #include <fmap.h>
 
 #include <iostream>
+#include <memory>
 #include <numbers>
+#include <string>
+#include <vector>
 
 #include <GLFW/glfw3.h>
 #include <imgui.h>

diff --git a/wpical/src/main/native/cpp/cameracalibration.cpp b/wpical/src/main/native/cpp/cameracalibration.cpp
@@ -4,6 +4,11 @@
 
 #include "cameracalibration.h"
 
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
 bool filter(std::vector<cv::Point2f> charuco_corners,
             std::vector<int> charuco_ids,
             std::vector<std::vector<cv::Point2f>> marker_corners,
@@ -205,7 +210,7 @@ int cameracalibration::calibrate(const std::string& input_video,
     std::vector<cv::Point3f> obj_points;
     std::vector<cv::Point2f> img_points;
 
-    mrcal_point3_t points[(board_width - 1) * (board_height - 1)];
+    const mrcal_point3_t points[(board_width - 1) * (board_height - 1)];
 
     charuco_detector.detectBoard(frame_gray, charuco_corners, charuco_ids,
                                  marker_corners, marker_ids);

diff --git a/wpical/src/main/native/cpp/fieldcalibration.cpp b/wpical/src/main/native/cpp/fieldcalibration.cpp
@@ -4,9 +4,18 @@
 
 #include "fieldcalibration.h"
 
+#include <algorithm>
+#include <functional>
+#include <iostream>
+#include <map>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 class PoseGraphError {
  public:
-  PoseGraphError(Pose t_ab_observed)
+  explicit PoseGraphError(Pose t_ab_observed)
       : m_t_ab_observed(std::move(t_ab_observed)) {}
 
   template <typename T>

diff --git a/wpical/src/main/native/cpp/fmap.cpp b/wpical/src/main/native/cpp/fmap.cpp
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <numbers>
+#include <string>
 
 std::string fmap::singleTag(int tag, tag::pose tagpose, bool endTag) {
   std::string transform = "";

diff --git a/wpical/src/main/native/include/cameracalibration.h b/wpical/src/main/native/include/cameracalibration.h
@@ -8,6 +8,7 @@
 #define CAMERACALIBRATION_H
 
 #include <fstream>
+#include <string>
 
 #include <mrcal_wrapper.h>
 #include <opencv2/aruco.hpp>

diff --git a/wpical/src/main/native/include/fieldcalibration.h b/wpical/src/main/native/include/fieldcalibration.h
@@ -9,6 +9,7 @@
 
 #include <filesystem>
 #include <fstream>
+#include <functional>
 #include <map>
 #include <string>
 #include <tuple>

diff --git a/wpical/src/test/native/test.cpp b/wpical/src/test/native/test.cpp
@@ -6,6 +6,7 @@
 #include <fieldcalibration.h>
 
 #include <iostream>
+#include <string>
 
 #include <gtest/gtest.h>
 #include <wpi/json.h>