Run wpiformat on merged repo (#1021)

cscore/.styleguide

@@ -1,5 +1,9 @@
+cHeaderFileInclude {
+  _c\.h$
+}
+
 cppHeaderFileInclude {
-  \.h$
+  (?<!_c)\.h$
   \.hpp$
   \.inc$
 }
@@ -8,12 +12,6 @@ cppSrcFileInclude {
   \.cpp$
 }
 
-generatedFileExclude {
-  gmock/
-  src/arm-linux-jni/
-  src/main/native/cpp/jni/CameraServerJNI\.cpp$
-}
-
 licenseUpdateExclude {
   src/main/native/cpp/default_init_allocator\.h$
 }
@@ -21,11 +19,16 @@ licenseUpdateExclude {
 includeGuardRoots {
   cscore/src/main/native/cpp/
   cscore/src/main/native/include/
+  cscore/src/main/test/native/cpp/
+}
+
+repoRootNameOverride {
+  cscore
 }
 
 includeOtherLibs {
-  ^llvm/
   ^opencv2/
   ^support/
   ^tcpsockets/
+  ^wpi/
 }

cscore/src/main/native/cpp/CvSinkImpl.cpp

@@ -173,7 +173,7 @@ std::string GetSinkError(CS_Sink sink, CS_Status* status) {
 }
 
 wpi::StringRef GetSinkError(CS_Sink sink, wpi::SmallVectorImpl<char>& buf,
-                             CS_Status* status) {
+                            CS_Status* status) {
   auto data = Sinks::GetInstance().Get(sink);
   if (!data || data->kind != CS_SINK_CV) {
     *status = CS_INVALID_HANDLE;

cscore/src/main/native/cpp/HttpCameraImpl.cpp

@@ -494,8 +494,7 @@ CS_Source CreateHttpCamera(wpi::StringRef name, wpi::StringRef url,
   return handle;
 }
 
-CS_Source CreateHttpCamera(wpi::StringRef name,
-                           wpi::ArrayRef<std::string> urls,
+CS_Source CreateHttpCamera(wpi::StringRef name, wpi::ArrayRef<std::string> urls,
                            CS_HttpCameraKind kind, CS_Status* status) {
   if (urls.empty()) {
     *status = CS_EMPTY_VALUE;

cscore/src/main/native/cpp/JpegUtil.cpp

@@ -93,9 +93,9 @@ bool JpegNeedsDHT(const char* data, size_t* size, size_t* locSOF) {
   for (;;) {
     if (sdata.size() < 4) return false;  // EOF
     bytes = sdata.bytes_begin();
-    if (bytes[0] != 0xff) return false;  // not a tag
-    if (bytes[1] == 0xda) break;  // SOS
-    if (bytes[1] == 0xc4) return false;  // DHT
+    if (bytes[0] != 0xff) return false;                   // not a tag
+    if (bytes[1] == 0xda) break;                          // SOS
+    if (bytes[1] == 0xc4) return false;                   // DHT
     if (bytes[1] == 0xc0) *locSOF = sdata.data() - data;  // SOF
     // Go to the next block
     sdata = sdata.substr(bytes[2] * 256 + bytes[3] + 2);
@@ -111,7 +111,7 @@ bool JpegNeedsDHT(const char* data, size_t* size, size_t* locSOF) {
 
 wpi::StringRef JpegGetDHT() {
   return wpi::StringRef(reinterpret_cast<const char*>(dhtData),
-                         sizeof(dhtData));
+                        sizeof(dhtData));
 }
 
 static inline void ReadInto(wpi::raw_istream& is, std::string& buf,

cscore/src/main/native/cpp/MjpegServerImpl.cpp

@@ -124,8 +124,8 @@ class MjpegServerImpl::ConnThread : public wpi::SafeThread {
 // A browser should connect for each file and not serve files from its cache.
 // Using cached pictures would lead to showing old/outdated pictures.
 // Many browsers seem to ignore, or at least not always obey, those headers.
-static void SendHeader(wpi::raw_ostream& os, int code,
-                       wpi::StringRef codeText, wpi::StringRef contentType,
+static void SendHeader(wpi::raw_ostream& os, int code, wpi::StringRef codeText,
+                       wpi::StringRef contentType,
                        wpi::StringRef extra = wpi::StringRef{}) {
   os << "HTTP/1.0 " << code << ' ' << codeText << "\r\n";
   os << "Connection: close\r\n"
@@ -143,8 +143,7 @@ static void SendHeader(wpi::raw_ostream& os, int code,
 // Send error header and message
 // @param code HTTP error code (e.g. 404)
 // @param message Additional message text
-static void SendError(wpi::raw_ostream& os, int code,
-                      wpi::StringRef message) {
+static void SendError(wpi::raw_ostream& os, int code, wpi::StringRef message) {
   wpi::StringRef codeText, extra, baseMessage;
   switch (code) {
     case 401:
@@ -733,8 +732,7 @@ void MjpegServerImpl::ConnThread::ProcessRequest() {
   } else if (req.find("GET /output") != wpi::StringRef::npos &&
              req.find(".json") != wpi::StringRef::npos) {
     kind = kGetSettings;
-  } else if ((pos = req.find("GET /?action=command")) !=
-             wpi::StringRef::npos) {
+  } else if ((pos = req.find("GET /?action=command")) != wpi::StringRef::npos) {
     kind = kCommand;
     parameters = req.substr(req.find('&', pos + 20)).substr(1);
   } else if (req.find("GET / ") != wpi::StringRef::npos || req == "GET /\n") {

cscore/src/main/native/cpp/SinkImpl.cpp

@@ -26,8 +26,7 @@ void SinkImpl::SetDescription(wpi::StringRef description) {
   m_description = description;
 }
 
-wpi::StringRef SinkImpl::GetDescription(
-    wpi::SmallVectorImpl<char>& buf) const {
+wpi::StringRef SinkImpl::GetDescription(wpi::SmallVectorImpl<char>& buf) const {
   std::lock_guard<wpi::mutex> lock(m_mutex);
   buf.append(m_description.begin(), m_description.end());
   return wpi::StringRef{buf.data(), buf.size()};

cscore/src/main/native/cpp/SourceImpl.cpp

@@ -131,8 +131,7 @@ CS_PropertyKind SourceImpl::GetPropertyKind(int property) const {
 wpi::StringRef SourceImpl::GetPropertyName(int property,
                                            wpi::SmallVectorImpl<char>& buf,
                                            CS_Status* status) const {
-  if (!m_properties_cached && !CacheProperties(status))
-    return wpi::StringRef{};
+  if (!m_properties_cached && !CacheProperties(status)) return wpi::StringRef{};
   std::lock_guard<wpi::mutex> lock(m_mutex);
   auto prop = GetProperty(property);
   if (!prop) {
@@ -206,8 +205,7 @@ int SourceImpl::GetPropertyDefault(int property, CS_Status* status) const {
 wpi::StringRef SourceImpl::GetStringProperty(int property,
                                              wpi::SmallVectorImpl<char>& buf,
                                              CS_Status* status) const {
-  if (!m_properties_cached && !CacheProperties(status))
-    return wpi::StringRef{};
+  if (!m_properties_cached && !CacheProperties(status)) return wpi::StringRef{};
   std::lock_guard<wpi::mutex> lock(m_mutex);
   auto prop = GetProperty(property);
   if (!prop) {

cscore/src/main/native/cpp/SourceImpl.h

@@ -94,8 +94,7 @@ class SourceImpl {
   wpi::ArrayRef<int> EnumerateProperties(wpi::SmallVectorImpl<int>& vec,
                                          CS_Status* status) const;
   CS_PropertyKind GetPropertyKind(int property) const;
-  wpi::StringRef GetPropertyName(int property,
-                                 wpi::SmallVectorImpl<char>& buf,
+  wpi::StringRef GetPropertyName(int property, wpi::SmallVectorImpl<char>& buf,
                                  CS_Status* status) const;
   int GetProperty(int property, CS_Status* status) const;
   virtual void SetProperty(int property, int value, CS_Status* status) = 0;

cscore/src/main/native/cpp/UsbCameraImpl.cpp

@@ -28,8 +28,8 @@
 #include <algorithm>
 
 #include <wpi/SmallString.h>
-#include <wpi/raw_ostream.h>
 #include <wpi/memory.h>
+#include <wpi/raw_ostream.h>
 #include <wpi/timestamp.h>
 
 #include "Handle.h"
@@ -389,7 +389,7 @@ void UsbCameraImpl::CameraThreadMain() {
         DeviceStreamOff();
         DeviceDisconnect();
         notified = true;  // device wasn't deleted, just error'ed
-        continue;  // will reconnect
+        continue;         // will reconnect
       }
 
       if ((buf.flags & V4L2_BUF_FLAG_ERROR) == 0) {
@@ -415,7 +415,7 @@ void UsbCameraImpl::CameraThreadMain() {
         DeviceStreamOff();
         DeviceDisconnect();
         notified = true;  // device wasn't deleted, just error'ed
-        continue;  // will reconnect
+        continue;         // will reconnect
       }
     }
   }

cscore/src/main/native/cpp/UsbCameraImpl.h

@@ -75,7 +75,7 @@ class UsbCameraImpl : public SourceImpl {
       kCmdSetFPS,
       kCmdSetProperty,
       kCmdSetPropertyStr,
-      kNumSinksChanged,  // no response
+      kNumSinksChanged,         // no response
       kNumSinksEnabledChanged,  // no response
       // Responses
       kOk,

cscore/src/main/native/cpp/UsbCameraProperty.h

@@ -62,7 +62,7 @@ class UsbCameraProperty : public PropertyImpl {
   int propPair{0};
 
   unsigned id{0};  // implementation-level id
-  int type{0};  // implementation type, not CS_PropertyKind!
+  int type{0};     // implementation type, not CS_PropertyKind!
 };
 
 }  // namespace cs

cscore/src/main/native/cpp/cscore_cpp.cpp

@@ -171,8 +171,7 @@ std::string GetSourceName(CS_Source source, CS_Status* status) {
   return data->source->GetName();
 }
 
-wpi::StringRef GetSourceName(CS_Source source,
-                             wpi::SmallVectorImpl<char>& buf,
+wpi::StringRef GetSourceName(CS_Source source, wpi::SmallVectorImpl<char>& buf,
                              CS_Status* status) {
   auto data = Sources::GetInstance().Get(source);
   if (!data) {
@@ -309,8 +308,9 @@ std::vector<VideoMode> EnumerateSourceVideoModes(CS_Source source,
   return data->source->EnumerateVideoModes(status);
 }
 
-wpi::ArrayRef<CS_Sink> EnumerateSourceSinks(
-    CS_Source source, wpi::SmallVectorImpl<CS_Sink>& vec, CS_Status* status) {
+wpi::ArrayRef<CS_Sink> EnumerateSourceSinks(CS_Source source,
+                                            wpi::SmallVectorImpl<CS_Sink>& vec,
+                                            CS_Status* status) {
   auto data = Sources::GetInstance().Get(source);
   if (!data) {
     *status = CS_INVALID_HANDLE;
@@ -468,8 +468,7 @@ std::string GetSinkDescription(CS_Sink sink, CS_Status* status) {
   return data->sink->GetDescription(buf);
 }
 
-wpi::StringRef GetSinkDescription(CS_Sink sink,
-                                  wpi::SmallVectorImpl<char>& buf,
+wpi::StringRef GetSinkDescription(CS_Sink sink, wpi::SmallVectorImpl<char>& buf,
                                   CS_Status* status) {
   auto data = Sinks::GetInstance().Get(sink);
   if (!data) {
@@ -630,8 +629,8 @@ wpi::ArrayRef<CS_Source> EnumerateSourceHandles(
   return Sources::GetInstance().GetAll(vec);
 }
 
-wpi::ArrayRef<CS_Sink> EnumerateSinkHandles(
-    wpi::SmallVectorImpl<CS_Sink>& vec, CS_Status* status) {
+wpi::ArrayRef<CS_Sink> EnumerateSinkHandles(wpi::SmallVectorImpl<CS_Sink>& vec,
+                                            CS_Status* status) {
   return Sinks::GetInstance().GetAll(vec);
 }
 
@@ -642,7 +641,7 @@ std::string GetHostname() {
   name[255] = '\0';  // Per POSIX, may not be null terminated if too long
   return name;
 #else
-  return "";  // TODO
+  return "";                          // TODO
 #endif
 }
 
@@ -654,7 +653,7 @@ std::vector<std::string> GetNetworkInterfaces() {
   std::vector<std::string> rv;
   char buf[256];
   for (struct ifaddrs* i = ifa; i; i = i->ifa_next) {
-    if (!i->ifa_addr) continue;  // no address
+    if (!i->ifa_addr) continue;                       // no address
     if (i->ifa_addr->sa_family != AF_INET) continue;  // only return IPv4
     struct sockaddr_in* addr_in = reinterpret_cast<sockaddr_in*>(i->ifa_addr);
     const char* addr =

cscore/src/main/native/cpp/jni/CameraServerJNI.cpp

@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2016-2017 FIRST. All Rights Reserved.                        */
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
 /* Open Source Software - may be modified and shared by FRC teams. The code   */
 /* must be accompanied by the FIRST BSD license file in the root directory of */
 /* the project.                                                               */
@@ -106,7 +106,8 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) {
 template <typename T>
 class JCSGlobal {
  public:
-  JCSGlobal(JNIEnv* env, T obj) : m_obj(static_cast<T>(env->NewGlobalRef(obj))) {}
+  JCSGlobal(JNIEnv* env, T obj)
+      : m_obj(static_cast<T>(env->NewGlobalRef(obj))) {}
   ~JCSGlobal() {
     if (!jvm || cs::NotifierDestroyed()) return;
     JNIEnv* env;
@@ -179,7 +180,7 @@ static inline bool CheckStatus(JNIEnv* env, CS_Status status) {
 }
 
 #ifdef __linux__
-static jobject MakeJObject(JNIEnv* env, const cs::UsbCameraInfo &info) {
+static jobject MakeJObject(JNIEnv* env, const cs::UsbCameraInfo& info) {
   static jmethodID constructor = env->GetMethodID(
       usbCameraInfoCls, "<init>", "(ILjava/lang/String;Ljava/lang/String;)V");
   JLocal<jstring> path(env, MakeJString(env, info.path));
@@ -230,7 +231,8 @@ extern "C" {
  * Method:    getPropertyKind
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyKind
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyKind
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -244,7 +246,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyKind
  * Method:    getPropertyName
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyName
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyName
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -259,7 +262,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyName
  * Method:    getProperty
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getProperty
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getProperty
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -273,7 +277,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getProperty
  * Method:    setProperty
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setProperty
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setProperty
   (JNIEnv* env, jclass, jint property, jint value)
 {
   CS_Status status = 0;
@@ -286,7 +291,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setProperty
  * Method:    getPropertyMin
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyMin
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyMin
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -300,7 +306,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyMin
  * Method:    getPropertyMax
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyMax
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyMax
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -314,7 +321,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyMax
  * Method:    getPropertyStep
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyStep
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyStep
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -328,7 +336,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyStep
  * Method:    getPropertyDefault
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyDefault
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getPropertyDefault
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -342,7 +351,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getPropertyDefault
  * Method:    getStringProperty
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getStringProperty
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getStringProperty
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -357,7 +367,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getStringProperty
  * Method:    setStringProperty
  * Signature: (ILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setStringProperty
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setStringProperty
   (JNIEnv* env, jclass, jint property, jstring value)
 {
   if (!value) {
@@ -372,9 +383,10 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setStringProperty
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    getEnumPropertyChoices
- * Signature: (I)[Ljava/lang/String;
+ * Signature: (I)[Ljava/lang/Object;
  */
-JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getEnumPropertyChoices
+JNIEXPORT jobjectArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getEnumPropertyChoices
   (JNIEnv* env, jclass, jint property)
 {
   CS_Status status = 0;
@@ -388,7 +400,8 @@ JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getEnumProper
  * Method:    createUsbCameraDev
  * Signature: (Ljava/lang/String;I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev
   (JNIEnv* env, jclass, jstring name, jint dev)
 {
 #ifndef __linux__
@@ -411,7 +424,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev
  * Method:    createUsbCameraPath
  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath
   (JNIEnv* env, jclass, jstring name, jstring path)
 {
 #ifndef __linux__
@@ -439,7 +453,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath
  * Method:    createHttpCamera
  * Signature: (Ljava/lang/String;Ljava/lang/String;I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera
   (JNIEnv* env, jclass, jstring name, jstring url, jint kind)
 {
   if (!name) {
@@ -461,9 +476,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    createHttpCameraMulti
- * Signature: (Ljava/lang/String;[Ljava/lang/String;I)I
+ * Signature: (Ljava/lang/String;[Ljava/lang/Object;I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHttpCameraMulti
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createHttpCameraMulti
   (JNIEnv* env, jclass, jstring name, jobjectArray urls, jint kind)
 {
   if (!name) {
@@ -499,9 +515,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHttpCameraMulti
  * Method:    createCvSource
  * Signature: (Ljava/lang/String;IIII)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createCvSource
-  (JNIEnv* env, jclass, jstring name, jint pixelFormat, jint width,
-   jint height, jint fps)
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createCvSource
+  (JNIEnv* env, jclass, jstring name, jint pixelFormat, jint width, jint height,
+   jint fps)
 {
   if (!name) {
     nullPointerEx.Throw(env, "name cannot be null");
@@ -523,7 +540,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createCvSource
  * Method:    getSourceKind
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceKind
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceKind
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -537,7 +555,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceKind
  * Method:    getSourceName
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceName
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceName
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -552,7 +571,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceName
  * Method:    getSourceDescription
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceDescription
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceDescription
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -567,7 +587,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceDescripti
  * Method:    getSourceLastFrameTime
  * Signature: (I)J
  */
-JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceLastFrameTime
+JNIEXPORT jlong JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceLastFrameTime
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -581,7 +602,8 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceLastFrameTi
  * Method:    isSourceConnected
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_isSourceConnected
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_isSourceConnected
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -595,7 +617,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_isSourceConnected
  * Method:    getSourceProperty
  * Signature: (ILjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceProperty
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceProperty
   (JNIEnv* env, jclass, jint source, jstring name)
 {
   if (!name) {
@@ -613,7 +636,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceProperty
  * Method:    enumerateSourceProperties
  * Signature: (I)[I
  */
-JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceProperties
+JNIEXPORT jintArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceProperties
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -626,9 +650,10 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceP
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    getSourceVideoMode
- * Signature: (I)Ledu/wpi/cameraserver/VideoMode;
+ * Signature: (I)Ljava/lang/Object;
  */
-JNIEXPORT jobject JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceVideoMode
+JNIEXPORT jobject JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSourceVideoMode
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -642,7 +667,8 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSourceVideoMode
  * Method:    setSourceVideoMode
  * Signature: (IIIII)Z
  */
-JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceVideoMode
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceVideoMode
   (JNIEnv* env, jclass, jint source, jint pixelFormat, jint width, jint height,
    jint fps)
 {
@@ -661,7 +687,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceVideoMod
  * Method:    setSourcePixelFormat
  * Signature: (II)Z
  */
-JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourcePixelFormat
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourcePixelFormat
   (JNIEnv* env, jclass, jint source, jint pixelFormat)
 {
   CS_Status status = 0;
@@ -676,7 +703,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourcePixelFor
  * Method:    setSourceResolution
  * Signature: (III)Z
  */
-JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceResolution
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceResolution
   (JNIEnv* env, jclass, jint source, jint width, jint height)
 {
   CS_Status status = 0;
@@ -690,7 +718,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceResoluti
  * Method:    setSourceFPS
  * Signature: (II)Z
  */
-JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceFPS
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceFPS
   (JNIEnv* env, jclass, jint source, jint fps)
 {
   CS_Status status = 0;
@@ -702,9 +731,10 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceFPS
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    enumerateSourceVideoModes
- * Signature: (I)[Ledu/wpi/cameraserver/VideoMode;
+ * Signature: (I)[Ljava/lang/Object;
  */
-JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceVideoModes
+JNIEXPORT jobjectArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceVideoModes
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -724,7 +754,8 @@ JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSour
  * Method:    enumerateSourceSinks
  * Signature: (I)[I
  */
-JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceSinks
+JNIEXPORT jintArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceSinks
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -739,7 +770,8 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceS
  * Method:    copySource
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_copySource
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_copySource
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -753,7 +785,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_copySource
  * Method:    releaseSource
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSource
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_releaseSource
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -766,7 +799,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSource
  * Method:    setCameraBrightness
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraBrightness
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraBrightness
   (JNIEnv* env, jclass, jint source, jint brightness)
 {
   CS_Status status = 0;
@@ -779,7 +813,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraBrightness
  * Method:    getCameraBrightness
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getCameraBrightness
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getCameraBrightness
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -793,7 +828,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getCameraBrightness
  * Method:    setCameraWhiteBalanceAuto
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceAuto
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceAuto
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -806,7 +842,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalance
  * Method:    setCameraWhiteBalanceHoldCurrent
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -819,7 +856,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalance
  * Method:    setCameraWhiteBalanceManual
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceManual
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceManual
   (JNIEnv* env, jclass, jint source, jint value)
 {
   CS_Status status = 0;
@@ -832,7 +870,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalance
  * Method:    setCameraExposureAuto
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureAuto
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureAuto
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -845,7 +884,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureAuto
  * Method:    setCameraExposureHoldCurrent
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureHoldCurrent
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureHoldCurrent
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -858,7 +898,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureHold
  * Method:    setCameraExposureManual
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureManual
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureManual
   (JNIEnv* env, jclass, jint source, jint value)
 {
   CS_Status status = 0;
@@ -871,7 +912,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureManu
  * Method:    getUsbCameraPath
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath
   (JNIEnv* env, jclass, jint source)
 {
 #ifndef __linux__
@@ -890,7 +932,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath
  * Method:    getHttpCameraKind
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraKind
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraKind
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -902,9 +945,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraKind
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    setHttpCameraUrls
- * Signature: (I[Ljava/lang/String;)V
+ * Signature: (I[Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setHttpCameraUrls
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setHttpCameraUrls
   (JNIEnv* env, jclass, jint source, jobjectArray urls)
 {
   if (!urls) {
@@ -931,9 +975,10 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setHttpCameraUrls
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    getHttpCameraUrls
- * Signature: (I)[Ljava/lang/String;
+ * Signature: (I)[Ljava/lang/Object;
  */
-JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraUrls
+JNIEXPORT jobjectArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraUrls
   (JNIEnv* env, jclass, jint source)
 {
   CS_Status status = 0;
@@ -947,7 +992,8 @@ JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHttpCamera
  * Method:    putSourceFrame
  * Signature: (IJ)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_putSourceFrame
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_putSourceFrame
   (JNIEnv* env, jclass, jint source, jlong imageNativeObj)
 {
   cv::Mat& image = *((cv::Mat*)imageNativeObj);
@@ -961,7 +1007,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_putSourceFrame
  * Method:    notifySourceError
  * Signature: (ILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_notifySourceError
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_notifySourceError
   (JNIEnv* env, jclass, jint source, jstring msg)
 {
   if (!msg) {
@@ -978,7 +1025,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_notifySourceError
  * Method:    setSourceConnected
  * Signature: (IZ)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceConnected
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceConnected
   (JNIEnv* env, jclass, jint source, jboolean connected)
 {
   CS_Status status = 0;
@@ -991,7 +1039,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceConnected
  * Method:    setSourceDescription
  * Signature: (ILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceDescription
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceDescription
   (JNIEnv* env, jclass, jint source, jstring description)
 {
   if (!description) {
@@ -1008,7 +1057,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceDescription
  * Method:    createSourceProperty
  * Signature: (ILjava/lang/String;IIIIII)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createSourceProperty
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createSourceProperty
   (JNIEnv* env, jclass, jint source, jstring name, jint kind, jint minimum,
    jint maximum, jint step, jint defaultValue, jint value)
 {
@@ -1023,9 +1073,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createSourceProperty
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    setSourceEnumPropertyChoices
- * Signature: (II[Ljava/lang/String;)V
+ * Signature: (II[Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumPropertyChoices
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumPropertyChoices
   (JNIEnv* env, jclass, jint source, jint property, jobjectArray choices)
 {
   if (!choices) {
@@ -1054,7 +1105,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumProperty
  * Method:    createMjpegServer
  * Signature: (Ljava/lang/String;Ljava/lang/String;I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer
   (JNIEnv* env, jclass, jstring name, jstring listenAddress, jint port)
 {
   if (!name) {
@@ -1077,7 +1129,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer
  * Method:    createCvSink
  * Signature: (Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createCvSink
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_createCvSink
   (JNIEnv* env, jclass, jstring name)
 {
   if (!name) {
@@ -1095,7 +1148,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createCvSink
  * Method:    getSinkKind
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkKind
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkKind
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1109,7 +1163,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkKind
  * Method:    getSinkName
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkName
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkName
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1124,7 +1179,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkName
  * Method:    getSinkDescription
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkDescription
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkDescription
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1139,7 +1195,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkDescription
  * Method:    setSinkSource
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkSource
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSinkSource
   (JNIEnv* env, jclass, jint sink, jint source)
 {
   CS_Status status = 0;
@@ -1152,7 +1209,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkSource
  * Method:    getSinkSourceProperty
  * Signature: (ILjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkSourceProperty
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkSourceProperty
   (JNIEnv* env, jclass, jint sink, jstring name)
 {
   if (!name) {
@@ -1170,7 +1228,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkSourceProperty
  * Method:    getSinkSource
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkSource
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkSource
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1184,7 +1243,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkSource
  * Method:    copySink
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_copySink
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_copySink
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1198,7 +1258,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_copySink
  * Method:    releaseSink
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSink
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_releaseSink
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1211,7 +1272,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSink
  * Method:    getMjpegServerListenAddress
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerListenAddress
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerListenAddress
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1225,7 +1287,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerList
  * Method:    getMjpegServerPort
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1239,7 +1302,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort
  * Method:    setSinkDescription
  * Signature: (ILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkDescription
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSinkDescription
   (JNIEnv* env, jclass, jint sink, jstring description)
 {
   if (!description) {
@@ -1256,7 +1320,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkDescription
  * Method:    grabSinkFrame
  * Signature: (IJ)J
  */
-JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrame
+JNIEXPORT jlong JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrame
   (JNIEnv* env, jclass, jint sink, jlong imageNativeObj)
 {
   cv::Mat& image = *((cv::Mat*)imageNativeObj);
@@ -1271,7 +1336,8 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrame
  * Method:    grabSinkFrameTimeout
  * Signature: (IJD)J
  */
-JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrameTimeout
+JNIEXPORT jlong JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrameTimeout
   (JNIEnv* env, jclass, jint sink, jlong imageNativeObj, jdouble timeout)
 {
   cv::Mat& image = *((cv::Mat*)imageNativeObj);
@@ -1286,7 +1352,8 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_grabSinkFrameTimeout
  * Method:    getSinkError
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkError
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getSinkError
   (JNIEnv* env, jclass, jint sink)
 {
   CS_Status status = 0;
@@ -1301,7 +1368,8 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getSinkError
  * Method:    setSinkEnabled
  * Signature: (IZ)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkEnabled
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setSinkEnabled
   (JNIEnv* env, jclass, jint sink, jboolean enabled)
 {
   CS_Status status = 0;
@@ -1312,9 +1380,10 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSinkEnabled
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    addListener
- * Signature: (Ljava/util/function/Consumer;IZ)I
+ * Signature: (Ljava/lang/Object;IZ)I
  */
-JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_addListener
+JNIEXPORT jint JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_addListener
   (JNIEnv* envouter, jclass, jobject listener, jint eventMask,
    jboolean immediateNotify)
 {
@@ -1324,7 +1393,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_addListener
   }
   // the shared pointer to the weak global will keep it around until the
   // entry listener is destroyed
-  auto listener_global = std::make_shared<JCSGlobal<jobject>>(envouter, listener);
+  auto listener_global =
+      std::make_shared<JCSGlobal<jobject>>(envouter, listener);
 
   // cls is a temporary here; cannot be used within callback functor
   jclass cls = envouter->GetObjectClass(listener);
@@ -1368,7 +1438,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_addListener
  * Method:    removeListener
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_removeListener
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_removeListener
   (JNIEnv* env, jclass, jint handle)
 {
   CS_Status status = 0;
@@ -1381,7 +1452,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_removeListener
  * Method:    setTelemetryPeriod
  * Signature: (D)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setTelemetryPeriod
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setTelemetryPeriod
   (JNIEnv* env, jclass, jdouble seconds)
 {
   cs::SetTelemetryPeriod(seconds);
@@ -1392,7 +1464,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setTelemetryPeriod
  * Method:    getTelemetryElapsedTime
  * Signature: ()D
  */
-JNIEXPORT jdouble JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryElapsedTime
+JNIEXPORT jdouble JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getTelemetryElapsedTime
   (JNIEnv* env, jclass)
 {
   return cs::GetTelemetryElapsedTime();
@@ -1403,7 +1476,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryElapse
  * Method:    getTelemetryValue
  * Signature: (II)J
  */
-JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryValue
+JNIEXPORT jlong JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getTelemetryValue
   (JNIEnv* env, jclass, jint handle, jint kind)
 {
   CS_Status status = 0;
@@ -1418,13 +1492,13 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryValue
  * Method:    getTelemetryAverageValue
  * Signature: (II)D
  */
-JNIEXPORT jdouble JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryAverageValue
+JNIEXPORT jdouble JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getTelemetryAverageValue
   (JNIEnv* env, jclass, jint handle, jint kind)
 {
   CS_Status status = 0;
-  auto val = cs::GetTelemetryAverageValue(handle,
-                                          static_cast<CS_TelemetryKind>(kind),
-                                          &status);
+  auto val = cs::GetTelemetryAverageValue(
+      handle, static_cast<CS_TelemetryKind>(kind), &status);
   CheckStatus(env, status);
   return val;
 }
@@ -1432,9 +1506,10 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_cscore_CameraServerJNI_getTelemetryAverag
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    enumerateUsbCameras
- * Signature: ()[Ledu/wpi/cameraserver/UsbCameraInfo;
+ * Signature: ()[Ljava/lang/Object;
  */
-JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbCameras
+JNIEXPORT jobjectArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbCameras
   (JNIEnv* env, jclass)
 {
 #ifndef __linux__
@@ -1460,7 +1535,8 @@ JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbC
  * Method:    enumerateSources
  * Signature: ()[I
  */
-JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSources
+JNIEXPORT jintArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateSources
   (JNIEnv* env, jclass)
 {
   CS_Status status = 0;
@@ -1475,7 +1551,8 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSources
  * Method:    enumerateSinks
  * Signature: ()[I
  */
-JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSinks
+JNIEXPORT jintArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_enumerateSinks
   (JNIEnv* env, jclass)
 {
   CS_Status status = 0;
@@ -1490,7 +1567,8 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateSinks
  * Method:    getHostname
  * Signature: ()Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHostname
+JNIEXPORT jstring JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getHostname
   (JNIEnv* env, jclass)
 {
   return MakeJString(env, cs::GetHostname());
@@ -1499,9 +1577,10 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getHostname
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    getNetworkInterfaces
- * Signature: ()[Ljava/lang/String;
+ * Signature: ()[Ljava/lang/Object;
  */
-JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getNetworkInterfaces
+JNIEXPORT jobjectArray JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_getNetworkInterfaces
   (JNIEnv* env, jclass)
 {
   return MakeJStringArray(env, cs::GetNetworkInterfaces());
@@ -1536,16 +1615,17 @@ struct LogMessage {
 
 typedef JSingletonCallbackManager<LogMessage> LoggerJNI;
 
-}  // anonymous namespace
+}  // namespace
 
 extern "C" {
 
 /*
  * Class:     edu_wpi_cscore_CameraServerJNI
  * Method:    setLogger
- * Signature: (Ledu/wpi/cscore/CameraServerJNI/LoggerFunction;I)V
+ * Signature: (Ljava/lang/Object;I)V
  */
-JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setLogger
+JNIEXPORT void JNICALL
+Java_edu_wpi_cscore_CameraServerJNI_setLogger
   (JNIEnv* env, jclass, jobject func, jint minLevel)
 {
   if (!func) {

cscore/src/main/native/include/cscore_cpp.h

@@ -164,8 +164,7 @@ CS_Source CreateUsbCameraPath(wpi::StringRef name, wpi::StringRef path,
                               CS_Status* status);
 CS_Source CreateHttpCamera(wpi::StringRef name, wpi::StringRef url,
                            CS_HttpCameraKind kind, CS_Status* status);
-CS_Source CreateHttpCamera(wpi::StringRef name,
-                           wpi::ArrayRef<std::string> urls,
+CS_Source CreateHttpCamera(wpi::StringRef name, wpi::ArrayRef<std::string> urls,
                            CS_HttpCameraKind kind, CS_Status* status);
 CS_Source CreateCvSource(wpi::StringRef name, const VideoMode& mode,
                          CS_Status* status);
@@ -175,8 +174,7 @@ CS_Source CreateCvSource(wpi::StringRef name, const VideoMode& mode,
 //
 CS_SourceKind GetSourceKind(CS_Source source, CS_Status* status);
 std::string GetSourceName(CS_Source source, CS_Status* status);
-wpi::StringRef GetSourceName(CS_Source source,
-                             wpi::SmallVectorImpl<char>& buf,
+wpi::StringRef GetSourceName(CS_Source source, wpi::SmallVectorImpl<char>& buf,
                              CS_Status* status);
 std::string GetSourceDescription(CS_Source source, CS_Status* status);
 wpi::StringRef GetSourceDescription(CS_Source source,
@@ -199,8 +197,9 @@ bool SetSourceResolution(CS_Source source, int width, int height,
 bool SetSourceFPS(CS_Source source, int fps, CS_Status* status);
 std::vector<VideoMode> EnumerateSourceVideoModes(CS_Source source,
                                                  CS_Status* status);
-wpi::ArrayRef<CS_Sink> EnumerateSourceSinks(
-    CS_Source source, wpi::SmallVectorImpl<CS_Sink>& vec, CS_Status* status);
+wpi::ArrayRef<CS_Sink> EnumerateSourceSinks(CS_Source source,
+                                            wpi::SmallVectorImpl<CS_Sink>& vec,
+                                            CS_Status* status);
 CS_Source CopySource(CS_Source source, CS_Status* status);
 void ReleaseSource(CS_Source source, CS_Status* status);
 
@@ -234,8 +233,7 @@ std::vector<std::string> GetHttpCameraUrls(CS_Source source, CS_Status* status);
 // OpenCV Source Functions
 //
 void PutSourceFrame(CS_Source source, cv::Mat& image, CS_Status* status);
-void NotifySourceError(CS_Source source, wpi::StringRef msg,
-                       CS_Status* status);
+void NotifySourceError(CS_Source source, wpi::StringRef msg, CS_Status* status);
 void SetSourceConnected(CS_Source source, bool connected, CS_Status* status);
 void SetSourceDescription(CS_Source source, wpi::StringRef description,
                           CS_Status* status);
@@ -265,8 +263,7 @@ std::string GetSinkName(CS_Sink sink, CS_Status* status);
 wpi::StringRef GetSinkName(CS_Sink sink, wpi::SmallVectorImpl<char>& buf,
                            CS_Status* status);
 std::string GetSinkDescription(CS_Sink sink, CS_Status* status);
-wpi::StringRef GetSinkDescription(CS_Sink sink,
-                                  wpi::SmallVectorImpl<char>& buf,
+wpi::StringRef GetSinkDescription(CS_Sink sink, wpi::SmallVectorImpl<char>& buf,
                                   CS_Status* status);
 void SetSinkSource(CS_Sink sink, CS_Source source, CS_Status* status);
 CS_Property GetSinkSourceProperty(CS_Sink sink, wpi::StringRef name,
@@ -333,8 +330,8 @@ std::vector<UsbCameraInfo> EnumerateUsbCameras(CS_Status* status);
 
 wpi::ArrayRef<CS_Source> EnumerateSourceHandles(
     wpi::SmallVectorImpl<CS_Source>& vec, CS_Status* status);
-wpi::ArrayRef<CS_Sink> EnumerateSinkHandles(
-    wpi::SmallVectorImpl<CS_Sink>& vec, CS_Status* status);
+wpi::ArrayRef<CS_Sink> EnumerateSinkHandles(wpi::SmallVectorImpl<CS_Sink>& vec,
+                                            CS_Status* status);
 
 std::string GetHostname();
 

cscore/src/main/native/include/cscore_oo.h

@@ -448,8 +448,7 @@ class CvSource : public VideoSource {
   /// @param defaultValue Default value
   /// @param value Current value
   /// @return Property
-  VideoProperty CreateStringProperty(wpi::StringRef name,
-                                     wpi::StringRef value);
+  VideoProperty CreateStringProperty(wpi::StringRef name, wpi::StringRef value);
 
   /// Configure enum property choices.
   /// @param property Property