diff --git a/cscore/src/main/native/cpp/cscore_c.cpp b/cscore/src/main/native/cpp/cscore_c.cpp index ffbc1640ad..3fbbfcda37 100644 --- a/cscore/src/main/native/cpp/cscore_c.cpp +++ b/cscore/src/main/native/cpp/cscore_c.cpp @@ -516,7 +516,7 @@ void CS_FreeEnumeratedVideoModes(CS_VideoMode* modes, int count) { std::free(modes); } -char* CS_GetHostname() { +char* CS_GetHostname(void) { return cs::ConvertToC(cs::GetHostname()); } diff --git a/cscore/src/main/native/include/cscore_c.h b/cscore/src/main/native/include/cscore_c.h index fb3f3f88a2..3d30a0e7ec 100644 --- a/cscore/src/main/native/include/cscore_c.h +++ b/cscore/src/main/native/include/cscore_c.h @@ -504,7 +504,7 @@ void CS_FreeHttpCameraUrls(char** urls, int count); void CS_FreeEnumeratedProperties(CS_Property* properties, int count); void CS_FreeEnumeratedVideoModes(CS_VideoMode* modes, int count); -char* CS_GetHostname(); +char* CS_GetHostname(void); char** CS_GetNetworkInterfaces(int* count); void CS_FreeNetworkInterfaces(char** interfaces, int count); diff --git a/cscore/src/main/native/objcpp/UsbCameraImplObjc.mm b/cscore/src/main/native/objcpp/UsbCameraImplObjc.mm index 0b8f18a0b5..ac644f29ee 100644 --- a/cscore/src/main/native/objcpp/UsbCameraImplObjc.mm +++ b/cscore/src/main/native/objcpp/UsbCameraImplObjc.mm @@ -328,8 +328,6 @@ static cs::VideoMode::PixelFormat FourCCToPixelFormat(FourCharCode fourcc) { @autoreleasepool { NSArray* formats = self.videoDevice.formats; - int count = 0; - for (AVCaptureDeviceFormat* format in formats) { CMFormatDescriptionRef cmformat = format.formatDescription; CMVideoDimensions s1 = CMVideoFormatDescriptionGetDimensions(cmformat); @@ -363,7 +361,6 @@ static cs::VideoMode::PixelFormat FourCCToPixelFormat(FourCharCode fourcc) { modes.emplace_back(store.mode); platformModes.emplace_back(store); - count++; } }