Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting in CameraServer.cpp (#689)

Browse Source 
A PR didn't rerun the formatter before merging.
This commit is contained in:
Tyler Veness
2017-10-27 11:35:57 -07:00
committed by Peter Johnson
parent 541753c814
commit 4ab095e9c9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/cpp/CameraServer.cpp
View File

@@ -7,10 +7,10 @@
#include "CameraServer.h"
#include <HAL/HAL.h>
#include <llvm/SmallString.h>
#include <llvm/raw_ostream.h>
#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