[cscore] Replace CS_PixelFormat with WPI_PixelFormat (wpilibsuite#5954)

This fixes a compilation error introduced by wpilibsuite#5923.
Starlight220 · Dec 1, 2023 · 77db4ff · 77db4ff
1 parent 209c4f0
commit 77db4ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cscore/src/main/native/cpp/CvSinkImpl.cpp b/cscore/src/main/native/cpp/CvSinkImpl.cpp
@@ -211,14 +211,14 @@ void SetSinkEnabled(CS_Sink sink, bool enabled, CS_Status* status) {
 
 extern "C" {
 
-CS_Sink CS_CreateCvSink(const char* name, enum CS_PixelFormat pixelFormat,
+CS_Sink CS_CreateCvSink(const char* name, enum WPI_PixelFormat pixelFormat,
                         CS_Status* status) {
   return cs::CreateCvSink(
       name, static_cast<VideoMode::PixelFormat>(pixelFormat), status);
 }
 
 CS_Sink CS_CreateCvSinkCallback(const char* name,
-                                enum CS_PixelFormat pixelFormat, void* data,
+                                enum WPI_PixelFormat pixelFormat, void* data,
                                 void (*processFrame)(void* data, uint64_t time),
                                 CS_Status* status) {
   return cs::CreateCvSinkCallback(

diff --git a/cscore/src/main/native/include/cscore_c.h b/cscore/src/main/native/include/cscore_c.h
@@ -370,10 +370,10 @@ void CS_SetSourceEnumPropertyChoices(CS_Source source, CS_Property property,
  */
 CS_Sink CS_CreateMjpegServer(const char* name, const char* listenAddress,
                              int port, CS_Status* status);
-CS_Sink CS_CreateCvSink(const char* name, enum CS_PixelFormat pixelFormat,
+CS_Sink CS_CreateCvSink(const char* name, enum WPI_PixelFormat pixelFormat,
                         CS_Status* status);
 CS_Sink CS_CreateCvSinkCallback(const char* name,
-                                enum CS_PixelFormat pixelFormat, void* data,
+                                enum WPI_PixelFormat pixelFormat, void* data,
                                 void (*processFrame)(void* data, uint64_t time),
                                 CS_Status* status);
 /** @} */