Run clang-format on the entire repo
This patch clang-formats the entire repo. Third-party code is
excluded.
I needed to fix up the .clang-format file so that all the header
includes are ordered properly. I could have sworn that it used to work
without the extra modification, but I guess not.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I64bb9f2c795401393f9dfe2fefc4f04cb36b52f6
diff --git a/y2020/vision/extrinsics_calibration.cc b/y2020/vision/extrinsics_calibration.cc
index d9e13b3..334de0b 100644
--- a/y2020/vision/extrinsics_calibration.cc
+++ b/y2020/vision/extrinsics_calibration.cc
@@ -3,6 +3,7 @@
#include "Eigen/Dense"
#include "Eigen/Geometry"
#include "absl/strings/str_format.h"
+
#include "aos/events/logging/log_reader.h"
#include "aos/init.h"
#include "aos/network/team_number.h"
diff --git a/y2020/vision/sift/fast_gaussian.h b/y2020/vision/sift/fast_gaussian.h
index 580083f..f243e53 100644
--- a/y2020/vision/sift/fast_gaussian.h
+++ b/y2020/vision/sift/fast_gaussian.h
@@ -3,9 +3,10 @@
#include <type_traits>
-#include <opencv2/core/mat.hpp>
-#include "HalideBuffer.h"
#include "glog/logging.h"
+#include <opencv2/core/mat.hpp>
+
+#include "HalideBuffer.h"
namespace frc971 {
namespace vision {
@@ -39,6 +40,6 @@
cv::Mat *difference, double sigma);
} // namespace vision
-} // namespace vision
+} // namespace frc971
#endif // Y2020_VISION_SIFT_FAST_GAUSSIAN_H_
diff --git a/y2020/vision/sift/fast_gaussian_test.cc b/y2020/vision/sift/fast_gaussian_test.cc
index 73fd8a7..0ed9e20 100644
--- a/y2020/vision/sift/fast_gaussian_test.cc
+++ b/y2020/vision/sift/fast_gaussian_test.cc
@@ -1,8 +1,8 @@
#include "y2020/vision/sift/fast_gaussian.h"
+#include "gtest/gtest.h"
#include <opencv2/imgproc.hpp>
-#include "gtest/gtest.h"
#include "y2020/vision/sift/fast_gaussian_all.h"
namespace frc971 {
diff --git a/y2020/vision/sift/get_gaussian_kernel_test.cc b/y2020/vision/sift/get_gaussian_kernel_test.cc
index 9d799ad..e35f06e 100644
--- a/y2020/vision/sift/get_gaussian_kernel_test.cc
+++ b/y2020/vision/sift/get_gaussian_kernel_test.cc
@@ -1,12 +1,12 @@
#include "y2020/vision/sift/get_gaussian_kernel.h"
-#include <opencv2/core/mat.hpp>
-#include <opencv2/imgproc.hpp>
#include <tuple>
#include "glog/logging.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
+#include <opencv2/core/mat.hpp>
+#include <opencv2/imgproc.hpp>
namespace frc971 {
namespace vision {
diff --git a/y2020/vision/sift/sift971.cc b/y2020/vision/sift/sift971.cc
index 788ae23..afab9b4 100644
--- a/y2020/vision/sift/sift971.cc
+++ b/y2020/vision/sift/sift971.cc
@@ -109,10 +109,11 @@
#include <cstdarg>
#include <iostream>
#include <mutex>
+
+#include "glog/logging.h"
#include <opencv2/core/hal/hal.hpp>
#include <opencv2/imgproc.hpp>
-#include "glog/logging.h"
#include "y2020/vision/sift/fast_gaussian.h"
using namespace cv;
diff --git a/y2020/vision/sift/testing_sift.cc b/y2020/vision/sift/testing_sift.cc
index d4b1306..c0d4ca2 100644
--- a/y2020/vision/sift/testing_sift.cc
+++ b/y2020/vision/sift/testing_sift.cc
@@ -1,5 +1,6 @@
#include <memory>
+#include "glog/logging.h"
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/imgproc.hpp>
@@ -7,7 +8,6 @@
#include "aos/init.h"
#include "aos/time/time.h"
#include "y2020/vision/sift/fast_gaussian.h"
-#include "glog/logging.h"
#include "y2020/vision/sift/sift971.h"
DEFINE_string(image, "", "Image to test with");
@@ -15,7 +15,7 @@
int main(int argc, char **argv) {
aos::InitGoogle(&argc, &argv);
- cv::setNumThreads (4);
+ cv::setNumThreads(4);
const cv::Mat raw_image = cv::imread(FLAGS_image);
CHECK(!raw_image.empty()) << ": Failed to read: " << FLAGS_image;
@@ -58,7 +58,8 @@
#endif
LOG(INFO);
- std::unique_ptr<frc971::vision::SIFT971_Impl> sift(new frc971::vision::SIFT971_Impl());
+ std::unique_ptr<frc971::vision::SIFT971_Impl> sift(
+ new frc971::vision::SIFT971_Impl());
std::vector<cv::KeyPoint> keypoints;
cv::Mat descriptors;
LOG(INFO) << "detectAndCompute on " << image.rows << "x" << image.cols;
diff --git a/y2020/vision/tools/python_code/camera_param_test.cc b/y2020/vision/tools/python_code/camera_param_test.cc
index a2d3a75..30616b0 100644
--- a/y2020/vision/tools/python_code/camera_param_test.cc
+++ b/y2020/vision/tools/python_code/camera_param_test.cc
@@ -1,9 +1,9 @@
#include <unistd.h>
-#include <opencv2/features2d.hpp>
-#include <opencv2/imgproc.hpp>
#include "glog/logging.h"
#include "gtest/gtest.h"
+#include <opencv2/features2d.hpp>
+#include <opencv2/imgproc.hpp>
#if 1
#include "y2020/vision/tools/python_code/sift_training_data_test.h"
diff --git a/y2020/vision/viewer.cc b/y2020/vision/viewer.cc
index d923407..ff08f01 100644
--- a/y2020/vision/viewer.cc
+++ b/y2020/vision/viewer.cc
@@ -1,9 +1,10 @@
#include <map>
+#include <random>
+
#include <opencv2/calib3d.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc.hpp>
-#include <random>
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"