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

Fix build on macos10.14.4 (#1648)

Browse Source
This commit is contained in:
Austin Shalit
2019-04-27 23:25:27 -04:00
committed by Peter Johnson
parent 4e0c10f488
commit 3cf4f38f5d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,21 +56,21 @@ static wpi::StringRef MakeSourceValue(CS_Source source,
CS_Status status = 0;
buf.clear();
switch (cs::GetSourceKind(source, &status)) {
case cs::VideoSource::kUsb: {
case CS_SOURCE_USB: {
wpi::StringRef prefix{"usb:"};
buf.append(prefix.begin(), prefix.end());
auto path = cs::GetUsbCameraPath(source, &status);
buf.append(path.begin(), path.end());
break;
}
case cs::VideoSource::kHttp: {
case CS_SOURCE_HTTP: {
wpi::StringRef prefix{"ip:"};
buf.append(prefix.begin(), prefix.end());
auto urls = cs::GetHttpCameraUrls(source, &status);
if (!urls.empty()) buf.append(urls[0].begin(), urls[0].end());
break;
}
case cs::VideoSource::kCv:
case CS_SOURCE_CV:
return "cv:";
default:
return "unknown:";
@@ -239,14 +239,14 @@ static void PutSourcePropertyValue(nt::NetworkTable* table,
CS_Status status = 0;
nt::NetworkTableEntry entry = table->GetEntry(name);
switch (event.propertyKind) {
case cs::VideoProperty::kBoolean:
case CS_PROP_BOOLEAN:
if (isNew)
entry.SetDefaultBoolean(event.value != 0);
else
entry.SetBoolean(event.value != 0);
break;
case cs::VideoProperty::kInteger:
case cs::VideoProperty::kEnum:
case CS_PROP_INTEGER:
case CS_PROP_ENUM:
if (isNew) {
entry.SetDefaultDouble(event.value);
table->GetEntry(infoName + "/min")
@@ -261,7 +261,7 @@ static void PutSourcePropertyValue(nt::NetworkTable* table,
entry.SetDouble(event.value);
}
break;
case cs::VideoProperty::kString:
case CS_PROP_STRING:
if (isNew)
entry.SetDefaultString(event.valueStr);
else