mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-30 02:31:44 +00:00
[build] Upgrade clang-format and clang-tidy (NFC) (#3422)
This commit is contained in:
@@ -2154,7 +2154,7 @@ struct LogMessage {
|
||||
std::string m_msg;
|
||||
};
|
||||
|
||||
typedef JSingletonCallbackManager<LogMessage> LoggerJNI;
|
||||
using LoggerJNI = JSingletonCallbackManager<LogMessage>;
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
/**
|
||||
* Raw Frame
|
||||
*/
|
||||
typedef struct CS_RawFrame {
|
||||
typedef struct CS_RawFrame { // NOLINT
|
||||
char* data;
|
||||
int dataLength;
|
||||
int pixelFormat;
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#error "Cannot include both cscore_cv.h and cscore_raw_cv.h in the same file"
|
||||
#endif
|
||||
|
||||
#include <opencv2/core/mat.hpp>
|
||||
|
||||
#include "cscore_raw.h"
|
||||
|
||||
namespace cs {
|
||||
|
||||
@@ -533,8 +533,9 @@ bool UsbCameraImpl::CacheProperties(CS_Status* status) const {
|
||||
auto result = m_messagePump->SendWindowMessage<CS_Status>(
|
||||
WaitForStartupMessage, nullptr, nullptr);
|
||||
*status = result;
|
||||
if (*status != CS_OK)
|
||||
if (*status != CS_OK) {
|
||||
return false;
|
||||
}
|
||||
if (!m_properties_cached) {
|
||||
*status = CS_SOURCE_IS_DISCONNECTED;
|
||||
return false;
|
||||
@@ -883,10 +884,12 @@ CS_StatusValue UsbCameraImpl::DeviceCmdSetMode(
|
||||
}
|
||||
|
||||
bool UsbCameraImpl::DeviceStreamOn() {
|
||||
if (m_streaming)
|
||||
if (m_streaming) {
|
||||
return false;
|
||||
if (!m_deviceValid)
|
||||
}
|
||||
if (!m_deviceValid) {
|
||||
return false;
|
||||
}
|
||||
m_streaming = true;
|
||||
m_sourceReader->ReadSample(MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL,
|
||||
NULL, NULL);
|
||||
|
||||
@@ -45,7 +45,7 @@ class UsbCameraImpl : public SourceImpl,
|
||||
Telemetry& telemetry, int deviceId);
|
||||
~UsbCameraImpl() override;
|
||||
|
||||
void Start();
|
||||
void Start() override;
|
||||
|
||||
// Property functions
|
||||
void SetProperty(int property, int value, CS_Status* status) override;
|
||||
|
||||
Reference in New Issue
Block a user