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

Upgraded clang-format to 5.0 (#103)

Browse Source
This commit is contained in:
Tyler Veness
2017-11-19 15:15:41 -08:00
committed by Peter Johnson
parent 7847c69231
commit cf828ca858
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/native/cpp/UnlimitedHandleResource.h
View File

@@ -109,8 +109,9 @@ THandle UnlimitedHandleResource<THandle, TStruct, typeValue, TMutex>::Allocate(
}
template <typename THandle, typename TStruct, int typeValue, typename TMutex>
inline std::shared_ptr<TStruct> UnlimitedHandleResource<
THandle, TStruct, typeValue, TMutex>::Get(THandle handle) {
inline std::shared_ptr<TStruct>
UnlimitedHandleResource<THandle, TStruct, typeValue, TMutex>::Get(
THandle handle) {
auto index =
handle.GetTypedIndex(static_cast<typename THandle::Type>(typeValue));
if (index < 0) return nullptr;

5
src/main/native/cpp/UsbCameraImpl.cpp
View File

@@ -664,9 +664,8 @@ CS_StatusValue UsbCameraImpl::DeviceCmdSetProperty(
// Check kind match
if ((setString && prop->propKind != CS_PROP_STRING) ||
(!setString &&
(prop->propKind & (CS_PROP_BOOLEAN | CS_PROP_INTEGER | CS_PROP_ENUM)) ==
0))
(!setString && (prop->propKind &
(CS_PROP_BOOLEAN | CS_PROP_INTEGER | CS_PROP_ENUM)) == 0))
return CS_WRONG_PROPERTY_TYPE;
// Handle percentage property

7
src/main/native/cpp/cscore_c.cpp
View File

@@ -133,9 +133,10 @@ CS_Bool CS_SetSourceVideoModeDiscrete(CS_Source source,
int width, int height, int fps,
CS_Status* status) {
return cs::SetSourceVideoMode(
source, cs::VideoMode{static_cast<cs::VideoMode::PixelFormat>(
static_cast<int>(pixelFormat)),
width, height, fps},
source,
cs::VideoMode{static_cast<cs::VideoMode::PixelFormat>(
static_cast<int>(pixelFormat)),
width, height, fps},
status);
}