Clang-format aos
It has drifted... Clean it up a bit.
Change-Id: I2fe31a2187b4f690634ae6942786575db20192af
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/aos/vision/debug/aveugle-source.cc b/aos/vision/debug/aveugle-source.cc
index d03be14..65a8e84 100644
--- a/aos/vision/debug/aveugle-source.cc
+++ b/aos/vision/debug/aveugle-source.cc
@@ -1,9 +1,9 @@
-#include "aos/vision/debug/debug_framework.h"
-
#include <gdk/gdk.h>
+
#include <fstream>
#include <string>
+#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_stream.h"
@@ -46,9 +46,8 @@
++i_;
}
});
- interface_->InstallSetExposure([this](int abs_exp) {
- this->SetExposure(abs_exp);
- });
+ interface_->InstallSetExposure(
+ [this](int abs_exp) { this->SetExposure(abs_exp); });
}
void ProcessImage(DataRef data, aos::monotonic_clock::time_point) override {
prev_data_ = std::string(data);
diff --git a/aos/vision/debug/blob_log-source.cc b/aos/vision/debug/blob_log-source.cc
index 26706bb..006c09a 100644
--- a/aos/vision/debug/blob_log-source.cc
+++ b/aos/vision/debug/blob_log-source.cc
@@ -1,17 +1,16 @@
-#include "aos/vision/debug/debug_framework.h"
-
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <sys/stat.h>
#include <unistd.h>
+
#include <fstream>
#include <functional>
#include <string>
#include "aos/vision/blob/codec.h"
#include "aos/vision/blob/stream_view.h"
+#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/debug/overlay.h"
-
#include "glog/logging.h"
namespace aos {
diff --git a/aos/vision/debug/camera-source.cc b/aos/vision/debug/camera-source.cc
index 5eeabfc..578ebc1 100644
--- a/aos/vision/debug/camera-source.cc
+++ b/aos/vision/debug/camera-source.cc
@@ -1,9 +1,9 @@
-#include "aos/vision/debug/debug_framework.h"
-
#include <gdk/gdk.h>
+
#include <fstream>
#include <string>
+#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_stream.h"
diff --git a/aos/vision/debug/debug_framework.h b/aos/vision/debug/debug_framework.h
index d8ed4a1..c2913c2 100644
--- a/aos/vision/debug/debug_framework.h
+++ b/aos/vision/debug/debug_framework.h
@@ -44,9 +44,8 @@
void InstallSetExposure(std::function<void(int)> set_exp) {
set_exposure_ = set_exp;
}
- void SetExposure(int abs_exp) {
- set_exposure_(abs_exp);
- }
+ void SetExposure(int abs_exp) { set_exposure_(abs_exp); }
+
private:
std::function<void(int)> set_exposure_;
};
diff --git a/aos/vision/debug/debug_window.h b/aos/vision/debug/debug_window.h
index aa31a8c..573cef5 100644
--- a/aos/vision/debug/debug_window.h
+++ b/aos/vision/debug/debug_window.h
@@ -2,7 +2,9 @@
#define AOS_VISION_DEBUG_DEBUG_WINDOW_H_
#include <cairo.h>
+
#include <functional>
+
#include "aos/vision/debug/overlay.h"
#include "aos/vision/image/image_types.h"
diff --git a/aos/vision/debug/jpeg_list-source.cc b/aos/vision/debug/jpeg_list-source.cc
index 027acc9..ecc3f14 100644
--- a/aos/vision/debug/jpeg_list-source.cc
+++ b/aos/vision/debug/jpeg_list-source.cc
@@ -1,11 +1,11 @@
-#include "aos/vision/debug/debug_framework.h"
-
-#include "aos/vision/image/image_dataset.h"
-
#include <gdk/gdk.h>
+
#include <fstream>
#include <string>
+#include "aos/vision/debug/debug_framework.h"
+#include "aos/vision/image/image_dataset.h"
+
namespace aos {
namespace vision {
@@ -37,16 +37,15 @@
interface_->NewJpeg(frame.data);
} else {
const auto &data = frame.data;
- interface_->NewImage({640, 480},
- [&](ImagePtr img_data) {
- for (int y = 0; y < 480; ++y) {
- for (int x = 0; x < 640; ++x) {
- uint8_t v = data[y * 640 * 2 + x * 2 + 0];
- img_data.get_px(x, y) = PixelRef{v, v, v};
- }
- }
- return false;
- });
+ interface_->NewImage({640, 480}, [&](ImagePtr img_data) {
+ for (int y = 0; y < 480; ++y) {
+ for (int x = 0; x < 640; ++x) {
+ uint8_t v = data[y * 640 * 2 + x * 2 + 0];
+ img_data.get_px(x, y) = PixelRef{v, v, v};
+ }
+ }
+ return false;
+ });
}
}
diff --git a/aos/vision/debug/overlay.h b/aos/vision/debug/overlay.h
index c668e17..a2cecd5 100644
--- a/aos/vision/debug/overlay.h
+++ b/aos/vision/debug/overlay.h
@@ -239,7 +239,7 @@
std::vector<std::pair<Vector<2>, double>> circles_;
};
-} // vision
-} // aos
+} // namespace vision
+} // namespace aos
#endif // _AOS_VISION_IMAGE_DEBUG_OVERLAY_H_
diff --git a/aos/vision/debug/tcp-source.cc b/aos/vision/debug/tcp-source.cc
index b95e189..de406ae 100644
--- a/aos/vision/debug/tcp-source.cc
+++ b/aos/vision/debug/tcp-source.cc
@@ -1,15 +1,15 @@
-#include "aos/vision/debug/debug_framework.h"
-
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <sys/stat.h>
#include <unistd.h>
+
#include <cstdlib>
#include <fstream>
#include <functional>
#include <string>
#include "aos/vision/blob/codec.h"
+#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/events/tcp_client.h"
namespace aos {