From 4bb7c6960a092dd25a9d51d70ac40a55c82e4b1b Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 23 Nov 2023 11:10:36 -0800 Subject: [PATCH] [cscore] Replace CS_PixelFormat with WPI_PixelFormat This fixes a compilation error introduced by #5923. --- cscore/src/main/native/cpp/CvSinkImpl.cpp | 4 ++-- cscore/src/main/native/include/cscore_c.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cscore/src/main/native/cpp/CvSinkImpl.cpp b/cscore/src/main/native/cpp/CvSinkImpl.cpp index bfe96adac1b..a5447cccfe1 100644 --- 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(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 index 3f187f3cf4b..277d0ffc032 100644 --- 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); /** @} */