From 4ab095e9c9102576ff40f5fe8faecce8dea5c4be Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 27 Oct 2017 11:35:57 -0700 Subject: [PATCH] Fix formatting in CameraServer.cpp (#689) A PR didn't rerun the formatter before merging. --- wpilibc/src/main/native/cpp/CameraServer.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/wpilibc/src/main/native/cpp/CameraServer.cpp b/wpilibc/src/main/native/cpp/CameraServer.cpp index 02de3fb68b..28fbd46cc7 100644 --- a/wpilibc/src/main/native/cpp/CameraServer.cpp +++ b/wpilibc/src/main/native/cpp/CameraServer.cpp @@ -7,10 +7,10 @@ #include "CameraServer.h" +#include #include #include -#include "HAL/HAL.h" #include "Utility.h" #include "WPIErrors.h" #include "networktables/NetworkTableInstance.h" @@ -495,7 +495,8 @@ CameraServer::CameraServer() #ifdef __linux__ cs::UsbCamera CameraServer::StartAutomaticCapture() { cs::UsbCamera camera = StartAutomaticCapture(m_defaultUsbDevice++); - HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, camera.GetHandle()); + HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, + camera.GetHandle()); return camera; } @@ -506,7 +507,8 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(int dev) { cs::UsbCamera camera{name.str(), dev}; StartAutomaticCapture(camera); - HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, camera.GetHandle()); + HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, + camera.GetHandle()); return camera; } @@ -514,7 +516,8 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(llvm::StringRef name, int dev) { cs::UsbCamera camera{name, dev}; StartAutomaticCapture(camera); - HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, camera.GetHandle()); + HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, + camera.GetHandle()); return camera; } @@ -522,7 +525,8 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(llvm::StringRef name, llvm::StringRef path) { cs::UsbCamera camera{name, path}; StartAutomaticCapture(camera); - HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, camera.GetHandle()); + HAL_Report(HALUsageReporting::kResourceType_PCVideoServer, + camera.GetHandle()); return camera; } #endif